Skip to content

Commit

Permalink
style(map): add uniform indicator style for BottomSheet components
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert27 committed Nov 19, 2024
1 parent ea90005 commit 3fa68d0
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 10 deletions.
Binary file modified bun.lockb
Binary file not shown.
10 changes: 8 additions & 2 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,8 @@ PODS:
- ExpoModulesCore
- ExpoSplashScreen (0.29.11):
- ExpoModulesCore
- ExpoStoreReview (8.0.0):
- ExpoModulesCore
- ExpoSystemUI (4.0.3):
- ExpoModulesCore
- EXUpdatesInterface (1.0.0):
Expand Down Expand Up @@ -2072,7 +2074,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- RNScreens (4.1.0):
- RNScreens (4.2.0):
- DoubleConversion
- glog
- hermes-engine
Expand Down Expand Up @@ -2136,6 +2138,7 @@ DEPENDENCIES:
- ExpoScreenOrientation (from `../node_modules/expo-screen-orientation/ios`)
- ExpoSecureStore (from `../node_modules/expo-secure-store/ios`)
- ExpoSplashScreen (from `../node_modules/expo-splash-screen/ios`)
- ExpoStoreReview (from `../node_modules/expo-store-review/ios`)
- ExpoSystemUI (from `../node_modules/expo-system-ui/ios`)
- EXUpdatesInterface (from `../node_modules/expo-updates-interface/ios`)
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
Expand Down Expand Up @@ -2292,6 +2295,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/expo-secure-store/ios"
ExpoSplashScreen:
:path: "../node_modules/expo-splash-screen/ios"
ExpoStoreReview:
:path: "../node_modules/expo-store-review/ios"
ExpoSystemUI:
:path: "../node_modules/expo-system-ui/ios"
EXUpdatesInterface:
Expand Down Expand Up @@ -2494,6 +2499,7 @@ SPEC CHECKSUMS:
ExpoScreenOrientation: 21f691bc804e35e19e3a2113f7b02393d5bdb5db
ExpoSecureStore: 06c3192d58ed167f619af3d53797c055f5ada785
ExpoSplashScreen: 26cee50e9e95572baf87cd3a8ccaf2ffc3856422
ExpoStoreReview: f3439c43f13fa497cfe07d16b095f39101ed5548
ExpoSystemUI: d8fb1abd91c7283d8ead3df77ed0575b85f1bb42
EXUpdatesInterface: 1dcebac98ac5dad4289e6ff2bd5616822e894397
FBLazyVector: bc70dcb22ad30ce734a7cce7210791dc737e230f
Expand Down Expand Up @@ -2576,7 +2582,7 @@ SPEC CHECKSUMS:
RNFlashList: 115dd44377580761bff386a0caebf165424cf16f
RNGestureHandler: 511250b190a284388f9dd0d2e56c1df76f14cfb8
RNReanimated: 3e6072b3d49d4fc687b8f1ba3022f0fdc0b43969
RNScreens: e6f9bc3a41be76af2ba0a815ea299a0000b1c838
RNScreens: ae4f97fae3cbc96841668d0d3c0a0b83bbf9383a
RNSVG: 8b1a777d54096b8c2a0fd38fc9d5a454332bbb4d
Shimmer: c5374be1c2b0c9e292fb05b339a513cf291cac86
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
"@react-native-community/datetimepicker": "8.2.0",
"@react-native-community/netinfo": "11.4.1",
"@react-navigation/native": "^7.0.3",
"@react-navigation/stack": "^7.0.4",
"@react-navigation/stack": "^7.0.5",
"@shopify/flash-list": "1.7.1",
"@tanstack/query-sync-storage-persister": "^5.60.5",
"@tanstack/react-query": "^5.60.5",
"@tanstack/react-query-persist-client": "^5.60.5",
"@tanstack/query-sync-storage-persister": "^5.60.6",
"@tanstack/react-query": "^5.60.6",
"@tanstack/react-query-persist-client": "^5.60.6",
"@th3rdwave/react-navigation-bottom-sheet": "0.3.2",
"burnt": "^0.12.2",
"color": "^4.2.3",
Expand Down Expand Up @@ -77,7 +77,7 @@
"react-native-paper": "5.12.5",
"react-native-reanimated": "~3.16.1",
"react-native-safe-area-context": "4.12.0",
"react-native-screens": "^4.1.0",
"react-native-screens": "^4.2.0",
"react-native-select-dropdown": "^4.0.1",
"react-native-shimmer": "0.6.0",
"react-native-svg": "15.8.0",
Expand All @@ -97,8 +97,8 @@
"@babel/plugin-transform-arrow-functions": "^7.25.9",
"@babel/plugin-transform-shorthand-properties": "^7.25.9",
"@babel/plugin-transform-template-literals": "^7.25.9",
"@commitlint/cli": "^19.5.0",
"@commitlint/config-conventional": "^19.5.0",
"@commitlint/cli": "^19.6.0",
"@commitlint/config-conventional": "^19.6.0",
"@expo/ngrok": "^4.1.3",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/bun": "latest",
Expand Down
4 changes: 4 additions & 0 deletions src/components/Map/BottomSheetDetailModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ export const BottomSheetDetailModal = ({
onDismiss={handleSheetChangesModal}
backgroundComponent={BottomSheetBackground}
animatedPosition={currentPositionModal}
handleIndicatorStyle={styles.indicator}
>
<BottomSheetView style={styles.contentContainer}>
<View style={styles.modalSectionHeaderContainer}>
Expand Down Expand Up @@ -166,6 +167,9 @@ const stylesheet = createStyleSheet((theme) => ({
marginVertical: 16,
width: '100%',
},
indicator: {
backgroundColor: theme.colors.labelSecondaryColor,
},
modalSectionHeader: {
color: theme.colors.text,
fontSize: 26,
Expand Down
6 changes: 5 additions & 1 deletion src/components/Map/BottomSheetMap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ const MapBottomSheet: React.FC<MapBottomSheetProps> = ({
}
}}
enableDynamicSizing={false}
handleIndicatorStyle={styles.indicator}
>
<BottomSheetView style={styles.page}>
<BottomSheetView style={styles.inputContainer}>
Expand Down Expand Up @@ -791,12 +792,15 @@ const stylesheet = createStyleSheet((theme) => ({
paddingVertical: 3,
width: '100%',
},
indicator: {
backgroundColor: theme.colors.labelSecondaryColor,
},

inputContainer: {
flexDirection: 'row',
height: 40,
marginBottom: 10,
},

label: {
color: theme.colors.labelColor,
},
Expand Down

0 comments on commit 3fa68d0

Please sign in to comment.