Skip to content

Commit 6b29d47

Browse files
authored
Merge branch 'main' into fix/7117-dock-icon-packaged
2 parents a6ded7e + bab4b6f commit 6b29d47

106 files changed

Lines changed: 3176 additions & 1842 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.

‎.github/workflows/mobile-showcase-screenshots.yml‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,19 @@ on:
2121
- both
2222
- dark
2323
- light
24+
theme:
25+
description: Palette to capture (all multiplies the run by six)
26+
required: true
27+
default: t3-code
28+
type: choice
29+
options:
30+
- t3-code
31+
- t3-chat
32+
- grove
33+
- ocean
34+
- ember
35+
- iris
36+
- all
2437

2538
permissions:
2639
contents: read
@@ -33,7 +46,9 @@ jobs:
3346
name: iPhone 6.9, iPhone 6.5, and iPad 13
3447
if: inputs.platform == 'all' || inputs.platform == 'ios'
3548
runs-on: blacksmith-12vcpu-macos-26
36-
timeout-minutes: 60
49+
# Capturing every palette multiplies the device matrix by six, and only the
50+
# one native build is shared between them.
51+
timeout-minutes: ${{ inputs.theme == 'all' && 300 || 60 }}
3752
steps:
3853
- name: Checkout
3954
uses: actions/checkout@v6
@@ -62,10 +77,10 @@ jobs:
6277
"$vp_pnpm_bin/pnpm" --version
6378
6479
- name: Capture iOS showcase
65-
run: pnpm screenshots:mobile --platform ios --appearance "${{ inputs.appearance }}"
80+
run: pnpm screenshots:mobile --platform ios --appearance "${{ inputs.appearance }}" --theme "${{ inputs.theme }}"
6681

6782
- name: Validate App Store Connect assets
68-
run: pnpm screenshots:mobile --platform ios --appearance "${{ inputs.appearance }}" --validate-only
83+
run: pnpm screenshots:mobile --platform ios --appearance "${{ inputs.appearance }}" --theme "${{ inputs.theme }}" --validate-only
6984

7085
- name: Upload iOS screenshots
7186
if: always()
@@ -80,7 +95,9 @@ jobs:
8095
name: Android phone, 7-inch tablet, and 10-inch tablet
8196
if: inputs.platform == 'all' || inputs.platform == 'android'
8297
runs-on: blacksmith-16vcpu-ubuntu-2404
83-
timeout-minutes: 60
98+
# Capturing every palette multiplies the device matrix by six, and only the
99+
# one native build is shared between them.
100+
timeout-minutes: ${{ inputs.theme == 'all' && 300 || 60 }}
84101
env:
85102
T3_SHOWCASE_ANDROID_ABI: x86_64
86103
steps:
@@ -137,10 +154,10 @@ jobs:
137154
cores: 8
138155
ram-size: 4096M
139156
disable-animations: false
140-
script: pnpm screenshots:mobile --platform android --appearance "${{ inputs.appearance }}"
157+
script: pnpm screenshots:mobile --platform android --appearance "${{ inputs.appearance }}" --theme "${{ inputs.theme }}"
141158

142159
- name: Validate Google Play assets
143-
run: pnpm screenshots:mobile --platform android --appearance "${{ inputs.appearance }}" --validate-only
160+
run: pnpm screenshots:mobile --platform android --appearance "${{ inputs.appearance }}" --theme "${{ inputs.theme }}" --validate-only
144161

145162
- name: Upload Android screenshots
146163
if: always()

‎CLAUDE.md‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎CLAUDE.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@AGENTS.md

‎apps/desktop/src/backend/tailscaleEndpointProvider.test.ts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { HttpClient } from "effect/unstable/http";
55
import { ChildProcessSpawner } from "effect/unstable/process";
66

77
import {
8-
isTailscaleIpv4Address,
98
parseTailscaleMagicDnsName,
109
resolveTailscaleAdvertisedEndpoints,
1110
} from "./tailscaleEndpointProvider.ts";
@@ -22,13 +21,6 @@ const unusedTailscaleExternalServicesLayer = Layer.mergeAll(
2221
);
2322

2423
describe("tailscale endpoint provider", () => {
25-
it("detects Tailnet IPv4 addresses", () => {
26-
assert.equal(isTailscaleIpv4Address("100.64.0.1"), true);
27-
assert.equal(isTailscaleIpv4Address("100.127.255.254"), true);
28-
assert.equal(isTailscaleIpv4Address("100.128.0.1"), false);
29-
assert.equal(isTailscaleIpv4Address("192.168.1.44"), false);
30-
});
31-
3224
it.effect("parses MagicDNS names from tailscale status", () =>
3325
Effect.gen(function* () {
3426
const dnsName = yield* parseTailscaleMagicDnsName(

‎apps/desktop/src/preview/PickPreload.test.ts‎

Lines changed: 0 additions & 86 deletions
This file was deleted.

‎apps/mobile/global.css‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/* Page backgrounds */
1313
--color-screen: #f2f2f7;
1414
--color-sheet: rgba(242, 242, 247, 0.98);
15+
--color-sheet-solid: #f2f2f7;
1516

1617
/* Card / surface */
1718
--color-card: #ffffff;
@@ -39,13 +40,16 @@
3940
/* Primary action */
4041
--color-primary: #262626;
4142
--color-primary-foreground: #ffffff;
42-
--color-primary-shadow: rgba(0, 0, 0, 0.18);
43+
--color-primary-shadow: #000000;
4344

4445
/* Secondary action */
4546
--color-secondary: #ffffff;
4647
--color-secondary-foreground: #262626;
4748
--color-secondary-border: rgba(0, 0, 0, 0.08);
48-
--color-switch-active: #34c759;
49+
--color-switch-active-track: #34c759;
50+
--color-switch-active-thumb: #ffffff;
51+
--color-switch-inactive-track: rgba(0, 0, 0, 0.08);
52+
--color-switch-inactive-thumb: #8e8e93;
4953

5054
/* Danger */
5155
--color-danger: #fef2f2;
@@ -56,7 +60,7 @@
5660
--color-input: #ffffff;
5761
--color-input-border: rgba(0, 0, 0, 0.1);
5862
--color-sidebar-search: rgba(118, 118, 128, 0.12);
59-
--color-placeholder: #a3a3a3;
63+
--color-placeholder: #737373;
6064

6165
/* Icons */
6266
--color-icon: #262626;
@@ -90,6 +94,7 @@
9094
--color-user-bubble: #007aff;
9195
--color-user-bubble-foreground: #ffffff;
9296
--color-user-bubble-foreground-muted: rgba(255, 255, 255, 0.78);
97+
--color-user-bubble-skill-foreground: #f0abfc;
9398

9499
/* Drawer / modal backdrop */
95100
--color-backdrop: rgba(0, 0, 0, 0.22);
@@ -106,6 +111,7 @@
106111
/* Page backgrounds */
107112
--color-screen: #0a0a0a;
108113
--color-sheet: rgba(14, 14, 14, 0.98);
114+
--color-sheet-solid: #0e0e0e;
109115

110116
/* Card / surface */
111117
--color-card: #171717;
@@ -133,13 +139,16 @@
133139
/* Primary action */
134140
--color-primary: #f5f5f5;
135141
--color-primary-foreground: #0a0a0a;
136-
--color-primary-shadow: rgba(0, 0, 0, 0.22);
142+
--color-primary-shadow: #000000;
137143

138144
/* Secondary action */
139145
--color-secondary: rgba(255, 255, 255, 0.04);
140146
--color-secondary-foreground: #f5f5f5;
141147
--color-secondary-border: rgba(255, 255, 255, 0.06);
142-
--color-switch-active: #30d158;
148+
--color-switch-active-track: #30d158;
149+
--color-switch-active-thumb: #ffffff;
150+
--color-switch-inactive-track: rgba(255, 255, 255, 0.06);
151+
--color-switch-inactive-thumb: #8e8e93;
143152

144153
/* Danger */
145154
--color-danger: rgba(239, 68, 68, 0.14);
@@ -184,6 +193,7 @@
184193
--color-user-bubble: #0a84ff;
185194
--color-user-bubble-foreground: #ffffff;
186195
--color-user-bubble-foreground-muted: rgba(255, 255, 255, 0.78);
196+
--color-user-bubble-skill-foreground: #f0abfc;
187197

188198
/* Drawer / modal backdrop */
189199
--color-backdrop: rgba(0, 0, 0, 0.48);

‎apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3NativeControlsModule.kt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ class T3NativeControlsModule : Module() {
2222
storedScene ?: appContext.currentActivity?.intent?.getStringExtra("showcaseScene")
2323
}
2424

25+
// The palette is fixed for the whole capture, so it only ever arrives as a
26+
// launch extra — unlike the scene, which the runner rewrites in place.
27+
Function("getShowcaseTheme") {
28+
appContext.currentActivity?.intent?.getStringExtra("showcaseTheme")
29+
}
30+
2531
Function("prepareShowcaseCapture") {
2632
// Android app data is cleared by the host runner before launch.
2733
}

‎apps/mobile/modules/t3-native-controls/ios/T3NativeControlsModule.swift‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,19 @@ public final class T3NativeControlsModule: Module {
3333
return arguments[flagIndex + 1]
3434
}
3535

36+
// The palette is fixed for the whole capture, so it only ever arrives as a
37+
// launch argument — unlike the scene, which the runner rewrites in place.
38+
Function("getShowcaseTheme") { () -> String? in
39+
let arguments = ProcessInfo.processInfo.arguments
40+
guard
41+
let flagIndex = arguments.firstIndex(of: "--showcaseTheme"),
42+
arguments.indices.contains(flagIndex + 1)
43+
else {
44+
return nil as String?
45+
}
46+
return arguments[flagIndex + 1]
47+
}
48+
3649
Function("getShowcaseOrientation") { () -> String? in
3750
let arguments = ProcessInfo.processInfo.arguments
3851
guard

0 commit comments

Comments
 (0)