diff --git a/.prettierrc.js b/.prettierrc.js
index 84196d9..95020db 100644
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -1,7 +1,10 @@
module.exports = {
- bracketSpacing: false,
- jsxBracketSameLine: true,
+ bracketSpacing: true,
+ bracketSameLine: true,
singleQuote: true,
trailingComma: 'all',
arrowParens: 'avoid',
+ tabWidth: 4,
+ useTabs: true,
+ semi: false,
};
diff --git a/App.tsx b/App.tsx
index 59fe689..89d7809 100644
--- a/App.tsx
+++ b/App.tsx
@@ -1,26 +1,32 @@
-import React, {useEffect} from 'react';
-import SplashScreen from 'react-native-splash-screen';
-import {Navigation} from './src/module/root';
-import './src/i18n/index';
-import {Provider} from 'react-redux';
-import {store} from './src/store/store';
-import {GestureHandlerRootView} from 'react-native-gesture-handler';
-
-if (__DEV__) {
- import('./ReactotronConfig').then(() => console.log('Reactotron Configured'));
-}
+import React, { useEffect } from 'react'
+import SplashScreen from 'react-native-splash-screen'
+import { Root } from './src/module/root'
+import './src/i18n/index'
+import { Provider } from 'react-redux'
+import { store } from './src/store/store'
+import { GestureHandlerRootView } from 'react-native-gesture-handler'
+import { NavigationContainer } from '@react-navigation/native'
+import {
+ SafeAreaProvider,
+ initialWindowMetrics,
+} from 'react-native-safe-area-context'
const App = () => {
- useEffect(() => {
- SplashScreen.hide();
- }, []);
- return (
-
-
-
-
-
- );
-};
+ useEffect(() => {
+ SplashScreen.hide()
+ }, [])
+
+ return (
+
+
+
+
+
+
+
+
+
+ )
+}
-export default App;
+export default App
diff --git a/android/app/src/main/assets/fonts/Roboto-Bold.ttf b/android/app/src/main/assets/fonts/Roboto-Bold.ttf
new file mode 100644
index 0000000..43da14d
Binary files /dev/null and b/android/app/src/main/assets/fonts/Roboto-Bold.ttf differ
diff --git a/android/app/src/main/assets/fonts/Roboto-Regular.ttf b/android/app/src/main/assets/fonts/Roboto-Regular.ttf
new file mode 100644
index 0000000..ddf4bfa
Binary files /dev/null and b/android/app/src/main/assets/fonts/Roboto-Regular.ttf differ
diff --git a/android/app/src/main/assets/fonts/fontello.ttf b/android/app/src/main/assets/fonts/fontello.ttf
index 1617660..cf29238 100644
Binary files a/android/app/src/main/assets/fonts/fontello.ttf and b/android/app/src/main/assets/fonts/fontello.ttf differ
diff --git a/android/link-assets-manifest.json b/android/link-assets-manifest.json
new file mode 100644
index 0000000..426f282
--- /dev/null
+++ b/android/link-assets-manifest.json
@@ -0,0 +1,17 @@
+{
+ "migIndex": 1,
+ "data": [
+ {
+ "path": "src/assets/resources/fonts/Roboto-Bold.ttf",
+ "sha1": "62442a18a9fe9457c1afeabf683d263a691b7798"
+ },
+ {
+ "path": "src/assets/resources/fonts/Roboto-Regular.ttf",
+ "sha1": "56c5c0d38bde4c1f1549dda43db37b09c608aad3"
+ },
+ {
+ "path": "src/assets/resources/fonts/fontello.ttf",
+ "sha1": "73fc32c22bdcda8f8bea6b28b74a9a45ba721f7d"
+ }
+ ]
+}
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index ef4cfed..a0541d6 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1279,6 +1279,8 @@ PODS:
- React-Core
- RNSVG (12.5.1):
- React-Core
+ - RNVectorIcons (9.2.0):
+ - React-Core
- SocketRocket (0.6.1)
- Yoga (1.14.0)
- YogaKit (1.18.1):
@@ -1359,6 +1361,7 @@ DEPENDENCIES:
- RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
- RNScreens (from `../node_modules/react-native-screens`)
- RNSVG (from `../node_modules/react-native-svg`)
+ - RNVectorIcons (from `../node_modules/react-native-vector-icons`)
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
SPEC REPOS:
@@ -1488,6 +1491,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native-screens"
RNSVG:
:path: "../node_modules/react-native-svg"
+ RNVectorIcons:
+ :path: "../node_modules/react-native-vector-icons"
Yoga:
:path: "../node_modules/react-native/ReactCommon/yoga"
@@ -1566,6 +1571,7 @@ SPEC CHECKSUMS:
RNGestureHandler: 6e46dde1f87e5f018a54fe5d40cd0e0b942b49ee
RNScreens: 3c2d122f5e08c192e254c510b212306da97d2581
RNSVG: d7d7bc8229af3842c9cfc3a723c815a52cdd1105
+ RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
Yoga: 4c3aa327e4a6a23eeacd71f61c81df1bcdf677d5
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
diff --git a/ios/Resources/Fonts/Roboto-Bold.ttf b/ios/Resources/Fonts/Roboto-Bold.ttf
new file mode 100644
index 0000000..43da14d
Binary files /dev/null and b/ios/Resources/Fonts/Roboto-Bold.ttf differ
diff --git a/ios/Resources/Fonts/Roboto-Regular.ttf b/ios/Resources/Fonts/Roboto-Regular.ttf
new file mode 100644
index 0000000..ddf4bfa
Binary files /dev/null and b/ios/Resources/Fonts/Roboto-Regular.ttf differ
diff --git a/ios/Truth.xcodeproj/project.pbxproj b/ios/Truth.xcodeproj/project.pbxproj
index ce45d8b..d6f2d0f 100644
--- a/ios/Truth.xcodeproj/project.pbxproj
+++ b/ios/Truth.xcodeproj/project.pbxproj
@@ -14,6 +14,8 @@
3F5CDF352995282400BD4B7F /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3F5CDF342995282400BD4B7F /* GoogleService-Info.plist */; };
52BCE0F228C76D5A008C74BC /* Fonts in Resources */ = {isa = PBXBuildFile; fileRef = 52BCE0EE28C76941008C74BC /* Fonts */; };
52BCE0F328C77143008C74BC /* fontello.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DA10DFDF3E05483BA976401B /* fontello.ttf */; };
+ 637B62A42B07BAFB008D8917 /* Roboto-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 637B62A32B07BAFB008D8917 /* Roboto-Bold.ttf */; };
+ 637B62A62B07BB0B008D8917 /* Roboto-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 637B62A52B07BB0B008D8917 /* Roboto-Regular.ttf */; };
8D22E0E3287C39ED0031C6E5 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8D22E0E2287C39ED0031C6E5 /* Launch Screen.storyboard */; };
A391FF929DB227F6E78842F0 /* libPods-Truth-TruthTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 28F2047B035775EA39D23C93 /* libPods-Truth-TruthTests.a */; };
BE14AC86F1757C0EC41F56B3 /* libPods-Truth.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7A2B08B3350C2BC99B4477A9 /* libPods-Truth.a */; };
@@ -33,6 +35,7 @@
00E356EE1AD99517003FC87E /* TruthTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TruthTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; };
00E356F21AD99517003FC87E /* TruthTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TruthTests.m; sourceTree = ""; };
+ 0A5DBF0F38024BCFB74F94C3 /* Roboto-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Regular.ttf"; path = "../src/assets/resources/fonts/Roboto-Regular.ttf"; sourceTree = ""; };
13B07F961A680F5B00A75B9A /* Truth.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Truth.app; sourceTree = BUILT_PRODUCTS_DIR; };
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Truth/AppDelegate.h; sourceTree = ""; };
13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Truth/AppDelegate.m; sourceTree = ""; };
@@ -40,9 +43,14 @@
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Truth/Info.plist; sourceTree = ""; };
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Truth/main.m; sourceTree = ""; };
28F2047B035775EA39D23C93 /* libPods-Truth-TruthTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Truth-TruthTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+ 36C7150ADAB54DA0B3D10FF5 /* Roboto-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Bold.ttf"; path = "../src/assets/resources/fonts/Roboto-Bold.ttf"; sourceTree = ""; };
3F5CDF302995158300BD4B7F /* ios */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ios; sourceTree = ""; };
3F5CDF342995282400BD4B7F /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; };
52BCE0EE28C76941008C74BC /* Fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Fonts; sourceTree = ""; };
+ 637B62A12B07B836008D8917 /* Roboto-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Roboto-Regular.ttf"; path = "../src/assets/resources/fonts/Roboto-Regular.ttf"; sourceTree = ""; };
+ 637B62A22B07B836008D8917 /* Roboto-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Roboto-Bold.ttf"; path = "../src/assets/resources/fonts/Roboto-Bold.ttf"; sourceTree = ""; };
+ 637B62A32B07BAFB008D8917 /* Roboto-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Roboto-Bold.ttf"; path = "../src/assets/resources/fonts/Roboto-Bold.ttf"; sourceTree = ""; };
+ 637B62A52B07BB0B008D8917 /* Roboto-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Roboto-Regular.ttf"; path = "../src/assets/resources/fonts/Roboto-Regular.ttf"; sourceTree = ""; };
7A2B08B3350C2BC99B4477A9 /* libPods-Truth.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Truth.a"; sourceTree = BUILT_PRODUCTS_DIR; };
8D22E0E2287C39ED0031C6E5 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = ""; };
98B9F113E9FC1559D43A3977 /* Pods-Truth-TruthTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Truth-TruthTests.release.xcconfig"; path = "Target Support Files/Pods-Truth-TruthTests/Pods-Truth-TruthTests.release.xcconfig"; sourceTree = ""; };
@@ -118,6 +126,8 @@
isa = PBXGroup;
children = (
52BCE0EE28C76941008C74BC /* Fonts */,
+ 36C7150ADAB54DA0B3D10FF5 /* Roboto-Bold.ttf */,
+ 0A5DBF0F38024BCFB74F94C3 /* Roboto-Regular.ttf */,
);
path = Resources;
sourceTree = "";
@@ -132,6 +142,8 @@
83CBB9F61A601CBA00E9B192 = {
isa = PBXGroup;
children = (
+ 637B62A52B07BB0B008D8917 /* Roboto-Regular.ttf */,
+ 637B62A32B07BAFB008D8917 /* Roboto-Bold.ttf */,
3F5CDF342995282400BD4B7F /* GoogleService-Info.plist */,
3F5CDF302995158300BD4B7F /* ios */,
13B07FAE1A68108700A75B9A /* Truth */,
@@ -170,6 +182,8 @@
EECF0ADD7A2F4406804069EA /* Resources */ = {
isa = PBXGroup;
children = (
+ 637B62A22B07B836008D8917 /* Roboto-Bold.ttf */,
+ 637B62A12B07B836008D8917 /* Roboto-Regular.ttf */,
DA10DFDF3E05483BA976401B /* fontello.ttf */,
);
name = Resources;
@@ -270,6 +284,8 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 637B62A62B07BB0B008D8917 /* Roboto-Regular.ttf in Resources */,
+ 637B62A42B07BAFB008D8917 /* Roboto-Bold.ttf in Resources */,
52BCE0F328C77143008C74BC /* fontello.ttf in Resources */,
52BCE0F228C76D5A008C74BC /* Fonts in Resources */,
8D22E0E3287C39ED0031C6E5 /* Launch Screen.storyboard in Resources */,
diff --git a/ios/Truth/Info.plist b/ios/Truth/Info.plist
index 7ad0291..e830106 100644
--- a/ios/Truth/Info.plist
+++ b/ios/Truth/Info.plist
@@ -36,10 +36,12 @@
NSLocationWhenInUseUsageDescription
-
+
UIAppFonts
fontello.ttf
+ Roboto-Bold.ttf
+ Roboto-Regular.ttf
UILaunchStoryboardName
Launch Screen
diff --git a/ios/link-assets-manifest.json b/ios/link-assets-manifest.json
new file mode 100644
index 0000000..426f282
--- /dev/null
+++ b/ios/link-assets-manifest.json
@@ -0,0 +1,17 @@
+{
+ "migIndex": 1,
+ "data": [
+ {
+ "path": "src/assets/resources/fonts/Roboto-Bold.ttf",
+ "sha1": "62442a18a9fe9457c1afeabf683d263a691b7798"
+ },
+ {
+ "path": "src/assets/resources/fonts/Roboto-Regular.ttf",
+ "sha1": "56c5c0d38bde4c1f1549dda43db37b09c608aad3"
+ },
+ {
+ "path": "src/assets/resources/fonts/fontello.ttf",
+ "sha1": "73fc32c22bdcda8f8bea6b28b74a9a45ba721f7d"
+ }
+ ]
+}
diff --git a/package-lock.json b/package-lock.json
index c2807d6..12581fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,13 +16,18 @@
"@reduxjs/toolkit": "^1.9.2",
"i18next": "^21.8.14",
"i18next-react-native-async-storage": "^1.0.4",
+ "jet-tools": "^1.3.0",
"link": "^1.5.1",
+ "lodash": "^4.17.21",
"react": "18.2.0",
"react-i18next": "^11.18.1",
"react-native": "0.72.7",
+ "react-native-actions-sheet": "*",
"react-native-animated-loader": "^1.0.0",
"react-native-gesture-handler": "^2.5.0",
"react-native-icomoon": "^0.1.1",
+ "react-native-keyboard-aware-scroll-view": "^0.9.5",
+ "react-native-modal": "^13.0.1",
"react-native-safe-area-context": "^4.3.1",
"react-native-screens": "^3.27.0",
"react-native-splash-screen": "^3.3.0",
@@ -38,6 +43,7 @@
"@react-native/eslint-config": "^0.72.2",
"@react-native/metro-config": "^0.72.11",
"@tsconfig/react-native": "^3.0.0",
+ "@types/lodash": "^4.14.201",
"@types/react": "^18.0.24",
"@types/react-native": "^0.66.15",
"@types/react-native-vector-icons": "^6.4.12",
@@ -4744,6 +4750,12 @@
"integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
"dev": true
},
+ "node_modules/@types/lodash": {
+ "version": "4.14.201",
+ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.201.tgz",
+ "integrity": "sha512-y9euML0cim1JrykNxADLfaG0FgD1g/yTHwUs/Jg9ZIU7WKj2/4IW9Lbb1WZbvck78W/lfGXFfe+u2EGfIJXdLQ==",
+ "dev": true
+ },
"node_modules/@types/node": {
"version": "20.9.0",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.0.tgz",
@@ -10480,6 +10492,28 @@
"url": "https://github.com/chalk/supports-color?sponsor=1"
}
},
+ "node_modules/jet-tools": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/jet-tools/-/jet-tools-1.3.0.tgz",
+ "integrity": "sha512-m+jiMpaTIhqkaeDVlqtw51BANUKVkbokuAXbwXlA7egsL2TROIulTqCvXgsL+r0N4qs3kibEcBExoClQT7HUEw==",
+ "dependencies": {
+ "lodash": "^4.17.21",
+ "react": "^17.0.2",
+ "validatorjs": "^3.22.1"
+ }
+ },
+ "node_modules/jet-tools/node_modules/react": {
+ "version": "17.0.2",
+ "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
+ "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
+ "dependencies": {
+ "loose-envify": "^1.1.0",
+ "object-assign": "^4.1.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/joi": {
"version": "17.11.0",
"resolved": "https://registry.npmjs.org/joi/-/joi-17.11.0.tgz",
@@ -12736,6 +12770,23 @@
"react": "18.2.0"
}
},
+ "node_modules/react-native-actions-sheet": {
+ "version": "0.9.0-alpha.24",
+ "resolved": "https://registry.npmjs.org/react-native-actions-sheet/-/react-native-actions-sheet-0.9.0-alpha.24.tgz",
+ "integrity": "sha512-NF0oO0vf3DrFsqI+pbQ+HTG2q+VEotkVwhtFr8aLiUFJT876icVOSurCaeqD1t4zHtH2U5qa8vKQxbA/j5Mu8w==",
+ "peerDependencies": {
+ "react-native": "*",
+ "react-native-gesture-handler": "*"
+ }
+ },
+ "node_modules/react-native-animatable": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/react-native-animatable/-/react-native-animatable-1.3.3.tgz",
+ "integrity": "sha512-2ckIxZQAsvWn25Ho+DK3d1mXIgj7tITkrS4pYDvx96WyOttSvzzFeQnM2od0+FUMzILbdHDsDEqZvnz1DYNQ1w==",
+ "dependencies": {
+ "prop-types": "^15.7.2"
+ }
+ },
"node_modules/react-native-animated-loader": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/react-native-animated-loader/-/react-native-animated-loader-1.0.0.tgz",
@@ -12786,6 +12837,39 @@
"react-native": "*"
}
},
+ "node_modules/react-native-iphone-x-helper": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz",
+ "integrity": "sha512-HOf0jzRnq2/aFUcdCJ9w9JGzN3gdEg0zFE4FyYlp4jtidqU03D5X7ZegGKfT1EWteR0gPBGp9ye5T5FvSWi9Yg==",
+ "peerDependencies": {
+ "react-native": ">=0.42.0"
+ }
+ },
+ "node_modules/react-native-keyboard-aware-scroll-view": {
+ "version": "0.9.5",
+ "resolved": "https://registry.npmjs.org/react-native-keyboard-aware-scroll-view/-/react-native-keyboard-aware-scroll-view-0.9.5.tgz",
+ "integrity": "sha512-XwfRn+T/qBH9WjTWIBiJD2hPWg0yJvtaEw6RtPCa5/PYHabzBaWxYBOl0usXN/368BL1XktnZPh8C2lmTpOREA==",
+ "dependencies": {
+ "prop-types": "^15.6.2",
+ "react-native-iphone-x-helper": "^1.0.3"
+ },
+ "peerDependencies": {
+ "react-native": ">=0.48.4"
+ }
+ },
+ "node_modules/react-native-modal": {
+ "version": "13.0.1",
+ "resolved": "https://registry.npmjs.org/react-native-modal/-/react-native-modal-13.0.1.tgz",
+ "integrity": "sha512-UB+mjmUtf+miaG/sDhOikRfBOv0gJdBU2ZE1HtFWp6UixW9jCk/bhGdHUgmZljbPpp0RaO/6YiMmQSSK3kkMaw==",
+ "dependencies": {
+ "prop-types": "^15.6.2",
+ "react-native-animatable": "1.3.3"
+ },
+ "peerDependencies": {
+ "react": "*",
+ "react-native": ">=0.65.0"
+ }
+ },
"node_modules/react-native-safe-area-context": {
"version": "4.7.4",
"resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-4.7.4.tgz",
@@ -14562,6 +14646,11 @@
"node": ">=10.12.0"
}
},
+ "node_modules/validatorjs": {
+ "version": "3.22.1",
+ "resolved": "https://registry.npmjs.org/validatorjs/-/validatorjs-3.22.1.tgz",
+ "integrity": "sha512-451KiCt/3E8qV/8fOUdO0YkA8zUdQBNVxubg9jvgEB+JAg9IlRKrClzwq2ir2ndj7TWmPYQ7bXFb4BxcyX2iWw=="
+ },
"node_modules/vary": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -18167,6 +18256,12 @@
"integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
"dev": true
},
+ "@types/lodash": {
+ "version": "4.14.201",
+ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.201.tgz",
+ "integrity": "sha512-y9euML0cim1JrykNxADLfaG0FgD1g/yTHwUs/Jg9ZIU7WKj2/4IW9Lbb1WZbvck78W/lfGXFfe+u2EGfIJXdLQ==",
+ "dev": true
+ },
"@types/node": {
"version": "20.9.0",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.0.tgz",
@@ -22318,6 +22413,27 @@
}
}
},
+ "jet-tools": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/jet-tools/-/jet-tools-1.3.0.tgz",
+ "integrity": "sha512-m+jiMpaTIhqkaeDVlqtw51BANUKVkbokuAXbwXlA7egsL2TROIulTqCvXgsL+r0N4qs3kibEcBExoClQT7HUEw==",
+ "requires": {
+ "lodash": "^4.17.21",
+ "react": "^17.0.2",
+ "validatorjs": "^3.22.1"
+ },
+ "dependencies": {
+ "react": {
+ "version": "17.0.2",
+ "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
+ "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
+ "requires": {
+ "loose-envify": "^1.1.0",
+ "object-assign": "^4.1.1"
+ }
+ }
+ }
+ },
"joi": {
"version": "17.11.0",
"resolved": "https://registry.npmjs.org/joi/-/joi-17.11.0.tgz",
@@ -24096,6 +24212,19 @@
}
}
},
+ "react-native-actions-sheet": {
+ "version": "0.9.0-alpha.24",
+ "resolved": "https://registry.npmjs.org/react-native-actions-sheet/-/react-native-actions-sheet-0.9.0-alpha.24.tgz",
+ "integrity": "sha512-NF0oO0vf3DrFsqI+pbQ+HTG2q+VEotkVwhtFr8aLiUFJT876icVOSurCaeqD1t4zHtH2U5qa8vKQxbA/j5Mu8w=="
+ },
+ "react-native-animatable": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/react-native-animatable/-/react-native-animatable-1.3.3.tgz",
+ "integrity": "sha512-2ckIxZQAsvWn25Ho+DK3d1mXIgj7tITkrS4pYDvx96WyOttSvzzFeQnM2od0+FUMzILbdHDsDEqZvnz1DYNQ1w==",
+ "requires": {
+ "prop-types": "^15.7.2"
+ }
+ },
"react-native-animated-loader": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/react-native-animated-loader/-/react-native-animated-loader-1.0.0.tgz",
@@ -24128,6 +24257,29 @@
"resolved": "https://registry.npmjs.org/react-native-icomoon/-/react-native-icomoon-0.1.1.tgz",
"integrity": "sha512-/WHF2OXHGPZcjqEHutOtMIPFBMf9wfRXiA/uA5kSAr3WLhyZZ/wNMlz7C+XFjoqAE7D+M2ycDB37z6yZmnCTQg=="
},
+ "react-native-iphone-x-helper": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz",
+ "integrity": "sha512-HOf0jzRnq2/aFUcdCJ9w9JGzN3gdEg0zFE4FyYlp4jtidqU03D5X7ZegGKfT1EWteR0gPBGp9ye5T5FvSWi9Yg=="
+ },
+ "react-native-keyboard-aware-scroll-view": {
+ "version": "0.9.5",
+ "resolved": "https://registry.npmjs.org/react-native-keyboard-aware-scroll-view/-/react-native-keyboard-aware-scroll-view-0.9.5.tgz",
+ "integrity": "sha512-XwfRn+T/qBH9WjTWIBiJD2hPWg0yJvtaEw6RtPCa5/PYHabzBaWxYBOl0usXN/368BL1XktnZPh8C2lmTpOREA==",
+ "requires": {
+ "prop-types": "^15.6.2",
+ "react-native-iphone-x-helper": "^1.0.3"
+ }
+ },
+ "react-native-modal": {
+ "version": "13.0.1",
+ "resolved": "https://registry.npmjs.org/react-native-modal/-/react-native-modal-13.0.1.tgz",
+ "integrity": "sha512-UB+mjmUtf+miaG/sDhOikRfBOv0gJdBU2ZE1HtFWp6UixW9jCk/bhGdHUgmZljbPpp0RaO/6YiMmQSSK3kkMaw==",
+ "requires": {
+ "prop-types": "^15.6.2",
+ "react-native-animatable": "1.3.3"
+ }
+ },
"react-native-safe-area-context": {
"version": "4.7.4",
"resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-4.7.4.tgz",
@@ -25368,6 +25520,11 @@
"convert-source-map": "^2.0.0"
}
},
+ "validatorjs": {
+ "version": "3.22.1",
+ "resolved": "https://registry.npmjs.org/validatorjs/-/validatorjs-3.22.1.tgz",
+ "integrity": "sha512-451KiCt/3E8qV/8fOUdO0YkA8zUdQBNVxubg9jvgEB+JAg9IlRKrClzwq2ir2ndj7TWmPYQ7bXFb4BxcyX2iWw=="
+ },
"vary": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
diff --git a/package.json b/package.json
index b98b4a0..debe897 100644
--- a/package.json
+++ b/package.json
@@ -23,13 +23,18 @@
"@reduxjs/toolkit": "^1.9.2",
"i18next": "^21.8.14",
"i18next-react-native-async-storage": "^1.0.4",
+ "jet-tools": "^1.3.0",
"link": "^1.5.1",
+ "lodash": "^4.17.21",
"react": "18.2.0",
"react-i18next": "^11.18.1",
"react-native": "0.72.7",
+ "react-native-actions-sheet": "*",
"react-native-animated-loader": "^1.0.0",
"react-native-gesture-handler": "^2.5.0",
"react-native-icomoon": "^0.1.1",
+ "react-native-keyboard-aware-scroll-view": "^0.9.5",
+ "react-native-modal": "^13.0.1",
"react-native-safe-area-context": "^4.3.1",
"react-native-screens": "^3.27.0",
"react-native-splash-screen": "^3.3.0",
@@ -45,6 +50,7 @@
"@react-native/eslint-config": "^0.72.2",
"@react-native/metro-config": "^0.72.11",
"@tsconfig/react-native": "^3.0.0",
+ "@types/lodash": "^4.14.201",
"@types/react": "^18.0.24",
"@types/react-native": "^0.66.15",
"@types/react-native-vector-icons": "^6.4.12",
diff --git a/react-native.config.js b/react-native.config.js
index d945765..f8b3dea 100644
--- a/react-native.config.js
+++ b/react-native.config.js
@@ -1,10 +1,3 @@
module.exports = {
assets: ['./src/assets/resources/fonts'],
- dependencies: {
- 'react-native-vector-icons': {
- platforms: {
- ios: null,
- },
- },
- },
};
diff --git a/src/assets/image/addPlus.png b/src/assets/image/addPlus.png
deleted file mode 100644
index 4281d52..0000000
Binary files a/src/assets/image/addPlus.png and /dev/null differ
diff --git a/src/assets/image/circleArrows.png b/src/assets/image/circleArrows.png
deleted file mode 100644
index ff412e4..0000000
Binary files a/src/assets/image/circleArrows.png and /dev/null differ
diff --git a/src/assets/image/glass.svg b/src/assets/image/glass.svg
index 33c3b20..1cae5d0 100644
--- a/src/assets/image/glass.svg
+++ b/src/assets/image/glass.svg
@@ -1,159 +1,110 @@
-