From 766e8ffefb2f098224ec2063d15f5b5c2630fceb Mon Sep 17 00:00:00 2001 From: Abdusalom G'ayratov Date: Mon, 8 Dec 2025 23:23:54 +0500 Subject: [PATCH] BASE: Update Firebase Json File. --- android/app/google-services.json | 42 +++++++++++++++++-- firebase.json | 2 +- ios/Runner/GoogleService-Info.plist | 8 ++-- lib/constant/const_texts.dart | 16 +++---- lib/firebase_options.dart | 12 +++--- .../home_screen/home_screen.dart | 6 +-- 6 files changed, 61 insertions(+), 25 deletions(-) diff --git a/android/app/google-services.json b/android/app/google-services.json index 869b8c5..3b964b4 100644 --- a/android/app/google-services.json +++ b/android/app/google-services.json @@ -8,7 +8,43 @@ "client": [ { "client_info": { - "mobilesdk_app_id": "1:893074789710:android:05002c15a64cf1e0c4ba1f", + "mobilesdk_app_id": "1:893074789710:android:70c2e98114a8ef1ac4ba1f", + "android_client_info": { + "package_name": "felix.fondex.driver" + } + }, + "oauth_client": [ + { + "client_id": "893074789710-nqkeis20f6b64luas7g44c836fvi0qms.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyALZhdy7Rw3jffipxsDvvz7_C_b4teVg1k" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "893074789710-nqkeis20f6b64luas7g44c836fvi0qms.apps.googleusercontent.com", + "client_type": 3 + }, + { + "client_id": "893074789710-7am77oq925d324gvpga8g6r6ggul4v9i.apps.googleusercontent.com", + "client_type": 2, + "ios_info": { + "bundle_id": "com.emart.driver" + } + } + ] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:893074789710:android:e932bc88da6665b3c4ba1f", "android_client_info": { "package_name": "felix.fondex.uz" } @@ -32,10 +68,10 @@ "client_type": 3 }, { - "client_id": "893074789710-pv12m4nhe82a4ueg9sb2pgt42r0e5da3.apps.googleusercontent.com", + "client_id": "893074789710-7am77oq925d324gvpga8g6r6ggul4v9i.apps.googleusercontent.com", "client_type": 2, "ios_info": { - "bundle_id": "felix.fondex.uz" + "bundle_id": "com.emart.driver" } } ] diff --git a/firebase.json b/firebase.json index 88cc8d5..0e7803d 100644 --- a/firebase.json +++ b/firebase.json @@ -1 +1 @@ -{"flutter":{"platforms":{"android":{"default":{"projectId":"fondexuzb","appId":"1:893074789710:android:05002c15a64cf1e0c4ba1f","fileOutput":"android/app/google-services.json"}},"dart":{"lib/firebase_options.dart":{"projectId":"fondexuzb","configurations":{"android":"1:893074789710:android:05002c15a64cf1e0c4ba1f","ios":"1:893074789710:ios:510ebf9e4ebed6a8c4ba1f"}}},"ios":{"default":{"projectId":"fondexuzb","appId":"1:893074789710:ios:510ebf9e4ebed6a8c4ba1f","uploadDebugSymbols":false,"fileOutput":"ios/Runner/GoogleService-Info.plist"}}}}} \ No newline at end of file +{"flutter":{"platforms":{"android":{"default":{"projectId":"fondexuzb","appId":"1:893074789710:android:e932bc88da6665b3c4ba1f","fileOutput":"android/app/google-services.json"}},"dart":{"lib/firebase_options.dart":{"projectId":"fondexuzb","configurations":{"android":"1:893074789710:android:e932bc88da6665b3c4ba1f","ios":"1:893074789710:ios:7dd456b65070f325c4ba1f"}}},"ios":{"default":{"projectId":"fondexuzb","appId":"1:893074789710:ios:7dd456b65070f325c4ba1f","uploadDebugSymbols":false,"fileOutput":"ios/Runner/GoogleService-Info.plist"}}}}} \ No newline at end of file diff --git a/ios/Runner/GoogleService-Info.plist b/ios/Runner/GoogleService-Info.plist index 9ddcbab..87acab5 100644 --- a/ios/Runner/GoogleService-Info.plist +++ b/ios/Runner/GoogleService-Info.plist @@ -3,9 +3,9 @@ CLIENT_ID - 893074789710-pv12m4nhe82a4ueg9sb2pgt42r0e5da3.apps.googleusercontent.com + 893074789710-tgc677brhj8902uu2nv6k53otbhbnp1e.apps.googleusercontent.com REVERSED_CLIENT_ID - com.googleusercontent.apps.893074789710-pv12m4nhe82a4ueg9sb2pgt42r0e5da3 + com.googleusercontent.apps.893074789710-tgc677brhj8902uu2nv6k53otbhbnp1e API_KEY AIzaSyD6Khoz4y93GCj3mOPi2FoluDipplH1av0 GCM_SENDER_ID @@ -13,7 +13,7 @@ PLIST_VERSION 1 BUNDLE_ID - felix.fondex.uz + uz.felix.fondex.customer PROJECT_ID fondexuzb STORAGE_BUCKET @@ -29,7 +29,7 @@ IS_SIGNIN_ENABLED GOOGLE_APP_ID - 1:893074789710:ios:510ebf9e4ebed6a8c4ba1f + 1:893074789710:ios:7dd456b65070f325c4ba1f DATABASE_URL https://fondexuzb-default-rtdb.firebaseio.com diff --git a/lib/constant/const_texts.dart b/lib/constant/const_texts.dart index 6cb4350..b44803e 100644 --- a/lib/constant/const_texts.dart +++ b/lib/constant/const_texts.dart @@ -152,12 +152,12 @@ class ConstTexts { static String favourites = "favourites"; static String orders = "orders"; static String takeAway = "takeAway"; - static String allStores = "allStores"; - static String alert = "alert"; - static String cancel = "cancel"; - static String ok = "ok"; - static String freeDelivery = "freeDelivery"; - static String upto = "upto"; - static String doYouWantChangeTheDeliverOption = "doYouWantChangeTheDeliverOption"; - static String cash = "cash"; + // static String allStores = "allStores"; + // static String alert = "alert"; + // static String cancel = "cancel"; + // static String ok = "ok"; + // static String freeDelivery = "freeDelivery"; + // static String upto = "upto"; + // static String doYouWantChangeTheDeliverOption = "doYouWantChangeTheDeliverOption"; + // static String cash = "cash"; } diff --git a/lib/firebase_options.dart b/lib/firebase_options.dart index 4df3f6e..cf4dd0d 100644 --- a/lib/firebase_options.dart +++ b/lib/firebase_options.dart @@ -51,7 +51,7 @@ class DefaultFirebaseOptions { static const FirebaseOptions android = FirebaseOptions( apiKey: 'AIzaSyALZhdy7Rw3jffipxsDvvz7_C_b4teVg1k', - appId: '1:893074789710:android:05002c15a64cf1e0c4ba1f', + appId: '1:893074789710:android:e932bc88da6665b3c4ba1f', messagingSenderId: '893074789710', projectId: 'fondexuzb', databaseURL: 'https://fondexuzb-default-rtdb.firebaseio.com', @@ -60,13 +60,13 @@ class DefaultFirebaseOptions { static const FirebaseOptions ios = FirebaseOptions( apiKey: 'AIzaSyD6Khoz4y93GCj3mOPi2FoluDipplH1av0', - appId: '1:893074789710:ios:510ebf9e4ebed6a8c4ba1f', + appId: '1:893074789710:ios:7dd456b65070f325c4ba1f', messagingSenderId: '893074789710', projectId: 'fondexuzb', databaseURL: 'https://fondexuzb-default-rtdb.firebaseio.com', storageBucket: 'fondexuzb.firebasestorage.app', - iosClientId: - '893074789710-pv12m4nhe82a4ueg9sb2pgt42r0e5da3.apps.googleusercontent.com', - iosBundleId: 'felix.fondex.uz', + iosClientId: '893074789710-tgc677brhj8902uu2nv6k53otbhbnp1e.apps.googleusercontent.com', + iosBundleId: 'uz.felix.fondex.customer', ); -} + +} \ No newline at end of file diff --git a/lib/screen_ui/multi_vendor_service/home_screen/home_screen.dart b/lib/screen_ui/multi_vendor_service/home_screen/home_screen.dart index e10d60e..9764e2f 100644 --- a/lib/screen_ui/multi_vendor_service/home_screen/home_screen.dart +++ b/lib/screen_ui/multi_vendor_service/home_screen/home_screen.dart @@ -1248,9 +1248,9 @@ class HomeScreen extends StatelessWidget { builder: (BuildContext context) { return CustomDialogBox( title: ConstTexts.alert.tr, - descriptions: - ConstTexts.doYouWantChangeTheDeliverOption - .tr, + descriptions:"", + // ConstTexts.doYouWantChangeTheDeliverOption + // .tr, positiveString: ConstTexts.ok.tr, negativeString: ConstTexts.cancel.tr, positiveClick: () async {