From fe799ad8208a3887419b6018bc61d28ff33932ba Mon Sep 17 00:00:00 2001 From: sainw Date: Sat, 11 Sep 2021 16:56:20 +0630 Subject: [PATCH] fix null safety --- android/app/build.gradle | 8 ++++-- android/app/src/dev/AndroidManifest.xml | 3 +-- android/app/src/main/AndroidManifest.xml | 1 - .../java/com/mokkon/fcs/fcs/Application.java | 13 +++++++++ .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 544 -> 8760 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 442 -> 4526 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 721 -> 12725 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 1031 -> 24893 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 1443 -> 37342 bytes android/app/src/main/res/values/strings.xml | 4 +++ android/settings_aar.gradle | 1 + lib/data/provider/auth_fb.dart | 23 +++++++--------- lib/data/provider/messaging_fcm.dart | 10 ++++--- lib/main-dev.dart | 4 ++- lib/pages/carton/model/carton_model.dart | 8 +++--- lib/pages/carton_search/carton_search.dart | 2 +- .../model/delivery_address_model.dart | 16 ++++++----- lib/pages/discount/model/discount_model.dart | 7 ++--- lib/pages/faq/model/faq_model.dart | 2 +- .../model/fcs_shipment_model.dart | 2 +- lib/pages/invoice/model/invoice_model.dart | 19 ++++++------- lib/pages/market/model/market_model.dart | 3 ++- lib/pages/package/model/package_model.dart | 25 +++++++++--------- lib/pages/package/package_info.dart | 12 ++++++--- lib/pages/package/package_list.dart | 2 +- .../model/payment_method_model.dart | 3 +-- lib/pages/processing/processing_list.dart | 2 +- lib/pages/processing_old/processing_list.dart | 2 +- lib/pages/receiving/receiving_list.dart | 2 +- lib/pages/shipment/model/shipment_model.dart | 14 +++++----- lib/pages/staff/model/staff_model.dart | 12 +++++---- lib/pages/widgets/local_text.dart | 18 ++++++------- 32 files changed, 125 insertions(+), 93 deletions(-) create mode 100644 android/app/src/main/java/com/mokkon/fcs/fcs/Application.java create mode 100644 android/app/src/main/res/values/strings.xml create mode 100644 android/settings_aar.gradle diff --git a/android/app/build.gradle b/android/app/build.gradle index 0e9c8c7..a02cc42 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -24,12 +24,16 @@ if (flutterVersionName == null) { apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" +def keystoreProperties = new Properties() +def keystorePropertiesFile = rootProject.file('key.properties') +if (keystorePropertiesFile.exists()) { + keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) +} + android { compileSdkVersion 30 defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.mokkon.fcs.fcs" minSdkVersion 21 targetSdkVersion 30 versionCode flutterVersionCode.toInteger() diff --git a/android/app/src/dev/AndroidManifest.xml b/android/app/src/dev/AndroidManifest.xml index d269aae..03ad093 100644 --- a/android/app/src/dev/AndroidManifest.xml +++ b/android/app/src/dev/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.mokkon.fcs.fcs">