Przeglądaj źródła

Android UI fix ("Reset" btn series filter)

Viktoriia 1 miesiąc temu
rodzic
commit
60e21693d2

+ 3 - 8
src/screens/InAppScreens/MapScreen/FilterModal/index.tsx

@@ -598,12 +598,7 @@ const FilterModal = forwardRef<
             })}
           </ScrollView>
 
-          <View
-            style={[
-              { marginTop: 'auto', paddingHorizontal: 16 },
-              Platform.OS === 'android' ? {} : { marginBottom: insets.bottom || 24 }
-            ]}
-          >
+          <View style={{ marginTop: 'auto', paddingHorizontal: 16 }}>
             <Button
               children="Reset"
               onPress={() => {
@@ -1058,14 +1053,14 @@ const FilterModal = forwardRef<
         closeOnTouchBackdrop
         defaultOverlayOpacity={0.2}
         onClose={handleCloseFilter}
-        containerStyle={[styles.sheetBackground, isSeriesFilter ? { height: '100%' } : {}]}
+        containerStyle={[styles.sheetBackground, isSeriesFilter && Platform.OS === 'ios' ? { height: '100%' } : {}]}
         safeAreaInsets={{ bottom: insets.bottom || 24, top: insets.top, left: 0, right: 0 }}
       >
         <View
           style={[
             {
               paddingTop: Platform.OS === 'android' ? 12 : 0,
-              height: isSeriesFilter ? windowHeight - insets.top : undefined
+              height: isSeriesFilter ? '100%' : undefined
             },
             isFilterVisible === 'series' ? {} : { paddingHorizontal: 16 }
           ]}