Skip to content

canary #6443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TinyKitten merged 6 commits into from
Jul 17, 2026
Merged

canary #6443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
726aec8
v10.10.0 をリリース
claude Jul 16, 2026
d3c96ec
Merge pull request #6431 from TrainLCD/release/v10.10.0
TinyKitten Jul 16, 2026
a8f0be7
origin/dev をマージし版数競合を解決（semver=10.10.0、ビルド番号=2751/100000538）
TinyKitten Jul 16, 2026
d7f8944
Merge pull request #6438 from TrainLCD/chore/dev-from-master
TinyKitten Jul 16, 2026
b1ccbae
ETA数字を拡大しPadArchに単位ラベルを追加、AndroidのTLC文字縦位置を補正 (#6442)
TinyKitten Jul 17, 2026
ba44bf8
Bump version for canary release (#6444)
github-actions[bot] Jul 17, 2026
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
8 changes: 4 additions & 4 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,13 @@ android {
dimension "environment"
applicationId "me.tinykitten.trainlcd.dev"
versionNameSuffix "-dev"
versionCode 100000538
versionName "10.9.1"
versionCode 100000539
versionName "10.10.0"
}
prod {
dimension "environment"
versionCode 100000538
versionName "10.9.1"
versionCode 100000539
versionName "10.10.0"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions app.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const IS_DEV = process.env.APP_VARIANT === 'dev';
export default {
name: 'TrainLCD',
slug: 'trainlcd',
version: '10.9.1',
version: '10.10.0',
plugins: [
'expo-image',
'expo-font',
Expand Down Expand Up @@ -52,15 +52,15 @@ export default {
},
},
ios: {
buildNumber: '2751',
buildNumber: '2752',
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: 100000538,
versionCode: 100000539,
},
owner: 'trainlcd',
experiments: {
Expand Down
44 changes: 22 additions & 22 deletions ios/TrainLCD.xcodeproj/project.pbxproj
View file
Open in desktop
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 = 2751;
CURRENT_PROJECT_VERSION = 2752;
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 = 2751;
CURRENT_PROJECT_VERSION = 2752;
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 = 2751;
CURRENT_PROJECT_VERSION = 2752;
CXX = "$(REACT_NATIVE_PATH)/scripts/xcode/ccache-clang++.sh";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
Expand Down Expand Up @@ -2561,7 +2561,7 @@
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
"\"$(inherited)\"",
);
MARKETING_VERSION = 10.9.1;
MARKETING_VERSION = 10.10.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "$(inherited)";
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 = 2751;
CURRENT_PROJECT_VERSION = 2752;
CXX = "$(REACT_NATIVE_PATH)/scripts/xcode/ccache-clang++.sh";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand Down Expand Up @@ -2663,7 +2663,7 @@
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
"\"$(inherited)\"",
);
MARKETING_VERSION = 10.9.1;
MARKETING_VERSION = 10.10.0;
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CFLAGS = "$(inherited)";
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
Expand All @@ -2690,7 +2690,7 @@
CODE_SIGN_ENTITLEMENTS = CanaryTrainLCD.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2751;
CURRENT_PROJECT_VERSION = 2752;
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 = 2751;
CURRENT_PROJECT_VERSION = 2752;
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 = 2751;
CURRENT_PROJECT_VERSION = 2752;
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 = 2751;
CURRENT_PROJECT_VERSION = 2752;
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 = 2751;
CURRENT_PROJECT_VERSION = 2752;
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 = 2751;
CURRENT_PROJECT_VERSION = 2752;
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 = 2751;
CURRENT_PROJECT_VERSION = 2752;
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 = 2751;
CURRENT_PROJECT_VERSION = 2752;
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 = 2751;
CURRENT_PROJECT_VERSION = 2752;
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 = 2751;
CURRENT_PROJECT_VERSION = 2752;
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 = 2751;
CURRENT_PROJECT_VERSION = 2752;
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 = 2751;
CURRENT_PROJECT_VERSION = 2752;
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 = 2751;
CURRENT_PROJECT_VERSION = 2752;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = E6R2G33Z36;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
Expand All @@ -3656,7 +3656,7 @@
"@executable_path/Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 10.9.1;
MARKETING_VERSION = 10.10.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
Expand Down Expand Up @@ -3690,7 +3690,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2751;
CURRENT_PROJECT_VERSION = 2752;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = E6R2G33Z36;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
Expand All @@ -3710,7 +3710,7 @@
"@executable_path/Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 10.9.1;
MARKETING_VERSION = 10.10.0;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PODS_ROOT = "${SRCROOT}/Pods";
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,5 +167,5 @@
}
},
"name": "trainlcd",
"version": "10.9.1"
"version": "10.10.0"
}
27 changes: 24 additions & 3 deletions src/components/LineBoardJO.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ const LEGACY_DOT_SIZE = 32;
const DOT_SIZE_JO = BAR_HEIGHT_JO - 8;
// 終端矢印が画面右端から離れすぎないよう、最終セグメントを右へ延長する
const BAR_TAIL_EXTENSION_JO = isTablet ? 24 : 14;
// ETA数字はドット幅を超えるサイズで表示するため、ドット中心に重ねる
// 絶対配置コンテナの寸法。width未指定の絶対配置子は親(ドット)幅上限で
// 測られて数字が折り返されるため、明示widthが必須
const ESTIMATED_MINUTES_BADGE_WIDTH = isTablet ? 96 : 64;
const ESTIMATED_MINUTES_BADGE_HEIGHT = isTablet ? 40 : 30;

// Local style overrides specific to JO
const localStyles = StyleSheet.create({
Expand All @@ -71,6 +76,19 @@ const localStyles = StyleSheet.create({
height: DOT_SIZE_JO,
justifyContent: 'center',
},
estimatedMinutesBadgeContainer: {
position: 'absolute',
left: (DOT_SIZE_JO - ESTIMATED_MINUTES_BADGE_WIDTH) / 2,
top: (DOT_SIZE_JO - ESTIMATED_MINUTES_BADGE_HEIGHT) / 2,
width: ESTIMATED_MINUTES_BADGE_WIDTH,
height: ESTIMATED_MINUTES_BADGE_HEIGHT,
justifyContent: 'center',
alignItems: 'center',
},
estimatedMinutesText: {
fontSize: isTablet ? 38 : 24,
lineHeight: isTablet ? 40 : 26,
},
});

const styles = { ...commonLineBoardStyles, ...localStyles };
Expand Down Expand Up @@ -416,13 +434,16 @@ const LineBoardJO: React.FC<Props> = ({ stations, lineColors }: Props) => {
bottom: getBottom(i),
width: dotSize,
height: dotSize,
justifyContent: 'center',
alignItems: 'center',
},
]}
>
{estimatedMinutes != null ? (
<EstimatedMinutesBadge estimatedMinutes={estimatedMinutes} />
<View style={localStyles.estimatedMinutesBadgeContainer}>
<EstimatedMinutesBadge
estimatedMinutes={estimatedMinutes}
style={localStyles.estimatedMinutesText}
/>
</View>
) : null}
{i === stations.length - 1 && estimatedMinutes != null ? (
<View
Expand Down
8 changes: 8 additions & 0 deletions src/components/NumberingIconSquare.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,14 @@ const styles = StyleSheet.create({
lineHeight: isTablet
? Math.round(24 * 1.5 * TLC_SCALE)
: Math.round(24 * TLC_SCALE),
// Androidはグリフが行ボックス下寄りに描画されTLCが下がって見えるため
// 上方向に補正して上下中央に揃える(iOSは補正不要)。
// 負マージンだと下のアイコンごと動いてバッジ全体が縮むため、
// レイアウトに影響しないtransformで文字だけを持ち上げる
transform:
Platform.OS === 'android'
? [{ translateY: Math.round(-6 * TLC_SCALE) }]
: [],
},
tlcIconRoot: {
width: isTablet
Expand Down
Loading
Loading