- Enhance Local Authentication Process

- Enhance home screen camera option experience

- Edit Some Localization Texts

Author: MoazSayed7

android/app/src/main/AndroidManifest.xml

@@ -31,7 +31,7 @@
             android:value="2" />
     </application>
     <uses-permission android:name="android.permission.INTERNET" />
-    
+    <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <!-- Required to query activities that can process text, see:

assets/translations/ar.json

@@ -56,12 +56,10 @@
     "update": "تحديث",
     "updateDesc": "التحديث متوفر. قم بتنزيله وتثبيته",
     "exit": "خروج",
-    "pleaseEnterPin": "الرجاء إدخال الرقم السري",
-    "tooManyAttemptsDisabled": "عدد محاولات كثيرة. تم تعطيل مستشعر بصمة الإصبع.",
-    "tooManyAttempts": "عدد محاولات كثيرة. حاول مرة أخرى بعد {} ثوانٍ.",
+    "tooManyAttempts": "عدد محاولات خاطئة كثيرة. حاول مرة أخرى بعد {} ثوانٍ.",
     "enterFingerprint": "مسح بصمة الإصبع (أو التعرف على الوجه أو أي شيء آخر) للمصادقة",
-    "appLocked": "محادثة مقفلة",
     "disableFingerprint": "إذا لم يكن مستشعر بصمة الإصبع يعمل، قم بتعطيله في إعدادات جهازك.",
+    "appLocked": "@:title مغلق",
     "photoGallery": "اختيار من المعرض",
     "camera": "التقاط صورة",
     "offline": "غير متصل",

assets/translations/en.json

@@ -56,10 +56,8 @@
     "update": "Update",
     "updateDesc": "Update Available. Download and Install",
     "exit": "Exit",
-    "pleaseEnterPin": "Please enter Pin",
-    "tooManyAttemptsDisabled": "Too many attempts. Fingerprint sensor disabled.",
-    "tooManyAttempts": "Too many attempts. Try again after {} seconds.",
-    "enterFingerprint": "Scan your fingerprint (or face or whatever) to authenticate",
+    "tooManyAttempts": "Too many wrong attempts. Try again after {} seconds.",
+    "enterFingerprint": "Scan your fingerprint (or face ID or whatever) to authenticate",
     "appLocked": "@:title Locked",
     "disableFingerprint": "If the fingerprint sensor isn't working, disable it in\nyour device's settings.",
     "photoGallery": "Photo Gallery",

lib/core/widgets/modal_fit.dart

@@ -12,8 +12,6 @@ class ModalFit extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Material(
-        child: SafeArea(
-      top: false,
       child: Column(
         mainAxisSize: MainAxisSize.min,
         children: <Widget>[
@@ -50,6 +48,6 @@ class ModalFit extends StatelessWidget {
           ),
         ],
       ),
-    ));
+    );
   }
 }

lib/features/camera/ui/camera.dart

@@ -185,32 +185,31 @@ class _ChatScreenState extends State<ChatScreen> {
   Future getImageFromCamera() async {
     final pickedFile = await _picker.pickImage(source: ImageSource.camera);
 
-    setState(() {
-      if (pickedFile != null) {
-        context.pushNamed(Routes.displayPictureScreen, arguments: [
-          pickedFile,
-          token!,
-          widget.receivedMToken,
-          widget.receivedUserID,
-        ]);
-      }
-    });
+    if (pickedFile != null) {
+      if (!mounted) return;
+
+      context.pushNamed(Routes.displayPictureScreen, arguments: [
+        pickedFile,
+        token!,
+        widget.receivedMToken,
+        widget.receivedUserID,
+      ]);
+    }
   }
 
 //Image Picker function to get image from gallery
   Future getImageFromGallery() async {
     final pickedFile = await _picker.pickImage(source: ImageSource.gallery);
 
-    setState(() {
-      if (pickedFile != null) {
-        context.pushNamed(Routes.displayPictureScreen, arguments: [
-          pickedFile,
-          token!,
-          widget.receivedMToken,
-          widget.receivedUserID,
-        ]);
-      }
-    });
+    if (pickedFile != null) {
+      if (!mounted) return;
+      context.pushNamed(Routes.displayPictureScreen, arguments: [
+        pickedFile,
+        token!,
+        widget.receivedMToken,
+        widget.receivedUserID,
+      ]);
+    }
   }
 
   getToken() async {

lib/features/chat/ui/chat_page.dart

@@ -8,7 +8,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:image_picker/image_picker.dart';
-import 'package:logger/logger.dart';
 
 import '../../../services/database.dart';
 import '../../../services/notification_service.dart';
@@ -32,7 +31,6 @@ class DisplayPictureScreen extends StatefulWidget {
 }
 
 class _DisplayPictureScreenState extends State<DisplayPictureScreen> {
-  final logger = Logger();
   late String url;
   final _auth = FirebaseAuth.instance;
 

lib/features/display_picture/ui/display_picture_screen.dart

@@ -1,12 +1,11 @@
-import 'package:camera/camera.dart';
+import 'package:image_picker/image_picker.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import '../../../services/database.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
 import 'package:google_sign_in/google_sign_in.dart';
-import 'package:logger/logger.dart';
 
 import '../../../helpers/extensions.dart';
 import '../../../router/routes.dart';
@@ -24,7 +23,7 @@ class HomeScreen extends StatefulWidget {
 
 class _HomeScreenState extends State<HomeScreen> with WidgetsBindingObserver {
   final _auth = FirebaseAuth.instance;
-  var logger = Logger();
+  final _picker = ImagePicker();
 
   @override
   Widget build(BuildContext context) {
@@ -58,13 +57,18 @@ class _HomeScreenState extends State<HomeScreen> with WidgetsBindingObserver {
               icon: const Icon(Icons.camera_alt_outlined),
               color: Colors.white,
               onPressed: () async {
-                final cameras = await availableCameras();
-                final firstCamera = cameras.first;
-                if (!context.mounted) return;
-                context.pushNamed(
-                  Routes.takePictureScreen,
-                  arguments: firstCamera,
-                );
+                final pickedFile =
+                    await _picker.pickImage(source: ImageSource.camera);
+
+                if (pickedFile != null) {
+                  if (!context.mounted) return;
+                  context.pushNamed(Routes.displayPictureScreen, arguments: [
+                    pickedFile,
+                    '',
+                    '',
+                    '',
+                  ]);
+                }
               },
             ),
             IconButton(
@@ -166,8 +170,6 @@ class _HomeScreenState extends State<HomeScreen> with WidgetsBindingObserver {
           onTap: () async {
             try {
               await GoogleSignIn().disconnect();
-            } catch (e) {
-              logger.e(e.toString());
             } finally {
               await DatabaseMethods.updateUserDetails({'isOnline': 'false'});