From fd3fc0267709469043dc4d134507660b4182a583 Mon Sep 17 00:00:00 2001 From: Tsubasa SEKIGUCHI Date: Sun, 28 Jun 2026 21:24:35 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B1=B1=E9=99=BD=E6=9C=AC=E7=B7=9A(?= =?UTF-8?q?=E5=A7=AB=E8=B7=AF=EF=BD=9E=E5=B2=A1=E5=B1=B1)=E3=83=BB?= =?UTF-8?q?=E8=B5=A4=E7=A9=82=E7=B7=9A=E3=81=AE=E8=B7=AF=E7=B7=9A=E8=A8=98?= =?UTF-8?q?=E5=8F=B7=E7=94=BB=E5=83=8F=E3=82=92=E4=BF=AE=E6=AD=A3=20(#6316?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 山陽本線(姫路～岡山)の路線記号画像をAに修正 Co-Authored-By: Claude Opus 4.6 * 赤穂線の路線記号画像の主副を入れ替え Co-Authored-By: Claude Opus 4.6 * 山陽本線(姫路～岡山)・赤穂線のグレースケール版路線記号画像も修正 Co-Authored-By: Claude Opus 4.6 --------- Co-authored-by: Claude Opus 4.6 --- src/lineSymbolImage.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lineSymbolImage.ts b/src/lineSymbolImage.ts index 43174684ab..ecd429232f 100644 --- a/src/lineSymbolImage.ts +++ b/src/lineSymbolImage.ts @@ -172,7 +172,7 @@ const LINE_SYMBOL_IMAGE_WITH_COLOR: Record = { 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'), @@ -221,8 +221,8 @@ const LINE_SYMBOL_IMAGE_WITH_COLOR: Record = { 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') }, // 可部線 @@ -504,7 +504,7 @@ const LINE_SYMBOL_IMAGE_GRAYSCALE: Record = { 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'), @@ -553,8 +553,8 @@ const LINE_SYMBOL_IMAGE_GRAYSCALE: Record = { 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') }, // 可部線 From d432f3ca7c7011da58f49c3a95db12547c941de8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 28 Jun 2026 21:26:36 +0900 Subject: [PATCH 2/2] Bump version for canary release (#6318) Co-authored-by: TinyKitten <32848922+TinyKitten@users.noreply.github.com> --- android/app/build.gradle | 4 +-- app.config.ts | 4 +-- ios/TrainLCD.xcodeproj/project.pbxproj | 36 +++++++++++++------------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index ff74f04e75..83e3085446 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -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" } } diff --git a/app.config.ts b/app.config.ts index 1c887bfd71..91706b6a96 100644 --- a/app.config.ts +++ b/app.config.ts @@ -52,7 +52,7 @@ export default { }, }, ios: { - buildNumber: '2720', + buildNumber: '2721', scheme: IS_DEV ? 'CanaryTrainLCD' : 'ProdTrainLCD', bundleIdentifier: IS_DEV ? 'me.tinykitten.trainlcd.dev' : 'me.tinykitten.trainlcd', supportsTablet: true, @@ -60,7 +60,7 @@ export default { android: { package: IS_DEV ? 'me.tinykitten.trainlcd.dev' : 'me.tinykitten.trainlcd', permissions: [], - versionCode: 100000507, + versionCode: 100000508, }, owner: 'trainlcd', experiments: { diff --git a/ios/TrainLCD.xcodeproj/project.pbxproj b/ios/TrainLCD.xcodeproj/project.pbxproj index 9d3f4f0d1c..3439c736fd 100644 --- a/ios/TrainLCD.xcodeproj/project.pbxproj +++ b/ios/TrainLCD.xcodeproj/project.pbxproj @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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;