diff --git a/src/app/(tabs)/_layout.tsx b/src/app/(tabs)/_layout.tsx index 4046f11a..de7b449d 100644 --- a/src/app/(tabs)/_layout.tsx +++ b/src/app/(tabs)/_layout.tsx @@ -55,7 +55,6 @@ function TabNav() { headerShown: false, tabBarLabel: 'Home', tabBarIcon: ({ color }) => HomeIcon({ color }), - // tabBarLabelStyle: { borderTopWidth: 12, paddingTop: 12 }, }} /> + {isLoading ? ( ) : ( router.back()} /> @@ -127,6 +127,9 @@ function AuthorScreen() { } /> ))} + + {/* View so there's space between the tab bar and the stories */} + )} diff --git a/src/app/(tabs)/genre/index.tsx b/src/app/(tabs)/genre/index.tsx index 2651f446..1b6a07ed 100644 --- a/src/app/(tabs)/genre/index.tsx +++ b/src/app/(tabs)/genre/index.tsx @@ -303,7 +303,7 @@ function GenreScreen() { }; return ( - + {loading && ( diff --git a/src/app/(tabs)/home/styles.ts b/src/app/(tabs)/home/styles.ts index e24896bc..9f75b42d 100644 --- a/src/app/(tabs)/home/styles.ts +++ b/src/app/(tabs)/home/styles.ts @@ -25,7 +25,7 @@ const styles = StyleSheet.create({ padding: 8, }, scrollView2: { - paddingBottom: 80, + paddingBottom: 20, flexGrow: 0, padding: 8, }, diff --git a/src/app/(tabs)/library/index.tsx b/src/app/(tabs)/library/index.tsx index 8a05bef0..c3ba5b57 100644 --- a/src/app/(tabs)/library/index.tsx +++ b/src/app/(tabs)/library/index.tsx @@ -5,7 +5,7 @@ import globalStyles from '../../../styles/globalStyles'; function LibraryScreen() { return ( - + Library ); diff --git a/src/app/(tabs)/search/index.tsx b/src/app/(tabs)/search/index.tsx index 81ae0bd0..a5114727 100644 --- a/src/app/(tabs)/search/index.tsx +++ b/src/app/(tabs)/search/index.tsx @@ -183,7 +183,7 @@ function SearchScreen() { return ( + {isLoading ? ( ) : ( diff --git a/src/app/(tabs)/story/styles.ts b/src/app/(tabs)/story/styles.ts index 7e6e2c8c..66932cf5 100644 --- a/src/app/(tabs)/story/styles.ts +++ b/src/app/(tabs)/story/styles.ts @@ -3,10 +3,6 @@ import colors from '../../../styles/colors'; const styles = StyleSheet.create({ container: { - flex: 1, - backgroundColor: 'white', - alignItems: 'flex-start', - justifyContent: 'flex-start', paddingLeft: 24, paddingRight: 24, paddingTop: 48, diff --git a/src/styles/globalStyles.ts b/src/styles/globalStyles.ts index 12e17283..6687047e 100644 --- a/src/styles/globalStyles.ts +++ b/src/styles/globalStyles.ts @@ -10,6 +10,15 @@ export default StyleSheet.create({ justifyContent: 'flex-start', paddingHorizontal: 24, }, + + tabBarContainer: { + flex: 1, + backgroundColor: 'white', + alignItems: 'flex-start', + justifyContent: 'flex-start', + paddingHorizontal: 24, + paddingBottom: 60 + }, authContainer: { marginHorizontal: 38, flex: 1,