girish54321 · girish54321 · Mar 30, 2023 · Mar 30, 2023 · Apr 1, 2023 · Apr 1, 2023
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -136,7 +136,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.1"
     }
     splits {
         abi {

diff --git a/android/build.gradle b/android/build.gradle
@@ -6,8 +6,8 @@ buildscript {
         ndkVersion = "21.4.7075529"
         buildToolsVersion = "28.0.3"
         minSdkVersion = 23
-        compileSdkVersion = 28
-        targetSdkVersion = 28
+        compileSdkVersion = 30
+        targetSdkVersion = 30
     }
     repositories {
         google()

diff --git a/index.js b/index.js
@@ -4,5 +4,5 @@ import { App } from './src/App';
 
 import codePush from "react-native-code-push";
 
-let codePushOptions = { checkFrequency: codePush.CheckFrequency.ON_APP_RESUME };
+let codePushOptions = { checkFrequency: codePush.CheckFrequency.ON_APP_START };
 AppRegistry.registerComponent(appName, () => codePush(codePushOptions)(App));
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -230,8 +230,12 @@ PODS:
     - React
   - react-native-restart (0.0.24):
     - React-Core
-  - react-native-safe-area-context (0.6.4):
+  - react-native-safe-area-context (4.1.2):
+    - RCT-Folly
+    - RCTRequired
+    - RCTTypeSafety
     - React
+    - ReactCommon/turbomodule/core
   - React-perflogger (0.68.5)
   - React-RCTActionSheet (0.68.5):
     - React-Core/RCTActionSheetHeaders (= 0.68.5)
@@ -303,6 +307,15 @@ PODS:
     - React
   - RNGestureHandler (1.10.3):
     - React-Core
+  - RNImageCropPicker (0.39.0):
+    - React-Core
+    - React-RCTImage
+    - RNImageCropPicker/QBImagePickerController (= 0.39.0)
+    - TOCropViewController
+  - RNImageCropPicker/QBImagePickerController (0.39.0):
+    - React-Core
+    - React-RCTImage
+    - TOCropViewController
   - RNLocalize (1.4.3):
     - React-Core
   - RNReanimated (2.13.0):
@@ -332,13 +345,14 @@ PODS:
     - React-RCTText
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNScreens (2.18.1):
+  - RNScreens (2.15.2):
     - React-Core
   - RNSVG (11.0.1):
     - React
-  - RNVectorIcons (8.1.0):
+  - RNVectorIcons (9.2.0):
     - React-Core
   - SSZipArchive (2.2.3)
+  - TOCropViewController (2.6.1)
   - Yoga (1.14.0)
 
 DEPENDENCIES:
@@ -381,6 +395,7 @@ DEPENDENCIES:
   - "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)"
   - "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)"
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
+  - RNImageCropPicker (from `../node_modules/react-native-image-crop-picker`)
   - RNLocalize (from `../node_modules/react-native-localize`)
   - RNReanimated (from `../node_modules/react-native-reanimated`)
   - RNScreens (from `../node_modules/react-native-screens`)
@@ -394,6 +409,7 @@ SPEC REPOS:
     - fmt
     - JWT
     - SSZipArchive
+    - TOCropViewController
 
 EXTERNAL SOURCES:
   boost:
@@ -470,6 +486,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@react-native-community/masked-view"
   RNGestureHandler:
     :path: "../node_modules/react-native-gesture-handler"
+  RNImageCropPicker:
+    :path: "../node_modules/react-native-image-crop-picker"
   RNLocalize:
     :path: "../node_modules/react-native-localize"
   RNReanimated:
@@ -508,7 +526,7 @@ SPEC CHECKSUMS:
   React-logger: 98f663b292a60967ebbc6d803ae96c1381183b6d
   react-native-encrypted-storage: aea5735891f45f04e0e222099090cece3de825ea
   react-native-restart: 45c8dca02491980f2958595333cbccd6877cb57e
-  react-native-safe-area-context: 52342d2d80ea8faadd0ffa76d83b6051f20c5329
+  react-native-safe-area-context: 114e9a74df2643012b9d6cc1460b94f3b6a90780
   React-perflogger: 0458a87ea9a7342079e7a31b0d32b3734fb8415f
   React-RCTActionSheet: 22538001ea2926dea001111dd2846c13a0730bc9
   React-RCTAnimation: 732ce66878d4aa151d56a0d142b1105aa12fd313
@@ -524,12 +542,14 @@ SPEC CHECKSUMS:
   RNCAsyncStorage: b03032fdbdb725bea0bd9e5ec5a7272865ae7398
   RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489
   RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
+  RNImageCropPicker: 14fe1c29298fb4018f3186f455c475ab107da332
   RNLocalize: 7c7aeda16c01db7a0918981c14875c0a53be9b79
   RNReanimated: b21b362b4b8ca921932e8b1718e88cf3a36f157e
-  RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d
+  RNScreens: 3d682bcaba69a4f8e55543d90818704f34338db1
   RNSVG: 67f1f12dae2cef6ed59a42cae74a6b8f5a9e7b46
-  RNVectorIcons: 31cebfcf94e8cf8686eb5303ae0357da64d7a5a4
+  RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8
   SSZipArchive: 62d4947b08730e4cda640473b0066d209ff033c9
+  TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
   Yoga: c4d61225a466f250c35c1ee78d2d0b3d41fe661c
 
 PODFILE CHECKSUM: 7a42b3d1c717dfdfca479dcc387351a58b6f8340

diff --git a/ios/Starter.xcodeproj/project.pbxproj b/ios/Starter.xcodeproj/project.pbxproj
@@ -427,6 +427,7 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Starter-StarterTests/Pods-Starter-StarterTests-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
 				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf",
 				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf",
 				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf",
@@ -444,9 +445,11 @@
 				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf",
 				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EvilIcons.ttf",
@@ -464,6 +467,7 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -557,6 +561,7 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Starter/Pods-Starter-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
 				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf",
 				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf",
 				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf",
@@ -574,9 +579,11 @@
 				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf",
 				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EvilIcons.ttf",
@@ -594,6 +601,7 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -778,6 +786,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
+				BASE_URL = "https://reqres.in/api/";
 				CLANG_ENABLE_MODULES = YES;
 				CODEPUSH_KEY = "";
 				CURRENT_PROJECT_VERSION = 1;
@@ -895,6 +904,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
+				BASE_URL = "https://reqres.in/api/";
 				CLANG_ENABLE_MODULES = YES;
 				CODEPUSH_KEY = "";
 				CURRENT_PROJECT_VERSION = 1;
@@ -1254,6 +1264,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon.Staging;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
+				BASE_URL = "https://reqres.in/api/";
 				CLANG_ENABLE_MODULES = YES;
 				CODEPUSH_KEY = fELQLBRhTSrcptH8iYyZnjgbfoAjpv_YAG5kS;
 				CURRENT_PROJECT_VERSION = 1;
@@ -1502,6 +1513,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon.Staging;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
+				BASE_URL = "https://reqres.in/api/";
 				CLANG_ENABLE_MODULES = YES;
 				CODEPUSH_KEY = fELQLBRhTSrcptH8iYyZnjgbfoAjpv_YAG5kS;
 				CURRENT_PROJECT_VERSION = 1;
@@ -1720,6 +1732,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon.Prod;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
+				BASE_URL = "https://reqres.in/api/";
 				CLANG_ENABLE_MODULES = YES;
 				CODEPUSH_KEY = "";
 				CURRENT_PROJECT_VERSION = 1;
@@ -1968,6 +1981,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon.Prod;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
+				BASE_URL = "https://reqres.in/api/";
 				CLANG_ENABLE_MODULES = YES;
 				CODEPUSH_KEY = "Rbbh4A-EomDicKm042eGpNQ33eMoDBffLJ7to";
 				CURRENT_PROJECT_VERSION = 1;

diff --git a/ios/Starter/Info.plist b/ios/Starter/Info.plist
@@ -30,6 +30,12 @@
 	<string>$(CODEPUSH_KEY)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+		<key>NSCameraUsageDescription</key>
+	<string>Testing purposes</string>
+			<key>NSPhotoLibraryUsageDescription</key>
+	<string>Testing purposes</string>
+  <key>NSMicrophoneUsageDescription</key>
+  <string>Testing purposes</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSExceptionDomains</key>

diff --git a/package.json b/package.json
@@ -20,9 +20,9 @@
     "android_dev_debug": "react-native run-android --variant=devDebug --appIdSuffix=dev",
     "android_staging_debug": "react-native run-android --variant=stagingDebug --appIdSuffix=staging",
     "android_prod_debug": "react-native run-android --variant=prodDebug --appIdSuffix=prod",
-    "android_apk_dev": "cd android && ./gradlew assembleDevRelease",
-    "android_staging_dev": "cd android && ./gradlew assembleStagingRelease",
-    "android_prod_dev": "cd android && ./gradlew assembleProdRelease",
+    "android_apk_dev": "cd android && ./gradlew clean && ./gradlew assembleDevRelease",
+    "android_staging_dev": "cd android && ./gradlew clean && ./gradlew assembleStagingRelease",
+    "android_prod_dev": "cd android && ./gradlew clean && ./gradlew assembleProdRelease",
     "deploy_dev": "appcenter codepush release-react -a parategirish50-gmail.com/Starter-App -d Dev",
     "deply_stageing": "appcenter codepush release-react -a parategirish50-gmail.com/Starter-App -d Staging",
     "deply_prod": "appcenter codepush release-react -a parategirish50-gmail.com/Starter-App -d Production",
@@ -32,10 +32,11 @@
   "dependencies": {
     "@react-native-community/async-storage": "^1.11.0",
     "@react-native-community/masked-view": "^0.1.6",
-    "@react-navigation/bottom-tabs": "^5.x",
-    "@react-navigation/material-top-tabs": "^5.x",
-    "@react-navigation/native": "^5.0.0",
-    "@react-navigation/stack": "^5.0.0",
+    "@react-navigation/bottom-tabs": "^6.5.7",
+    "@react-navigation/elements": "^1.3.17",
+    "@react-navigation/material-top-tabs": "^6.6.2",
+    "@react-navigation/native": "^6.1.6",
+    "@react-navigation/stack": "^6.3.16",
     "@types/react-native-vector-icons": "^6.4.10",
     "@types/react-redux": "^7.1.16",
     "@types/redux-thunk": "^2.1.0",
@@ -51,14 +52,13 @@
     "react-native-encrypted-storage": "^2.1.0",
     "react-native-gesture-handler": "^1.5.3",
     "react-native-localize": "^1.4.0",
-    "react-native-paper": "^4.8.1",
     "react-native-reanimated": "^2.13.0",
     "react-native-restart": "^0.0.24",
-    "react-native-safe-area-context": "^0.6.2",
-    "react-native-screens": "^2.0.0-alpha.29",
+    "react-native-safe-area-context": "4.1.2",
+    "react-native-screens": "2.15.2",
     "react-native-svg": "^11.0.1",
-    "react-native-tab-view": "^2.x",
-    "react-native-vector-icons": "^8.1.0",
+    "react-native-tab-view": "^3.5.1",
+    "react-native-vector-icons": "^9.2.0",
     "react-redux": "^7.2.4",
     "redux": "^4.1.0",
     "redux-persist": "^6.0.0",
@@ -77,4 +77,4 @@
     "react-native-svg-transformer": "^1.0.0",
     "react-test-renderer": "16.11.0"
   }
-}
+}
diff --git a/src/Config/ErrorHandleUtils.ts b/src/Config/ErrorHandleUtils.ts
@@ -1,10 +1,8 @@
 import { Alert } from "react-native";
 import RNRestart from 'react-native-restart';
-// import { hideLoader, showAlert } from "../../action/AppActions";
 
-export function handleApiError(error: any, appDispatch: any) {
-    // appDispatch(hideLoader());
-    // isDisplayError(error.message) && appDispatch(showAlert(error.message));
+export function handleApiError(error?: any, appDispatch?: any) {
+    Alert.alert("Error",error?.error || error)
 }
 
 function isDisplayError(message: string) {

diff --git a/src/Config/ScalingUtils.ts b/src/Config/ScalingUtils.ts
@@ -0,0 +1,12 @@
+import { Dimensions } from 'react-native';
+const { width, height } = Dimensions.get('window');
+
+//Guideline sizes are based on standard ~5" screen mobile device
+const guidelineBaseWidth = 350;
+const guidelineBaseHeight = 680;
+
+const scale = (size: number) => width / guidelineBaseWidth * size;
+const verticalScale = (size: number) => height / guidelineBaseHeight * size;
+const moderateScale = (size: number, factor = 0.5) => size + (scale(size) - size) * factor;
+
+export { scale, verticalScale, moderateScale };
diff --git a/src/components/AppText/AppText.tsx b/src/components/AppText/AppText.tsx
@@ -0,0 +1,57 @@
+// import * as React from 'react';
+// import { Text } from 'react-native-paper';
+
+// const MyComponent = () => (
+//     <>
+//         <Text variant="titleLarge">Title Large</Text>
+//         <Text variant="titleMedium">Title Medium</Text>
+//         <Text variant="titleSmall">Title Small</Text>
+
+//         <Text variant="bodyLarge">Body Large</Text>
+//         <Text variant="bodyMedium">Body Medium</Text>
+//         <Text variant="bodySmall">Body Small</Text>
+
+//         <Text variant="labelLarge">Label Large</Text>
+//         <Text variant="labelMedium">Label Medium</Text>
+//         <Text variant="labelSmall">Label Small</Text>
+//     </>
+// );
+
+// export default MyComponent;
+
+
+// export const Headline3 = () => {
+//     return (
+//         <Text variant="headlineSmall">Headline Small</Text>
+//     )
+// }
+
+// export const Headline2 = () => {
+//     return (
+//         <Text variant="headlineMedium">Headline Medium</Text>
+//     )
+// }
+
+// export const Headline1 = () => {
+//     return (
+//         <Text variant="headlineLarge">Headline Large</Text>
+//     )
+// }
+
+// export const H1Text = () => {
+//     return (
+//         <Text variant="displayLarge">Display Large</Text>
+//     )
+// }
+
+// export const H2Text = () => {
+//     return (
+//         <Text variant="displayMedium">Display Medium</Text>
+//     )
+// }
+
+// export const H3Text = () => {
+//     return (
+//         <Text variant="displaySmall">Display small</Text>
+//     )
+// }