🐛 - Fixed android crashes (#253)

better-rail · Jun 13, 2023 · 81e2f7a · 81e2f7a
1 parent d6c134b
commit 81e2f7a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/app/components/sheets/bottom-screen-sheet.tsx b/app/components/sheets/bottom-screen-sheet.tsx
@@ -1,4 +1,4 @@
-import { View, ViewStyle, useColorScheme } from "react-native"
+import { Platform, View, ViewStyle, useColorScheme } from "react-native"
 import { BlurView } from "@react-native-community/blur"
 import { useSafeAreaInsets } from "react-native-safe-area-context"
 import { color } from "../../theme"
@@ -38,12 +38,14 @@ export function BottomScreenSheet({ children, style }: BottomScreenSheetProps) {
       }}
     >
       {children}
-      <BlurView
-        style={{ position: "absolute", top: 0, left: 0, bottom: 0, right: 0, zIndex: -1 }}
-        blurType={isDarkMode ? "ultraThinMaterialDark" : "xlight"}
-        blurAmount={30}
-        reducedTransparencyFallbackColor={color.tertiaryBackground as unknown as string}
-      />
+      {Platform.OS === "ios" && (
+        <BlurView
+          style={{ position: "absolute", top: 0, left: 0, bottom: 0, right: 0, zIndex: -1 }}
+          blurType={isDarkMode ? "ultraThinMaterialDark" : "xlight"}
+          blurAmount={30}
+          reducedTransparencyFallbackColor={color.tertiaryBackground as unknown as string}
+        />
+      )}
     </View>
   )
 }
diff --git a/app/models/route-plan/route-plan.ts b/app/models/route-plan/route-plan.ts
@@ -41,11 +41,11 @@ export const RoutePlanModel = types
   .actions((self) => ({
     setOrigin(station) {
       self.origin = station
-      sendCurrentRouteToiOS(self.origin.id, self.destination?.id)
+      sendCurrentRouteToiOS(self.origin?.id, self.destination?.id)
     },
     setDestination(station) {
       self.destination = station
-      sendCurrentRouteToiOS(self.origin.id, self.destination?.id)
+      sendCurrentRouteToiOS(self.origin?.id, self.destination?.id)
     },
     setDate(date) {
       self.date = date

diff --git a/app/screens/settings/components/settings-box.tsx b/app/screens/settings/components/settings-box.tsx
@@ -84,7 +84,7 @@ export const SettingBox = function SettingBox(props: SettingBoxProps) {
   const { title, icon, first, last, externalLink, chevron, checkmark, onPress, toggle, style } = props
   let boxStyle: ViewStyle = {}
 
-  if (!first) boxStyle = { borderTopColor: Platform.select({ android: "transparent", ios: color.background }), borderTopWidth: 1 }
+  if (!first && Platform.OS === "ios") boxStyle = { borderTopColor: color.background, borderTopWidth: 1 }
 
   if (first) {
     boxStyle = { borderTopLeftRadius: 10, borderTopRightRadius: 10, ...boxStyle }