Skip to content

Commit 5a7da6c

Browse files
committed
fix (icon): loading vector icons
1 parent 6dc98b8 commit 5a7da6c

File tree

7 files changed

+58
-117
lines changed

7 files changed

+58
-117
lines changed

README.md

Lines changed: 42 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -103,43 +103,55 @@ $ tree -L 2 src
103103
src
104104
├── api
105105
├── assets
106-
   └── images
106+
└── images
107107
├── components
108-
│   ├── ActionCell.tsx
109-
│   ├── Button.tsx
110-
│   ├── Container.tsx
111-
│   ├── Spacing.tsx
112-
│   ├── Text.tsx
113-
│   ├── __tests__
114-
│   └── index.tsx
108+
│ ├── ActionCell.tsx
109+
│ ├── Button.tsx
110+
│ ├── Container.tsx
111+
│ ├── Logo.tsx
112+
│ ├── Spacing.tsx
113+
│ ├── SwitchCell.tsx
114+
│ ├── Text.tsx
115+
│ ├── __tests__
116+
│ └── index.tsx
117+
├── config
118+
│ └── auth0.ts
115119
├── hooks
116-
   └── preferenceHooks.ts
120+
└── preferenceHooks.ts
117121
├── navigation
118-
│   ├── NavigationHeader.tsx
119-
│   ├── TabBar.tsx
120-
│   ├── index.tsx
121-
│   └── types.ts
122+
│ ├── AuthNavigator.tsx
123+
│ ├── NavigationHeader.tsx
124+
│ ├── TabBar.tsx
125+
│ ├── index.tsx
126+
│ └── types.ts
122127
├── screens
123-
│   ├── Appointment
124-
│   ├── Finances
125-
│   ├── Home
126-
│   ├── MyBroker
127-
│   └── Properties
128+
│ ├── Appointment
129+
│ ├── Auth
130+
│ ├── Finances
131+
│ ├── Home
132+
│ ├── MyBroker
133+
│ └── Properties
128134
├── services
129-
│   └── appLaunch.ts
130-
├── store
131-
│   ├── __tests__
132-
│   ├── preferenceStore.ts
133-
│   └── store.ts
135+
│ ├── authService.ts
136+
│ ├── biometricService.ts
137+
│ └── deeplink.ts
138+
├── stores
139+
│ ├── __tests__
140+
│ ├── authStore.ts
141+
│ ├── index.ts
142+
│ ├── preferenceStore.ts
143+
│ └── stateStorage.ts
134144
├── theme
135-
   ├── ThemeContext.tsx
136-
   ├── colors.ts
137-
   ├── index.tsx
138-
   ├── spacings.ts
139-
   ├── theme.ts
140-
   ├── typography.ts
141-
   └── useStyle.ts
145+
├── ThemeContext.tsx
146+
├── colors.ts
147+
├── index.tsx
148+
├── spacings.ts
149+
├── theme.ts
150+
├── typography.ts
151+
└── useStyle.ts
142152
├── types
153+
│ ├── auth.ts
154+
│ └── env.d.ts
143155
└── utils
144156
└── localStorage.ts
145157
```

ios/Aussie.xcodeproj/project.pbxproj

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
/* End PBXBuildFile section */
1616

1717
/* Begin PBXFileReference section */
18+
03D9CF6F7002428A95A05E6A /* Ionicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Ionicons.ttf; path = "../node_modules/@react-native-vector-icons/ionicons/fonts/Ionicons.ttf"; sourceTree = "<group>"; };
1819
13B07F961A680F5B00A75B9A /* Aussie.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Aussie.app; sourceTree = BUILT_PRODUCTS_DIR; };
1920
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Aussie/Images.xcassets; sourceTree = "<group>"; };
2021
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Aussie/Info.plist; sourceTree = "<group>"; };
@@ -24,7 +25,6 @@
2425
5DCACB8F33CDC322A6C60F78 /* libPods-Aussie.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Aussie.a"; sourceTree = BUILT_PRODUCTS_DIR; };
2526
761780EC2CA45674006654EE /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = Aussie/AppDelegate.swift; sourceTree = "<group>"; };
2627
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = Aussie/LaunchScreen.storyboard; sourceTree = "<group>"; };
27-
B36408B389254D5FB259C060 /* Ionicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Ionicons.ttf; path = "../node_modules/@react-native-vector-icons/ionicons/fonts/Ionicons.ttf"; sourceTree = "<group>"; };
2828
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
2929
/* End PBXFileReference section */
3030

@@ -103,7 +103,7 @@
103103
E4E044142F7B45ACAFD2658B /* Resources */ = {
104104
isa = PBXGroup;
105105
children = (
106-
B36408B389254D5FB259C060 /* Ionicons.ttf */,
106+
03D9CF6F7002428A95A05E6A /* Ionicons.ttf */,
107107
);
108108
name = Resources;
109109
sourceTree = "<group>";
@@ -201,14 +201,10 @@
201201
inputFileListPaths = (
202202
"${PODS_ROOT}/Target Support Files/Pods-Aussie/Pods-Aussie-frameworks-${CONFIGURATION}-input-files.xcfilelist",
203203
);
204-
inputPaths = (
205-
);
206204
name = "[CP] Embed Pods Frameworks";
207205
outputFileListPaths = (
208206
"${PODS_ROOT}/Target Support Files/Pods-Aussie/Pods-Aussie-frameworks-${CONFIGURATION}-output-files.xcfilelist",
209207
);
210-
outputPaths = (
211-
);
212208
runOnlyForDeploymentPostprocessing = 0;
213209
shellPath = /bin/sh;
214210
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Aussie/Pods-Aussie-frameworks.sh\"\n";
@@ -244,14 +240,10 @@
244240
inputFileListPaths = (
245241
"${PODS_ROOT}/Target Support Files/Pods-Aussie/Pods-Aussie-resources-${CONFIGURATION}-input-files.xcfilelist",
246242
);
247-
inputPaths = (
248-
);
249243
name = "[CP] Copy Pods Resources";
250244
outputFileListPaths = (
251245
"${PODS_ROOT}/Target Support Files/Pods-Aussie/Pods-Aussie-resources-${CONFIGURATION}-output-files.xcfilelist",
252246
);
253-
outputPaths = (
254-
);
255247
runOnlyForDeploymentPostprocessing = 0;
256248
shellPath = /bin/sh;
257249
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Aussie/Pods-Aussie-resources.sh\"\n";
@@ -396,7 +388,10 @@
396388
"-DFOLLY_CFG_NO_COROUTINES=1",
397389
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
398390
);
399-
OTHER_LDFLAGS = "$(inherited) ";
391+
OTHER_LDFLAGS = (
392+
"$(inherited)",
393+
" ",
394+
);
400395
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
401396
SDKROOT = iphoneos;
402397
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
@@ -465,7 +460,10 @@
465460
"-DFOLLY_CFG_NO_COROUTINES=1",
466461
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
467462
);
468-
OTHER_LDFLAGS = "$(inherited) ";
463+
OTHER_LDFLAGS = (
464+
"$(inherited)",
465+
" ",
466+
);
469467
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
470468
SDKROOT = iphoneos;
471469
USE_HERMES = true;

ios/Aussie/Info.plist

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@
4949
</array>
5050
<key>UIViewControllerBasedStatusBarAppearance</key>
5151
<false/>
52-
<key>UIAppFonts</key>
53-
<array>
54-
<string>Ionicons.ttf</string>
55-
</array>
5652
<key>CFBundleURLTypes</key>
5753
<array>
5854
<dict>
@@ -74,5 +70,9 @@
7470
</array>
7571
<key>NSFaceIDUsageDescription</key>
7672
<string>Use Face ID to securely access your account</string>
73+
<key>UIAppFonts</key>
74+
<array>
75+
<string>Ionicons.ttf</string>
76+
</array>
7777
</dict>
7878
</plist>

ios/Podfile.lock

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2412,35 +2412,6 @@ PODS:
24122412
- ReactCommon/turbomodule/core
24132413
- SocketRocket
24142414
- Yoga
2415-
- RNVectorIcons (10.3.0):
2416-
- boost
2417-
- DoubleConversion
2418-
- fast_float
2419-
- fmt
2420-
- glog
2421-
- hermes-engine
2422-
- RCT-Folly
2423-
- RCT-Folly/Fabric
2424-
- RCTRequired
2425-
- RCTTypeSafety
2426-
- React-Core
2427-
- React-debug
2428-
- React-Fabric
2429-
- React-featureflags
2430-
- React-graphics
2431-
- React-hermes
2432-
- React-ImageManager
2433-
- React-jsi
2434-
- React-NativeModulesApple
2435-
- React-RCTFabric
2436-
- React-renderercss
2437-
- React-rendererdebug
2438-
- React-utils
2439-
- ReactCodegen
2440-
- ReactCommon/turbomodule/bridging
2441-
- ReactCommon/turbomodule/core
2442-
- SocketRocket
2443-
- Yoga
24442415
- RNWorklets (0.6.1):
24452416
- boost
24462417
- DoubleConversion
@@ -2615,7 +2586,6 @@ DEPENDENCIES:
26152586
- RNKeychain (from `../node_modules/react-native-keychain`)
26162587
- RNReanimated (from `../node_modules/react-native-reanimated`)
26172588
- RNScreens (from `../node_modules/react-native-screens`)
2618-
- RNVectorIcons (from `../node_modules/react-native-vector-icons`)
26192589
- RNWorklets (from `../node_modules/react-native-worklets`)
26202590
- SocketRocket (~> 0.7.1)
26212591
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
@@ -2789,8 +2759,6 @@ EXTERNAL SOURCES:
27892759
:path: "../node_modules/react-native-reanimated"
27902760
RNScreens:
27912761
:path: "../node_modules/react-native-screens"
2792-
RNVectorIcons:
2793-
:path: "../node_modules/react-native-vector-icons"
27942762
RNWorklets:
27952763
:path: "../node_modules/react-native-worklets"
27962764
Yoga:
@@ -2880,7 +2848,6 @@ SPEC CHECKSUMS:
28802848
RNKeychain: bbe2f6d5cc008920324acb49ef86ccc03d3b38e4
28812849
RNReanimated: d9b3c88b7a722ce8129ca8c96abd06d822ed315e
28822850
RNScreens: f35bcc83b6e3a871635b1c28728e63c9560f159a
2883-
RNVectorIcons: be4d047a76ad307ffe54732208fb0498fcb8477f
28842851
RNWorklets: 7fb44cd32a491df4a4832cce2f3b0aaaf813956d
28852852
SimpleKeychain: f8707c8e97b38c6a6e687b17732afc9bcef06439
28862853
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
"react-native-reanimated": "4.1.5",
3535
"react-native-safe-area-context": "^5.6.2",
3636
"react-native-screens": "^4.18.0",
37-
"react-native-vector-icons": "^10.3.0",
3837
"react-native-worklets": "^0.6.1",
3938
"zustand": "^4.5.2"
4039
},

src/screens/Auth/BiometricAuthScreen.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export const BiometricAuthScreen: React.FC<Props> = ({ navigation }) => {
3838
}
3939

4040
if (faceIdEnabled) {
41-
// handleBiometricAuth();
41+
handleBiometricAuth();
4242
} else {
4343
navigation.replace('Login');
4444
}

yarn.lock

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3143,15 +3143,6 @@ cliui@^6.0.0:
31433143
strip-ansi "^6.0.0"
31443144
wrap-ansi "^6.2.0"
31453145

3146-
cliui@^7.0.2:
3147-
version "7.0.4"
3148-
resolved "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"
3149-
integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
3150-
dependencies:
3151-
string-width "^4.2.0"
3152-
strip-ansi "^6.0.0"
3153-
wrap-ansi "^7.0.0"
3154-
31553146
cliui@^8.0.1:
31563147
version "8.0.1"
31573148
resolved "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz"
@@ -6658,7 +6649,7 @@ prompts@^2.0.1, prompts@^2.4.2:
66586649
kleur "^3.0.3"
66596650
sisteransi "^1.0.5"
66606651

6661-
prop-types@^15.7.2, prop-types@^15.8.1:
6652+
prop-types@^15.8.1:
66626653
version "15.8.1"
66636654
resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz"
66646655
integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -6834,14 +6825,6 @@ react-native-screens@^4.18.0:
68346825
react-freeze "^1.0.0"
68356826
warn-once "^0.1.0"
68366827

6837-
react-native-vector-icons@^10.3.0:
6838-
version "10.3.0"
6839-
resolved "https://registry.npmjs.org/react-native-vector-icons/-/react-native-vector-icons-10.3.0.tgz"
6840-
integrity sha512-IFQ0RE57819hOUdFvgK4FowM5aMXg7C7XKsuGLevqXkkIJatc3QopN0wYrb2IrzUgmdpfP+QVIbI3S6h7M0btw==
6841-
dependencies:
6842-
prop-types "^15.7.2"
6843-
yargs "^16.1.1"
6844-
68456828
react-native-worklets@^0.6.1:
68466829
version "0.6.1"
68476830
resolved "https://registry.yarnpkg.com/react-native-worklets/-/react-native-worklets-0.6.1.tgz#daa56dea896c7bdcead064b675ef341ac1f41029"
@@ -8208,11 +8191,6 @@ yargs-parser@^18.1.2:
82088191
camelcase "^5.0.0"
82098192
decamelize "^1.2.0"
82108193

8211-
yargs-parser@^20.2.2:
8212-
version "20.2.9"
8213-
resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"
8214-
integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
8215-
82168194
yargs-parser@^21.0.0, yargs-parser@^21.1.1:
82178195
version "21.1.1"
82188196
resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz"
@@ -8245,19 +8223,6 @@ yargs@^15.1.0:
82458223
y18n "^4.0.0"
82468224
yargs-parser "^18.1.2"
82478225

8248-
yargs@^16.1.1:
8249-
version "16.2.0"
8250-
resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"
8251-
integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
8252-
dependencies:
8253-
cliui "^7.0.2"
8254-
escalade "^3.1.1"
8255-
get-caller-file "^2.0.5"
8256-
require-directory "^2.1.1"
8257-
string-width "^4.2.0"
8258-
y18n "^5.0.5"
8259-
yargs-parser "^20.2.2"
8260-
82618226
yargs@^17.0.0, yargs@^17.3.1, yargs@^17.6.2:
82628227
version "17.7.2"
82638228
resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz"

0 commit comments

Comments
 (0)