ios changes for force app update

egovernments · Dec 7, 2023 · 5e1e0f1 · 5e1e0f1
1 parent b3beaf4
commit 5e1e0f1
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 62 deletions.
diff --git a/frontend/mgramseva/ios/Podfile.lock b/frontend/mgramseva/ios/Podfile.lock
@@ -1,6 +1,4 @@
 PODS:
-  - bluetooth_thermal_printer (0.0.1):
-    - Flutter
   - charset_converter (0.0.1):
     - Flutter
   - DKImagePickerController/Core (4.3.4):
@@ -95,7 +93,7 @@ PODS:
     - Flutter
   - flutter_keyboard_visibility (0.0.1):
     - Flutter
-  - flutter_secure_storage (3.3.1):
+  - flutter_secure_storage (6.0.0):
     - Flutter
   - flutter_share_me (0.0.1):
     - FBSDKCoreKit (~> 14.0.0)
@@ -150,14 +148,16 @@ PODS:
     - nanopb/encode (= 2.30909.1)
   - nanopb/decode (2.30909.1)
   - nanopb/encode (2.30909.1)
+  - network_info_plus (0.0.1):
+    - Flutter
   - open_filex (0.0.2):
     - Flutter
   - package_info_plus (0.4.5):
     - Flutter
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - "permission_handler (5.1.0+2)":
+  - permission_handler_apple (9.1.1):
     - Flutter
   - print_bluetooth_thermal (0.0.1):
     - Flutter
@@ -168,11 +168,12 @@ PODS:
     - SDWebImage/Core (= 5.18.5)
   - SDWebImage/Core (5.18.5)
   - SwiftyGif (5.4.4)
+  - thermal_printer (1.0.0):
+    - Flutter
   - url_launcher_ios (0.0.1):
     - Flutter
 
 DEPENDENCIES:
-  - bluetooth_thermal_printer (from `.symlinks/plugins/bluetooth_thermal_printer/ios`)
   - charset_converter (from `.symlinks/plugins/charset_converter/ios`)
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
   - firebase_analytics (from `.symlinks/plugins/firebase_analytics/ios`)
@@ -184,12 +185,14 @@ DEPENDENCIES:
   - flutter_share_me (from `.symlinks/plugins/flutter_share_me/ios`)
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
   - integration_test (from `.symlinks/plugins/integration_test/ios`)
+  - network_info_plus (from `.symlinks/plugins/network_info_plus/ios`)
   - open_filex (from `.symlinks/plugins/open_filex/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
-  - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
+  - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - print_bluetooth_thermal (from `.symlinks/plugins/print_bluetooth_thermal/ios`)
   - printing (from `.symlinks/plugins/printing/ios`)
+  - thermal_printer (from `.symlinks/plugins/thermal_printer/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
 
 SPEC REPOS:
@@ -214,8 +217,6 @@ SPEC REPOS:
     - SwiftyGif
 
 EXTERNAL SOURCES:
-  bluetooth_thermal_printer:
-    :path: ".symlinks/plugins/bluetooth_thermal_printer/ios"
   charset_converter:
     :path: ".symlinks/plugins/charset_converter/ios"
   file_picker:
@@ -238,23 +239,26 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/image_picker_ios/ios"
   integration_test:
     :path: ".symlinks/plugins/integration_test/ios"
+  network_info_plus:
+    :path: ".symlinks/plugins/network_info_plus/ios"
   open_filex:
     :path: ".symlinks/plugins/open_filex/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
-  permission_handler:
-    :path: ".symlinks/plugins/permission_handler/ios"
+  permission_handler_apple:
+    :path: ".symlinks/plugins/permission_handler_apple/ios"
   print_bluetooth_thermal:
     :path: ".symlinks/plugins/print_bluetooth_thermal/ios"
   printing:
     :path: ".symlinks/plugins/printing/ios"
+  thermal_printer:
+    :path: ".symlinks/plugins/thermal_printer/ios"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
-  bluetooth_thermal_printer: 65b8304b3a1d8c67d466642a28cc2b4984409346
   charset_converter: 215c7b04932ec2b9ba43be96a9bc34afed3e5322
   DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
   DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
@@ -263,7 +267,7 @@ SPEC CHECKSUMS:
   FBSDKCoreKit_Basics: 1ff46a12e80f0b66e6c00e1ef32d6a5b5b9008a5
   FBSDKLoginKit: dbe86ef42ab142f3bd0f1c904a21bb33f31c5569
   FBSDKShareKit: 2f6a6a1445cc1b8ea0f733e60d02d2f7c4ebf8be
-  file_picker: ce3938a0df3cc1ef404671531facef740d03f920
+  file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de
   Firebase: 414ad272f8d02dfbf12662a9d43f4bba9bec2a06
   firebase_analytics: 3e5dba777bb51d1e0358b5a37adefa69746a94bd
   firebase_core: 29d66baf806970cda37c93621b27cd369b27db1b
@@ -274,22 +278,24 @@ SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_downloader: b7301ae057deadd4b1650dc7c05375f10ff12c39
   flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
-  flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
+  flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
   flutter_share_me: 1fb559741e0dff56a9d2bdeaf4d966b0b47449ae
   GoogleAppMeasurement: 70ce9aa438cff1cfb31ea3e660bcc67734cb716e
   GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34
   image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
   integration_test: 13825b8a9334a850581300559b8839134b124670
   nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5
+  network_info_plus: 6d0c3eb8367b8164fa3fb0c19875e3f59d49697f
   open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4
   package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
-  permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0
+  permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
   print_bluetooth_thermal: 54a9ba9436479dd633d18f393669ee793ee498fa
   printing: 233e1b73bd1f4a05615548e9b5a324c98588640b
   PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
   SDWebImage: 7ac2b7ddc5e8484c79aa90fc4e30b149d6a2c88f
   SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
+  thermal_printer: 1885c43c3f17b912ca2c29e7f44822dddc2c24b9
   url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b
 
 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3

diff --git a/frontend/mgramseva/ios/Runner.xcodeproj/project.pbxproj b/frontend/mgramseva/ios/Runner.xcodeproj/project.pbxproj
@@ -368,7 +368,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 35;
 				DEVELOPMENT_TEAM = JP48C27R32;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -377,7 +377,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.16;
+				MARKETING_VERSION = 1.2.18;
 				PRODUCT_BUNDLE_IDENTIFIER = com.dwss.mgramseva;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -504,7 +504,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 35;
 				DEVELOPMENT_TEAM = JP48C27R32;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -513,7 +513,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.16;
+				MARKETING_VERSION = 1.2.18;
 				PRODUCT_BUNDLE_IDENTIFIER = com.dwss.mgramseva;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -532,7 +532,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 35;
 				DEVELOPMENT_TEAM = JP48C27R32;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -541,7 +541,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.16;
+				MARKETING_VERSION = 1.2.18;
 				PRODUCT_BUNDLE_IDENTIFIER = com.dwss.mgramseva;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/frontend/mgramseva/lib/main.dart b/frontend/mgramseva/lib/main.dart
@@ -287,7 +287,7 @@ class _LandingPageState extends State<LandingPage> {
     await commonProvider.getAppVersionDetails();
     if (!kIsWeb)
       CommonMethods()
-          .checkVersion(context, commonProvider.appVersion!.latestAppVersion);
+          .checkVersion(context, commonProvider.appVersion!);
   }
 
   @override

diff --git a/frontend/mgramseva/lib/model/localization/language.dart b/frontend/mgramseva/lib/model/localization/language.dart
@@ -29,7 +29,8 @@ class LanguageList {
     return data;
   }
 }
-class PSPCLIntegration{
+
+class PSPCLIntegration {
   List<AccountNumberGpMapping>? accountNumberGpMapping;
 
   PSPCLIntegration({this.accountNumberGpMapping});
@@ -52,15 +53,16 @@ class PSPCLIntegration{
     return data;
   }
 }
+
 class AccountNumberGpMapping {
   String? accountNumber;
   String? departmentEntityName;
   String? departmentEntityCode;
 
   AccountNumberGpMapping(
       {this.accountNumber,
-        this.departmentEntityName,
-        this.departmentEntityCode});
+      this.departmentEntityName,
+      this.departmentEntityCode});
 
   AccountNumberGpMapping.fromJson(Map<String, dynamic> json) {
     accountNumber = json['accountNumber'];
@@ -76,6 +78,7 @@ class AccountNumberGpMapping {
     return data;
   }
 }
+
 class MdmsRes {
   CommonMasters? commonMasters;
   BillingService? billingService;
@@ -166,19 +169,23 @@ class CommonMasters {
 
 class AppVersion {
   String? latestAppVersion;
+  String? latestAppVersionIos;
   // List<LocalizationModules>? localizationModules;
 
   AppVersion({
     this.latestAppVersion,
+    this.latestAppVersionIos
   });
 
   AppVersion.fromJson(Map<String, dynamic> json) {
     latestAppVersion = json['latestAppVersion'];
+    latestAppVersionIos = json['latestAppVersionIos'];
   }
 
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();
     data['latestAppVersion'] = this.latestAppVersion;
+    data['latestAppVersionIos'] = this.latestAppVersionIos;
 
     return data;
   }