Merge remote-tracking branch 'origin/master-Api2.0_update3.29' into master-Api2.0_update3.29

android/app/build.gradle

@@ -98,5 +98,7 @@ dependencies {
     implementation "com.google.firebase:firebase-analytics" // Firebase Analytics
     implementation"com.google.firebase:firebase-messaging"// Firebase Messaging
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10"
+
 //    implementation 'com.huawei.agconnect:agconnect-apms:1.8.0.300'
 }

android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="hmg.cloudSolutions.mohem">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="hmg.cloudSolutions.mohem">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
@@ -34,6 +33,7 @@
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="MoheM"
+        android:extractNativeLibs="true"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round">
         <provider

android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="hmg.cloudSolutions.mohem">
+    package="com.mohem_flutter_app">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

lib/ui/screens/offers_and_discounts/offers_and_discounts_details.dart

@@ -16,7 +16,8 @@ import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
 import 'package:mohem_flutter_app/models/offers_and_discounts/get_offers_list.dart';
 import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:share/share.dart';
+import 'package:share_plus/share_plus.dart';
+
 import 'package:url_launcher/url_launcher.dart';
 
 class OffersAndDiscountsDetails extends StatefulWidget {
@@ -127,7 +128,7 @@ class _OffersAndDiscountsDetailsState extends State<OffersAndDiscountsDetails> {
       Directory tempDir = await getTemporaryDirectory();
       File file = await File('${tempDir.path}/${DateTime.now().toString()}.png').create();
       await file.writeAsBytes(pngBytes);
-      await Share.shareFiles([(file.path)], text: AppState().isArabic(context) ? getOffersList[0].titleAr : getOffersList[0].titleEn);
+      await  Share.shareXFiles([XFile(file.path)], text: AppState().isArabic(context) ? getOffersList[0].titleAr : getOffersList[0].titleEn);
     } catch (ex) {
       debugPrint(ex.toString());
     }

pubspec.yaml

@@ -51,7 +51,7 @@ dependencies:
   shimmer: ^3.0.0
   logger: ^2.5.0
   flutter_countdown_timer: ^4.1.0
-  nfc_manager: ^3.2.0
+  nfc_manager: ^3.5.0
   platform_device_id_v2: ^1.0.4
   image_picker: ^1.1.2
   file_picker: ^10.1.9
@@ -64,7 +64,7 @@ dependencies:
   flutter_html: ^3.0.0-alpha.6
   qr_code_scanner: ^1.0.1
   url_launcher: ^6.0.15
-  share: 2.0.4
+  share_plus: ^11.0.0
   flutter_rating_bar: ^4.0.1
   auto_size_text: ^3.0.0
   pull_to_refresh: ^2.0.0
@@ -102,7 +102,7 @@ dependencies:
   #  huawei_hmsavailability: ^6.6.0+300
   #  huawei_location: 6.0.0+302
   huawei_location: ^6.11.0+301
-#  huawei_push: ^6.12.0+303
+  #  huawei_push: ^6.12.0+303
   firebase_crashlytics: ^4.3.5
 
   #Items for sale Image Carousel Slider
@@ -216,4 +216,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

test/widget_test.dart

@@ -1,30 +0,0 @@
-// This is a basic Flutter widget test.
-//
-// To perform an interaction with a widget in your test, use the WidgetTester
-// utility that Flutter provides. For example, you can send tap and scroll
-// gestures. You can also use WidgetTester to find child widgets in the widget
-// tree, read text, and verify that the values of widget properties are correct.
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-import 'package:mohem_flutter_app/main.dart';
-
-void main() {
-  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
-    // Build our app and trigger a frame.
-    await tester.pumpWidget( MyApp());
-
-    // Verify that our counter starts at 0.
-    expect(find.text('0'), findsOneWidget);
-    expect(find.text('1'), findsNothing);
-
-    // Tap the '+' icon and trigger a frame.
-    await tester.tap(find.byIcon(Icons.add));
-    await tester.pump();
-
-    // Verify that our counter has incremented.
-    expect(find.text('0'), findsNothing);
-    expect(find.text('1'), findsOneWidget);
-  });
-}