Merge branch 'dev' into release/canary

TrainLCD · Oct 13, 2024 · 3cc6b42 · 3cc6b42
2 parents 07609e8 + ffb1b15
commit 3cc6b42
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 126 deletions.
diff --git a/functions/package-lock.json b/functions/package-lock.json
diff --git a/ios/TrainLCD.xcodeproj/project.pbxproj b/ios/TrainLCD.xcodeproj/project.pbxproj
@@ -1457,7 +1457,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 7.7.2;
+				MARKETING_VERSION = 8.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1495,7 +1495,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 7.7.2;
+				MARKETING_VERSION = 8.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1586,7 +1586,7 @@
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
 					"\"$(inherited)\"",
 				);
-				MARKETING_VERSION = 8.0.0;
+				MARKETING_VERSION = 8.0.1;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "$(inherited)";
@@ -1672,7 +1672,7 @@
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
 					"\"$(inherited)\"",
 				);
-				MARKETING_VERSION = 8.0.0;
+				MARKETING_VERSION = 8.0.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
@@ -2137,7 +2137,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 7.7.2;
+				MARKETING_VERSION = 8.0.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -2181,7 +2181,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 7.7.2;
+				MARKETING_VERSION = 8.0.1;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE -D EXPO_CONFIGURATION_DEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = me.tinykitten.trainlcd.watchkitapp.watchkitextension;
@@ -2219,7 +2219,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				IBSC_MODULE = WatchApp_Extension;
 				INFOPLIST_FILE = WatchApp/Schemes/Prod/Info.plist;
-				MARKETING_VERSION = 7.7.2;
+				MARKETING_VERSION = 8.0.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -2259,7 +2259,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				IBSC_MODULE = WatchApp_Extension;
 				INFOPLIST_FILE = WatchApp/Schemes/Prod/Info.plist;
-				MARKETING_VERSION = 7.7.2;
+				MARKETING_VERSION = 8.0.1;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE -D EXPO_CONFIGURATION_DEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = me.tinykitten.trainlcd.watchkitapp;

diff --git a/src/components/Permitted.tsx b/src/components/Permitted.tsx
@@ -27,6 +27,7 @@ import { useCurrentLine } from '../hooks/useCurrentLine'
 import useListenMessaging from '../hooks/useListenMessaging'
 import useReport from '../hooks/useReport'
 import useReportEligibility from '../hooks/useReportEligibility'
+import { useResetMainState } from '../hooks/useResetMainState'
 import { useThemeStore } from '../hooks/useThemeStore'
 import { useUpdateLiveActivities } from '../hooks/useUpdateLiveActivities'
 import { AppTheme } from '../models/Theme'
@@ -96,6 +97,7 @@ const PermittedLayout: React.FC<Props> = ({ children }: Props) => {
   const { sendReport, descriptionLowerLimit } = useReport(user)
   const reportEligibility = useReportEligibility()
   const badAccuracy = useBadAccuracy()
+  const resetMainState = useResetMainState()
 
   const viewShotRef = useRef<ViewShot>(null)
 
@@ -134,6 +136,7 @@ const PermittedLayout: React.FC<Props> = ({ children }: Props) => {
           case 0:
             if (Platform.OS === 'ios') {
               navigation.navigate('SelectBound')
+              resetMainState()
               break
             }
             handleShare()

diff --git a/src/components/TrainTypeInfoModal.tsx b/src/components/TrainTypeInfoModal.tsx
@@ -4,7 +4,7 @@ import { Modal, ScrollView, StyleSheet, View } from 'react-native'
 import { RFValue } from 'react-native-responsive-fontsize'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import { useRecoilValue } from 'recoil'
-import { Line, Station, TrainType } from '../../gen/proto/stationapi_pb'
+import { Station, TrainType } from '../../gen/proto/stationapi_pb'
 import { LED_THEME_BG_COLOR } from '../constants'
 import { useThemeStore } from '../hooks/useThemeStore'
 import { APP_THEME } from '../models/Theme'
@@ -78,7 +78,7 @@ export const TrainTypeInfoModal: React.FC<Props> = ({
                 ? 0
                 : a.trainType?.id - b.trainType?.id
             )
-        : ([selectedLine] as Line[]),
+        : [selectedLine],
     [selectedLine, trainType?.lines]
   )
 
@@ -186,11 +186,11 @@ export const TrainTypeInfoModal: React.FC<Props> = ({
                     flexDirection: 'row',
                     alignItems: 'center',
                   }}
-                  key={l.id}
+                  key={l?.id}
                 >
                   <View
                     style={{
-                      backgroundColor: l.color,
+                      backgroundColor: l?.color ?? '#000000',
                       width: 10,
                       height: 10,
                       borderRadius: 8,
@@ -204,20 +204,20 @@ export const TrainTypeInfoModal: React.FC<Props> = ({
                       flex: 1,
                     }}
                   >
-                    {isJapanese ? l.nameShort : l.nameRoman}:{' '}
+                    {(isJapanese ? l?.nameShort : l?.nameRoman) ?? ''}:{' '}
                   </Typography>
                   <Typography
                     style={{
-                      color: l.trainType?.color,
+                      color: l?.trainType?.color ?? '#000000',
                       textAlign: 'right',
                       fontSize: RFValue(11),
                       fontWeight: 'bold',
                       lineHeight: RFValue(14),
                     }}
                   >
                     {isJapanese
-                      ? l.trainType?.name ?? '普通/各駅停車'
-                      : l.trainType?.nameRoman ?? 'Local'}
+                      ? l?.trainType?.name ?? '普通/各駅停車'
+                      : l?.trainType?.nameRoman ?? 'Local'}
                   </Typography>
                 </View>
               ))}