Merge branch 'development_haroon' into 'master'

Development haroon

See merge request Cloud_Solution/mohemm-flutter-app!132

lib/provider/chat_provider_model.dart

@@ -1200,7 +1200,7 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
     playerController.dispose();
   }
 
-  void startRecoding() async {
+  void startRecoding(BuildContext context) async {
     // if (await Permission.microphone.request().isGranted) {
     //   sRecoding();
     // } else {
@@ -1209,13 +1209,25 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
     // }
     await Permission.microphone.request().then((PermissionStatus status) {
       if (status.isPermanentlyDenied) {
-        openAppSettings();
+        Utils.confirmDialog(
+          context,
+          "The app needs microphone access to be able to record audio.",
+          onTap: () {
+            openAppSettings();
+          },
+        );
       } else if (status.isDenied) {
-        openAppSettings();
+        Utils.confirmDialog(
+          context,
+          "The app needs microphone access to be able to record audio.",
+          onTap: () {
+            openAppSettings();
+          },
+        );
       } else if (status.isGranted) {
         sRecoding();
       } else {
-        startRecoding();
+        startRecoding(context);
       }
     });
   }

lib/provider/dashboard_provider_model.dart

@@ -244,7 +244,7 @@ class DashboardProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
   void getCategoryOffersListAPI(BuildContext context) async {
     try {
       // Utils.showLoading(context);
-      getOffersList = await OffersAndDiscountsApiClient().getOffersList(0, 6);
+      getOffersList = await OffersAndDiscountsApiClient().getOffersList(0, 10);
       isOffersLoading = false;
       notifyListeners();
     } catch (ex) {

lib/ui/chat/chat_detailed_screen.dart

@@ -301,7 +301,7 @@ class _ChatDetailScreenState extends State<ChatDetailScreen> {
                               Icons.mic,
                               color: MyColors.lightGreenColor,
                             ).paddingOnly(right: 15).onPress(() {
-                              m.startRecoding();
+                              m.startRecoding(context);
                             }),
                             SvgPicture.asset("assets/icons/chat/chat_send_icon.svg", height: 26, width: 26)
                                 .onPress(

lib/ui/chat/my_team_screen.dart

@@ -101,7 +101,7 @@ class _MyTeamScreenState extends State<MyTeamScreen> {
                               mainAxisAlignment: MainAxisAlignment.start,
                               crossAxisAlignment: CrossAxisAlignment.start,
                               children: [
-                                (m.teamMembersList![index].userName!.replaceFirst(".", " ").capitalizeFirstofEach ?? "").toText14(color: MyColors.darkTextColor).paddingOnly(left: 11, top: 13),
+                                (m.teamMembersList[index].userName! ?? "").toText14(color: MyColors.darkTextColor).paddingOnly(left: 11, top: 13),
                               ],
                             ).expanded,
                             // SizedBox(

lib/ui/landing/dashboard_screen.dart

@@ -415,7 +415,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                           );
                                   },
                                   separatorBuilder: (BuildContext cxt, int index) => 8.width,
-                                  itemCount: 6),
+                                  itemCount: 9),
                             );
                           },
                         ),
@@ -463,7 +463,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                 "assets/icons/create_req.svg",
                 color: currentIndex == 1 ? MyColors.grey3AColor : MyColors.grey98Color,
               ).paddingAll(4),
-              label: LocaleKeys.createRequest.tr(),
+              label: LocaleKeys.mowadhafhiRequest.tr(),
             ),
             BottomNavigationBarItem(
               icon: Stack(

lib/widgets/image_picker.dart

@@ -20,7 +20,7 @@ class ImageOptions {
           if (Platform.isAndroid) {
             cameraImageAndroid(image);
           } else {
-            File _image = File((await ImagePicker.platform.pickImage(source: ImageSource.camera, imageQuality: 10))?.path ?? "");
+            File _image = File((await ImagePicker.platform.pickImage(source: ImageSource.camera, imageQuality: 20))?.path ?? "");
             String fileName = _image.path;
             var bytes = File(fileName).readAsBytesSync();
             String base64Encode = base64.encode(bytes);
@@ -33,7 +33,7 @@ class ImageOptions {
           if (Platform.isAndroid) {
             galleryImageAndroid(image);
           } else {
-            File _image = File((await ImagePicker.platform.pickImage(source: ImageSource.gallery, imageQuality: 10))?.path ?? "");
+            File _image = File((await ImagePicker.platform.pickImage(source: ImageSource.gallery, imageQuality: 20))?.path ?? "");
             String fileName = _image.path;
             var bytes = File(fileName).readAsBytesSync();
             String base64Encode = base64.encode(bytes);
@@ -114,7 +114,7 @@ class ImageOptions {
 }
 
 void galleryImageAndroid(Function(String, File) image) async {
-  File _image = File((await ImagePicker.platform.pickImage(source: ImageSource.gallery, imageQuality: 10))?.path ?? "");
+  File _image = File((await ImagePicker.platform.pickImage(source: ImageSource.gallery, imageQuality: 20))?.path ?? "");
   String fileName = _image.path;
   var bytes = File(fileName).readAsBytesSync();
   String base64Encode = base64.encode(bytes);
@@ -124,7 +124,7 @@ void galleryImageAndroid(Function(String, File) image) async {
 }
 
 void cameraImageAndroid(Function(String, File) image) async {
-  File _image = File((await ImagePicker.platform.pickImage(source: ImageSource.camera, imageQuality: 10))?.path ?? "");
+  File _image = File((await ImagePicker.platform.pickImage(source: ImageSource.camera, imageQuality: 20))?.path ?? "");
   String fileName = _image.path;
   var bytes = File(fileName).readAsBytesSync();
   String base64Encode = base64.encode(bytes);

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 3.1.5+300015
+version: 3.6.0+300060
 
 environment:
   sdk: ">=2.16.0 <3.0.0"