Skip to content

Commit eaec849

Browse files
committed
latest build v1.2.2 15
1 parent 6b51a85 commit eaec849

File tree

8 files changed

+25
-8
lines changed

8 files changed

+25
-8
lines changed

assets/images/olimax-bg.jpg

27.3 KB
Loading

config/default.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ export const DefaultConfig = {
3636
LoginScreen: backgroundImages[config('LOGIN_BG_IMAGE', 'storefront_photo_1')],
3737
BootScreen: backgroundImages[config('BOOTSCREEN_BG_IMAGE')] ?? null,
3838
},
39+
loginScreen: {
40+
showGradient: toBoolean(config('LOGIN_SCREEN_SHOW_GRADIENT', 1)),
41+
},
3942
storeHeader: {
4043
showGradient: toBoolean(config('STORE_HEADER_SHOW_GRADIENT', 1)),
4144
showLocationPicker: toBoolean(config('STORE_HEADER_SHOW_LOCATION_PICKER', 1)),

ios/StorefrontApp.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@
278278
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
279279
CLANG_ENABLE_MODULES = YES;
280280
CODE_SIGN_ENTITLEMENTS = StorefrontApp/StorefrontApp.entitlements;
281-
CURRENT_PROJECT_VERSION = 11;
281+
CURRENT_PROJECT_VERSION = 15;
282282
DEVELOPMENT_TEAM = DR48FNTWCV;
283283
ENABLE_BITCODE = NO;
284284
INFOPLIST_FILE = StorefrontApp/Info.plist;
@@ -311,7 +311,7 @@
311311
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
312312
CLANG_ENABLE_MODULES = YES;
313313
CODE_SIGN_ENTITLEMENTS = StorefrontApp/StorefrontApp.entitlements;
314-
CURRENT_PROJECT_VERSION = 11;
314+
CURRENT_PROJECT_VERSION = 15;
315315
DEVELOPMENT_TEAM = DR48FNTWCV;
316316
INFOPLIST_FILE = StorefrontApp/Info.plist;
317317
INFOPLIST_KEY_CFBundleDisplayName = "OLI MAX";

ios/StorefrontApp.xcodeproj/xcshareddata/xcschemes/StorefrontApp.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
</Testables>
6060
</TestAction>
6161
<LaunchAction
62-
buildConfiguration = "Debug"
62+
buildConfiguration = "Release"
6363
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
6464
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
6565
launchStyle = "0"

src/components/DeliveryRoutePreview.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,6 @@ const DeliveryRoutePreview = ({ children, zoom = 1, width = '100%', height = '10
291291
} catch (error) {
292292
console.error('Error fetching custom origin:', error);
293293
} finally {
294-
setDontFindOrigin(true);
295294
setFindingOrigin(false);
296295
setReady(true);
297296
}

src/screens/AccountScreen.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ const AccountScreen = () => {
299299
</XStack>
300300
<FlatList
301301
data={accountMenu}
302-
keyExtractor={(item) => item.title}
302+
keyExtractor={(item, index) => index}
303303
renderItem={renderMenuItem}
304304
ItemSeparatorComponent={() => <Separator borderBottomWidth={1} borderColor='$borderColorWithShadow' />}
305305
scrollEnabled={false}
@@ -313,7 +313,7 @@ const AccountScreen = () => {
313313
</YStack>
314314
<FlatList
315315
data={dataProtectionMenu}
316-
keyExtractor={(item) => item.title}
316+
keyExtractor={(item, index) => index}
317317
renderItem={renderMenuItem}
318318
ItemSeparatorComponent={() => <Separator borderBottomWidth={1} borderColor='$borderColorWithShadow' />}
319319
scrollEnabled={false}

src/screens/LoginScreen.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ const LoginScreen = () => {
1818
const theme = useTheme();
1919
const { login, loginSupported, loading } = useOAuth();
2020
const { t } = useLanguage();
21+
const showGradient = storefrontConfig('loginScreen.showGradient', true);
2122

2223
const handleClearCache = () => {
2324
storage.clearStore();
@@ -40,7 +41,14 @@ const LoginScreen = () => {
4041

4142
return (
4243
<ImageBackground source={storefrontConfig('backgroundImages.LoginScreen')} style={[styles.background, { backgroundColor: theme.background.val }]} resizeMode='cover'>
43-
<LinearGradient colors={['rgba(0, 0, 0, 0.0)', 'rgba(0, 0, 0, 0.4)', 'rgba(0, 0, 0, 0.8)']} style={StyleSheet.absoluteFillObject} start={{ x: 0, y: 0 }} end={{ x: 0, y: 1 }} />
44+
{showGradient && (
45+
<LinearGradient
46+
colors={['rgba(0, 0, 0, 0.0)', 'rgba(0, 0, 0, 0.4)', 'rgba(0, 0, 0, 0.8)']}
47+
style={StyleSheet.absoluteFillObject}
48+
start={{ x: 0, y: 0 }}
49+
end={{ x: 0, y: 1 }}
50+
/>
51+
)}
4452
<AbsoluteTabBarScreenWrapper>
4553
<SafeAreaView style={{ flex: 1 }}>
4654
<YStack flex={1} justifyContent='flex-end' alignItems='center' space='$3' padding='$4'>

storefront.config.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
import { createStorefrontConfig } from './config/default';
22

3-
export default createStorefrontConfig();
3+
export default createStorefrontConfig({
4+
backgroundImages: {
5+
LoginScreen: require('./assets/images/olimax-bg.jpg'),
6+
},
7+
loginScreen: {
8+
showGradient: false,
9+
},
10+
});

0 commit comments

Comments
 (0)