Skip to content

Commit 4d869d2

Browse files
Merge branch 'main' into fix/failed-remote-environment-removal
2 parents f1b5326 + a7f6d97 commit 4d869d2

79 files changed

Lines changed: 1462 additions & 139 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 1 addition & 1 deletion
Loading

‎apps/marketing/src/lib/site.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export const GITHUB_REPOSITORY_URL = "https://github.com/pingdotgg/t3code";
22

33
export const MARKETING_STATS = {
4-
githubStars: "12k+",
4+
githubStars: "14k+",
55
users: "100,000",
66
} as const;

‎apps/mobile/app.config.ts‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import type { ExpoConfig } from "expo/config";
22

3+
import { BRAND_ASSET_PATHS } from "../../scripts/lib/brand-assets.ts";
34
import { loadRepoEnv } from "../../scripts/lib/public-config.ts";
45

56
type AppVariant = "development" | "preview" | "production";
@@ -13,6 +14,8 @@ const isIosPersonalTeamBuild = repoEnv.T3CODE_IOS_PERSONAL_TEAM === "1";
1314
const personalTeamBundleIdentifier = repoEnv.T3CODE_IOS_PERSONAL_TEAM_BUNDLE_ID?.trim();
1415
const IOS_BUNDLE_IDENTIFIER_PATTERN = /^[A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)+$/;
1516

17+
const fromRepoRoot = (relativePath: string) => `../../${relativePath}`;
18+
1619
if (
1720
isIosPersonalTeamBuild &&
1821
(!personalTeamBundleIdentifier ||
@@ -24,20 +27,31 @@ if (
2427
}
2528

2629
const DEVELOPMENT_ASSETS = {
27-
appIcon: "./assets/splash-icon-dev.png",
28-
iosIcon: "./assets/icon-composer-dev.icon",
29-
splashIcon: "./assets/splash-icon-dev.png",
30-
androidAdaptiveForeground: "./assets/android-icon-dev-foreground.png",
30+
appIcon: fromRepoRoot(BRAND_ASSET_PATHS.developmentIosIconPng),
31+
iosIcon: fromRepoRoot(BRAND_ASSET_PATHS.developmentIconComposerProject),
32+
splashIcon: fromRepoRoot(BRAND_ASSET_PATHS.developmentIosIconPng),
33+
androidAdaptiveForeground: fromRepoRoot(BRAND_ASSET_PATHS.developmentUniversalIconPng),
3134
androidAdaptiveBackgroundColor: "#00639B",
3235
androidMonochromeIcon: "./assets/android-icon-mark.png",
3336
androidNotificationIcon: "./assets/android-notification-icon.png",
3437
androidNotificationColor: "#00639B",
3538
} as const;
3639

40+
const PREVIEW_ASSETS = {
41+
appIcon: fromRepoRoot(BRAND_ASSET_PATHS.nightlyIosIconPng),
42+
iosIcon: fromRepoRoot(BRAND_ASSET_PATHS.nightlyIconComposerProject),
43+
splashIcon: fromRepoRoot(BRAND_ASSET_PATHS.nightlyIosIconPng),
44+
androidAdaptiveForeground: fromRepoRoot(BRAND_ASSET_PATHS.nightlyLinuxIconPng),
45+
androidAdaptiveBackgroundColor: "#111533",
46+
androidMonochromeIcon: "./assets/android-icon-mark.png",
47+
androidNotificationIcon: "./assets/android-notification-icon.png",
48+
androidNotificationColor: "#7565C7",
49+
} as const;
50+
3751
const RELEASE_ASSETS = {
38-
appIcon: "./assets/splash-icon-prod.png",
39-
iosIcon: "./assets/icon-composer-prod.icon",
40-
splashIcon: "./assets/splash-icon-prod.png",
52+
appIcon: fromRepoRoot(BRAND_ASSET_PATHS.productionIosIconPng),
53+
iosIcon: fromRepoRoot(BRAND_ASSET_PATHS.productionIconComposerProject),
54+
splashIcon: fromRepoRoot(BRAND_ASSET_PATHS.productionIosIconPng),
4155
androidAdaptiveForeground: "./assets/android-icon-mark.png",
4256
androidAdaptiveBackgroundColor: "#000000",
4357
androidMonochromeIcon: "./assets/android-icon-mark.png",
@@ -60,7 +74,7 @@ const VARIANT_CONFIG = {
6074
iosBundleIdentifier: "com.t3tools.t3code.preview",
6175
androidPackage: "com.t3tools.t3code.preview",
6276
relyingParty: "clerk.t3.codes",
63-
assets: RELEASE_ASSETS,
77+
assets: PREVIEW_ASSETS,
6478
},
6579
production: {
6680
appName: "T3 Code",
-323 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.

‎apps/mobile/assets/icon-composer-prod.icon/Assets/T3.svg‎

Lines changed: 0 additions & 3 deletions
This file was deleted.
-2.04 MB
Binary file not shown.
-302 KB
Binary file not shown.

‎apps/mobile/src/components/BrandMark.tsx‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
1-
import { Image, View } from "react-native";
1+
import Constants from "expo-constants";
2+
import { Image } from "expo-image";
3+
import { View } from "react-native";
24

35
import { AppText as Text } from "./AppText";
46

5-
const BRAND_MARK_SOURCE = require("../../../../assets/dev/blueprint-ios-1024.png");
7+
const appVariant = Constants.expoConfig?.extra?.appVariant;
8+
const BRAND_MARK_SOURCE =
9+
appVariant === "development"
10+
? require("../../../../assets/dev/blueprint-ios-1024.png")
11+
: appVariant === "preview"
12+
? require("../../../../assets/nightly/nightly-ios-1024.png")
13+
: require("../../../../assets/prod/black-ios-1024.png");
14+
const DEFAULT_STAGE_LABEL =
15+
appVariant === "development" ? "Dev" : appVariant === "preview" ? "Preview" : "Alpha";
616

717
export function BrandMark(props: { readonly compact?: boolean; readonly stageLabel?: string }) {
818
const compact = props.compact ?? false;
919
const iconSize = compact ? 32 : 44;
10-
const stageLabel = props.stageLabel ?? "Alpha";
20+
const stageLabel = props.stageLabel ?? DEFAULT_STAGE_LABEL;
1121

1222
return (
1323
<View className="flex-row items-center gap-3">

0 commit comments

Comments
 (0)