Skip to content
Merged
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
1 change: 1 addition & 0 deletions .github/workflows/fork-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@ jobs:
echo "T3CODE_MOBILE_UPDATES_ENABLED=0"
echo "T3CODE_MOBILE_VERSION=$VERSION"
echo "T3CODE_ANDROID_ICON_BACKGROUND=./assets/android-icon-background-ember.png"
echo "T3CODE_ANDROID_SPLASH_ICON=./assets/android-splash-icon-ember.png"
echo "T3CODE_ANDROID_PACKAGE=$ANDROID_PACKAGE"
echo "T3CODE_APP_NAME=$APP_NAME"
} >> .env
Expand Down
2 changes: 1 addition & 1 deletion FORK.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ adds the feature, and remove it in the PR that drops the feature.
- #21 Open in VS Code and other SSH editor links use the host the client reached directly when
sshd is listening, instead of the server's first advertised host: `apps/web/src/remoteOpen.ts`,
`apps/server/src/environment/RemoteOpenTargets.ts` (`sshd`).
- #32 The Android APK is the fork's own app: an ember icon, plus the package name, app name, release
- #32 The Android APK is the fork's own app: an ember icon and splash screen, plus the package name, app name, release
keystore and Firebase config from repository variables and secrets when they are set:
`apps/mobile/app.config.ts` (`T3CODE_ANDROID_PACKAGE`), `.github/workflows/fork-release.yml`.
- #45 A server started with an FCM service account key is the push host: it sends the
Expand Down
10 changes: 6 additions & 4 deletions apps/mobile/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ const appName = repoEnv.T3CODE_APP_NAME?.trim() || variant.appName;
const androidPackage = repoEnv.T3CODE_ANDROID_PACKAGE?.trim() || variant.androidPackage;
const androidAdaptiveBackgroundImage =
repoEnv.T3CODE_ANDROID_ICON_BACKGROUND?.trim() || variant.assets.androidAdaptiveBackgroundImage;
const androidSplashIcon =
repoEnv.T3CODE_ANDROID_SPLASH_ICON?.trim() || variant.assets.androidSplashIcon;
if (!/^[A-Za-z][A-Za-z0-9_]*(?:\.[A-Za-z][A-Za-z0-9_]*)+$/.test(androidPackage)) {
throw new Error(
"T3CODE_ANDROID_PACKAGE must be an Android package name such as com.example.t3code.",
Expand Down Expand Up @@ -386,8 +388,8 @@ const config: ExpoConfig = {
shortcut_icon: {
foregroundImage: variant.assets.androidAdaptiveForeground,
backgroundColor: variant.assets.androidAdaptiveBackgroundColor,
...(variant.assets.androidAdaptiveBackgroundImage
? { backgroundImage: variant.assets.androidAdaptiveBackgroundImage }
...(androidAdaptiveBackgroundImage
? { backgroundImage: androidAdaptiveBackgroundImage }
: {}),
},
},
Expand Down Expand Up @@ -433,9 +435,9 @@ const config: ExpoConfig = {
},
android: {
// Android 12+ masks the central two thirds of the 288dp canvas; adaptive layers avoid clipped corners.
image: variant.assets.androidSplashIcon,
image: androidSplashIcon,
imageWidth: 288,
dark: { image: variant.assets.androidSplashIcon },
dark: { image: androidSplashIcon },
},
},
],
Expand Down
Binary file added apps/mobile/assets/android-splash-icon-ember.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading