@fadyshawky/react-native-magic 1.0.3 → 1.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +66 -0
- package/package.json +2 -1
- package/template/App.tsx +5 -1
- package/template/android/app/src/main/java/com/reactnativemagic/MainActivity.kt +5 -0
- package/template/ios/reactnativemagic.xcodeproj/project.pbxproj +65 -65
- package/template/package-lock.json +9 -9
- package/template/src/common/components/PhotoTakingButton.tsx +5 -7
- package/template/src/common/components/PrimaryTextInput.tsx +4 -15
- package/template/src/common/components/RadioButton.tsx +2 -9
- package/template/src/common/components/RadioIcon.tsx +4 -12
- package/template/src/common/components/Separator.tsx +2 -9
- package/template/src/common/components/TouchablePlatform.tsx +2 -11
- package/template/src/common/components/TryAgain.tsx +2 -9
- package/template/src/core/theme/colors.ts +42 -71
- package/template/src/core/theme/fonts.ts +5 -10
- package/template/src/navigation/MainNavigation.tsx +8 -6
- package/template/src/common/helpers/colorHelpers.ts +0 -34
package/CHANGELOG.md
ADDED
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
# Changelog
|
|
2
|
+
|
|
3
|
+
All notable changes to this project will be documented in this file.
|
|
4
|
+
|
|
5
|
+
## [1.0.4] - 2024-12-22
|
|
6
|
+
|
|
7
|
+
### Fixed
|
|
8
|
+
- Updated React Native Screens configuration for React Navigation v7 compatibility
|
|
9
|
+
- Fixed navigation theme implementation for Poppins font family
|
|
10
|
+
|
|
11
|
+
### Changed
|
|
12
|
+
- Simplified navigation container theme configuration
|
|
13
|
+
- Removed deprecated font configurations
|
|
14
|
+
|
|
15
|
+
## [1.0.3] - 2024-12-21
|
|
16
|
+
|
|
17
|
+
### Added
|
|
18
|
+
- Enhanced template structure with additional hooks and utilities
|
|
19
|
+
- Added new dependencies:
|
|
20
|
+
- @react-native-camera-roll/camera-roll ^7.9.0
|
|
21
|
+
- @react-native-community/datetimepicker ^8.2.0
|
|
22
|
+
- @react-native-community/image-editor ^4.2.1
|
|
23
|
+
- @react-native-community/netinfo ^11.4.1
|
|
24
|
+
- @react-native-community/slider ^4.5.5
|
|
25
|
+
- @shopify/flash-list ^1.7.2
|
|
26
|
+
|
|
27
|
+
### Updated
|
|
28
|
+
- Updated React Navigation to v7
|
|
29
|
+
- Updated dependencies to latest versions:
|
|
30
|
+
- @react-navigation/bottom-tabs ^7.2.0
|
|
31
|
+
- @react-navigation/drawer ^7.1.1
|
|
32
|
+
- @react-navigation/material-top-tabs ^7.1.0
|
|
33
|
+
- @react-navigation/native ^7.0.14
|
|
34
|
+
- @react-navigation/native-stack ^7.2.0
|
|
35
|
+
- @reduxjs/toolkit ^2.5.0
|
|
36
|
+
|
|
37
|
+
### Changed
|
|
38
|
+
- Improved project structure and organization
|
|
39
|
+
- Enhanced iOS configuration
|
|
40
|
+
- Updated Android Gradle configuration
|
|
41
|
+
|
|
42
|
+
## [1.0.2] - 2024-12-20
|
|
43
|
+
|
|
44
|
+
### Added
|
|
45
|
+
- Initial template setup with TypeScript support
|
|
46
|
+
- Basic navigation structure
|
|
47
|
+
- Redux integration with persist storage
|
|
48
|
+
- Common hooks and utilities
|
|
49
|
+
|
|
50
|
+
### Changed
|
|
51
|
+
- Updated project dependencies
|
|
52
|
+
- Improved documentation
|
|
53
|
+
|
|
54
|
+
## [1.0.1] - 2024-12-19
|
|
55
|
+
|
|
56
|
+
### Added
|
|
57
|
+
- Basic React Native template structure
|
|
58
|
+
- Essential project configuration
|
|
59
|
+
- Initial README documentation
|
|
60
|
+
|
|
61
|
+
## [1.0.0] - 2024-12-18
|
|
62
|
+
|
|
63
|
+
### Added
|
|
64
|
+
- Initial release
|
|
65
|
+
- Basic project setup
|
|
66
|
+
- Core dependencies
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fadyshawky/react-native-magic",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.4",
|
|
4
4
|
"description": "react native template with ready components, hooks, react navigation, redux, typescript, etc.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react-native-magic",
|
|
@@ -20,6 +20,7 @@
|
|
|
20
20
|
"type": "commonjs",
|
|
21
21
|
"main": "index.js",
|
|
22
22
|
"dependencies": {
|
|
23
|
+
"@fontsource/poppins": "^5.1.0",
|
|
23
24
|
"@react-native-async-storage/async-storage": "^2.1.0",
|
|
24
25
|
"@react-native-camera-roll/camera-roll": "^7.9.0",
|
|
25
26
|
"@react-native-community/datetimepicker": "^8.2.0",
|
package/template/App.tsx
CHANGED
|
@@ -4,7 +4,11 @@
|
|
|
4
4
|
*
|
|
5
5
|
* @format
|
|
6
6
|
*/
|
|
7
|
-
|
|
7
|
+
import '@fontsource/poppins/300.css'; // Light
|
|
8
|
+
import '@fontsource/poppins/400.css'; // Regular
|
|
9
|
+
import '@fontsource/poppins/500.css'; // Medium
|
|
10
|
+
import '@fontsource/poppins/600.css'; // SemiBold
|
|
11
|
+
import '@fontsource/poppins/700.css'; // Bold
|
|
8
12
|
import React from 'react';
|
|
9
13
|
import {LogBox, SafeAreaView, StatusBar} from 'react-native';
|
|
10
14
|
import {SheetProvider} from 'react-native-actions-sheet';
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
package com.reactnativemagic
|
|
2
2
|
|
|
3
|
+
import android.os.Bundle
|
|
3
4
|
import com.facebook.react.ReactActivity
|
|
4
5
|
import com.facebook.react.ReactActivityDelegate
|
|
5
6
|
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
|
|
@@ -7,6 +8,10 @@ import com.facebook.react.defaults.DefaultReactActivityDelegate
|
|
|
7
8
|
|
|
8
9
|
class MainActivity : ReactActivity() {
|
|
9
10
|
|
|
11
|
+
override fun onCreate(savedInstanceState: Bundle?) {
|
|
12
|
+
super.onCreate(null)
|
|
13
|
+
}
|
|
14
|
+
|
|
10
15
|
/**
|
|
11
16
|
* Returns the name of the main component registered from JavaScript. This is used to schedule
|
|
12
17
|
* rendering of the component.
|
|
@@ -11,8 +11,7 @@
|
|
|
11
11
|
13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
|
|
12
12
|
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
|
|
13
13
|
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
|
|
14
|
-
|
|
15
|
-
280C6F8FD6A3698B3128908D /* libPods-reactnativemagic-reactnativemagicTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EAA8A6B316A064CB8CF9DC1 /* libPods-reactnativemagic-reactnativemagicTests.a */; };
|
|
14
|
+
44CEDDADA0FFEFA1C02AD162 /* libPods-reactnativemagic.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 72FCDE6D8263C5D62A717153 /* libPods-reactnativemagic.a */; };
|
|
16
15
|
52BF1DA92D160E8100046137 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
|
|
17
16
|
52BF1DAA2D160E8100046137 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
|
|
18
17
|
52BF1DAE2D160E8100046137 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
|
|
@@ -20,6 +19,7 @@
|
|
|
20
19
|
52BF1DB02D160E8100046137 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */; };
|
|
21
20
|
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
|
|
22
21
|
910638E3E666DD629C55D964 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */; };
|
|
22
|
+
F5460503102D1B15F9526BEA /* libPods-reactnativemagic-reactnativemagicTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E0F08C4FA8BBC7D24AE0AD6 /* libPods-reactnativemagic-reactnativemagicTests.a */; };
|
|
23
23
|
/* End PBXBuildFile section */
|
|
24
24
|
|
|
25
25
|
/* Begin PBXContainerItemProxy section */
|
|
@@ -36,6 +36,7 @@
|
|
|
36
36
|
00E356EE1AD99517003FC87E /* reactnativemagicTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = reactnativemagicTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
|
|
37
37
|
00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
|
38
38
|
00E356F21AD99517003FC87E /* reactnativemagicTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = reactnativemagicTests.m; sourceTree = "<group>"; };
|
|
39
|
+
123D2B186506039FFA026D6C /* Pods-reactnativemagic-reactnativemagicTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-reactnativemagic-reactnativemagicTests.release.xcconfig"; path = "Target Support Files/Pods-reactnativemagic-reactnativemagicTests/Pods-reactnativemagic-reactnativemagicTests.release.xcconfig"; sourceTree = "<group>"; };
|
|
39
40
|
13B07F961A680F5B00A75B9A /* reactnativemagic.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = reactnativemagic.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
|
40
41
|
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = reactnativemagic/AppDelegate.h; sourceTree = "<group>"; };
|
|
41
42
|
13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = reactnativemagic/AppDelegate.mm; sourceTree = "<group>"; };
|
|
@@ -43,16 +44,15 @@
|
|
|
43
44
|
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = reactnativemagic/Info.plist; sourceTree = "<group>"; };
|
|
44
45
|
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = reactnativemagic/main.m; sourceTree = "<group>"; };
|
|
45
46
|
13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = PrivacyInfo.xcprivacy; path = reactnativemagic/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
|
|
46
|
-
|
|
47
|
+
2FC2A41A7C9CECF77A6F86E9 /* Pods-reactnativemagic.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-reactnativemagic.release.xcconfig"; path = "Target Support Files/Pods-reactnativemagic/Pods-reactnativemagic.release.xcconfig"; sourceTree = "<group>"; };
|
|
47
48
|
52BF1DB72D160E8100046137 /* reactnativemagic-Development.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "reactnativemagic-Development.app"; sourceTree = BUILT_PRODUCTS_DIR; };
|
|
48
49
|
52BF1DB82D160E8100046137 /* reactnativemagic copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "reactnativemagic copy-Info.plist"; path = "/Users/fady/Dev/template/ReactNativeMagic/template/ios/reactnativemagic copy-Info.plist"; sourceTree = "<absolute>"; };
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
50
|
+
56A7F0350C455B9C5A7234F8 /* Pods-reactnativemagic-reactnativemagicTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-reactnativemagic-reactnativemagicTests.debug.xcconfig"; path = "Target Support Files/Pods-reactnativemagic-reactnativemagicTests/Pods-reactnativemagic-reactnativemagicTests.debug.xcconfig"; sourceTree = "<group>"; };
|
|
51
|
+
72FCDE6D8263C5D62A717153 /* libPods-reactnativemagic.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-reactnativemagic.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
|
52
|
+
7E0F08C4FA8BBC7D24AE0AD6 /* libPods-reactnativemagic-reactnativemagicTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-reactnativemagic-reactnativemagicTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
|
52
53
|
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = reactnativemagic/LaunchScreen.storyboard; sourceTree = "<group>"; };
|
|
53
|
-
91F3E60D945E8CE7540D951D /* Pods-reactnativemagic.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-reactnativemagic.release.xcconfig"; path = "Target Support Files/Pods-reactnativemagic/Pods-reactnativemagic.release.xcconfig"; sourceTree = "<group>"; };
|
|
54
|
-
DB791B0A57A611BA4A66B1AA /* libPods-reactnativemagic.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-reactnativemagic.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
|
55
54
|
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
|
|
55
|
+
F4E5443D5B5729DC581A3C5D /* Pods-reactnativemagic.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-reactnativemagic.debug.xcconfig"; path = "Target Support Files/Pods-reactnativemagic/Pods-reactnativemagic.debug.xcconfig"; sourceTree = "<group>"; };
|
|
56
56
|
/* End PBXFileReference section */
|
|
57
57
|
|
|
58
58
|
/* Begin PBXFrameworksBuildPhase section */
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
isa = PBXFrameworksBuildPhase;
|
|
61
61
|
buildActionMask = 2147483647;
|
|
62
62
|
files = (
|
|
63
|
-
|
|
63
|
+
F5460503102D1B15F9526BEA /* libPods-reactnativemagic-reactnativemagicTests.a in Frameworks */,
|
|
64
64
|
);
|
|
65
65
|
runOnlyForDeploymentPostprocessing = 0;
|
|
66
66
|
};
|
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
isa = PBXFrameworksBuildPhase;
|
|
69
69
|
buildActionMask = 2147483647;
|
|
70
70
|
files = (
|
|
71
|
-
|
|
71
|
+
44CEDDADA0FFEFA1C02AD162 /* libPods-reactnativemagic.a in Frameworks */,
|
|
72
72
|
);
|
|
73
73
|
runOnlyForDeploymentPostprocessing = 0;
|
|
74
74
|
};
|
|
@@ -117,8 +117,8 @@
|
|
|
117
117
|
isa = PBXGroup;
|
|
118
118
|
children = (
|
|
119
119
|
ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
|
|
120
|
-
|
|
121
|
-
|
|
120
|
+
72FCDE6D8263C5D62A717153 /* libPods-reactnativemagic.a */,
|
|
121
|
+
7E0F08C4FA8BBC7D24AE0AD6 /* libPods-reactnativemagic-reactnativemagicTests.a */,
|
|
122
122
|
);
|
|
123
123
|
name = Frameworks;
|
|
124
124
|
sourceTree = "<group>";
|
|
@@ -159,10 +159,10 @@
|
|
|
159
159
|
BBD78D7AC51CEA395F1C20DB /* Pods */ = {
|
|
160
160
|
isa = PBXGroup;
|
|
161
161
|
children = (
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
162
|
+
F4E5443D5B5729DC581A3C5D /* Pods-reactnativemagic.debug.xcconfig */,
|
|
163
|
+
2FC2A41A7C9CECF77A6F86E9 /* Pods-reactnativemagic.release.xcconfig */,
|
|
164
|
+
56A7F0350C455B9C5A7234F8 /* Pods-reactnativemagic-reactnativemagicTests.debug.xcconfig */,
|
|
165
|
+
123D2B186506039FFA026D6C /* Pods-reactnativemagic-reactnativemagicTests.release.xcconfig */,
|
|
166
166
|
);
|
|
167
167
|
path = Pods;
|
|
168
168
|
sourceTree = "<group>";
|
|
@@ -174,12 +174,12 @@
|
|
|
174
174
|
isa = PBXNativeTarget;
|
|
175
175
|
buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "reactnativemagicTests" */;
|
|
176
176
|
buildPhases = (
|
|
177
|
-
|
|
177
|
+
EED047F6BD1AA157DA019A41 /* [CP] Check Pods Manifest.lock */,
|
|
178
178
|
00E356EA1AD99517003FC87E /* Sources */,
|
|
179
179
|
00E356EB1AD99517003FC87E /* Frameworks */,
|
|
180
180
|
00E356EC1AD99517003FC87E /* Resources */,
|
|
181
|
-
|
|
182
|
-
|
|
181
|
+
6885AAAF4A337A2C83681DB7 /* [CP] Embed Pods Frameworks */,
|
|
182
|
+
2EF2E59BD6FE2C5EBC2BB493 /* [CP] Copy Pods Resources */,
|
|
183
183
|
);
|
|
184
184
|
buildRules = (
|
|
185
185
|
);
|
|
@@ -195,13 +195,13 @@
|
|
|
195
195
|
isa = PBXNativeTarget;
|
|
196
196
|
buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "reactnativemagic" */;
|
|
197
197
|
buildPhases = (
|
|
198
|
-
|
|
198
|
+
C72E6C65FAFBA98366933A78 /* [CP] Check Pods Manifest.lock */,
|
|
199
199
|
13B07F871A680F5B00A75B9A /* Sources */,
|
|
200
200
|
13B07F8C1A680F5B00A75B9A /* Frameworks */,
|
|
201
201
|
13B07F8E1A680F5B00A75B9A /* Resources */,
|
|
202
202
|
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
|
|
203
|
-
|
|
204
|
-
|
|
203
|
+
EAE36A1A92A8C5319B9244BA /* [CP] Embed Pods Frameworks */,
|
|
204
|
+
B397E35E78379B2686A7DC44 /* [CP] Copy Pods Resources */,
|
|
205
205
|
);
|
|
206
206
|
buildRules = (
|
|
207
207
|
);
|
|
@@ -314,29 +314,7 @@
|
|
|
314
314
|
shellPath = /bin/sh;
|
|
315
315
|
shellScript = "set -e\n\nWITH_ENVIRONMENT=\"$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"$REACT_NATIVE_PATH/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
|
|
316
316
|
};
|
|
317
|
-
|
|
318
|
-
isa = PBXShellScriptBuildPhase;
|
|
319
|
-
buildActionMask = 2147483647;
|
|
320
|
-
files = (
|
|
321
|
-
);
|
|
322
|
-
inputFileListPaths = (
|
|
323
|
-
);
|
|
324
|
-
inputPaths = (
|
|
325
|
-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
|
|
326
|
-
"${PODS_ROOT}/Manifest.lock",
|
|
327
|
-
);
|
|
328
|
-
name = "[CP] Check Pods Manifest.lock";
|
|
329
|
-
outputFileListPaths = (
|
|
330
|
-
);
|
|
331
|
-
outputPaths = (
|
|
332
|
-
"$(DERIVED_FILE_DIR)/Pods-reactnativemagic-reactnativemagicTests-checkManifestLockResult.txt",
|
|
333
|
-
);
|
|
334
|
-
runOnlyForDeploymentPostprocessing = 0;
|
|
335
|
-
shellPath = /bin/sh;
|
|
336
|
-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
|
|
337
|
-
showEnvVarsInLog = 0;
|
|
338
|
-
};
|
|
339
|
-
4ED040DCF71E37BF11F40959 /* [CP] Copy Pods Resources */ = {
|
|
317
|
+
2EF2E59BD6FE2C5EBC2BB493 /* [CP] Copy Pods Resources */ = {
|
|
340
318
|
isa = PBXShellScriptBuildPhase;
|
|
341
319
|
buildActionMask = 2147483647;
|
|
342
320
|
files = (
|
|
@@ -369,58 +347,80 @@
|
|
|
369
347
|
shellPath = /bin/sh;
|
|
370
348
|
shellScript = "set -e\n\nWITH_ENVIRONMENT=\"$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"$REACT_NATIVE_PATH/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
|
|
371
349
|
};
|
|
372
|
-
|
|
350
|
+
6885AAAF4A337A2C83681DB7 /* [CP] Embed Pods Frameworks */ = {
|
|
373
351
|
isa = PBXShellScriptBuildPhase;
|
|
374
352
|
buildActionMask = 2147483647;
|
|
375
353
|
files = (
|
|
376
354
|
);
|
|
377
355
|
inputFileListPaths = (
|
|
378
|
-
"${PODS_ROOT}/Target Support Files/Pods-reactnativemagic/Pods-reactnativemagic-frameworks-${CONFIGURATION}-input-files.xcfilelist",
|
|
356
|
+
"${PODS_ROOT}/Target Support Files/Pods-reactnativemagic-reactnativemagicTests/Pods-reactnativemagic-reactnativemagicTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
|
|
379
357
|
);
|
|
380
358
|
name = "[CP] Embed Pods Frameworks";
|
|
381
359
|
outputFileListPaths = (
|
|
382
|
-
"${PODS_ROOT}/Target Support Files/Pods-reactnativemagic/Pods-reactnativemagic-frameworks-${CONFIGURATION}-output-files.xcfilelist",
|
|
360
|
+
"${PODS_ROOT}/Target Support Files/Pods-reactnativemagic-reactnativemagicTests/Pods-reactnativemagic-reactnativemagicTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
|
|
383
361
|
);
|
|
384
362
|
runOnlyForDeploymentPostprocessing = 0;
|
|
385
363
|
shellPath = /bin/sh;
|
|
386
|
-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-reactnativemagic/Pods-reactnativemagic-frameworks.sh\"\n";
|
|
364
|
+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-reactnativemagic-reactnativemagicTests/Pods-reactnativemagic-reactnativemagicTests-frameworks.sh\"\n";
|
|
387
365
|
showEnvVarsInLog = 0;
|
|
388
366
|
};
|
|
389
|
-
|
|
367
|
+
B397E35E78379B2686A7DC44 /* [CP] Copy Pods Resources */ = {
|
|
390
368
|
isa = PBXShellScriptBuildPhase;
|
|
391
369
|
buildActionMask = 2147483647;
|
|
392
370
|
files = (
|
|
393
371
|
);
|
|
394
372
|
inputFileListPaths = (
|
|
395
|
-
"${PODS_ROOT}/Target Support Files/Pods-reactnativemagic
|
|
373
|
+
"${PODS_ROOT}/Target Support Files/Pods-reactnativemagic/Pods-reactnativemagic-resources-${CONFIGURATION}-input-files.xcfilelist",
|
|
396
374
|
);
|
|
397
|
-
name = "[CP]
|
|
375
|
+
name = "[CP] Copy Pods Resources";
|
|
398
376
|
outputFileListPaths = (
|
|
399
|
-
"${PODS_ROOT}/Target Support Files/Pods-reactnativemagic
|
|
377
|
+
"${PODS_ROOT}/Target Support Files/Pods-reactnativemagic/Pods-reactnativemagic-resources-${CONFIGURATION}-output-files.xcfilelist",
|
|
400
378
|
);
|
|
401
379
|
runOnlyForDeploymentPostprocessing = 0;
|
|
402
380
|
shellPath = /bin/sh;
|
|
403
|
-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-reactnativemagic
|
|
381
|
+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-reactnativemagic/Pods-reactnativemagic-resources.sh\"\n";
|
|
404
382
|
showEnvVarsInLog = 0;
|
|
405
383
|
};
|
|
406
|
-
|
|
384
|
+
C72E6C65FAFBA98366933A78 /* [CP] Check Pods Manifest.lock */ = {
|
|
407
385
|
isa = PBXShellScriptBuildPhase;
|
|
408
386
|
buildActionMask = 2147483647;
|
|
409
387
|
files = (
|
|
410
388
|
);
|
|
411
389
|
inputFileListPaths = (
|
|
412
|
-
"${PODS_ROOT}/Target Support Files/Pods-reactnativemagic/Pods-reactnativemagic-resources-${CONFIGURATION}-input-files.xcfilelist",
|
|
413
390
|
);
|
|
414
|
-
|
|
391
|
+
inputPaths = (
|
|
392
|
+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
|
|
393
|
+
"${PODS_ROOT}/Manifest.lock",
|
|
394
|
+
);
|
|
395
|
+
name = "[CP] Check Pods Manifest.lock";
|
|
415
396
|
outputFileListPaths = (
|
|
416
|
-
|
|
397
|
+
);
|
|
398
|
+
outputPaths = (
|
|
399
|
+
"$(DERIVED_FILE_DIR)/Pods-reactnativemagic-checkManifestLockResult.txt",
|
|
417
400
|
);
|
|
418
401
|
runOnlyForDeploymentPostprocessing = 0;
|
|
419
402
|
shellPath = /bin/sh;
|
|
420
|
-
shellScript = "\"${PODS_ROOT}/
|
|
403
|
+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
|
|
421
404
|
showEnvVarsInLog = 0;
|
|
422
405
|
};
|
|
423
|
-
|
|
406
|
+
EAE36A1A92A8C5319B9244BA /* [CP] Embed Pods Frameworks */ = {
|
|
407
|
+
isa = PBXShellScriptBuildPhase;
|
|
408
|
+
buildActionMask = 2147483647;
|
|
409
|
+
files = (
|
|
410
|
+
);
|
|
411
|
+
inputFileListPaths = (
|
|
412
|
+
"${PODS_ROOT}/Target Support Files/Pods-reactnativemagic/Pods-reactnativemagic-frameworks-${CONFIGURATION}-input-files.xcfilelist",
|
|
413
|
+
);
|
|
414
|
+
name = "[CP] Embed Pods Frameworks";
|
|
415
|
+
outputFileListPaths = (
|
|
416
|
+
"${PODS_ROOT}/Target Support Files/Pods-reactnativemagic/Pods-reactnativemagic-frameworks-${CONFIGURATION}-output-files.xcfilelist",
|
|
417
|
+
);
|
|
418
|
+
runOnlyForDeploymentPostprocessing = 0;
|
|
419
|
+
shellPath = /bin/sh;
|
|
420
|
+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-reactnativemagic/Pods-reactnativemagic-frameworks.sh\"\n";
|
|
421
|
+
showEnvVarsInLog = 0;
|
|
422
|
+
};
|
|
423
|
+
EED047F6BD1AA157DA019A41 /* [CP] Check Pods Manifest.lock */ = {
|
|
424
424
|
isa = PBXShellScriptBuildPhase;
|
|
425
425
|
buildActionMask = 2147483647;
|
|
426
426
|
files = (
|
|
@@ -435,7 +435,7 @@
|
|
|
435
435
|
outputFileListPaths = (
|
|
436
436
|
);
|
|
437
437
|
outputPaths = (
|
|
438
|
-
"$(DERIVED_FILE_DIR)/Pods-reactnativemagic-checkManifestLockResult.txt",
|
|
438
|
+
"$(DERIVED_FILE_DIR)/Pods-reactnativemagic-reactnativemagicTests-checkManifestLockResult.txt",
|
|
439
439
|
);
|
|
440
440
|
runOnlyForDeploymentPostprocessing = 0;
|
|
441
441
|
shellPath = /bin/sh;
|
|
@@ -484,7 +484,7 @@
|
|
|
484
484
|
/* Begin XCBuildConfiguration section */
|
|
485
485
|
00E356F61AD99517003FC87E /* Debug */ = {
|
|
486
486
|
isa = XCBuildConfiguration;
|
|
487
|
-
baseConfigurationReference =
|
|
487
|
+
baseConfigurationReference = 56A7F0350C455B9C5A7234F8 /* Pods-reactnativemagic-reactnativemagicTests.debug.xcconfig */;
|
|
488
488
|
buildSettings = {
|
|
489
489
|
BUNDLE_LOADER = "$(TEST_HOST)";
|
|
490
490
|
GCC_PREPROCESSOR_DEFINITIONS = (
|
|
@@ -511,7 +511,7 @@
|
|
|
511
511
|
};
|
|
512
512
|
00E356F71AD99517003FC87E /* Release */ = {
|
|
513
513
|
isa = XCBuildConfiguration;
|
|
514
|
-
baseConfigurationReference =
|
|
514
|
+
baseConfigurationReference = 123D2B186506039FFA026D6C /* Pods-reactnativemagic-reactnativemagicTests.release.xcconfig */;
|
|
515
515
|
buildSettings = {
|
|
516
516
|
BUNDLE_LOADER = "$(TEST_HOST)";
|
|
517
517
|
COPY_PHASE_STRIP = NO;
|
|
@@ -535,7 +535,7 @@
|
|
|
535
535
|
};
|
|
536
536
|
13B07F941A680F5B00A75B9A /* Debug */ = {
|
|
537
537
|
isa = XCBuildConfiguration;
|
|
538
|
-
baseConfigurationReference =
|
|
538
|
+
baseConfigurationReference = F4E5443D5B5729DC581A3C5D /* Pods-reactnativemagic.debug.xcconfig */;
|
|
539
539
|
buildSettings = {
|
|
540
540
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
|
541
541
|
CLANG_ENABLE_MODULES = YES;
|
|
@@ -566,7 +566,7 @@
|
|
|
566
566
|
};
|
|
567
567
|
13B07F951A680F5B00A75B9A /* Release */ = {
|
|
568
568
|
isa = XCBuildConfiguration;
|
|
569
|
-
baseConfigurationReference =
|
|
569
|
+
baseConfigurationReference = 2FC2A41A7C9CECF77A6F86E9 /* Pods-reactnativemagic.release.xcconfig */;
|
|
570
570
|
buildSettings = {
|
|
571
571
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
|
572
572
|
CLANG_ENABLE_MODULES = YES;
|
|
@@ -8689,9 +8689,9 @@
|
|
|
8689
8689
|
}
|
|
8690
8690
|
},
|
|
8691
8691
|
"node_modules/image-size": {
|
|
8692
|
-
"version": "1.
|
|
8693
|
-
"resolved": "https://registry.npmjs.org/image-size/-/image-size-1.
|
|
8694
|
-
"integrity": "sha512-
|
|
8692
|
+
"version": "1.2.0",
|
|
8693
|
+
"resolved": "https://registry.npmjs.org/image-size/-/image-size-1.2.0.tgz",
|
|
8694
|
+
"integrity": "sha512-4S8fwbO6w3GeCVN6OPtA9I5IGKkcDMPcKndtUlpJuCwu7JLjtj7JZpwqLuyY2nrmQT3AWsCJLSKPsc2mPBSl3w==",
|
|
8695
8695
|
"license": "MIT",
|
|
8696
8696
|
"dependencies": {
|
|
8697
8697
|
"queue": "6.0.2"
|
|
@@ -8909,9 +8909,9 @@
|
|
|
8909
8909
|
}
|
|
8910
8910
|
},
|
|
8911
8911
|
"node_modules/is-core-module": {
|
|
8912
|
-
"version": "2.16.
|
|
8913
|
-
"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.
|
|
8914
|
-
"integrity": "sha512-
|
|
8912
|
+
"version": "2.16.1",
|
|
8913
|
+
"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
|
|
8914
|
+
"integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
|
|
8915
8915
|
"license": "MIT",
|
|
8916
8916
|
"dependencies": {
|
|
8917
8917
|
"hasown": "^2.0.2"
|
|
@@ -10486,9 +10486,9 @@
|
|
|
10486
10486
|
"license": "MIT"
|
|
10487
10487
|
},
|
|
10488
10488
|
"node_modules/json-stable-stringify": {
|
|
10489
|
-
"version": "1.2.
|
|
10490
|
-
"resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.2.
|
|
10491
|
-
"integrity": "sha512-
|
|
10489
|
+
"version": "1.2.1",
|
|
10490
|
+
"resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.2.1.tgz",
|
|
10491
|
+
"integrity": "sha512-Lp6HbbBgosLmJbjx0pBLbgvx68FaFU1sdkmBuckmhhJ88kL13OA51CDtR2yJB50eCNMH9wRqtQNNiAqQH4YXnA==",
|
|
10492
10492
|
"license": "MIT",
|
|
10493
10493
|
"dependencies": {
|
|
10494
10494
|
"call-bind": "^1.0.8",
|
|
@@ -8,11 +8,9 @@ import {
|
|
|
8
8
|
TouchableOpacity,
|
|
9
9
|
ViewStyle,
|
|
10
10
|
} from 'react-native';
|
|
11
|
-
import {ImageResources} from '../ImageResources.g';
|
|
12
11
|
import {Image as CropperImage} from 'react-native-image-crop-picker';
|
|
12
|
+
import {Colors} from '../../core/theme/colors';
|
|
13
13
|
import {CommonSizes} from '../../core/theme/commonSizes';
|
|
14
|
-
import {Colors, PlatformColorsIOS} from '../../core/theme/colors';
|
|
15
|
-
import {platformMixedColor} from '../helpers/colorHelpers';
|
|
16
14
|
|
|
17
15
|
interface IProps {
|
|
18
16
|
onPress?: () => void;
|
|
@@ -26,7 +24,7 @@ interface IProps {
|
|
|
26
24
|
|
|
27
25
|
export const PhotoTakingButton: FC<IProps> = memo(
|
|
28
26
|
({
|
|
29
|
-
icon
|
|
27
|
+
icon,
|
|
30
28
|
onPress,
|
|
31
29
|
backgroundImage,
|
|
32
30
|
style,
|
|
@@ -36,7 +34,7 @@ export const PhotoTakingButton: FC<IProps> = memo(
|
|
|
36
34
|
}) => {
|
|
37
35
|
return (
|
|
38
36
|
<TouchableOpacity
|
|
39
|
-
style={[styles.button, style]
|
|
37
|
+
style={[styles.button, style]}
|
|
40
38
|
onPress={onPress}
|
|
41
39
|
disabled={disabled}>
|
|
42
40
|
<BackgroundComponent image={backgroundImage} style={imageStyle}>
|
|
@@ -78,7 +76,7 @@ const styles = StyleSheet.create({
|
|
|
78
76
|
justifyContent: 'center',
|
|
79
77
|
borderRadius: CommonSizes.borderRadius.small,
|
|
80
78
|
borderWidth: 1,
|
|
81
|
-
borderColor:
|
|
79
|
+
borderColor: Colors.gray,
|
|
82
80
|
} as ViewStyle,
|
|
83
81
|
image: {
|
|
84
82
|
height: 120,
|
|
@@ -93,7 +91,7 @@ const styles = StyleSheet.create({
|
|
|
93
91
|
width: 32,
|
|
94
92
|
height: 32,
|
|
95
93
|
resizeMode: 'contain',
|
|
96
|
-
tintColor:
|
|
94
|
+
tintColor: Colors.black,
|
|
97
95
|
opacity: 0.8,
|
|
98
96
|
} as ImageStyle,
|
|
99
97
|
});
|
|
@@ -21,15 +21,10 @@ import {
|
|
|
21
21
|
View,
|
|
22
22
|
ViewStyle,
|
|
23
23
|
} from 'react-native';
|
|
24
|
-
import {
|
|
25
|
-
Colors,
|
|
26
|
-
PlatformColorsAndroid,
|
|
27
|
-
PlatformColorsIOS,
|
|
28
|
-
} from '../../core/theme/colors';
|
|
24
|
+
import {Colors} from '../../core/theme/colors';
|
|
29
25
|
import {isIos} from '../../core/theme/commonConsts';
|
|
30
26
|
import {CommonSizes} from '../../core/theme/commonSizes';
|
|
31
27
|
import {CommonStyles} from '../../core/theme/commonStyles';
|
|
32
|
-
import {platformMixedColor, platformNativeColor} from '../helpers/colorHelpers';
|
|
33
28
|
import {localization} from '../localization/localization';
|
|
34
29
|
|
|
35
30
|
interface IProps extends TextInputProps {
|
|
@@ -65,10 +60,7 @@ export const PrimaryTextInput: FC<IProps> = memo(
|
|
|
65
60
|
disableFullscreenUI = true,
|
|
66
61
|
enablesReturnKeyAutomatically = true,
|
|
67
62
|
underlineColorAndroid = Colors.transparent,
|
|
68
|
-
placeholderTextColor =
|
|
69
|
-
PlatformColorsIOS.placeholderText,
|
|
70
|
-
PlatformColorsAndroid.secondaryText,
|
|
71
|
-
),
|
|
63
|
+
placeholderTextColor = Colors.gray,
|
|
72
64
|
editable = true,
|
|
73
65
|
clearButtonMode = 'while-editing',
|
|
74
66
|
label,
|
|
@@ -200,10 +192,7 @@ function getInputContainerStyle(
|
|
|
200
192
|
}
|
|
201
193
|
}
|
|
202
194
|
|
|
203
|
-
const selectionColor =
|
|
204
|
-
PlatformColorsIOS.systemBlue,
|
|
205
|
-
PlatformColorsAndroid.primary,
|
|
206
|
-
);
|
|
195
|
+
const selectionColor = Colors.primary100;
|
|
207
196
|
|
|
208
197
|
const commonInputContainer: TextStyle = {
|
|
209
198
|
flexDirection: 'row',
|
|
@@ -279,7 +268,7 @@ const styles = StyleSheet.create({
|
|
|
279
268
|
} as TextStyle,
|
|
280
269
|
error: {
|
|
281
270
|
...CommonStyles.normalText,
|
|
282
|
-
color:
|
|
271
|
+
color: Colors.red,
|
|
283
272
|
fontSize: CommonSizes.font.small,
|
|
284
273
|
lineHeight: CommonSizes.lineHeight.small,
|
|
285
274
|
paddingTop: CommonSizes.spacing.extraSmall,
|
|
@@ -4,11 +4,7 @@ import {RadioIcon} from './RadioIcon';
|
|
|
4
4
|
import {TouchablePlatform} from './TouchablePlatform';
|
|
5
5
|
import {CommonSizes} from '../../core/theme/commonSizes';
|
|
6
6
|
import {CommonStyles} from '../../core/theme/commonStyles';
|
|
7
|
-
import {
|
|
8
|
-
PlatformColorsAndroid,
|
|
9
|
-
PlatformColorsIOS,
|
|
10
|
-
} from '../../core/theme/colors';
|
|
11
|
-
import {platformNativeColor} from '../helpers/colorHelpers';
|
|
7
|
+
import {Colors} from '../../core/theme/colors';
|
|
12
8
|
|
|
13
9
|
interface IIconComponentProps {
|
|
14
10
|
isSelected: boolean;
|
|
@@ -65,9 +61,6 @@ const styles = StyleSheet.create({
|
|
|
65
61
|
} as TextStyle,
|
|
66
62
|
labelDisabled: {
|
|
67
63
|
...commonLabel,
|
|
68
|
-
color:
|
|
69
|
-
PlatformColorsIOS.systemFill,
|
|
70
|
-
PlatformColorsAndroid.secondaryText,
|
|
71
|
-
),
|
|
64
|
+
color: Colors.gray,
|
|
72
65
|
} as TextStyle,
|
|
73
66
|
});
|
|
@@ -1,11 +1,6 @@
|
|
|
1
1
|
import React, {FC, memo, useMemo} from 'react';
|
|
2
2
|
import {StyleSheet, View, ViewStyle} from 'react-native';
|
|
3
|
-
import {
|
|
4
|
-
Colors,
|
|
5
|
-
PlatformColorsAndroid,
|
|
6
|
-
PlatformColorsIOS,
|
|
7
|
-
} from '../../core/theme/colors';
|
|
8
|
-
import {platformMixedColor, platformNativeColor} from '../helpers/colorHelpers';
|
|
3
|
+
import {Colors} from '../../core/theme/colors';
|
|
9
4
|
|
|
10
5
|
interface IProps {
|
|
11
6
|
isSelected: boolean;
|
|
@@ -47,17 +42,14 @@ const commonInnerCircle: ViewStyle = {
|
|
|
47
42
|
const styles = StyleSheet.create({
|
|
48
43
|
outerCircle: {
|
|
49
44
|
...commonOuterCircle,
|
|
50
|
-
borderColor:
|
|
45
|
+
borderColor: Colors.primary100,
|
|
51
46
|
} as ViewStyle,
|
|
52
47
|
outerCircleSelected: {
|
|
53
48
|
...commonOuterCircle,
|
|
54
|
-
borderColor:
|
|
49
|
+
borderColor: Colors.primary100,
|
|
55
50
|
} as ViewStyle,
|
|
56
51
|
innerCircle: {
|
|
57
52
|
...commonInnerCircle,
|
|
58
|
-
backgroundColor:
|
|
59
|
-
PlatformColorsIOS.systemBlue,
|
|
60
|
-
PlatformColorsAndroid.primary,
|
|
61
|
-
),
|
|
53
|
+
backgroundColor: Colors.primary100,
|
|
62
54
|
} as ViewStyle,
|
|
63
55
|
});
|
|
@@ -1,12 +1,8 @@
|
|
|
1
1
|
import React, {FC, useMemo} from 'react';
|
|
2
2
|
import {StyleSheet, View, ViewStyle} from 'react-native';
|
|
3
|
-
import {
|
|
4
|
-
PlatformColorsAndroid,
|
|
5
|
-
PlatformColorsIOS,
|
|
6
|
-
} from '../../core/theme/colors';
|
|
3
|
+
import {Colors} from '../../core/theme/colors';
|
|
7
4
|
import {hairlineWidth} from '../../core/theme/commonConsts';
|
|
8
5
|
import {CommonSizes} from '../../core/theme/commonSizes';
|
|
9
|
-
import {platformNativeColor} from '../helpers/colorHelpers';
|
|
10
6
|
|
|
11
7
|
interface IProps {
|
|
12
8
|
isFull?: boolean;
|
|
@@ -22,10 +18,7 @@ export const Separator: FC<IProps> = ({isFull = true}) => {
|
|
|
22
18
|
|
|
23
19
|
const sharedStyle: ViewStyle = {
|
|
24
20
|
height: hairlineWidth,
|
|
25
|
-
backgroundColor:
|
|
26
|
-
PlatformColorsIOS.separator,
|
|
27
|
-
PlatformColorsAndroid.divider,
|
|
28
|
-
),
|
|
21
|
+
backgroundColor: Colors.gray,
|
|
29
22
|
};
|
|
30
23
|
|
|
31
24
|
const styles = StyleSheet.create({
|
|
@@ -7,9 +7,8 @@ import {
|
|
|
7
7
|
PressableStateCallbackType,
|
|
8
8
|
ViewStyle,
|
|
9
9
|
} from 'react-native';
|
|
10
|
-
import {Colors
|
|
10
|
+
import {Colors} from '../../core/theme/colors';
|
|
11
11
|
import {isAndroid} from '../../core/theme/commonConsts';
|
|
12
|
-
import {platformMixedColor} from '../helpers/colorHelpers';
|
|
13
12
|
|
|
14
13
|
interface IProps extends PressableProps {
|
|
15
14
|
style?: ViewStyle | ViewStyle[];
|
|
@@ -17,15 +16,7 @@ interface IProps extends PressableProps {
|
|
|
17
16
|
}
|
|
18
17
|
|
|
19
18
|
export const TouchablePlatform: FC<IProps> = memo(
|
|
20
|
-
({
|
|
21
|
-
children,
|
|
22
|
-
highlightColor = platformMixedColor(
|
|
23
|
-
PlatformColorsIOS.secondarySystemFill,
|
|
24
|
-
Colors.white,
|
|
25
|
-
),
|
|
26
|
-
style,
|
|
27
|
-
...props
|
|
28
|
-
}) => {
|
|
19
|
+
({children, highlightColor = Colors.white, style, ...props}) => {
|
|
29
20
|
const pressableStyle = useCallback(
|
|
30
21
|
(state: PressableStateCallbackType) => {
|
|
31
22
|
if (isAndroid) {
|
|
@@ -6,13 +6,9 @@ import {
|
|
|
6
6
|
TouchableOpacity,
|
|
7
7
|
View,
|
|
8
8
|
} from 'react-native';
|
|
9
|
-
import {
|
|
10
|
-
PlatformColorsAndroid,
|
|
11
|
-
PlatformColorsIOS,
|
|
12
|
-
} from '../../core/theme/colors';
|
|
9
|
+
import {Colors} from '../../core/theme/colors';
|
|
13
10
|
import {CommonSizes} from '../../core/theme/commonSizes';
|
|
14
11
|
import {CommonStyles} from '../../core/theme/commonStyles';
|
|
15
|
-
import {platformNativeColor} from '../helpers/colorHelpers';
|
|
16
12
|
import {localization} from '../localization/localization';
|
|
17
13
|
|
|
18
14
|
interface IProps {
|
|
@@ -46,10 +42,7 @@ const styles = StyleSheet.create({
|
|
|
46
42
|
} as TextStyle,
|
|
47
43
|
description: {
|
|
48
44
|
...CommonStyles.normalText,
|
|
49
|
-
color:
|
|
50
|
-
PlatformColorsIOS.systemBlue,
|
|
51
|
-
PlatformColorsAndroid.primary,
|
|
52
|
-
),
|
|
45
|
+
color: Colors.primary100,
|
|
53
46
|
textAlign: 'center',
|
|
54
47
|
textDecorationLine: 'underline',
|
|
55
48
|
} as TextStyle,
|
|
@@ -43,75 +43,46 @@ export enum Colors {
|
|
|
43
43
|
yellow5 = '#FFFDF8',
|
|
44
44
|
}
|
|
45
45
|
|
|
46
|
-
export enum
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
systemOrange = 'systemOrange',
|
|
89
|
-
systemPink = 'systemPink',
|
|
90
|
-
systemPurple = 'systemPurple',
|
|
91
|
-
systemRed = 'systemRed',
|
|
92
|
-
systemTeal = 'systemTeal',
|
|
93
|
-
systemYellow = 'systemYellow',
|
|
94
|
-
|
|
95
|
-
/* Adaptable Gray Colors */
|
|
96
|
-
systemGray = 'systemGray',
|
|
97
|
-
systemGray2 = 'systemGray2',
|
|
98
|
-
systemGray3 = 'systemGray3',
|
|
99
|
-
systemGray4 = 'systemGray4',
|
|
100
|
-
systemGray5 = 'systemGray5',
|
|
101
|
-
systemGray6 = 'systemGray6',
|
|
102
|
-
}
|
|
103
|
-
|
|
104
|
-
export enum PlatformColorsAndroid {
|
|
105
|
-
primary = '@color/primary',
|
|
106
|
-
primaryDark = '@color/primaryDark',
|
|
107
|
-
primaryLight = '@color/primaryLight',
|
|
108
|
-
background = '@color/background',
|
|
109
|
-
primaryText = '@color/primaryText',
|
|
110
|
-
primaryTextOpacity = '@color/primaryTextOpacity',
|
|
111
|
-
secondaryText = '@color/secondaryText',
|
|
112
|
-
onPrimaryText = '@color/onPrimaryText',
|
|
113
|
-
onPrimaryTextOpacity = '@color/onPrimaryTextOpacity',
|
|
114
|
-
divider = '@color/divider',
|
|
115
|
-
navigation = '@color/navigation',
|
|
116
|
-
statusbar = '@color/statusbar',
|
|
46
|
+
export enum NewColors {
|
|
47
|
+
violetLight = '#F3F2FF',
|
|
48
|
+
violetLightHover = '#E6E6FF',
|
|
49
|
+
violetLightActive = '#C1C0FE',
|
|
50
|
+
violetNormal = '#8481FD',
|
|
51
|
+
violetNormalHover = '#5250D9',
|
|
52
|
+
violetNormalActive = '#3331B8',
|
|
53
|
+
violetDark = '#262626',
|
|
54
|
+
violetDarkHover = '#1A1994',
|
|
55
|
+
violetDarkActive = '#111066',
|
|
56
|
+
violetDarker = '#000033',
|
|
57
|
+
blueLight = '#F6FCFF',
|
|
58
|
+
blueLightHover = '#E9F8FF',
|
|
59
|
+
blueLightActive = '#C1E5FF',
|
|
60
|
+
blueNormal = '#52BDFF',
|
|
61
|
+
blueNormalHover = '#3399D9',
|
|
62
|
+
blueNormalActive = '#1A7DB3',
|
|
63
|
+
blueDarker = '#262626',
|
|
64
|
+
greyLight = '#F9FCFF',
|
|
65
|
+
greyLightHover = '#E0E0E0',
|
|
66
|
+
greyLightActive = '#BDBDBD',
|
|
67
|
+
greyNormal = '#929292',
|
|
68
|
+
greyNormalHover = '#666666',
|
|
69
|
+
greyNormalActive = '#4D4D4D',
|
|
70
|
+
greyDarker = '#262626',
|
|
71
|
+
orandeLight = '#FFFAF8',
|
|
72
|
+
orandeLightHover = '#FDECE1',
|
|
73
|
+
orandeLightActive = '#FBCEB4',
|
|
74
|
+
orandeNormal = '#F2565E',
|
|
75
|
+
orandeNormalHover = '#CE3C3E',
|
|
76
|
+
orandeNormalActive = '#AD3335',
|
|
77
|
+
orandeDarker = '#262626',
|
|
78
|
+
lightBlueLight = '#FEF7F7',
|
|
79
|
+
lightBlueLightHover = '#FCDDDF',
|
|
80
|
+
lightBlueLightActive = '#F9AAAF',
|
|
81
|
+
lightBlueNormal = '#CE3C3E',
|
|
82
|
+
lightBlueNormalHover = '#AD3335',
|
|
83
|
+
lightBlueNormalActive = '#8C292B',
|
|
84
|
+
lightBlueDarker = '#262626',
|
|
85
|
+
red = '#FFFCF1',
|
|
86
|
+
green = '#F4FDFB',
|
|
87
|
+
background = '#FAFAFA',
|
|
117
88
|
}
|
|
@@ -1,12 +1,7 @@
|
|
|
1
1
|
export const Fonts = {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
medium: 'KumbhSans-Medium',
|
|
8
|
-
semiBold: 'KumbhSans-SemiBold',
|
|
9
|
-
bold: 'KumbhSans-Bold',
|
|
10
|
-
extraBold: 'KumbhSans-ExtraBold',
|
|
11
|
-
black: 'KumbhSans-Black',
|
|
2
|
+
light: 'Poppins-Light',
|
|
3
|
+
regular: 'Poppins-Regular',
|
|
4
|
+
medium: 'Poppins-Medium',
|
|
5
|
+
semiBold: 'Poppins-SemiBold',
|
|
6
|
+
bold: 'Poppins-Bold',
|
|
12
7
|
};
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
// In App.js in a new project
|
|
2
2
|
|
|
3
|
-
import {NavigationContainer} from '@react-navigation/native';
|
|
3
|
+
import {DefaultTheme, NavigationContainer} from '@react-navigation/native';
|
|
4
4
|
import * as React from 'react';
|
|
5
5
|
import {useRef} from 'react';
|
|
6
6
|
import {useAppSelector} from '../core/store/reduxHelpers';
|
|
7
7
|
import {AuthStack} from './AuthStack';
|
|
8
8
|
import {AppMainNavigator} from './MainStack';
|
|
9
9
|
import {navigationRef} from './RootNavigation';
|
|
10
|
+
import {NewColors} from '../core/theme/colors';
|
|
11
|
+
import {Fonts} from '../core/theme/fonts';
|
|
10
12
|
|
|
11
13
|
function AppNavigator() {
|
|
12
14
|
const routeNameRef = useRef<string | undefined>(undefined);
|
|
@@ -19,7 +21,7 @@ function AppNavigator() {
|
|
|
19
21
|
dark: false,
|
|
20
22
|
colors: {
|
|
21
23
|
primary: '#000',
|
|
22
|
-
background:
|
|
24
|
+
background: NewColors.background,
|
|
23
25
|
card: '#fff',
|
|
24
26
|
text: '#000',
|
|
25
27
|
border: '#000',
|
|
@@ -27,19 +29,19 @@ function AppNavigator() {
|
|
|
27
29
|
},
|
|
28
30
|
fonts: {
|
|
29
31
|
regular: {
|
|
30
|
-
fontFamily:
|
|
32
|
+
fontFamily: Fonts.regular,
|
|
31
33
|
fontWeight: 'normal',
|
|
32
34
|
},
|
|
33
35
|
medium: {
|
|
34
|
-
fontFamily:
|
|
36
|
+
fontFamily: Fonts.medium,
|
|
35
37
|
fontWeight: '500',
|
|
36
38
|
},
|
|
37
39
|
bold: {
|
|
38
|
-
fontFamily:
|
|
40
|
+
fontFamily: Fonts.bold,
|
|
39
41
|
fontWeight: '700',
|
|
40
42
|
},
|
|
41
43
|
heavy: {
|
|
42
|
-
fontFamily:
|
|
44
|
+
fontFamily: Fonts.bold,
|
|
43
45
|
fontWeight: '900',
|
|
44
46
|
},
|
|
45
47
|
},
|
|
@@ -1,34 +0,0 @@
|
|
|
1
|
-
import {isIos} from '../../core/theme/commonConsts';
|
|
2
|
-
import {
|
|
3
|
-
Colors,
|
|
4
|
-
PlatformColorsAndroid,
|
|
5
|
-
PlatformColorsIOS,
|
|
6
|
-
} from '../../core/theme/colors';
|
|
7
|
-
|
|
8
|
-
export function platformNativeColor(
|
|
9
|
-
iosColor?: PlatformColorsIOS,
|
|
10
|
-
androidColor?: PlatformColorsAndroid,
|
|
11
|
-
) {
|
|
12
|
-
const selectedColor = isIos ? iosColor : androidColor;
|
|
13
|
-
|
|
14
|
-
return selectedColor != null ? 'black' : undefined;
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
export function platformLocalColor(iosColor?: Colors, androidColor?: Colors) {
|
|
18
|
-
return isIos ? iosColor : androidColor;
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
export function platformMixedColor(
|
|
22
|
-
iosColor?: Colors | PlatformColorsIOS,
|
|
23
|
-
androidColor?: Colors | PlatformColorsAndroid,
|
|
24
|
-
) {
|
|
25
|
-
const selectedColor = iosColor;
|
|
26
|
-
|
|
27
|
-
if (selectedColor != null) {
|
|
28
|
-
return Object.values(Colors).includes(selectedColor as Colors)
|
|
29
|
-
? (selectedColor as Colors)
|
|
30
|
-
: 'black';
|
|
31
|
-
} else {
|
|
32
|
-
return undefined;
|
|
33
|
-
}
|
|
34
|
-
}
|