Skip to content

Commit

Permalink
fix ios bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
CanciuCostin committed Sep 10, 2024
1 parent b2172c1 commit 8eba22a
Show file tree
Hide file tree
Showing 18 changed files with 296 additions and 58 deletions.
6 changes: 6 additions & 0 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@
"eas": {
"projectId": "17b6b090-ccd0-46f1-8694-747bffef7242"
}
},
"runtimeVersion": {
"policy": "appVersion"
},
"updates": {
"url": "https://u.expo.dev/17b6b090-ccd0-46f1-8694-747bffef7242"
}
}
}
201 changes: 201 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
"react-native-web": "~0.19.10",
"react-redux": "^9.1.2",
"redux-persist": "^6.0.0",
"zod": "^3.23.8"
"zod": "^3.23.8",
"expo-updates": "~0.25.24"
},
"devDependencies": {
"@babel/core": "^7.20.0",
Expand Down
13 changes: 0 additions & 13 deletions src/__tests__/integration/.env

This file was deleted.

8 changes: 5 additions & 3 deletions src/app/(tabs)/_layout.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import FontAwesome from '@expo/vector-icons/FontAwesome';
import { Link, Tabs } from 'expo-router';
import { Pressable } from 'react-native';
import { Pressable, Platform } from 'react-native';
import { useTheme } from '@react-navigation/native';
import { useTranslation } from 'react-i18next';
import {
Expand Down Expand Up @@ -33,15 +33,17 @@ export default function TabLayout() {
headerShown: true, //useClientOnlyValue(false, true),
headerShadowVisible: true,
headerStatusBarHeight: hp('5%'),

tabBarStyle: {
height: hp('6%'),
height: Platform.OS === 'ios' ? hp('9%') : hp('6%'),
},
tabBarLabelStyle: { fontSize: hp('1.6%') },
tabBarIconStyle: {
height: hp('5%'),
width: hp('5%'),
},
headerTitleStyle: { fontSize: hp('2.5%') },
headerTitleAlign: 'left',
}}
>
<Tabs.Screen
Expand All @@ -67,7 +69,7 @@ export default function TabLayout() {
size={hp('3%')}
color={colors.primary}
style={{
marginRight: wp('2%'),
marginRight: wp('5%'),
opacity: pressed ? 0.5 : 1,
}}
/>
Expand Down
6 changes: 4 additions & 2 deletions src/app/(tabs)/categories/[categoryId]/_layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,16 @@ const CategoryDetailsLayout = () => {
return (
<Stack
screenOptions={{
headerShown: true,
//headerShown: true,
headerShown: false,
headerTitle: t('productsHeader'),
}}
>
<Stack.Screen
name="index"
options={{
headerShown: true,
//headerShown: true,
headerShown: false,
headerTitle: ProductsHelper.getCategoryNameBasedOnId(
selectedCategoryId,
categories,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ const styles = StyleSheet.create({
},
descriptionText: {
textAlign: 'justify',
marginVertical: hp('1.5%'),
},
});

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
import { View, StyleSheet, Image, ScrollView, Alert } from 'react-native';
import {
View,
StyleSheet,
Image,
ScrollView,
Alert,
KeyboardAvoidingView,
Platform,

Check failure on line 8 in src/app/(tabs)/categories/[categoryId]/products/[productId]/productOrder.tsx

View workflow job for this annotation

GitHub Actions / Linter (ubuntu-latest, 20)

'Platform' is defined but never used

Check warning on line 8 in src/app/(tabs)/categories/[categoryId]/products/[productId]/productOrder.tsx

View workflow job for this annotation

GitHub Actions / Linter (ubuntu-latest, 20)

'Platform' is defined but never used
} from 'react-native';
import ImagePicker from '@components/input/ImagePicker';
import DropDown from '@components/input/DropDown';
import DateTimePicker from '@components/input/DateTimePicker';
Expand Down Expand Up @@ -166,9 +174,12 @@ export default function ProductOrderScreen() {
customFlow: false,
merchantDisplayName: 'Example Inc.',
style: 'alwaysDark',
applePay: {
merchantCountryCode: 'RO',
},
// Configure the payment sheet to use the return URL in the app
returnURL: 'payments-example://stripe-redirect',
// Uncomment to enable Apple Pay
// applePay: {
// merchantCountryCode: 'RO',
// },
googlePay: {
merchantCountryCode: 'RO',
testEnv: true, // use test environment
Expand Down Expand Up @@ -320,7 +331,11 @@ export default function ProductOrderScreen() {
});

return (
<View style={[styles.container]}>
<KeyboardAvoidingView
keyboardVerticalOffset={hp('10%')}
behavior="padding"
style={[styles.container]}
>
<ScrollView
contentContainerStyle={{ backgroundColor: colors.background }}
ref={scrollViewRef}
Expand Down Expand Up @@ -415,6 +430,6 @@ export default function ProductOrderScreen() {
onPressAsync={onButtonPress}
></CustomButton>
</View>
</View>
</KeyboardAvoidingView>
);
}
Loading

0 comments on commit 8eba22a

Please sign in to comment.