react-native-timacare 3.1.30-production → 3.1.31-production

package/src/screens/toan-trinh-so/RegisterCamera.tsx

@@ -5,7 +5,6 @@ import {
   Dimensions,
   Image,
   ImageStyle,
-  PermissionsAndroid,
   Platform,
   SafeAreaView,
   TextStyle,
@@ -41,6 +40,7 @@ import { ScreenNames } from '../../navigation';
 import DeviceInfo from 'react-native-device-info';
 import ImagePicker from 'react-native-image-crop-picker';
 import { IconUpload } from '../../assets/svgs';
+import { launchImageLibrary } from 'react-native-image-picker';
 
 export default function RegisterCamera(props: any) {
   const isFocused = useIsFocused();
@@ -189,75 +189,49 @@ export default function RegisterCamera(props: any) {
     }
   };
 
-  const hasAndroidPermission = async () => {
-    const getCheckPermissionPromise = () => {
-      if (Number(Platform.Version) >= 33) {
-        return Promise.all([
-          PermissionsAndroid.check(
-            PermissionsAndroid.PERMISSIONS.READ_MEDIA_IMAGES
-          ),
-          PermissionsAndroid.check(
-            PermissionsAndroid.PERMISSIONS.READ_MEDIA_VIDEO
-          ),
-        ]).then(
-          ([hasReadMediaImagesPermission, hasReadMediaVideoPermission]) =>
-            hasReadMediaImagesPermission && hasReadMediaVideoPermission
-        );
-      } else {
-        return PermissionsAndroid.check(
-          PermissionsAndroid.PERMISSIONS.READ_EXTERNAL_STORAGE
-        );
-      }
-    };
-    const hasPermission = await getCheckPermissionPromise();
-    if (hasPermission) {
-      return true;
-    }
-
-    const getRequestPermissionPromise = () => {
-      if (Number(Platform.Version) >= 33) {
-        return PermissionsAndroid.requestMultiple([
-          PermissionsAndroid.PERMISSIONS.READ_MEDIA_IMAGES,
-          PermissionsAndroid.PERMISSIONS.READ_MEDIA_VIDEO,
-        ]).then(
-          (statuses) =>
-            statuses[PermissionsAndroid.PERMISSIONS.READ_MEDIA_IMAGES] ===
-              PermissionsAndroid.RESULTS.GRANTED &&
-            statuses[PermissionsAndroid.PERMISSIONS.READ_MEDIA_VIDEO] ===
-              PermissionsAndroid.RESULTS.GRANTED
-        );
-      } else {
-        return PermissionsAndroid.request(
-          PermissionsAndroid.PERMISSIONS.READ_EXTERNAL_STORAGE
-        ).then((status) => status === PermissionsAndroid.RESULTS.GRANTED);
-      }
-    };
-
-    return await getRequestPermissionPromise();
-  };
-
   const pickImageFromGallery = async () => {
-    await hasAndroidPermission();
-    ImagePicker.openPicker({}).then((image) => {
-      if (props?.route?.params?.front) {
-        navigation.push(ScreenNames.VehicleRegistration, {
-          uri:
-            Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
-          loan: props?.route?.params?.loan,
-        });
-      } else if (props.route?.params?.callback) {
-        navigation.goBack();
-        props.route?.params?.callback(
-          Platform.OS === 'android' ? image?.path : 'file://' + image?.path
-        );
-      } else {
-        navigation.push(ScreenNames.RegisterBack, {
-          uri:
-            Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
-          loan: props?.route?.params?.loan,
-        });
+    if (Platform.OS === 'android') {
+      const result = await launchImageLibrary({
+        mediaType: 'photo',
+      });
+      if (result.assets) {
+        if (props?.route?.params?.front) {
+          navigation.push(ScreenNames.VehicleRegistration, {
+            uri: result.assets[0]?.uri,
+            loan: props?.route?.params?.loan,
+          });
+        } else if (props.route?.params?.callback) {
+          navigation.goBack();
+          props.route?.params?.callback(result.assets[0]?.uri);
+        } else {
+          navigation.push(ScreenNames.RegisterBack, {
+            uri: result.assets[0]?.uri,
+            loan: props?.route?.params?.loan,
+          });
+        }
       }
-    });
+    } else {
+      ImagePicker.openPicker({}).then((image) => {
+        if (props?.route?.params?.front) {
+          navigation.push(ScreenNames.VehicleRegistration, {
+            uri:
+              Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
+            loan: props?.route?.params?.loan,
+          });
+        } else if (props.route?.params?.callback) {
+          navigation.goBack();
+          props.route?.params?.callback(
+            Platform.OS === 'android' ? image?.path : 'file://' + image?.path
+          );
+        } else {
+          navigation.push(ScreenNames.RegisterBack, {
+            uri:
+              Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
+            loan: props?.route?.params?.loan,
+          });
+        }
+      });
+    }
   };
   return (
     <View
@@ -279,7 +253,7 @@ export default function RegisterCamera(props: any) {
           <View
             style={{
               marginVertical: 16,
-              marginTop: DeviceInfo.hasNotch() ? 70 : 0,
+              marginTop: DeviceInfo.hasNotch() ? 70 : 8,
             }}
           >
             <TouchableOpacity
@@ -383,7 +357,7 @@ export default function RegisterCamera(props: any) {
                 <View
                   style={{
                     alignItems: 'center',
-                    marginVertical: 24,
+                    marginVertical: DeviceInfo.hasNotch() ? 24 : 16,
                   }}
                 >
                   <MButton

package/src/screens/toan-trinh-so/VehicleCamera.tsx

@@ -5,7 +5,6 @@ import {
   Dimensions,
   Image,
   ImageStyle,
-  PermissionsAndroid,
   Platform,
   SafeAreaView,
   TextStyle,
@@ -40,6 +39,7 @@ import { ScreenNames } from '../../navigation';
 import { load, OCR_V2, save } from '../../utils/storage';
 import { IconUpload } from '../../assets/svgs';
 import ImagePicker from 'react-native-image-crop-picker';
+import { launchImageLibrary } from 'react-native-image-picker';
 
 export default function VehicleCamera(props: any) {
   const isFocused = useIsFocused();
@@ -197,75 +197,49 @@ export default function VehicleCamera(props: any) {
     return () => clearTimeout(timeout);
   }, [isFocused]);
 
-  const hasAndroidPermission = async () => {
-    const getCheckPermissionPromise = () => {
-      if (Number(Platform.Version) >= 33) {
-        return Promise.all([
-          PermissionsAndroid.check(
-            PermissionsAndroid.PERMISSIONS.READ_MEDIA_IMAGES
-          ),
-          PermissionsAndroid.check(
-            PermissionsAndroid.PERMISSIONS.READ_MEDIA_VIDEO
-          ),
-        ]).then(
-          ([hasReadMediaImagesPermission, hasReadMediaVideoPermission]) =>
-            hasReadMediaImagesPermission && hasReadMediaVideoPermission
-        );
-      } else {
-        return PermissionsAndroid.check(
-          PermissionsAndroid.PERMISSIONS.READ_EXTERNAL_STORAGE
-        );
-      }
-    };
-    const hasPermission = await getCheckPermissionPromise();
-    if (hasPermission) {
-      return true;
-    }
-
-    const getRequestPermissionPromise = () => {
-      if (Number(Platform.Version) >= 33) {
-        return PermissionsAndroid.requestMultiple([
-          PermissionsAndroid.PERMISSIONS.READ_MEDIA_IMAGES,
-          PermissionsAndroid.PERMISSIONS.READ_MEDIA_VIDEO,
-        ]).then(
-          (statuses) =>
-            statuses[PermissionsAndroid.PERMISSIONS.READ_MEDIA_IMAGES] ===
-              PermissionsAndroid.RESULTS.GRANTED &&
-            statuses[PermissionsAndroid.PERMISSIONS.READ_MEDIA_VIDEO] ===
-              PermissionsAndroid.RESULTS.GRANTED
-        );
-      } else {
-        return PermissionsAndroid.request(
-          PermissionsAndroid.PERMISSIONS.READ_EXTERNAL_STORAGE
-        ).then((status) => status === PermissionsAndroid.RESULTS.GRANTED);
-      }
-    };
-
-    return await getRequestPermissionPromise();
-  };
-
   const pickImageFromGallery = async () => {
-    await hasAndroidPermission();
-    ImagePicker.openPicker({}).then((image) => {
-      if (props?.route?.params?.front) {
-        navigation.push(ScreenNames.VehicleRegistrationFront, {
-          uri:
-            Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
-          loan: props?.route?.params?.loan,
-        });
-      } else if (props.route?.params?.callback) {
-        navigation.goBack();
-        props.route?.params?.callback(
-          Platform.OS === 'android' ? image?.path : 'file://' + image?.path
-        );
-      } else {
-        navigation.push(ScreenNames.VehicleRegistrationBack, {
-          uri:
-            Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
-          loan: props?.route?.params?.loan,
-        });
+    if (Platform.OS === 'android') {
+      const result = await launchImageLibrary({
+        mediaType: 'photo',
+      });
+      if (result.assets) {
+        if (props?.route?.params?.front) {
+          navigation.push(ScreenNames.VehicleRegistrationFront, {
+            uri: result.assets[0]?.uri,
+            loan: props?.route?.params?.loan,
+          });
+        } else if (props.route?.params?.callback) {
+          navigation.goBack();
+          props.route?.params?.callback(result.assets[0]?.uri);
+        } else {
+          navigation.push(ScreenNames.VehicleRegistrationBack, {
+            uri: result.assets[0]?.uri,
+            loan: props?.route?.params?.loan,
+          });
+        }
       }
-    });
+    } else {
+      ImagePicker.openPicker({}).then((image) => {
+        if (props?.route?.params?.front) {
+          navigation.push(ScreenNames.VehicleRegistrationFront, {
+            uri:
+              Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
+            loan: props?.route?.params?.loan,
+          });
+        } else if (props.route?.params?.callback) {
+          navigation.goBack();
+          props.route?.params?.callback(
+            Platform.OS === 'android' ? image?.path : 'file://' + image?.path
+          );
+        } else {
+          navigation.push(ScreenNames.VehicleRegistrationBack, {
+            uri:
+              Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
+            loan: props?.route?.params?.loan,
+          });
+        }
+      });
+    }
   };
 
   return (