Merge branch 'master_mohemm_flutter'

# Conflicts:
#	pubspec.yaml

lib/ui/landing/itg/its_add_screen_video_image.dart

@@ -387,12 +387,15 @@ class _ITGAdsScreenState extends State<ITGAdsScreen> {
                           Navigator.pop(context);
                         } else {
                           Uri uri = Uri.parse(advertisementData!.actionButtonsColl![index].iconOrImage);
-                          if (await canLaunchUrl(uri)) {
+                          // if (await canLaunchUrl(uri)) {
-                            await launchUrl(uri);
+                          await launchUrl(uri, mode: LaunchMode.externalApplication).catchError((err) {
-                            Navigator.pop(context);
+                            // print(err);
-                          } else {
                             Utils.showToast('Could not launch');
-                          }
+                          });
+                          Navigator.pop(context);
+                          // } else {
+                          //   Utils.showToast('Could not launch');
+                          // }
                         }
                       },
                     ),

pubspec.yaml

@@ -61,10 +61,10 @@ dependencies:
   platform_device_id: ^1.0.1
   image_picker: ^0.8.5+3
   file_picker: 5.2.5
-  geolocator: ^9.0.2
+  geolocator: ^11.1.0
   month_year_picker: ^0.2.0+1
   month_picker_dialog_2: ^0.5.5
-#  open_file: ^3.2.1
+  #  open_file: ^3.2.1
   open_filex: ^4.4.0
   wifi_iot: ^0.3.19+1
   flutter_html: ^3.0.0-alpha.6
@@ -110,7 +110,7 @@ dependencies:
 
   #Huawei Dependencies
   #  huawei_hmsavailability: ^6.6.0+300
-#  huawei_location: 6.0.0+302
+  #  huawei_location: 6.0.0+302
   huawei_location: ^6.11.0+301
   huawei_push: ^6.7.0+300
   firebase_crashlytics: ^2.9.0
@@ -228,4 +228,4 @@ flutter:
   # see https://flutter.dev/custom-fonts/#from-packages
 
 
-#  Adding this to test the push from iMac
+#  Adding this to test the push from iMac