From ddea2f93d51722f6c187d3bfffb0731cf16e994d Mon Sep 17 00:00:00 2001 From: venbaittech Date: Fri, 4 Apr 2025 09:18:38 +0530 Subject: [PATCH] new package name --- .env | 1 - .../arm64-v8a/configure_fingerprint.bin | 24 +++++++-------- .../armeabi-v7a/configure_fingerprint.bin | 24 +++++++-------- .../4x4l1c1m/x86/configure_fingerprint.bin | 24 +++++++-------- .../4x4l1c1m/x86_64/configure_fingerprint.bin | 24 +++++++-------- android/app/build.gradle | 9 +++--- android/app/google-services.json | 19 ++++++++++++ android/app/src/debug/google-services.json | 29 +++++++++++++++---- android/app/src/main/AndroidManifest.xml | 2 +- .../{frontend => benefits}/MainActivity.kt | 2 +- android/build.gradle | 4 +-- ios/Runner/Info.plist | 2 +- lib/main.dart | 2 +- lib/pages/login.dart | 13 ++++++--- lib/pages/postEnrollment/profile.dart | 7 +++-- lib/pages/verify.dart | 4 ++- linux/CMakeLists.txt | 2 +- macos/Runner/Configs/AppInfo.xcconfig | 2 +- pubspec.yaml | 2 +- web/index.html | 2 +- 20 files changed, 121 insertions(+), 77 deletions(-) rename android/app/src/main/kotlin/nh/ind/nhance/{frontend => benefits}/MainActivity.kt (77%) diff --git a/.env b/.env index b4a315a..611d01d 100644 --- a/.env +++ b/.env @@ -4,4 +4,3 @@ TICKET_API_URL=https://venbait.in/nhance/dev/api ticketToken=3YTSia2mRoZ7A4zvBgkqbGPrCd6Ewp8IDOuyjXhVFsl1nxWNcQJ95MeUftKH BASE_HREF=/nhance/app/dev/ ENV=development - diff --git a/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/configure_fingerprint.bin index 5dff4d9..8b2737b 100644 --- a/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/configure_fingerprint.bin +++ b/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log  ~/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2 } -{/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/android_gradle_build.json  2 2 +{/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/android_gradle_build.json  2 2  -/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/android_gradle_build_mini.json  2 2q +/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/android_gradle_build_mini.json  2 2q o -m/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/build.ninja  2Է 2u +m/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/build.ninja  2Է 2u s -q/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/build.ninja.txt  2z +q/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/build.ninja.txt  2z x -v/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/build_file_index.txt  2 d 2{ +v/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/build_file_index.txt  2 d 2{ y -w/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/compile_commands.json  2 +w/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/compile_commands.json  2 } -{/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/compile_commands.json.bin  2  +{/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/compile_commands.json.bin  2   -/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/metadata_generation_command.txt  2 +/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/metadata_generation_command.txt  2  2x v -t/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/prefab_config.json  2  ( 2} +t/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/prefab_config.json  2  ( 2} { -y/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/symbol_folder_index.txt  2  p 2h +y/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/arm64-v8a/symbol_folder_index.txt  2  p 2h f -d/home/venba/snap/flutter/common/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  2  2 \ No newline at end of file +d/home/venba/snap/flutter/common/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  2  2 \ No newline at end of file diff --git a/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/configure_fingerprint.bin index 2886ca2..cb47f49 100644 --- a/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/configure_fingerprint.bin +++ b/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log  /home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2  -}/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/android_gradle_build.json  2 2 +}/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/android_gradle_build.json  2 2  -/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/android_gradle_build_mini.json  2 2s +/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/android_gradle_build_mini.json  2 2s q -o/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/build.ninja  2޷ 2w +o/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/build.ninja  2޷ 2w u -s/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/build.ninja.txt  2| +s/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/build.ninja.txt  2| z -x/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/build_file_index.txt  2 d 2} +x/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/build_file_index.txt  2 d 2} { -y/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/compile_commands.json  2 +y/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/compile_commands.json  2  -}/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/compile_commands.json.bin  2  +}/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/compile_commands.json.bin  2   -/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/metadata_generation_command.txt  2 +/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/metadata_generation_command.txt  2  2z x -v/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/prefab_config.json  2  ( 2 +v/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/prefab_config.json  2  ( 2 } -{/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/symbol_folder_index.txt  2  r 2h +{/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/armeabi-v7a/symbol_folder_index.txt  2  r 2h f -d/home/venba/snap/flutter/common/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  2  2 \ No newline at end of file +d/home/venba/snap/flutter/common/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  2  2 \ No newline at end of file diff --git a/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/configure_fingerprint.bin index e4c61fd..b4076c9 100644 --- a/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/configure_fingerprint.bin +++ b/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log| z x/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2y +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2y w -u/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/android_gradle_build.json  2 2~ +u/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/android_gradle_build.json  2 2~ | -z/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/android_gradle_build_mini.json  2 2k +z/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/android_gradle_build_mini.json  2 2k i -g/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/build.ninja  2 2o +g/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/build.ninja  2 2o m -k/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/build.ninja.txt  2t +k/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/build.ninja.txt  2t r -p/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/build_file_index.txt  2 d 2u +p/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/build_file_index.txt  2 d 2u s -q/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/compile_commands.json  2y +q/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/compile_commands.json  2y w -u/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/compile_commands.json.bin  2  +u/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/compile_commands.json.bin  2  } -{/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/metadata_generation_command.txt  2 +{/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/metadata_generation_command.txt  2  2r p -n/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/prefab_config.json  2  ( 2w +n/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/prefab_config.json  2  ( 2w u -s/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/symbol_folder_index.txt  2  j 2h +s/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86/symbol_folder_index.txt  2  j 2h f -d/home/venba/snap/flutter/common/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  2  2 \ No newline at end of file +d/home/venba/snap/flutter/common/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  2  2 \ No newline at end of file diff --git a/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/configure_fingerprint.bin index 35c7393..99619ec 100644 --- a/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/configure_fingerprint.bin +++ b/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log } {/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  Ģ2  2| +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2| z -x/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/android_gradle_build.json  Ģ2 2 +x/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/android_gradle_build.json  2 2  -}/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/android_gradle_build_mini.json  Ģ2 2n +}/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/android_gradle_build_mini.json  2 2n l -j/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/build.ninja  Ģ2ŷ 2r +j/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/build.ninja  2ŷ 2r p -n/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/build.ninja.txt  Ģ2w +n/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/build.ninja.txt  2w u -s/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/build_file_index.txt  Ģ2 d 2x +s/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/build_file_index.txt  2 d 2x v -t/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/compile_commands.json  Ģ2| +t/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/compile_commands.json  2| z -x/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/compile_commands.json.bin  Ģ2  +x/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/compile_commands.json.bin  2   -~/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/metadata_generation_command.txt  Ģ2 +~/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/metadata_generation_command.txt  2  2u s -q/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/prefab_config.json  Ģ2  ( 2z +q/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/prefab_config.json  2  ( 2z x -v/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/symbol_folder_index.txt  Ģ2  m 2h +v/home/venba/StudioProjects/post_enrollment_app/android/app/.cxx/RelWithDebInfo/4x4l1c1m/x86_64/symbol_folder_index.txt  2  m 2h f -d/home/venba/snap/flutter/common/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  Ģ2  2 \ No newline at end of file +d/home/venba/snap/flutter/common/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  2  2 \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index ddecd51..7c1d1b5 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -19,7 +19,7 @@ if (project.hasProperty('google-services.json')) { def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { - flutterVersionCode = '3' + flutterVersionCode = '2' } def flutterVersionName = localProperties.getProperty('flutter.versionName') @@ -34,7 +34,7 @@ if (keystorePropertiesFile.exists()) { } android { - namespace "nh.ind.nhance.frontend" + namespace "nh.ind.nhance.benefits" compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion @@ -53,7 +53,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "nh.ind.nhance.frontend" + applicationId "nh.ind.nhance.benefits" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdkVersion 23 @@ -88,8 +88,7 @@ flutter { } dependencies { - implementation platform("com.google.firebase:firebase-bom:33.11.0") // Latest BOM version + implementation platform("com.google.firebase:firebase-bom:33.12.0") // Latest BOM version implementation "com.google.firebase:firebase-auth:23.2.0" implementation "com.google.firebase:firebase-messaging:24.1.1" - implementation "com.google.firebase:firebase-core:21.1.1" } diff --git a/android/app/google-services.json b/android/app/google-services.json index 945fed9..7ab7ac8 100644 --- a/android/app/google-services.json +++ b/android/app/google-services.json @@ -5,6 +5,25 @@ "storage_bucket": "nhance-ee8d1.firebasestorage.app" }, "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:1084115316849:android:68b14c4ff37f4bbc6c6bd0", + "android_client_info": { + "package_name": "nh.ind.nhance.benefits" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyC4yHbCX4mQu0jO81pJrDwxKLQlTQWofrc" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } + }, { "client_info": { "mobilesdk_app_id": "1:1084115316849:android:963ff492c3d23ab06c6bd0", diff --git a/android/app/src/debug/google-services.json b/android/app/src/debug/google-services.json index 9f9141c..7ab7ac8 100644 --- a/android/app/src/debug/google-services.json +++ b/android/app/src/debug/google-services.json @@ -1,13 +1,32 @@ { "project_info": { - "project_number": "203846206303", - "project_id": "push-notification-enrollment", - "storage_bucket": "push-notification-enrollment.appspot.com" + "project_number": "1084115316849", + "project_id": "nhance-ee8d1", + "storage_bucket": "nhance-ee8d1.firebasestorage.app" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:203846206303:android:01f39a22f39a50539b6cea", + "mobilesdk_app_id": "1:1084115316849:android:68b14c4ff37f4bbc6c6bd0", + "android_client_info": { + "package_name": "nh.ind.nhance.benefits" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyC4yHbCX4mQu0jO81pJrDwxKLQlTQWofrc" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:1084115316849:android:963ff492c3d23ab06c6bd0", "android_client_info": { "package_name": "nh.ind.nhance.frontend" } @@ -15,7 +34,7 @@ "oauth_client": [], "api_key": [ { - "current_key": "AIzaSyAdacw5svpqopDCpoEym7aDkI3F2AajEO4" + "current_key": "AIzaSyC4yHbCX4mQu0jO81pJrDwxKLQlTQWofrc" } ], "services": { diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 2bb9022..5b31b0a 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ - + diff --git a/android/app/src/main/kotlin/nh/ind/nhance/frontend/MainActivity.kt b/android/app/src/main/kotlin/nh/ind/nhance/benefits/MainActivity.kt similarity index 77% rename from android/app/src/main/kotlin/nh/ind/nhance/frontend/MainActivity.kt rename to android/app/src/main/kotlin/nh/ind/nhance/benefits/MainActivity.kt index 134f34a..b0157a7 100644 --- a/android/app/src/main/kotlin/nh/ind/nhance/frontend/MainActivity.kt +++ b/android/app/src/main/kotlin/nh/ind/nhance/benefits/MainActivity.kt @@ -1,4 +1,4 @@ -package nh.ind.nhance.frontend +package nh.ind.nhance.benefits import io.flutter.embedding.android.FlutterFragmentActivity diff --git a/android/build.gradle b/android/build.gradle index 74a4c03..1113ecc 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -4,8 +4,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' // Update this if needed - classpath 'com.google.gms:google-services:4.3.10' // Correct version for google-services + classpath 'com.android.tools.build:gradle:8.1.4' // Update this if needed + classpath 'com.google.gms:google-services:4.4.2' // Correct version for google-services } } diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index aac0205..fdc1b3e 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -5,7 +5,7 @@ NSFaceIDUsageDescription We use Face ID to protect your data in the app. CFBundleIdentifier - nh.ind.nhance.frontend + nh.ind.nhance.benefits CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName diff --git a/lib/main.dart b/lib/main.dart index f16bac7..0580941 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -46,7 +46,7 @@ Future main() async { await Firebase.initializeApp( options: const FirebaseOptions( apiKey: 'AIzaSyC4yHbCX4mQu0jO81pJrDwxKLQlTQWofrc', - appId: '1:1084115316849:android:963ff492c3d23ab06c6bd0', + appId: '1:1084115316849:android:68b14c4ff37f4bbc6c6bd0', messagingSenderId: '1084115316849', projectId: 'nhance-ee8d1')); diff --git a/lib/pages/login.dart b/lib/pages/login.dart index 29fa80b..05b4d3a 100644 --- a/lib/pages/login.dart +++ b/lib/pages/login.dart @@ -44,9 +44,13 @@ class _loginState extends State { checkLoginPinOnMobile(); } - void checkLoginPinOnMobile() { + Future checkLoginPinOnMobile() async { if (isMobilePlatform()) { - checkLoginPin(context); + final SharedPreferences prefs = await SharedPreferences.getInstance(); + empMobileNo = prefs.getString('empMobileNo'); + if (empMobileNo != null && empMobileNo.isNotEmpty) { + checkLoginPin(context); + } } } @@ -138,7 +142,6 @@ class _loginState extends State { ), ); } else { - prefs.setString('empMobileNo', mobileController.text); _verifyPhoneNumber(); } @@ -190,13 +193,15 @@ class _loginState extends State { _isLoading = false; }); }, - codeSent: (String verificationId, int? resendToken) { + codeSent: (String verificationId, int? resendToken) async { setState(() { _verificationId = verificationId; _resendToken = resendToken; }); + ToastHelper.showSuccessToast( context, 'Verification code sent to ${enteredMobileNumber}'); + Navigator.push( context, MaterialPageRoute( diff --git a/lib/pages/postEnrollment/profile.dart b/lib/pages/postEnrollment/profile.dart index 3bb9159..8f7a703 100644 --- a/lib/pages/postEnrollment/profile.dart +++ b/lib/pages/postEnrollment/profile.dart @@ -155,13 +155,14 @@ class _profileState extends State { // Get the value of the mobile_number key String? mobileNumber = prefs.getString('empMobileNo'); - // Clear all keys await prefs.clear(); // html.window.localStorage.clear(); // Re-set the mobile_number key - if (mobileNumber != null) { - await prefs.setString('empMobileNo', mobileNumber); + if (isMobilePlatform()) { + if (mobileNumber != null) { + await prefs.setString('empMobileNo', mobileNumber); + } } ToastHelper.showSuccessToast(context, 'logout'); // Navigate to login page diff --git a/lib/pages/verify.dart b/lib/pages/verify.dart index d7bc74e..16f2597 100644 --- a/lib/pages/verify.dart +++ b/lib/pages/verify.dart @@ -297,6 +297,8 @@ class _MyVerifyState extends State { if (isMobilePlatform()) { // if (prefs.containsKey('mpin') && mpinText == 'Mpin - exist') { if (_postToken != null && _postToken.isNotEmpty) { + final SharedPreferences prefs = await SharedPreferences.getInstance(); + prefs.setString('empMobileNo', widget.mobileNumber); await initNotification(); Navigator.pushReplacementNamed(context, 'pinSettingPage'); } @@ -406,7 +408,7 @@ class _MyVerifyState extends State { Future getClientLogoAndDetails() async { print('getClientLogoAndDetails'); - var url = Uri.parse(Environment.apiUrl + + var url = Uri.parse(Environment.apiUrlEnrollment + 'getClientDetails?client_id=$enrollmentClient_id&emp_code=$enrollmentEmpCodeString&client_branch_id=$enrollmentEmpClientBranchId'); try { var response = await http.get( diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 5af18bd..3e0b46a 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -7,7 +7,7 @@ project(runner LANGUAGES CXX) set(BINARY_NAME "nhance_app_pwa") # The unique GTK application identifier for this application. See: # https://wiki.gnome.org/HowDoI/ChooseApplicationID -set(APPLICATION_ID "nh.ind.nhance.frontend") +set(APPLICATION_ID "nh.ind.nhance.benefits") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig index 6e32976..5bbb91d 100644 --- a/macos/Runner/Configs/AppInfo.xcconfig +++ b/macos/Runner/Configs/AppInfo.xcconfig @@ -8,7 +8,7 @@ PRODUCT_NAME = nhance_app_pwa // The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = nh.ind.nhance.frontend +PRODUCT_BUNDLE_IDENTIFIER = nh.ind.nhance.benefits // The copyright displayed in application information PRODUCT_COPYRIGHT = Copyright © 2024 com.example. All rights reserved. diff --git a/pubspec.yaml b/pubspec.yaml index fa77629..bff4b57 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.0.0+3 +version: 1.0.2+2 environment: sdk: '>=3.3.3 <4.0.0' diff --git a/web/index.html b/web/index.html index e05f885..0082364 100644 --- a/web/index.html +++ b/web/index.html @@ -61,7 +61,7 @@ import { initializeApp } from "https://www.gstatic.com/firebasejs/10.12.4/firebase-app.js"; const firebaseConfig = { - apiKey: "AIzaSyCnxkfRZW6EkON2laovunzYRXgHvHEPo0E", + apiKey: "AIzaSyC4yHbCX4mQu0jO81pJrDwxKLQlTQWofrc", authDomain: "nhance-ee8d1.firebaseapp.com", projectId: "nhance-ee8d1", storageBucket: "nhance-ee8d1.firebasestorage.app",