Skip to content
Merged

canary #6317

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,12 @@ android {
dimension "environment"
applicationId "me.tinykitten.trainlcd.dev"
versionNameSuffix "-dev"
versionCode 100000507
versionCode 100000508
versionName "10.8.0"
}
prod {
dimension "environment"
versionCode 100000507
versionCode 100000508
versionName "10.8.0"
}
}
Expand Down
4 changes: 2 additions & 2 deletions app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ export default {
},
},
ios: {
buildNumber: '2720',
buildNumber: '2721',
scheme: IS_DEV ? 'CanaryTrainLCD' : 'ProdTrainLCD',
bundleIdentifier: IS_DEV ? 'me.tinykitten.trainlcd.dev' : 'me.tinykitten.trainlcd',
supportsTablet: true,
},
android: {
package: IS_DEV ? 'me.tinykitten.trainlcd.dev' : 'me.tinykitten.trainlcd',
permissions: [],
versionCode: 100000507,
versionCode: 100000508,
},
owner: 'trainlcd',
experiments: {
Expand Down
36 changes: 18 additions & 18 deletions ios/TrainLCD.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -2407,7 +2407,7 @@
CODE_SIGN_ENTITLEMENTS = ProdTrainLCD.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2720;
CURRENT_PROJECT_VERSION = 2721;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = E6R2G33Z36;
INFOPLIST_FILE = TrainLCD/Schemes/Prod/Info.plist;
Expand Down Expand Up @@ -2446,7 +2446,7 @@
CODE_SIGN_ENTITLEMENTS = ProdTrainLCD.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2720;
CURRENT_PROJECT_VERSION = 2721;
DEVELOPMENT_TEAM = E6R2G33Z36;
INFOPLIST_FILE = TrainLCD/Schemes/Prod/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = TrainLCD;
Expand Down Expand Up @@ -2505,7 +2505,7 @@
CODE_SIGN_ENTITLEMENTS = TrainLCD/trainlcd.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2720;
CURRENT_PROJECT_VERSION = 2721;
CXX = "$(REACT_NATIVE_PATH)/scripts/xcode/ccache-clang++.sh";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
Expand Down Expand Up @@ -2611,7 +2611,7 @@
CODE_SIGN_ENTITLEMENTS = TrainLCD/trainlcd.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 2720;
CURRENT_PROJECT_VERSION = 2721;
CXX = "$(REACT_NATIVE_PATH)/scripts/xcode/ccache-clang++.sh";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand Down Expand Up @@ -2690,7 +2690,7 @@
CODE_SIGN_ENTITLEMENTS = CanaryTrainLCD.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2720;
CURRENT_PROJECT_VERSION = 2721;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = E6R2G33Z36;
INFOPLIST_FILE = TrainLCD/Schemes/Dev/Info.plist;
Expand Down Expand Up @@ -2729,7 +2729,7 @@
CODE_SIGN_ENTITLEMENTS = CanaryTrainLCD.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2720;
CURRENT_PROJECT_VERSION = 2721;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = E6R2G33Z36;
INFOPLIST_FILE = TrainLCD/Schemes/Dev/Info.plist;
Expand Down Expand Up @@ -2940,7 +2940,7 @@
CODE_SIGN_ENTITLEMENTS = RideSessionActivity/CanaryRideSessionActivity.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2720;
CURRENT_PROJECT_VERSION = 2721;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = E6R2G33Z36;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -2991,7 +2991,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2720;
CURRENT_PROJECT_VERSION = 2721;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = E6R2G33Z36;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -3042,7 +3042,7 @@
CODE_SIGN_ENTITLEMENTS = WatchWidget/ProdWatchWidget.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2720;
CURRENT_PROJECT_VERSION = 2721;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = E6R2G33Z36;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
Expand Down Expand Up @@ -3100,7 +3100,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2720;
CURRENT_PROJECT_VERSION = 2721;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = E6R2G33Z36;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
Expand Down Expand Up @@ -3151,7 +3151,7 @@
CODE_SIGN_ENTITLEMENTS = WatchWidget/CanaryWatchWidget.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2720;
CURRENT_PROJECT_VERSION = 2721;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = E6R2G33Z36;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
Expand Down Expand Up @@ -3208,7 +3208,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2720;
CURRENT_PROJECT_VERSION = 2721;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = E6R2G33Z36;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
Expand Down Expand Up @@ -3256,7 +3256,7 @@
CODE_SIGN_ENTITLEMENTS = RideSessionActivity/ProdRideSessionActivity.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2720;
CURRENT_PROJECT_VERSION = 2721;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = E6R2G33Z36;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -3307,7 +3307,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2720;
CURRENT_PROJECT_VERSION = 2721;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = E6R2G33Z36;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -3526,7 +3526,7 @@
CODE_SIGN_ENTITLEMENTS = ProdAppClip/ProdAppClip.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2720;
CURRENT_PROJECT_VERSION = 2721;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = E6R2G33Z36;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
Expand Down Expand Up @@ -3582,7 +3582,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2720;
CURRENT_PROJECT_VERSION = 2721;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = E6R2G33Z36;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
Expand Down Expand Up @@ -3632,7 +3632,7 @@
CODE_SIGN_ENTITLEMENTS = CanaryAppClip/CanaryAppClip.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2720;
CURRENT_PROJECT_VERSION = 2721;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = E6R2G33Z36;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
Expand Down Expand Up @@ -3690,7 +3690,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2720;
CURRENT_PROJECT_VERSION = 2721;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = E6R2G33Z36;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
Expand Down
12 changes: 6 additions & 6 deletions src/lineSymbolImage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ const LINE_SYMBOL_IMAGE_WITH_COLOR: Record<number, LineSymbolImage> = {
11602: { signPath: require('../assets/marks/jrw/a.webp') }, // 京都線
11603: { signPath: require('../assets/marks/jrw/a.webp') }, // 神戸線
11608: { signPath: require('../assets/marks/jrw/a.webp') }, // 山陽線
11609: { signPath: require('../assets/marks/jrw/s2.webp') }, // JR山陽本線(姫路~岡山)
11609: { signPath: require('../assets/marks/jrw/a.webp') }, // JR山陽本線(姫路~岡山)
11610: {
signPath: require('../assets/marks/jrw/w.webp'),
subSignPath: require('../assets/marks/jrw/x.webp'),
Expand Down Expand Up @@ -221,8 +221,8 @@ const LINE_SYMBOL_IMAGE_WITH_COLOR: Record<number, LineSymbolImage> = {
11720: { signPath: require('../assets/marks/jrw/z.webp') }, // 福塩線
11710: { signPath: require('../assets/marks/jrw/m.webp') }, // 瀬戸大橋線
11631: {
signPath: require('../assets/marks/jrw/n.webp'),
subSignPath: require('../assets/marks/jrw/a.webp'),
signPath: require('../assets/marks/jrw/a.webp'),
subSignPath: require('../assets/marks/jrw/n.webp'),
}, // 赤穂線
11704: { signPath: require('../assets/marks/jrw/b2.webp') }, // 因美線
11717: { signPath: require('../assets/marks/jrw/b3.webp') }, // 可部線
Expand Down Expand Up @@ -504,7 +504,7 @@ const LINE_SYMBOL_IMAGE_GRAYSCALE: Record<number, LineSymbolImageWithImage> = {
11602: { signPath: require('../assets/marks/jrw/a_g.webp') }, // 京都線
11603: { signPath: require('../assets/marks/jrw/a_g.webp') }, // 神戸線
11608: { signPath: require('../assets/marks/jrw/a_g.webp') }, // 山陽線
11609: { signPath: require('../assets/marks/jrw/s2_g.webp') }, // JR山陽本線(姫路~岡山)
11609: { signPath: require('../assets/marks/jrw/a_g.webp') }, // JR山陽本線(姫路~岡山)
11610: {
signPath: require('../assets/marks/jrw/w_g.webp'),
subSignPath: require('../assets/marks/jrw/x_g.webp'),
Expand Down Expand Up @@ -553,8 +553,8 @@ const LINE_SYMBOL_IMAGE_GRAYSCALE: Record<number, LineSymbolImageWithImage> = {
11720: { signPath: require('../assets/marks/jrw/z_g.webp') }, // 福塩線
11710: { signPath: require('../assets/marks/jrw/m_g.webp') }, // 瀬戸大橋線
11631: {
signPath: require('../assets/marks/jrw/n_g.webp'),
subSignPath: require('../assets/marks/jrw/a_g.webp'),
signPath: require('../assets/marks/jrw/a_g.webp'),
subSignPath: require('../assets/marks/jrw/n_g.webp'),
}, // 赤穂線
11704: { signPath: require('../assets/marks/jrw/b2_g.webp') }, // 因美線
11717: { signPath: require('../assets/marks/jrw/b3_g.webp') }, // 可部線
Expand Down
Loading