Skip to content

Commit

Permalink
Merge pull request #3828 from TrainLCD/release/v8.1.1
Browse files Browse the repository at this point in the history 
[iOS]v8.1.1
  • Loading branch information
@TinyKitten
TinyKitten authored Oct 19, 2024
2 parents 3ca2251 + e2e09e5 commit 7a7cf6d
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 19 deletions.
36 changes: 18 additions & 18 deletions ios/TrainLCD.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1457,7 +1457,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 8.1.0;
MARKETING_VERSION = 8.1.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -1495,7 +1495,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 8.1.0;
MARKETING_VERSION = 8.1.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -1586,7 +1586,7 @@
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
"\"$(inherited)\"",
);
MARKETING_VERSION = 8.1.0;
MARKETING_VERSION = 8.1.1;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "$(inherited)";
Expand Down Expand Up @@ -1672,7 +1672,7 @@
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
"\"$(inherited)\"",
);
MARKETING_VERSION = 8.1.0;
MARKETING_VERSION = 8.1.1;
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CFLAGS = "$(inherited)";
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
Expand Down Expand Up @@ -1708,7 +1708,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 8.1.0;
MARKETING_VERSION = 8.1.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -1746,7 +1746,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 8.1.0;
MARKETING_VERSION = 8.1.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -1784,7 +1784,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
IBSC_MODULE = WatchApp_Extension;
INFOPLIST_FILE = WatchApp/Schemes/Dev/Info.plist;
MARKETING_VERSION = 8.1.0;
MARKETING_VERSION = 8.1.1;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
Expand Down Expand Up @@ -1823,7 +1823,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
IBSC_MODULE = WatchApp_Extension;
INFOPLIST_FILE = WatchApp/Schemes/Dev/Info.plist;
MARKETING_VERSION = 8.1.0;
MARKETING_VERSION = 8.1.1;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE -D EXPO_CONFIGURATION_DEBUG";
PRODUCT_BUNDLE_IDENTIFIER = me.tinykitten.trainlcd.dev.watchkitapp;
Expand Down Expand Up @@ -1865,7 +1865,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 8.1.0;
MARKETING_VERSION = 8.1.1;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
Expand Down Expand Up @@ -1909,7 +1909,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 8.1.0;
MARKETING_VERSION = 8.1.1;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE -D EXPO_CONFIGURATION_DEBUG";
PRODUCT_BUNDLE_IDENTIFIER = me.tinykitten.trainlcd.dev.watchkitapp.watchkitextension;
Expand Down Expand Up @@ -1953,7 +1953,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 8.1.0;
MARKETING_VERSION = 8.1.1;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
Expand Down Expand Up @@ -2001,7 +2001,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 8.1.0;
MARKETING_VERSION = 8.1.1;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE -D EXPO_CONFIGURATION_DEBUG";
PRODUCT_BUNDLE_IDENTIFIER = me.tinykitten.trainlcd.dev.ridesessionactivity;
Expand Down Expand Up @@ -2047,7 +2047,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 8.1.0;
MARKETING_VERSION = 8.1.1;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
Expand Down Expand Up @@ -2095,7 +2095,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 8.1.0;
MARKETING_VERSION = 8.1.1;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE -D EXPO_CONFIGURATION_DEBUG";
PRODUCT_BUNDLE_IDENTIFIER = me.tinykitten.trainlcd.ridesessionactivity;
Expand Down Expand Up @@ -2139,7 +2139,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 8.1.0;
MARKETING_VERSION = 8.1.1;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
Expand Down Expand Up @@ -2183,7 +2183,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 8.1.0;
MARKETING_VERSION = 8.1.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;
Expand Down Expand Up @@ -2221,7 +2221,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
IBSC_MODULE = WatchApp_Extension;
INFOPLIST_FILE = WatchApp/Schemes/Prod/Info.plist;
MARKETING_VERSION = 8.1.0;
MARKETING_VERSION = 8.1.1;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
Expand Down Expand Up @@ -2261,7 +2261,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
IBSC_MODULE = WatchApp_Extension;
INFOPLIST_FILE = WatchApp/Schemes/Prod/Info.plist;
MARKETING_VERSION = 8.1.0;
MARKETING_VERSION = 8.1.1;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE -D EXPO_CONFIGURATION_DEBUG";
PRODUCT_BUNDLE_IDENTIFIER = me.tinykitten.trainlcd.watchkitapp;
Expand Down
3 changes: 2 additions & 1 deletion src/hooks/useUpdateLiveActivities.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { parenthesisRegexp } from '../constants'
import { directionToDirectionName } from '../models/Bound'
import stationState from '../store/atoms/station'
import { isJapanese } from '../translation'
import getIsPass from '../utils/isPass'
import {
startLiveActivity,
stopLiveActivity,
Expand Down Expand Up @@ -91,7 +92,7 @@ export const useUpdateLiveActivities = (): void => {

const stoppedStation = useMemo(
() =>
arrivedFromState && !approachingFromState
arrivedFromState && !approachingFromState && !getIsPass(currentStation)
? currentStation
: previousStation,
[approachingFromState, arrivedFromState, currentStation, previousStation]
Expand Down

0 comments on commit 7a7cf6d

Please sign in to comment.