From 21cf7a2517392b14848e1107b5d82eb106a90720 Mon Sep 17 00:00:00 2001 From: sainw Date: Mon, 13 Jan 2025 10:10:05 +0630 Subject: [PATCH] android release 1 --- .gitignore | 3 -- android/app/build.gradle | 18 +++++++--- android/app/src/prod/AndroidManifest.xml | 38 +++++++++++++++++++++ android/app/src/prod/res/values/strings.xml | 4 +++ firebase.json | 1 + lib/main-prod.dart | 4 +-- lib/main.dart | 24 +++++++++++++ lib/pages/main/home_page.dart | 18 +++++----- 8 files changed, 92 insertions(+), 18 deletions(-) create mode 100644 android/app/src/prod/AndroidManifest.xml create mode 100644 android/app/src/prod/res/values/strings.xml create mode 100644 firebase.json create mode 100644 lib/main.dart diff --git a/.gitignore b/.gitignore index bc82e23..29788fd 100644 --- a/.gitignore +++ b/.gitignore @@ -43,9 +43,7 @@ app.*.map.json !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages android/key.properties android/key.jks -android/app/src/prod/AndroidManifest.xml android/app/src/prod/google-services.json -android/app/src/prod/res/values/strings.xml .gradle/5.6.2/gc.properties .gradle/5.6.2/executionHistory/executionHistory.bin .gradle/5.6.2/executionHistory/executionHistory.lock @@ -59,4 +57,3 @@ android/dev-key.properties ios/Runner/GoogleService-Info.plist android/app/google-services.json ios/Runner/GoogleService-Info.plist -ios/Runner/GoogleService-Info.plist diff --git a/android/app/build.gradle b/android/app/build.gradle index d12ef09..91b3464 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -67,16 +67,16 @@ android { } - flavorDimensions "app" + flavorDimensions "fcs" productFlavors { prod { - dimension "app" + dimension "fcs" applicationId "com.mokkon.fcs" versionCode flutterVersionCode.toInteger() versionName flutterVersionName } dev { - dimension "app" + dimension "fcs" applicationId "com.mokkon.fcs.dev" versionCode flutterVersionCode.toInteger() versionName flutterVersionName @@ -100,11 +100,21 @@ android { // useProguard false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + applicationVariants.all { variant -> + variant.outputs.all { + def newName + // if (buildType == 'debug'){ + // newName = "app-${variant.getFlavorName()}-debug.apk" + // } else { + newName = "${variant.productFlavors[0].dimension}_${variant.productFlavors[0].name}_v${defaultConfig.versionName}+${defaultConfig.versionCode}.apk" + // } + outputFileName = newName + } + } } debug { debuggable true } - } } diff --git a/android/app/src/prod/AndroidManifest.xml b/android/app/src/prod/AndroidManifest.xml new file mode 100644 index 0000000..48ad6f0 --- /dev/null +++ b/android/app/src/prod/AndroidManifest.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + diff --git a/android/app/src/prod/res/values/strings.xml b/android/app/src/prod/res/values/strings.xml new file mode 100644 index 0000000..eb33086 --- /dev/null +++ b/android/app/src/prod/res/values/strings.xml @@ -0,0 +1,4 @@ + + + FCS Logistics + diff --git a/firebase.json b/firebase.json new file mode 100644 index 0000000..3eb16fd --- /dev/null +++ b/firebase.json @@ -0,0 +1 @@ +{"flutter":{"platforms":{"android":{"default":{"projectId":"fcs-dev1","appId":"1:944560757353:android:d21ae04e44e82f10fa60f8","fileOutput":"android/app/google-services.json"}},"ios":{"default":{"projectId":"fcs-dev1","appId":"1:944560757353:ios:de037244faea4173fa60f8","uploadDebugSymbols":false,"fileOutput":"ios/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"fcs-dev1","configurations":{"android":"1:944560757353:android:d21ae04e44e82f10fa60f8","ios":"1:944560757353:ios:de037244faea4173fa60f8"}}}}}} \ No newline at end of file diff --git a/lib/main-prod.dart b/lib/main-prod.dart index 883989d..bc08ca8 100644 --- a/lib/main-prod.dart +++ b/lib/main-prod.dart @@ -1,5 +1,5 @@ import 'package:fcs/data/provider/messaging_fcm.dart'; -import 'package:fcs/firebase_options.dart'; +import 'package:fcs/firebase_options_prod.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:flutter/material.dart'; @@ -20,5 +20,5 @@ Future main() async { color: Colors.blue, apiURL: "https://asia-northeast1-fcs-prod1.cloudfunctions.net/API13", level: Level.ALL); - runApp(App(title: "FCS")); + runApp(App(title: "FCS Logistics")); } diff --git a/lib/main.dart b/lib/main.dart new file mode 100644 index 0000000..9c3ac08 --- /dev/null +++ b/lib/main.dart @@ -0,0 +1,24 @@ +import 'package:fcs/data/provider/messaging_fcm.dart'; +import 'package:fcs/firebase_options_prod.dart'; +import 'package:firebase_core/firebase_core.dart'; +import 'package:firebase_messaging/firebase_messaging.dart'; +import 'package:flutter/material.dart'; +import 'package:logging/logging.dart'; + +import 'app.dart'; +import 'config.dart'; + +Future main() async { + WidgetsFlutterBinding.ensureInitialized(); + await Firebase.initializeApp( + options: DefaultFirebaseOptions.currentPlatform, + ); + FirebaseMessaging.onBackgroundMessage(backgroundMessageHandler); + + Config( + flavor: Flavor.PRODUCTION, + color: Colors.blue, + apiURL: "https://asia-northeast1-fcs-prod1.cloudfunctions.net/API13", + level: Level.ALL); + runApp(App(title: "FCS")); +} diff --git a/lib/pages/main/home_page.dart b/lib/pages/main/home_page.dart index f04d77d..ed66a40 100644 --- a/lib/pages/main/home_page.dart +++ b/lib/pages/main/home_page.dart @@ -352,19 +352,19 @@ class _HomePageState extends State { if (user.joined) { widgets.add(packagesBtn); // widgets.add(shipmentBtn); - widgets.add(invoicesBtn); + // widgets.add(invoicesBtn); if (user.hasAdmin() || user.hasSupport()) widgetsFcs.add(rateBtnFcs); if (user.hasPackages()) widgetsFcs.add(packagesBtnFcs); // if (user.hasShipment()) widgetsFcs.add(shipmentBtnFcs); - if (user.hasShipment()) widgetsFcs.add(pickupBtnFcs); - if (user.hasInvoices()) widgetsFcs.add(invoicesBtnFcs); + // if (user.hasShipment()) widgetsFcs.add(pickupBtnFcs); + // if (user.hasInvoices()) widgetsFcs.add(invoicesBtnFcs); - if (user.hasFcsShipments()) widgetsFcs.add(fcsShipmentBtn); - if (user.hasReceiving()) widgetsFcs.add(receivingBtn); - if (user.hasProcessing()) widgetsFcs.add(processingBtn); - if (user.hasCarton()) widgetsFcs.add(cartonBtn); - if (user.hasDeliveries()) widgetsFcs.add(deliveryBtn); + // if (user.hasFcsShipments()) widgetsFcs.add(fcsShipmentBtn); + // if (user.hasReceiving()) widgetsFcs.add(receivingBtn); + // if (user.hasProcessing()) widgetsFcs.add(processingBtn); + // if (user.hasCarton()) widgetsFcs.add(cartonBtn); + // if (user.hasDeliveries()) widgetsFcs.add(deliveryBtn); if (user.hasCustomers()) widgetsFcs.add(customersBtn); if (user.hasAdmin()) widgetsFcs.add(discountBtn); if (user.hasStaffs()) widgetsFcs.add(staffBtn); @@ -512,7 +512,7 @@ class _HomePageState extends State { profileBtn, ] : [ - mainModel.isPinLogin ? pinLogoutBtn : pinLoginBtn, + // mainModel.isPinLogin ? pinLogoutBtn : pinLoginBtn, fcsToggle, profileBtn, ]