From f1f7075ce3d4fd4b98f7329a9612171bd186c95c Mon Sep 17 00:00:00 2001 From: team-nimblehq Date: Mon, 31 Jul 2023 09:34:44 +0000 Subject: [PATCH] [Chore] Generate & update sample project --- sample/android/.gitignore | 3 +- sample/android/app/build.gradle | 40 +++++++++++++++++++++++---- sample/android/config/debug.keystore | Bin 0 -> 2649 bytes sample/assets/colors/colors.xml | 4 --- sample/lib/main.dart | 4 +-- sample/lib/resources/app_colors.dart | 5 ++++ sample/pubspec.yaml | 4 --- 7 files changed, 43 insertions(+), 17 deletions(-) create mode 100644 sample/android/config/debug.keystore delete mode 100644 sample/assets/colors/colors.xml create mode 100644 sample/lib/resources/app_colors.dart diff --git a/sample/android/.gitignore b/sample/android/.gitignore index 0a741cb4..6fd19d60 100644 --- a/sample/android/.gitignore +++ b/sample/android/.gitignore @@ -8,4 +8,5 @@ GeneratedPluginRegistrant.java # Remember to never publicly share your keystore. # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app -key.properties +signing.properties +config/release.keystore diff --git a/sample/android/app/build.gradle b/sample/android/app/build.gradle index 7d71e363..41cc0787 100644 --- a/sample/android/app/build.gradle +++ b/sample/android/app/build.gradle @@ -6,6 +6,12 @@ if (localPropertiesFile.exists()) { } } +def keystoreProperties = new Properties() +def keystorePropertiesFile = rootProject.file('signing.properties') +if (keystorePropertiesFile.exists()) { + keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) +} + def flutterRoot = localProperties.getProperty('flutter.sdk') if (flutterRoot == null) { throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") @@ -26,10 +32,10 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" project.ext.envConfigFiles = [ - stagingdebug: ".env.staging", - stagingrelease: ".env.staging", - productiondebug: ".env", - productionrelease: ".env" + stagingdebug : ".env.staging", + stagingrelease : ".env.staging", + productiondebug : ".env", + productionrelease: ".env" ] apply from: project(':flutter_config').projectDir.getPath() + "/dotenv.gradle" @@ -61,10 +67,32 @@ android { resValue "string", "build_config_package", "co.nimblehq.flutter.template" } + signingConfigs { + release { + storeFile file('../config/release.keystore') + storePassword keystoreProperties['KEYSTORE_PASSWORD'] + keyAlias keystoreProperties['KEY_ALIAS'] + keyPassword keystoreProperties['KEY_PASSWORD'] + } + + debug { + storeFile file('../config/debug.keystore') + storePassword 'android' + keyAlias 'androiddebugkey' + keyPassword 'android' + } + } + buildTypes { release { - // TODO: Add your own signing config for the release build. - // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig signingConfigs.release + minifyEnabled true + shrinkResources true + debuggable false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + + debug { signingConfig signingConfigs.debug } } diff --git a/sample/android/config/debug.keystore b/sample/android/config/debug.keystore new file mode 100644 index 0000000000000000000000000000000000000000..cc8985c65287708e004bec40588615cb37d81bde GIT binary patch literal 2649 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 literal 0 HcmV?d00001 diff --git a/sample/assets/colors/colors.xml b/sample/assets/colors/colors.xml deleted file mode 100644 index 29ab3010..00000000 --- a/sample/assets/colors/colors.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #201547 - diff --git a/sample/lib/main.dart b/sample/lib/main.dart index 5c3a518f..3b14fac4 100644 --- a/sample/lib/main.dart +++ b/sample/lib/main.dart @@ -6,7 +6,7 @@ import 'package:go_router/go_router.dart'; import 'package:package_info_plus/package_info_plus.dart'; import 'package:sample/di/di.dart'; import 'package:sample/gen/assets.gen.dart'; -import 'package:sample/gen/colors.gen.dart'; +import 'package:sample/resources/app_colors.dart'; import 'package:sample/usecases/user/get_users_use_case.dart'; import 'home_view_model.dart'; @@ -117,7 +117,7 @@ class HomeScreenState extends ConsumerState { Text( FlutterConfig.get('SECRET'), style: const TextStyle( - color: ColorName.nimblePrimaryBlue, + color: AppColors.nimblePrimaryBlue, fontSize: 24, ), ), diff --git a/sample/lib/resources/app_colors.dart b/sample/lib/resources/app_colors.dart new file mode 100644 index 00000000..267e483d --- /dev/null +++ b/sample/lib/resources/app_colors.dart @@ -0,0 +1,5 @@ +import 'package:flutter/material.dart'; + +class AppColors { + static const Color nimblePrimaryBlue = Color(0xFF201547); +} diff --git a/sample/pubspec.yaml b/sample/pubspec.yaml index bc06b707..59e6ca74 100644 --- a/sample/pubspec.yaml +++ b/sample/pubspec.yaml @@ -95,7 +95,3 @@ flutter: flutter_gen: integrations: flutter_svg: true - - colors: - inputs: - - assets/colors/colors.xml