From 0d2052346e258fdeddc8d5e938362e0b74ea517a Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 1 Jan 2023 17:21:39 +0300 Subject: [PATCH 1/4] updates --- lib/provider/dashboard_provider_model.dart | 2 +- lib/ui/landing/dashboard_screen.dart | 2 +- lib/widgets/image_picker.dart | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/provider/dashboard_provider_model.dart b/lib/provider/dashboard_provider_model.dart index c851570..aa9a38f 100644 --- a/lib/provider/dashboard_provider_model.dart +++ b/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) { diff --git a/lib/ui/landing/dashboard_screen.dart b/lib/ui/landing/dashboard_screen.dart index c64cfa6..ba622b2 100644 --- a/lib/ui/landing/dashboard_screen.dart +++ b/lib/ui/landing/dashboard_screen.dart @@ -417,7 +417,7 @@ class _DashboardScreenState extends State { ); }, separatorBuilder: (BuildContext cxt, int index) => 8.width, - itemCount: 6), + itemCount: 9), ); }, ), diff --git a/lib/widgets/image_picker.dart b/lib/widgets/image_picker.dart index 75466fc..834695b 100644 --- a/lib/widgets/image_picker.dart +++ b/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); From fe5807c9977b2ac2a9cedb76833b938f30438130 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Mon, 2 Jan 2023 14:36:57 +0300 Subject: [PATCH 2/4] version update --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index d0758c5..074cc08 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 # 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" From e685cf188c355b3d5b55f25dbc38746d50d9b53b Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Tue, 3 Jan 2023 15:44:22 +0300 Subject: [PATCH 3/4] updates --- lib/ui/chat/my_team_screen.dart | 2 +- lib/ui/landing/dashboard_screen.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ui/chat/my_team_screen.dart b/lib/ui/chat/my_team_screen.dart index 5d36a68..091226d 100644 --- a/lib/ui/chat/my_team_screen.dart +++ b/lib/ui/chat/my_team_screen.dart @@ -101,7 +101,7 @@ class _MyTeamScreenState extends State { 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( diff --git a/lib/ui/landing/dashboard_screen.dart b/lib/ui/landing/dashboard_screen.dart index 23d2c16..98bf976 100644 --- a/lib/ui/landing/dashboard_screen.dart +++ b/lib/ui/landing/dashboard_screen.dart @@ -463,7 +463,7 @@ class _DashboardScreenState extends State { "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( From f933539395d618258f391f5fef1fbc79474364dc Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Tue, 3 Jan 2023 16:00:25 +0300 Subject: [PATCH 4/4] dialog added to app settings --- lib/provider/chat_provider_model.dart | 20 ++++++++++++++++---- lib/ui/chat/chat_detailed_screen.dart | 2 +- lib/ui/chat/my_team_screen.dart | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/lib/provider/chat_provider_model.dart b/lib/provider/chat_provider_model.dart index 53dbade..fb61891 100644 --- a/lib/provider/chat_provider_model.dart +++ b/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); } }); } diff --git a/lib/ui/chat/chat_detailed_screen.dart b/lib/ui/chat/chat_detailed_screen.dart index f597fe2..3e02d96 100644 --- a/lib/ui/chat/chat_detailed_screen.dart +++ b/lib/ui/chat/chat_detailed_screen.dart @@ -301,7 +301,7 @@ class _ChatDetailScreenState extends State { 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( diff --git a/lib/ui/chat/my_team_screen.dart b/lib/ui/chat/my_team_screen.dart index 091226d..79da90d 100644 --- a/lib/ui/chat/my_team_screen.dart +++ b/lib/ui/chat/my_team_screen.dart @@ -101,7 +101,7 @@ class _MyTeamScreenState extends State { mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [ - (m.teamMembersList![index].userName! ?? "").toText14(color: MyColors.darkTextColor).paddingOnly(left: 11, top: 13), + (m.teamMembersList[index].userName! ?? "").toText14(color: MyColors.darkTextColor).paddingOnly(left: 11, top: 13), ], ).expanded, // SizedBox(