Skip to content

Commit 14fa3bf

Browse files
TinyKittenTinyKitten
authored
Merge pull request #5353 from TrainLCD/dev
canary
2 parents e873e21 + dfaf395 commit 14fa3bf

File tree

5 files changed

+41
-34
lines changed

5 files changed

+41
-34
lines changed

‎android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,12 @@ android {
142142
dimension "environment"
143143
applicationId "me.tinykitten.trainlcd.dev"
144144
versionNameSuffix "-dev"
145-
versionCode 100000253
145+
versionCode 100000254
146146
versionName "10.1.0"
147147
}
148148
prod {
149149
dimension "environment"
150-
versionCode 100000253
150+
versionCode 100000254
151151
versionName "10.1.0"
152152
}
153153
}

‎app.config.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export default ({ config }: ConfigContext) => ({
4343
},
4444
},
4545
ios: {
46-
buildNumber: '2466',
46+
buildNumber: '2467',
4747
bundleIdentifier:
4848
process.env.EAS_BUILD_PROFILE === 'production'
4949
? 'me.tinykitten.trainlcd'
@@ -60,7 +60,7 @@ export default ({ config }: ConfigContext) => ({
6060
? 'me.tinykitten.trainlcd'
6161
: 'me.tinykitten.trainlcd.dev',
6262
permissions: [],
63-
versionCode: 100000253,
63+
versionCode: 100000254,
6464
},
6565
owner: 'trainlcd',
6666
});
@@ -83,4 +83,5 @@ export default ({ config }: ConfigContext) => ({
8383

8484

8585

86+
8687

‎ios/TrainLCD.xcodeproj/project.pbxproj‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2435,7 +2435,7 @@
24352435
CODE_SIGN_ENTITLEMENTS = ProdTrainLCD.entitlements;
24362436
CODE_SIGN_IDENTITY = "Apple Development";
24372437
CODE_SIGN_STYLE = Automatic;
2438-
CURRENT_PROJECT_VERSION = 2466;
2438+
CURRENT_PROJECT_VERSION = 2467;
24392439
DEAD_CODE_STRIPPING = YES;
24402440
DEVELOPMENT_TEAM = E6R2G33Z36;
24412441
INFOPLIST_FILE = TrainLCD/Schemes/Prod/Info.plist;
@@ -2474,7 +2474,7 @@
24742474
CODE_SIGN_ENTITLEMENTS = ProdTrainLCD.entitlements;
24752475
CODE_SIGN_IDENTITY = "Apple Development";
24762476
CODE_SIGN_STYLE = Automatic;
2477-
CURRENT_PROJECT_VERSION = 2466;
2477+
CURRENT_PROJECT_VERSION = 2467;
24782478
DEVELOPMENT_TEAM = E6R2G33Z36;
24792479
INFOPLIST_FILE = TrainLCD/Schemes/Prod/Info.plist;
24802480
INFOPLIST_KEY_CFBundleDisplayName = TrainLCD;
@@ -2533,7 +2533,7 @@
25332533
CODE_SIGN_ENTITLEMENTS = TrainLCD/trainlcd.entitlements;
25342534
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
25352535
COPY_PHASE_STRIP = NO;
2536-
CURRENT_PROJECT_VERSION = 2466;
2536+
CURRENT_PROJECT_VERSION = 2467;
25372537
CXX = "";
25382538
ENABLE_STRICT_OBJC_MSGSEND = YES;
25392539
ENABLE_TESTABILITY = YES;
@@ -2639,7 +2639,7 @@
26392639
CODE_SIGN_ENTITLEMENTS = TrainLCD/trainlcd.entitlements;
26402640
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
26412641
COPY_PHASE_STRIP = YES;
2642-
CURRENT_PROJECT_VERSION = 2466;
2642+
CURRENT_PROJECT_VERSION = 2467;
26432643
CXX = "";
26442644
ENABLE_NS_ASSERTIONS = NO;
26452645
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -2718,7 +2718,7 @@
27182718
CODE_SIGN_ENTITLEMENTS = CanaryTrainLCD.entitlements;
27192719
CODE_SIGN_IDENTITY = "Apple Development";
27202720
CODE_SIGN_STYLE = Automatic;
2721-
CURRENT_PROJECT_VERSION = 2466;
2721+
CURRENT_PROJECT_VERSION = 2467;
27222722
DEAD_CODE_STRIPPING = YES;
27232723
DEVELOPMENT_TEAM = E6R2G33Z36;
27242724
INFOPLIST_FILE = TrainLCD/Schemes/Dev/Info.plist;
@@ -2757,7 +2757,7 @@
27572757
CODE_SIGN_ENTITLEMENTS = CanaryTrainLCD.entitlements;
27582758
CODE_SIGN_IDENTITY = "Apple Development";
27592759
CODE_SIGN_STYLE = Automatic;
2760-
CURRENT_PROJECT_VERSION = 2466;
2760+
CURRENT_PROJECT_VERSION = 2467;
27612761
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
27622762
DEVELOPMENT_TEAM = E6R2G33Z36;
27632763
INFOPLIST_FILE = TrainLCD/Schemes/Dev/Info.plist;
@@ -2968,7 +2968,7 @@
29682968
CODE_SIGN_ENTITLEMENTS = RideSessionActivity/CanaryRideSessionActivity.entitlements;
29692969
CODE_SIGN_IDENTITY = "Apple Development";
29702970
CODE_SIGN_STYLE = Automatic;
2971-
CURRENT_PROJECT_VERSION = 2466;
2971+
CURRENT_PROJECT_VERSION = 2467;
29722972
DEBUG_INFORMATION_FORMAT = dwarf;
29732973
DEVELOPMENT_TEAM = E6R2G33Z36;
29742974
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -3019,7 +3019,7 @@
30193019
CODE_SIGN_IDENTITY = "Apple Development";
30203020
CODE_SIGN_STYLE = Automatic;
30213021
COPY_PHASE_STRIP = NO;
3022-
CURRENT_PROJECT_VERSION = 2466;
3022+
CURRENT_PROJECT_VERSION = 2467;
30233023
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
30243024
DEVELOPMENT_TEAM = E6R2G33Z36;
30253025
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -3070,7 +3070,7 @@
30703070
CODE_SIGN_ENTITLEMENTS = WatchWidget/ProdWatchWidget.entitlements;
30713071
CODE_SIGN_IDENTITY = "Apple Development";
30723072
CODE_SIGN_STYLE = Automatic;
3073-
CURRENT_PROJECT_VERSION = 2466;
3073+
CURRENT_PROJECT_VERSION = 2467;
30743074
DEBUG_INFORMATION_FORMAT = dwarf;
30753075
DEVELOPMENT_TEAM = E6R2G33Z36;
30763076
ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -3128,7 +3128,7 @@
31283128
CODE_SIGN_IDENTITY = "Apple Development";
31293129
CODE_SIGN_STYLE = Automatic;
31303130
COPY_PHASE_STRIP = NO;
3131-
CURRENT_PROJECT_VERSION = 2466;
3131+
CURRENT_PROJECT_VERSION = 2467;
31323132
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
31333133
DEVELOPMENT_TEAM = E6R2G33Z36;
31343134
ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -3179,7 +3179,7 @@
31793179
CODE_SIGN_ENTITLEMENTS = WatchWidget/CanaryWatchWidget.entitlements;
31803180
CODE_SIGN_IDENTITY = "Apple Development";
31813181
CODE_SIGN_STYLE = Automatic;
3182-
CURRENT_PROJECT_VERSION = 2466;
3182+
CURRENT_PROJECT_VERSION = 2467;
31833183
DEBUG_INFORMATION_FORMAT = dwarf;
31843184
DEVELOPMENT_TEAM = E6R2G33Z36;
31853185
ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -3236,7 +3236,7 @@
32363236
CODE_SIGN_IDENTITY = "Apple Development";
32373237
CODE_SIGN_STYLE = Automatic;
32383238
COPY_PHASE_STRIP = NO;
3239-
CURRENT_PROJECT_VERSION = 2466;
3239+
CURRENT_PROJECT_VERSION = 2467;
32403240
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
32413241
DEVELOPMENT_TEAM = E6R2G33Z36;
32423242
ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -3284,7 +3284,7 @@
32843284
CODE_SIGN_ENTITLEMENTS = RideSessionActivity/ProdRideSessionActivity.entitlements;
32853285
CODE_SIGN_IDENTITY = "Apple Development";
32863286
CODE_SIGN_STYLE = Automatic;
3287-
CURRENT_PROJECT_VERSION = 2466;
3287+
CURRENT_PROJECT_VERSION = 2467;
32883288
DEBUG_INFORMATION_FORMAT = dwarf;
32893289
DEVELOPMENT_TEAM = E6R2G33Z36;
32903290
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -3335,7 +3335,7 @@
33353335
CODE_SIGN_IDENTITY = "Apple Development";
33363336
CODE_SIGN_STYLE = Automatic;
33373337
COPY_PHASE_STRIP = NO;
3338-
CURRENT_PROJECT_VERSION = 2466;
3338+
CURRENT_PROJECT_VERSION = 2467;
33393339
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
33403340
DEVELOPMENT_TEAM = E6R2G33Z36;
33413341
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -3554,7 +3554,7 @@
35543554
CODE_SIGN_ENTITLEMENTS = ProdAppClip/ProdAppClip.entitlements;
35553555
CODE_SIGN_IDENTITY = "Apple Development";
35563556
CODE_SIGN_STYLE = Automatic;
3557-
CURRENT_PROJECT_VERSION = 2466;
3557+
CURRENT_PROJECT_VERSION = 2467;
35583558
DEBUG_INFORMATION_FORMAT = dwarf;
35593559
DEVELOPMENT_TEAM = E6R2G33Z36;
35603560
ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3610,7 +3610,7 @@
36103610
CODE_SIGN_IDENTITY = "Apple Development";
36113611
CODE_SIGN_STYLE = Automatic;
36123612
COPY_PHASE_STRIP = NO;
3613-
CURRENT_PROJECT_VERSION = 2466;
3613+
CURRENT_PROJECT_VERSION = 2467;
36143614
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
36153615
DEVELOPMENT_TEAM = E6R2G33Z36;
36163616
ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3660,7 +3660,7 @@
36603660
CODE_SIGN_ENTITLEMENTS = CanaryAppClip/CanaryAppClip.entitlements;
36613661
CODE_SIGN_IDENTITY = "Apple Development";
36623662
CODE_SIGN_STYLE = Automatic;
3663-
CURRENT_PROJECT_VERSION = 2466;
3663+
CURRENT_PROJECT_VERSION = 2467;
36643664
DEBUG_INFORMATION_FORMAT = dwarf;
36653665
DEVELOPMENT_TEAM = E6R2G33Z36;
36663666
ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3718,7 +3718,7 @@
37183718
CODE_SIGN_IDENTITY = "Apple Development";
37193719
CODE_SIGN_STYLE = Automatic;
37203720
COPY_PHASE_STRIP = NO;
3721-
CURRENT_PROJECT_VERSION = 2466;
3721+
CURRENT_PROJECT_VERSION = 2467;
37223722
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
37233723
DEVELOPMENT_TEAM = E6R2G33Z36;
37243724
ENABLE_USER_SCRIPT_SANDBOXING = NO;

‎src/components/PadArch.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ const computeColorSegments = (
103103
for (let i = 1; i <= stationColors.length; i++) {
104104
if (i === stationColors.length || stationColors[i] !== currentColor) {
105105
// アニメーションSVGはARC_SVG_Y_OFFSETだけ下にずれているため境界もずらす
106-
// 境界位置: 前の駅ドットと次の駅ドットの間を 0.65 の比率で按分（やや次の駅寄り）
107-
const BOUNDARY_RATIO = 0.65;
106+
// 境界位置: 前の駅ドットと次の駅ドットの間を 0.8 の比率で按分（やや次の駅寄り）
107+
const BOUNDARY_RATIO = 0.8;
108108
const yStart =
109109
segStartIdx === 0
110110
? -height

‎src/screens/SelectLineScreen.tsx‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -562,18 +562,10 @@ const SelectLineScreen = () => {
562562

563563
setIsSelectBoundModalOpen(true);
564564

565-
const result = await fetchStationsByLineId({
566-
variables: { lineId, stationId: lineStationId },
567-
});
568-
const fetchedStations = result.data?.lineStations ?? [];
569-
570-
const pendingStation =
571-
fetchedStations.find((s) => s.id === lineStationId) ?? null;
572-
573565
setStationState((prev) => ({
574566
...prev,
575-
pendingStation,
576-
pendingStations: fetchedStations,
567+
pendingStation: null,
568+
pendingStations: [],
577569
selectedDirection: null,
578570
wantedDestination: null,
579571
selectedBound: null,
@@ -589,6 +581,20 @@ const SelectLineScreen = () => {
589581
pendingTrainType: null,
590582
}));
591583

584+
const result = await fetchStationsByLineId({
585+
variables: { lineId, stationId: lineStationId },
586+
});
587+
const fetchedStations = result.data?.lineStations ?? [];
588+
589+
const pendingStation =
590+
fetchedStations.find((s) => s.id === lineStationId) ?? null;
591+
592+
setStationState((prev) => ({
593+
...prev,
594+
pendingStation,
595+
pendingStations: fetchedStations,
596+
}));
597+
592598
if (line.station?.hasTrainTypes) {
593599
const result = await fetchTrainTypes({
594600
variables: {

0 commit comments

Comments
 (0)