about summary refs log tree commit diff
path: root/src/view/shell
diff options
context:
space:
mode:
Diffstat (limited to 'src/view/shell')
-rw-r--r--src/view/shell/mobile/MainMenu.tsx10
-rw-r--r--src/view/shell/mobile/index.tsx5
2 files changed, 10 insertions, 5 deletions
diff --git a/src/view/shell/mobile/MainMenu.tsx b/src/view/shell/mobile/MainMenu.tsx
index 874b8786f..d05e70a81 100644
--- a/src/view/shell/mobile/MainMenu.tsx
+++ b/src/view/shell/mobile/MainMenu.tsx
@@ -8,6 +8,7 @@ import {
   TouchableWithoutFeedback,
   View,
 } from 'react-native'
+import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import Animated, {
   useSharedValue,
   useAnimatedStyle,
@@ -27,6 +28,7 @@ export const MainMenu = observer(
   ({active, onClose}: {active: boolean; onClose: () => void}) => {
     const store = useStores()
     const initInterp = useSharedValue<number>(0)
+    const insets = useSafeAreaInsets()
 
     useEffect(() => {
       if (active) {
@@ -167,7 +169,12 @@ export const MainMenu = observer(
         <TouchableWithoutFeedback onPress={onClose}>
           <View style={styles.bg} />
         </TouchableWithoutFeedback>
-        <Animated.View style={[styles.wrapper, wrapperAnimStyle]}>
+        <Animated.View
+          style={[
+            styles.wrapper,
+            {bottom: insets.bottom + 55},
+            wrapperAnimStyle,
+          ]}>
           <SafeAreaView>
             <View style={[styles.topSection]}>
               <TouchableOpacity
@@ -251,7 +258,6 @@ const styles = StyleSheet.create({
   wrapper: {
     position: 'absolute',
     top: 0,
-    bottom: 75,
     width: '100%',
     backgroundColor: '#fff',
   },
diff --git a/src/view/shell/mobile/index.tsx b/src/view/shell/mobile/index.tsx
index 96390e9b8..94407599f 100644
--- a/src/view/shell/mobile/index.tsx
+++ b/src/view/shell/mobile/index.tsx
@@ -220,7 +220,7 @@ export const MobileShell: React.FC = observer(() => {
           </ScreenContainer>
         </GestureDetector>
       </SafeAreaView>
-      <View style={styles.bottomBar}>
+      <SafeAreaView style={styles.bottomBar}>
         <Btn icon="house" onPress={onPressHome} />
         <Btn icon="search" onPress={onPressSearch} />
         <Btn icon="menu" onPress={onPressMenu} />
@@ -230,7 +230,7 @@ export const MobileShell: React.FC = observer(() => {
           notificationCount={store.me.notificationCount}
         />
         <Btn icon={['far', 'clone']} onPress={onPressTabs} />
-      </View>
+      </SafeAreaView>
       <MainMenu
         active={isMainMenuActive}
         onClose={() => setMainMenuActive(false)}
@@ -373,7 +373,6 @@ const styles = StyleSheet.create({
     borderTopColor: colors.gray2,
     paddingLeft: 5,
     paddingRight: 15,
-    paddingBottom: 20,
   },
   ctrl: {
     flex: 1,