Skip to content

Commit 0aa1b0e

Browse files
Merge branch 'main' into feature/browser-import-zen
2 parents c61db9e + 12391bd commit 0aa1b0e

41 files changed

Lines changed: 1123 additions & 210 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/mobile/generated-uniwind-default-theme-variables.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@
66
"--color-card": "#ffffff",
77
"--color-card-alt": "#f5f5f5",
88
"--color-card-translucent": "rgba(255, 255, 255, 0.8)",
9+
"--color-thread-canvas": "#f5f5f5",
10+
"--color-thread-selected": "#ffffff",
11+
"--color-thread-selected-foreground": "#262626",
12+
"--color-thread-selected-foreground-muted": "#737373",
13+
"--color-composer-panel": "rgba(245, 245, 245, 0.88)",
14+
"--color-composer-surface": "rgba(255, 255, 255, 0.94)",
15+
"--color-composer-border": "rgba(0, 0, 0, 0.1)",
916
"--color-foreground": "#262626",
1017
"--color-foreground-secondary": "#525252",
1118
"--color-foreground-muted": "#737373",
@@ -76,6 +83,13 @@
7683
"--color-card": "#171717",
7784
"--color-card-alt": "#1c1c1c",
7885
"--color-card-translucent": "rgba(17, 17, 17, 0.8)",
86+
"--color-thread-canvas": "#1c1c1c",
87+
"--color-thread-selected": "#171717",
88+
"--color-thread-selected-foreground": "#f5f5f5",
89+
"--color-thread-selected-foreground-muted": "#8e8e93",
90+
"--color-composer-panel": "rgba(28, 28, 28, 0.92)",
91+
"--color-composer-surface": "rgba(23, 23, 23, 0.9)",
92+
"--color-composer-border": "rgba(255, 255, 255, 0.08)",
7993
"--color-foreground": "#f5f5f5",
8094
"--color-foreground-secondary": "#a3a3a3",
8195
"--color-foreground-muted": "#8e8e93",

‎apps/mobile/generated-uniwind-themes.css‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,13 @@
128128
--color-card: #fdfafd;
129129
--color-card-alt: #faf3fb;
130130
--color-card-translucent: rgba(253, 250, 253, 0.8);
131+
--color-thread-canvas: #faf3fb;
132+
--color-thread-selected: #fdfafd;
133+
--color-thread-selected-foreground: #501854;
134+
--color-thread-selected-foreground-muted: #ac1668;
135+
--color-composer-panel: rgba(250, 243, 251, 0.88);
136+
--color-composer-surface: rgba(253, 250, 253, 0.94);
137+
--color-composer-border: rgba(238, 225, 237, 0.54);
131138
--color-foreground: #501854;
132139
--color-foreground-secondary: #ac1668;
133140
--color-foreground-muted: #8d1255;
@@ -256,6 +263,13 @@
256263
--color-card: #2c2631;
257264
--color-card-alt: #29232d;
258265
--color-card-translucent: rgba(44, 38, 49, 0.8);
266+
--color-thread-canvas: #29232d;
267+
--color-thread-selected: #2c2631;
268+
--color-thread-selected-foreground: #f9f8fb;
269+
--color-thread-selected-foreground-muted: #e7d0dd;
270+
--color-composer-panel: rgba(41, 35, 45, 0.92);
271+
--color-composer-surface: rgba(44, 38, 49, 0.9);
272+
--color-composer-border: rgba(39, 36, 44, 0.46);
259273
--color-foreground: #f9f8fb;
260274
--color-foreground-secondary: #e7d0dd;
261275
--color-foreground-muted: #e7d0dd;
@@ -384,6 +398,13 @@
384398
--color-card: #ecefed;
385399
--color-card-alt: #f3f7f4;
386400
--color-card-translucent: rgba(236, 239, 237, 0.8);
401+
--color-thread-canvas: #f3f7f4;
402+
--color-thread-selected: #ecefed;
403+
--color-thread-selected-foreground: #241523;
404+
--color-thread-selected-foreground-muted: #746c73;
405+
--color-composer-panel: rgba(243, 247, 244, 0.88);
406+
--color-composer-surface: rgba(236, 239, 237, 0.94);
407+
--color-composer-border: rgba(203, 213, 209, 0.54);
387408
--color-foreground: #241523;
388409
--color-foreground-secondary: #746c73;
389410
--color-foreground-muted: #6e696f;
@@ -512,6 +533,13 @@
512533
--color-card: #36413c;
513534
--color-card-alt: #1b2821;
514535
--color-card-translucent: rgba(54, 65, 60, 0.8);
536+
--color-thread-canvas: #1b2821;
537+
--color-thread-selected: #36413c;
538+
--color-thread-selected-foreground: #fffaff;
539+
--color-thread-selected-foreground-muted: #919595;
540+
--color-composer-panel: rgba(27, 40, 33, 0.92);
541+
--color-composer-surface: rgba(54, 65, 60, 0.9);
542+
--color-composer-border: rgba(65, 95, 79, 0.46);
515543
--color-foreground: #fffaff;
516544
--color-foreground-secondary: #919595;
517545
--color-foreground-muted: #9da5a2;
@@ -640,6 +668,13 @@
640668
--color-card: #edeff1;
641669
--color-card-alt: #f5f7f8;
642670
--color-card-translucent: rgba(237, 239, 241, 0.8);
671+
--color-thread-canvas: #f5f7f8;
672+
--color-thread-selected: #edeff1;
673+
--color-thread-selected-foreground: #241523;
674+
--color-thread-selected-foreground-muted: #746c75;
675+
--color-composer-panel: rgba(245, 247, 248, 0.88);
676+
--color-composer-surface: rgba(237, 239, 241, 0.94);
677+
--color-composer-border: rgba(205, 212, 220, 0.54);
643678
--color-foreground: #241523;
644679
--color-foreground-secondary: #746c75;
645680
--color-foreground-muted: #6f6873;
@@ -768,6 +803,13 @@
768803
--color-card: #333b45;
769804
--color-card-alt: #17212b;
770805
--color-card-translucent: rgba(51, 59, 69, 0.8);
806+
--color-thread-canvas: #17212b;
807+
--color-thread-selected: #333b45;
808+
--color-thread-selected-foreground: #fffaff;
809+
--color-thread-selected-foreground-muted: #8d8f97;
810+
--color-composer-panel: rgba(23, 33, 43, 0.92);
811+
--color-composer-surface: rgba(51, 59, 69, 0.9);
812+
--color-composer-border: rgba(64, 85, 103, 0.46);
771813
--color-foreground: #fffaff;
772814
--color-foreground-secondary: #8d8f97;
773815
--color-foreground-muted: #969ca6;
@@ -896,6 +938,13 @@
896938
--color-card: #f1efee;
897939
--color-card-alt: #f9f7f5;
898940
--color-card-translucent: rgba(241, 239, 238, 0.8);
941+
--color-thread-canvas: #f9f7f5;
942+
--color-thread-selected: #f1efee;
943+
--color-thread-selected-foreground: #241523;
944+
--color-thread-selected-foreground-muted: #766c74;
945+
--color-composer-panel: rgba(249, 247, 245, 0.88);
946+
--color-composer-surface: rgba(241, 239, 238, 0.94);
947+
--color-composer-border: rgba(221, 210, 206, 0.54);
899948
--color-foreground: #241523;
900949
--color-foreground-secondary: #766c74;
901950
--color-foreground-muted: #74686f;
@@ -1024,6 +1073,13 @@
10241073
--color-card: #433835;
10251074
--color-card-alt: #291e1a;
10261075
--color-card-translucent: rgba(67, 56, 53, 0.8);
1076+
--color-thread-canvas: #291e1a;
1077+
--color-thread-selected: #433835;
1078+
--color-thread-selected-foreground: #fffaff;
1079+
--color-thread-selected-foreground-muted: #968e8f;
1080+
--color-composer-panel: rgba(41, 30, 26, 0.92);
1081+
--color-composer-surface: rgba(67, 56, 53, 0.9);
1082+
--color-composer-border: rgba(102, 76, 63, 0.46);
10271083
--color-foreground: #fffaff;
10281084
--color-foreground-secondary: #968e8f;
10291085
--color-foreground-muted: #a59996;
@@ -1152,6 +1208,13 @@
11521208
--color-card: #f0eff2;
11531209
--color-card-alt: #f8f7f9;
11541210
--color-card-translucent: rgba(240, 239, 242, 0.8);
1211+
--color-thread-canvas: #f8f7f9;
1212+
--color-thread-selected: #f0eff2;
1213+
--color-thread-selected-foreground: #241523;
1214+
--color-thread-selected-foreground-muted: #766c76;
1215+
--color-composer-panel: rgba(248, 247, 249, 0.88);
1216+
--color-composer-surface: rgba(240, 239, 242, 0.94);
1217+
--color-composer-border: rgba(214, 209, 222, 0.54);
11551218
--color-foreground: #241523;
11561219
--color-foreground-secondary: #766c76;
11571220
--color-foreground-muted: #726874;
@@ -1280,6 +1343,13 @@
12801343
--color-card: #383443;
12811344
--color-card-alt: #1d1929;
12821345
--color-card-translucent: rgba(56, 52, 67, 0.8);
1346+
--color-thread-canvas: #1d1929;
1347+
--color-thread-selected: #383443;
1348+
--color-thread-selected-foreground: #fffaff;
1349+
--color-thread-selected-foreground-muted: #8e8a95;
1350+
--color-composer-panel: rgba(29, 25, 41, 0.92);
1351+
--color-composer-surface: rgba(56, 52, 67, 0.9);
1352+
--color-composer-border: rgba(77, 67, 102, 0.46);
12831353
--color-foreground: #fffaff;
12841354
--color-foreground-secondary: #8e8a95;
12851355
--color-foreground-muted: #9690a1;

‎apps/mobile/global.css‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@
1919
--color-card: #ffffff;
2020
--color-card-alt: #f5f5f5;
2121
--color-card-translucent: rgba(255, 255, 255, 0.8);
22+
--color-thread-canvas: #f5f5f5;
23+
--color-thread-selected: #ffffff;
24+
--color-thread-selected-foreground: #262626;
25+
--color-thread-selected-foreground-muted: #737373;
26+
--color-composer-panel: rgba(245, 245, 245, 0.88);
27+
--color-composer-surface: rgba(255, 255, 255, 0.94);
28+
--color-composer-border: rgba(0, 0, 0, 0.1);
2229

2330
/* Text */
2431
--color-foreground: #262626;
@@ -123,6 +130,13 @@
123130
--color-card: #171717;
124131
--color-card-alt: #1c1c1c;
125132
--color-card-translucent: rgba(17, 17, 17, 0.8);
133+
--color-thread-canvas: #1c1c1c;
134+
--color-thread-selected: #171717;
135+
--color-thread-selected-foreground: #f5f5f5;
136+
--color-thread-selected-foreground-muted: #8e8e93;
137+
--color-composer-panel: rgba(28, 28, 28, 0.92);
138+
--color-composer-surface: rgba(23, 23, 23, 0.9);
139+
--color-composer-border: rgba(255, 255, 255, 0.08);
126140

127141
/* Text */
128142
--color-foreground: #f5f5f5;

‎apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt‎

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ import android.graphics.Canvas
77
import android.graphics.Paint
88
import android.graphics.RectF
99
import android.graphics.Typeface
10+
import android.os.Build
1011
import android.text.Editable
1112
import android.text.InputType
1213
import android.text.Spanned
1314
import android.text.TextWatcher
1415
import android.text.style.ReplacementSpan
16+
import android.util.TypedValue
1517
import android.view.Gravity
1618
import android.view.ViewGroup
1719
import android.view.inputmethod.InputMethodManager
@@ -27,6 +29,11 @@ class T3ComposerEditorView(context: Context, appContext: AppContext) : ExpoView(
2729
appContext
2830
) {
2931
private val editor = SelectionAwareEditText(context)
32+
private val defaultHighlightColor = editor.highlightColor
33+
private val defaultSelectionColor = context.resolveThemeColor(
34+
android.R.attr.colorAccent,
35+
editor.currentTextColor,
36+
)
3037
private val onComposerChange by EventDispatcher()
3138
private val onComposerSelectionChange by EventDispatcher()
3239
private val onComposerFocus by EventDispatcher()
@@ -152,6 +159,11 @@ class T3ComposerEditorView(context: Context, appContext: AppContext) : ExpoView(
152159
val theme = JSONObject(themeJson)
153160
editor.setTextColor(parseColor(theme.optString("text"), Color.BLACK))
154161
editor.setHintTextColor(parseColor(theme.optString("placeholder"), Color.GRAY))
162+
if (theme.isNull("selection")) {
163+
resetSelectionTheme()
164+
} else {
165+
applySelectionTheme(parseColor(theme.optString("selection"), editor.currentTextColor))
166+
}
155167
chipTheme = ComposerChipTheme(
156168
chipBackground = parseColor(theme.optString("chipBackground"), chipTheme.chipBackground),
157169
chipBorder = parseColor(theme.optString("chipBorder"), chipTheme.chipBorder),
@@ -277,6 +289,21 @@ class T3ComposerEditorView(context: Context, appContext: AppContext) : ExpoView(
277289
editor.setLineSpacing(max(0, desiredLineHeightPx - fontHeight).toFloat(), 1f)
278290
}
279291

292+
private fun applySelectionTheme(color: Int) {
293+
editor.highlightColor = color.withAlpha(0x52)
294+
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) return
295+
296+
editor.textCursorDrawable = editor.textCursorDrawable?.mutate()?.apply { setTint(color) }
297+
editor.textSelectHandle?.mutate()?.setTint(color)
298+
editor.textSelectHandleLeft?.mutate()?.setTint(color)
299+
editor.textSelectHandleRight?.mutate()?.setTint(color)
300+
}
301+
302+
private fun resetSelectionTheme() {
303+
applySelectionTheme(defaultSelectionColor)
304+
editor.highlightColor = defaultHighlightColor
305+
}
306+
280307
private fun currentSelectionPayload(): Map<String, Int> =
281308
mapOf(
282309
"start" to editor.selectionStart.coerceAtLeast(0),
@@ -335,12 +362,24 @@ class T3ComposerEditorView(context: Context, appContext: AppContext) : ExpoView(
335362

336363
private fun parseColor(value: String, fallback: Int): Int =
337364
try {
338-
Color.parseColor(value)
365+
val androidColor = if (value.length == 9 && value.startsWith("#")) {
366+
"#${value.takeLast(2)}${value.substring(1, 7)}"
367+
} else {
368+
value
369+
}
370+
Color.parseColor(androidColor)
339371
} catch (_: Exception) {
340372
fallback
341373
}
342374
}
343375

376+
private fun Int.withAlpha(alpha: Int): Int = (this and 0x00FFFFFF) or (alpha shl 24)
377+
378+
private fun Context.resolveThemeColor(attribute: Int, fallback: Int): Int {
379+
val value = TypedValue()
380+
return if (theme.resolveAttribute(attribute, value, true)) value.data else fallback
381+
}
382+
344383
private data class ComposerToken(
345384
val type: String,
346385
val source: String,

‎apps/mobile/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
"@expo/metro-runtime": "~57.0.14",
5252
"@expo/ui": "~57.0.14",
5353
"@legendapp/list": "catalog:",
54+
"@material/material-color-utilities": "0.3.0",
5455
"@noble/curves": "catalog:",
5556
"@pierre/diffs": "catalog:",
5657
"@react-native-ai/apple": "0.12.0",

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ export function AndroidScreenHeader(props: {
4848
readonly trailing?: ReactNode;
4949
readonly onBack?: () => void;
5050
readonly embedded?: boolean;
51+
readonly hideBottomBorder?: boolean;
5152
}) {
5253
const insets = useSafeAreaInsets();
5354

@@ -56,6 +57,7 @@ export function AndroidScreenHeader(props: {
5657
className="border-b border-header-border bg-header px-3 pb-2.5"
5758
style={{
5859
paddingTop: props.embedded ? 8 : Math.max(insets.top, 12),
60+
borderBottomWidth: props.hideBottomBorder ? 0 : undefined,
5961
}}
6062
>
6163
<View className="min-h-12 flex-row items-center gap-2">

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

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,52 @@
1-
import { Platform, Switch, type SwitchProps } from "react-native";
1+
import { Platform, Pressable, Switch, View, type SwitchProps } from "react-native";
2+
3+
import { useAppearancePreferences } from "../features/settings/appearance/AppearancePreferencesProvider";
4+
import { SymbolView } from "./AppSymbol";
25

36
export function ThemedSwitch(props: SwitchProps) {
7+
const { materialYouStyleLayoutActive } = useAppearancePreferences();
8+
if (materialYouStyleLayoutActive) {
9+
return (
10+
<Pressable
11+
accessibilityHint={props.accessibilityHint}
12+
accessibilityLabel={props.accessibilityLabel}
13+
accessibilityRole="switch"
14+
accessibilityState={{ checked: Boolean(props.value), disabled: props.disabled }}
15+
disabled={props.disabled}
16+
hitSlop={8}
17+
onPress={() => props.onValueChange?.(!props.value)}
18+
style={props.style}
19+
testID={props.testID}
20+
className={props.disabled ? "opacity-40" : "active:opacity-70"}
21+
>
22+
<View
23+
className={
24+
props.value
25+
? "h-8 w-[52px] items-end justify-center rounded-full border-2 border-switch-active-track bg-switch-active-track px-0.5"
26+
: "h-8 w-[52px] items-start justify-center rounded-full border-2 border-switch-inactive-thumb bg-switch-inactive-track px-0.5"
27+
}
28+
>
29+
<View
30+
className={
31+
props.value
32+
? "size-6 items-center justify-center rounded-full bg-switch-active-thumb"
33+
: "size-6 items-center justify-center rounded-full bg-switch-inactive-thumb"
34+
}
35+
>
36+
<SymbolView
37+
name={props.value ? "checkmark" : "xmark"}
38+
size={13}
39+
tintColorClassName={
40+
props.value ? "accent-switch-active-track" : "accent-switch-inactive-track"
41+
}
42+
type="monochrome"
43+
/>
44+
</View>
45+
</View>
46+
</Pressable>
47+
);
48+
}
49+
450
return (
551
<Switch
652
{...props}

0 commit comments

Comments
 (0)