Merge pull request #172 from himanshu8443/feature

Fixed button navigation issue
Zenda-Cross · Dec 25, 2024 · 45a9298 · 45a9298
2 parents 8c0c4d7 + 9be00ca
commit 45a9298
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 61 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -86,8 +86,8 @@ android {
         applicationId "com.vega"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 85
-        versionName "2.5.8"
+        versionCode 88
+        versionName "2.5.9"
     }
     signingConfigs {
         release {

diff --git a/app.json b/app.json
@@ -21,12 +21,12 @@
       ]
     ],
     "slug": "vega",
-    "version": "2.5.8",
+    "version": "2.5.9",
     "sdkVersion": "51.0.0",
     "android": {
       "minSdkVersion": 24,
       "package": "com.vega",
-      "versionCode": 85
+      "versionCode": 88
     },
     "platforms": ["ios", "android"]
   }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vega",
-  "version": "2.5.8",
+  "version": "2.5.9",
   "private": true,
   "scripts": {
     "android": "react-native run-android",

diff --git a/src/App.tsx b/src/App.tsx
@@ -23,10 +23,13 @@ import BootSplash from 'react-native-bootsplash';
 import {enableFreeze, enableScreens} from 'react-native-screens';
 import Preferences from './screens/settings/Preference';
 import useThemeStore from './lib/zustand/themeStore';
-import {LogBox, TouchableOpacity} from 'react-native';
+import {LogBox, ViewStyle} from 'react-native';
 import {EpisodeLink} from './lib/providers/types';
 import RNReactNativeHapticFeedback from 'react-native-haptic-feedback';
 import TabBarBackgound from './components/TabBarBackgound';
+import {TouchableOpacity} from 'react-native';
+import {SafeAreaProvider, SafeAreaView} from 'react-native-safe-area-context';
+import {StyleProp} from 'react-native';
 
 enableScreens(true);
 enableFreeze(true);
@@ -203,19 +206,20 @@ const App = () => {
           tabBarButton: props => {
             return (
               <TouchableOpacity
-                {...props}
+                accessibilityRole="button"
+                accessibilityState={props.accessibilityState}
+                style={props.style as StyleProp<ViewStyle>}
                 onPress={e => {
-                  if (props.onPress) {
-                    props.onPress(e);
-                  }
+                  props.onPress && props.onPress(e);
                   if (!props?.accessibilityState?.selected) {
                     RNReactNativeHapticFeedback.trigger('effectTick', {
                       enableVibrateFallback: true,
                       ignoreAndroidSystemSettings: false,
                     });
                   }
-                }}
-              />
+                }}>
+                {props.children}
+              </TouchableOpacity>
             );
           },
         }}>
@@ -287,55 +291,59 @@ const App = () => {
   }, []);
 
   return (
-    <NavigationContainer
-      onReady={() => BootSplash.hide({fade: true})}
-      theme={{
-        fonts: {
-          regular: {
-            fontFamily: 'Inter_400Regular',
-            fontWeight: '400',
-          },
-          medium: {
-            fontFamily: 'Inter_500Medium',
-            fontWeight: '500',
-          },
-          bold: {
-            fontFamily: 'Inter_700Bold',
-            fontWeight: '700',
-          },
-          heavy: {
-            fontFamily: 'Inter_800ExtraBold',
-            fontWeight: '800',
-          },
-        },
-        dark: true,
-        colors: {
-          background: 'transparent',
-          card: 'black',
-          primary: primary,
-          text: 'white',
-          border: 'black',
-          notification: primary,
-        },
-      }}>
-      <Stack.Navigator
-        screenOptions={{
-          headerShown: false,
-          animation: 'ios_from_right',
-          animationDuration: 200,
-          freezeOnBlur: true,
-          contentStyle: {backgroundColor: 'transparent'},
-        }}>
-        <Stack.Screen name="TabStack" component={TabStack} />
-        <Stack.Screen
-          options={{
-            orientation: 'landscape',
-          }}
-          name="Player"
-          component={Player}
-        />
-      </Stack.Navigator>
-    </NavigationContainer>
+    <SafeAreaProvider>
+      <SafeAreaView edges={{top: 'off', bottom: 'additive'}} style={{flex: 1}}>
+        <NavigationContainer
+          onReady={() => BootSplash.hide({fade: true})}
+          theme={{
+            fonts: {
+              regular: {
+                fontFamily: 'Inter_400Regular',
+                fontWeight: '400',
+              },
+              medium: {
+                fontFamily: 'Inter_500Medium',
+                fontWeight: '500',
+              },
+              bold: {
+                fontFamily: 'Inter_700Bold',
+                fontWeight: '700',
+              },
+              heavy: {
+                fontFamily: 'Inter_800ExtraBold',
+                fontWeight: '800',
+              },
+            },
+            dark: true,
+            colors: {
+              background: 'transparent',
+              card: 'black',
+              primary: primary,
+              text: 'white',
+              border: 'black',
+              notification: primary,
+            },
+          }}>
+          <Stack.Navigator
+            screenOptions={{
+              headerShown: false,
+              animation: 'ios_from_right',
+              animationDuration: 200,
+              freezeOnBlur: true,
+              contentStyle: {backgroundColor: 'transparent'},
+            }}>
+            <Stack.Screen name="TabStack" component={TabStack} />
+            <Stack.Screen
+              options={{
+                orientation: 'landscape',
+              }}
+              name="Player"
+              component={Player}
+            />
+          </Stack.Navigator>
+        </NavigationContainer>
+      </SafeAreaView>
+    </SafeAreaProvider>
   );
 };