Commit 397a46123999ada6b9ddcbe85534631a241bb0ed | the-knife

apps/mobile/assets/icons/file-diff.png created

Binary files /dev/null and b/apps/mobile/assets/icons/file-diff.png differ

apps/mobile/assets/icons/file-diff@2x.png created

Binary files /dev/null and b/apps/mobile/assets/icons/file-diff@2x.png differ

apps/mobile/assets/icons/file-diff@3x.png created

Binary files /dev/null and b/apps/mobile/assets/icons/file-diff@3x.png differ

apps/mobile/modules/t3-native-controls/android/build.gradle+11

 @@ -1,5 +1,13 @@
+buildscript {
+  repositories { mavenCentral() }
+  dependencies {
+    classpath("org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:${kotlinVersion}")
+  }
+}
 apply plugin: 'com.android.library'
 apply plugin: 'org.jetbrains.kotlin.android'
+apply plugin: 'org.jetbrains.kotlin.plugin.compose'
 group = 'com.t3tools.nativecontrols'
 version = '0.0.0'
 @@ -12,8 +20,11 @@ android {
     minSdkVersion rootProject.ext.minSdkVersion
     targetSdkVersion rootProject.ext.targetSdkVersion
   }
+  buildFeatures { compose true }
 }
 dependencies {
   implementation project(':expo-modules-core')
+  implementation 'androidx.compose.ui:ui-android:1.10.6'
+  implementation 'androidx.compose.material3:material3-android:1.5.0-alpha17'
 }

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

created+184

...	@@ -0,0 +1,184 @@
1	package expo.modules.t3nativecontrols
2
3	import android.content.Context
4	import android.view.ViewGroup
5	import androidx.compose.foundation.layout.WindowInsets
6	import androidx.compose.foundation.layout.Spacer
7	import androidx.compose.foundation.layout.fillMaxSize
8	import androidx.compose.material3.Icon
9	import androidx.compose.material3.MaterialTheme
10	import androidx.compose.material3.NavigationBar
11	import androidx.compose.material3.NavigationBarItem
12	import androidx.compose.material3.NavigationBarItemDefaults
13	import androidx.compose.material3.NavigationRail
14	import androidx.compose.material3.NavigationRailItem
15	import androidx.compose.material3.NavigationRailItemDefaults
16	import androidx.compose.material3.Text
17	import androidx.compose.material3.darkColorScheme
18	import androidx.compose.material3.lightColorScheme
19	import androidx.compose.runtime.Composable
20	import androidx.compose.runtime.getValue
21	import androidx.compose.runtime.mutableStateOf
22	import androidx.compose.runtime.setValue
23	import androidx.compose.ui.Modifier
24	import androidx.compose.ui.graphics.Color
25	import androidx.compose.ui.platform.ComposeView
26	import androidx.compose.ui.platform.ViewCompositionStrategy
27	import androidx.compose.ui.res.painterResource
28	import androidx.compose.ui.unit.sp
29	import expo.modules.kotlin.AppContext
30	import expo.modules.kotlin.modules.Module
31	import expo.modules.kotlin.modules.ModuleDefinition
32	import expo.modules.kotlin.viewevent.EventDispatcher
33	import expo.modules.kotlin.views.ExpoView
34
35	class T3WorkspaceNavigationModule : Module() {
36	override fun definition() = ModuleDefinition {
37	Name("T3WorkspaceNavigation")
38	View(T3WorkspaceNavigationView::class) {
39	Prop("selectedTab") { view: T3WorkspaceNavigationView, value: String ->
40	view.selectedTab = value
41	}
42	Prop("rail") { view: T3WorkspaceNavigationView, value: Boolean -> view.rail = value }
43	Prop("dark") { view: T3WorkspaceNavigationView, value: Boolean -> view.dark = value }
44	Prop("textScale") { view: T3WorkspaceNavigationView, value: Float -> view.textScale = value }
45	Prop("containerColor") { view: T3WorkspaceNavigationView, value: Int ->
46	view.containerColor = value
47	}
48	Prop("selectedColor") { view: T3WorkspaceNavigationView, value: Int ->
49	view.selectedColor = value
50	}
51	Prop("indicatorColor") { view: T3WorkspaceNavigationView, value: Int ->
52	view.indicatorColor = value
53	}
54	Prop("unselectedColor") { view: T3WorkspaceNavigationView, value: Int ->
55	view.unselectedColor = value
56	}
57	Events("onTabSelected")
58	}
59	}
60	}
61
62	/** One Material3 selection surface moves from below the list to its leading edge. */
63	class T3WorkspaceNavigationView(
64	context: Context,
65	appContext: AppContext
66	) : ExpoView(context, appContext) {
67	// Compose must remeasure native children when Yoga resizes the folded window.
68	override val shouldUseAndroidLayout = true
69
70	private val onTabSelected by EventDispatcher()
71	var selectedTab by mutableStateOf("threads")
72	var rail by mutableStateOf(false)
73	var dark by mutableStateOf(false)
74	var textScale by mutableStateOf(1f)
75	var containerColor by mutableStateOf(0)
76	var selectedColor by mutableStateOf(0)
77	var indicatorColor by mutableStateOf(0)
78	var unselectedColor by mutableStateOf(0)
79
80	override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
81	// Fabric measures the replacement bar before attaching it on a fold.
82	// Compose needs an attached window to obtain its lifecycle recomposer.
83	if (!isAttachedToWindow) {
84	setMeasuredDimension(
85	MeasureSpec.getSize(widthMeasureSpec),
86	MeasureSpec.getSize(heightMeasureSpec)
87	)
88	return
89	}
90	super.onMeasure(widthMeasureSpec, heightMeasureSpec)
91	}
92
93	override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
94	if (isAttachedToWindow) super.onLayout(changed, left, top, right, bottom)
95	}
96
97	override fun onAttachedToWindow() {
98	super.onAttachedToWindow()
99	requestLayout()
100	}
101
102	init {
103	addView(
104	ComposeView(context).apply {
105	setViewCompositionStrategy(
106	ViewCompositionStrategy.DisposeOnDetachedFromWindowOrReleasedFromPool
107	)
108	setContent {
109	MaterialTheme(colorScheme = if (dark) darkColorScheme() else lightColorScheme()) {
110	val tabs = listOf("threads", "pullRequests")
111	if (rail) {
112	NavigationRail(
113	modifier = Modifier.fillMaxSize(),
114	containerColor = Color(containerColor),
115	windowInsets = WindowInsets(0),
116	) {
117	Spacer(Modifier.weight(1f))
118	tabs.forEach { tab ->
119	NavigationRailItem(
120	selected = selectedTab == tab,
121	onClick = { onTabSelected(mapOf("tab" to tab)) },
122	icon = { tabIcon(tab) },
123	label = {
124	val title = if (tab == "threads") "Chats" else "PRs"
125	Text(title, fontSize = (12 * textScale).sp)
126	},
127	colors = NavigationRailItemDefaults.colors(
128	selectedIconColor = Color(selectedColor),
129	selectedTextColor = Color(selectedColor),
130	indicatorColor = Color(indicatorColor),
131	unselectedIconColor = Color(unselectedColor),
132	unselectedTextColor = Color(unselectedColor),
133	),
134	)
135	}
136	Spacer(Modifier.weight(1f))
137	}
138	} else {
139	NavigationBar(
140	modifier = Modifier.fillMaxSize(),
141	containerColor = Color(containerColor),
142	tonalElevation = androidx.compose.ui.unit.Dp(0f),
143	windowInsets = WindowInsets(0),
144	) {
145	tabs.forEach { tab ->
146	NavigationBarItem(
147	selected = selectedTab == tab,
148	onClick = { onTabSelected(mapOf("tab" to tab)) },
149	icon = { tabIcon(tab) },
150	label = {
151	val title = if (tab == "threads") "Chats" else "Pull requests"
152	Text(title, fontSize = (12 * textScale).sp)
153	},
154	colors = NavigationBarItemDefaults.colors(
155	selectedIconColor = Color(selectedColor),
156	selectedTextColor = Color(selectedColor),
157	indicatorColor = Color(indicatorColor),
158	unselectedIconColor = Color(unselectedColor),
159	unselectedTextColor = Color(unselectedColor),
160	),
161	)
162	}
163	}
164	}
165	}
166	}
167	},
168	LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
169	)
170	}
171
172	@Composable
173	private fun tabIcon(tab: String) {
174	val drawable = if (tab == "threads") {
175	R.drawable.t3_chats
176	} else {
177	R.drawable.t3_pull_requests
178	}
179	Icon(
180	painter = painterResource(drawable),
181	contentDescription = if (tab == "threads") "Chats" else "Pull requests",
182	)
183	}
184	}

apps/mobile/modules/t3-native-controls/android/src/main/res/drawable/t3_chats.xml created+3

...	@@ -0,0 +1,3 @@
1	<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
2	<path android:fillColor="#000000" android:pathData="M20,2H4C2.9,2 2,2.9 2,4V22L6,18H20C21.1,18 22,17.1 22,16V4C22,2.9 21.1,2 20,2ZM20,16H5.17L4,17.17V4H20V16ZM6,6H18V8H6V6ZM6,10H16V12H6V10Z" />
3	</vector>

apps/mobile/modules/t3-native-controls/android/src/main/res/drawable/t3_pull_requests.xml created+3

...	@@ -0,0 +1,3 @@
1	<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
2	<path android:fillColor="#000000" android:pathData="M6,2C4.34,2 3,3.34 3,5C3,6.31 3.84,7.42 5,7.83V16.17C3.84,16.58 3,17.69 3,19C3,20.66 4.34,22 6,22C7.66,22 9,20.66 9,19C9,17.69 8.16,16.58 7,16.17V7.83C8.16,7.42 9,6.31 9,5C9,3.34 7.66,2 6,2ZM6,4C6.55,4 7,4.45 7,5C7,5.55 6.55,6 6,6C5.45,6 5,5.55 5,5C5,4.45 5.45,4 6,4ZM6,18C6.55,18 7,18.45 7,19C7,19.55 6.55,20 6,20C5.45,20 5,19.55 5,19C5,18.45 5.45,18 6,18ZM14,2L10,6L14,10V7H15C16.1,7 17,7.9 17,9V16.17C15.84,16.58 15,17.69 15,19C15,20.66 16.34,22 18,22C19.66,22 21,20.66 21,19C21,17.69 20.16,16.58 19,16.17V9C19,6.79 17.21,5 15,5H14V2ZM18,18C18.55,18 19,18.45 19,19C19,19.55 18.55,20 18,20C17.45,20 17,19.55 17,19C17,18.45 17.45,18 18,18Z" />
3	</vector>

apps/mobile/modules/t3-native-controls/expo-module.config.json+1

...	@@ -7,6 +7,7 @@	...	@@ -7,6 +7,7 @@
7	"android": {	7	"android": {
8	"modules": [	8	"modules": [
9	"expo.modules.t3nativecontrols.T3NativeControlsModule",	9	"expo.modules.t3nativecontrols.T3NativeControlsModule",
		10	"expo.modules.t3nativecontrols.T3WorkspaceNavigationModule",
10	"expo.modules.t3nativecontrols.T3KeyboardCommandsModule"	11	"expo.modules.t3nativecontrols.T3KeyboardCommandsModule"
11	]	12	]
12	}	13	}

apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffModule.kt+3

 @@ -41,6 +41,9 @@ class T3ReviewDiffModule : Module() {
       Prop("contentWidth") { view: T3ReviewDiffView, contentWidth: Double ->
         view.setContentWidth(contentWidth.toFloat())
       }
+      Prop("contentInsetBottom") { view: T3ReviewDiffView, value: Double ->
+        view.setContentInsetBottom(value.toFloat())
+      }
       Prop("scrollEnabled") { view: T3ReviewDiffView, enabled: Boolean ->
         view.setScrollEnabled(enabled)
       }

apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffView.kt+12-4

 @@ -143,6 +143,12 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
     canvasView.contentWidthPx = max(width, dp(value).toInt())
   }
+  fun setContentInsetBottom(value: Float) {
+    canvasView.setPadding(0, 0, 0, max(0, dp(value).toInt()))
+    canvasView.setVerticalOffset(canvasView.verticalOffset())
+    canvasView.invalidate()
+  }
   fun setInitialRowIndex(value: Double) {
     initialRowIndex = value.toInt().coerceAtLeast(0)
     pendingInitialScroll = true
 @@ -818,7 +824,7 @@ private class DiffCanvasView(context: Context) : View(context) {
   fun rowTop(index: Int): Int = rowOffsets[index.coerceIn(0, max(0, rowOffsets.size - 2))]
   fun setVerticalOffset(value: Int) {
-    val maxOffset = max(0, (rowOffsets.lastOrNull() ?: 0) - height)
+    val maxOffset = maxVerticalOffset()
     val nextOffset = value.coerceIn(0, maxOffset)
     if (verticalOffset == nextOffset) return
     verticalOffset = nextOffset
 @@ -832,7 +838,8 @@ private class DiffCanvasView(context: Context) : View(context) {
   fun verticalOffset(): Int = verticalOffset
-  fun maxVerticalOffset(): Int = max(0, (rowOffsets.lastOrNull() ?: 0) - height)
+  fun maxVerticalOffset(): Int =
+    max(0, (rowOffsets.lastOrNull() ?: 0) + paddingBottom - height)
   fun setHorizontalOffset(value: Int) {
     val nextOffset = value.coerceIn(0, maxHorizontalOffset())
 @@ -932,8 +939,9 @@ private class DiffCanvasView(context: Context) : View(context) {
         return rows.getOrNull(sticky.index)?.let { RowHit(it, sticky.top, sticky.bottom) }
       }
     }
-    val index = rowIndexAt(verticalOffset + y.toInt())
+    val contentY = verticalOffset + y.toInt()
-    return rows.getOrNull(index)?.let {
+    val index = rowIndexAt(contentY)
+    return rows.getOrNull(index)?.takeIf { contentY in 0 until rowOffsets.last() }?.let {
       RowHit(
         row = it,
         top = rowOffsets[index] - verticalOffset,

apps/mobile/src/Stack.tsx+21-12

 @@ -31,6 +31,7 @@ import { useResolveClassNames } from "uniwind";
 import { AppText as Text } from "./components/AppText";
 import { getCompactBrandHeaderOptions } from "./components/CompactBrandTitle";
 import { WorkspaceRootScreen } from "./features/workspace/WorkspaceRootScreen";
+import { AndroidWorkspaceTabsProvider } from "./features/workspace/AndroidWorkspaceTabsProvider";
 import {
   PullRequestRouteScreen,
   PullRequestFileRouteScreen,
 @@ -170,6 +171,12 @@ const GLASS_HEADER_OPTIONS: AppScreenOptions = {
   unstable_navigationItemStyle: NATIVE_LIQUID_GLASS_SUPPORTED ? "editor" : undefined,
 };
+// Android PR screens render their own Material toolbar.
+const PULL_REQUEST_HEADER_OPTIONS: AppScreenOptions = {
+  ...GLASS_HEADER_OPTIONS,
+  headerShown: Platform.OS !== "android",
+};
 // SOLID: opaque sheet-colored header for surfaces that manage their own viewport.
 const SOLID_HEADER_OPTIONS: AppScreenOptions = {
   headerBackButtonDisplayMode: "minimal",
 @@ -647,13 +654,15 @@ function RootStackLayout(props: {
       <ThreadOutboxDrainWorker />
       <ShowcaseCaptureCoordinator pathname={pathname} />
       <ExistingThreadSettingsRouteProvider>
-        <AdaptiveWorkspaceLayout
+        <AndroidWorkspaceTabsProvider>
-          pathname={workspaceLocation.pathname}
+          <AdaptiveWorkspaceLayout
-          workspaceRouteKey={workspaceLocation.routeKey}
+            pathname={workspaceLocation.pathname}
-        >
+            workspaceRouteKey={workspaceLocation.routeKey}
-          {props.children}
+          >
-          <HardwareKeyboardCommandOverlay />
+            {props.children}
-        </AdaptiveWorkspaceLayout>
+            <HardwareKeyboardCommandOverlay />
+          </AdaptiveWorkspaceLayout>
+        </AndroidWorkspaceTabsProvider>
       </ExistingThreadSettingsRouteProvider>
     </HardwareKeyboardCommandProvider>
   );
 @@ -721,15 +730,15 @@ const RootStackConfig = createWorkspaceStackNavigator({
         path: "pull-requests/:environmentId/:projectId/:repository/:number",
         parse: { number: Number },
       },
-      options: GLASS_HEADER_OPTIONS,
+      options: PULL_REQUEST_HEADER_OPTIONS,
     }),
     PullRequestGuideStop: createNativeStackScreen({
       screen: PullRequestGuideStopScreen,
-      options: GLASS_HEADER_OPTIONS,
+      options: PULL_REQUEST_HEADER_OPTIONS,
     }),
     PullRequestFile: createNativeStackScreen({
       screen: PullRequestFileRouteScreen,
-      options: GLASS_HEADER_OPTIONS,
+      options: PULL_REQUEST_HEADER_OPTIONS,
     }),
     PullRequestFiles: createNativeStackScreen({
       screen: PullRequestFilesRouteScreen,
 @@ -743,7 +752,7 @@ const RootStackConfig = createWorkspaceStackNavigator({
     PullRequestReviewers: createNativeStackScreen({
       screen: PullRequestReviewersScreen,
       options: {
-        ...GLASS_HEADER_OPTIONS,
+        ...PULL_REQUEST_HEADER_OPTIONS,
         ...FORM_SHEET_PRESENTATION_OPTIONS,
         sheetAllowedDetents: [0.75, 0.92],
         sheetGrabberVisible: true,
 @@ -752,7 +761,7 @@ const RootStackConfig = createWorkspaceStackNavigator({
     }),
     PullRequestDiscussion: createNativeStackScreen({
       screen: PullRequestDiscussionScreen,
-      options: GLASS_HEADER_OPTIONS,
+      options: PULL_REQUEST_HEADER_OPTIONS,
     }),
     PullRequestInlineComment: createNativeStackScreen({
       screen: PullRequestInlineCommentScreen,

apps/mobile/src/components/AppSymbol.ios.tsx+6-4

apps/mobile/src/components/AppSymbol.tsx+10-2

 @@ -58,6 +58,7 @@ import IconExternalLink from "@tabler/icons-react-native/IconExternalLink";
 import IconEyeOff from "@tabler/icons-react-native/IconEyeOff";
 import IconEye from "@tabler/icons-react-native/IconEye";
 import IconFileText from "@tabler/icons-react-native/IconFileText";
+import IconFileDiff from "@tabler/icons-react-native/IconFileDiff";
 import IconFilter from "@tabler/icons-react-native/IconFilter";
 import IconFilterFilled from "@tabler/icons-react-native/IconFilterFilled";
 import IconFolder from "@tabler/icons-react-native/IconFolder";
 @@ -188,6 +189,7 @@ const ANDROID_ICON_BY_SF_SYMBOL = {
   doc: IconFileText,
   "doc.on.doc": IconCopy,
   "doc.text": IconFileText,
+  "file.diff": IconFileDiff,
   ellipsis: IconDots,
   moon: IconMoon,
   "ellipsis.circle": IconDotsCircleHorizontal,
 @@ -271,10 +273,16 @@ const ANDROID_ICON_BY_SF_SYMBOL = {
   xmark: IconX,
   "xmark.circle.fill": IconCircleXFilled,
 } satisfies Partial<
-  Record<SFSymbol | "git.pull-request.closed" | "git.pull-request.draft" | "git.commit", Icon>
+  Record<
+    SFSymbol | "git.pull-request.closed" | "git.pull-request.draft" | "git.commit" | "file.diff",
+    Icon
+  >
 >;
 const SF_ICON_LOOKUP: Partial<
-  Record<SFSymbol | "git.pull-request.closed" | "git.pull-request.draft" | "git.commit", Icon>
+  Record<
+    SFSymbol | "git.pull-request.closed" | "git.pull-request.draft" | "git.commit" | "file.diff",
+    Icon
+  >
 > = ANDROID_ICON_BY_SF_SYMBOL;
 // Callers can pass `{ ios, android }` names where `android` is a Material

apps/mobile/src/features/home/HomeHeader.android.tsx-2

...	@@ -92,8 +92,6 @@ export function HomeHeader(props: HomeHeaderProps) {	...	@@ -92,8 +92,6 @@ export function HomeHeader(props: HomeHeaderProps) {
92	[props],	92	[props],
93	);	93	);
94		94
95	if (props.usesWorkspaceToolbar) return null;
96
97	return (	95	return (
98	<>	96	<>
99	<NativeStackScreenOptions options={{ headerShown: false }} />	97	<NativeStackScreenOptions options={{ headerShown: false }} />

apps/mobile/src/features/home/HomeRouteScreen.tsx+2-2

...	@@ -209,7 +209,7 @@ export function HomeRouteScreen() {	...	@@ -209,7 +209,7 @@ export function HomeRouteScreen() {
209		209
210	return (	210	return (
211	<AndroidHomeFabLayout	211	<AndroidHomeFabLayout
212	disabled={workspace !== null}	212	disabled={workspace !== null && Platform.OS !== "android"}
213	onStartNewTask={() => navigation.navigate("NewTaskSheet", { screen: "NewTask" })}	213	onStartNewTask={() => navigation.navigate("NewTaskSheet", { screen: "NewTask" })}
214	>	214	>
215	<>	215	<>
...	@@ -230,7 +230,7 @@ export function HomeRouteScreen() {	...	@@ -230,7 +230,7 @@ export function HomeRouteScreen() {
230	params: { screen: "SettingsEnvironments" },	230	params: { screen: "SettingsEnvironments" },
231	}),	231	}),
232	}),	232	}),
233	headerShown: true,	233	headerShown: Platform.OS !== "android",
234	}}	234	}}
235	/>	235	/>
236	)}	236	)}

apps/mobile/src/features/home/HomeScreen.tsx+1-1

...	@@ -983,7 +983,7 @@ export function HomeScreen(props: HomeScreenProps) {	...	@@ -983,7 +983,7 @@ export function HomeScreen(props: HomeScreenProps) {
983	const v2ListHeader = (	983	const v2ListHeader = (
984	<>	984	<>
985	{listHeader}	985	{listHeader}
986	{workspace ? (	986	{Platform.OS === "ios" && workspace ? (
987	<ThreadListFilters	987	<ThreadListFilters
988	environments={props.environments}	988	environments={props.environments}
989	projects={projectScopes.map((scope) => ({ key: scope.key, label: scope.title }))}	989	projects={projectScopes.map((scope) => ({ key: scope.key, label: scope.title }))}

apps/mobile/src/features/home/MaterialThreadListToolbar.tsx+20-3

 @@ -1,4 +1,6 @@
 import { useCallback, useEffect, useRef, useState, type ComponentProps } from "react";
+import { useNavigation, useNavigationState } from "@react-navigation/native";
+import { useWorkspaceTabs } from "../workspace/WorkspaceTabsContext";
 import {
   BackHandler,
   Keyboard,
 @@ -35,6 +37,12 @@ export function MaterialThreadListToolbar(props: {
   readonly onRequestVisibility?: () => void;
 }) {
   const insets = useSafeAreaInsets();
+  const navigation = useNavigation();
+  const workspace = useWorkspaceTabs();
+  const isTabActive = workspace?.isTabActive;
+  const homeFocused = useNavigationState((state) => state.routes[state.index]?.name === "Home");
+  const listFocused =
+    homeFocused && (workspace === null || workspace.state.selectedTab === "threads");
   const { fabSize } = useAndroidControlSizing();
   const { height: toolbarHeight, ...headerPadding } = useMaterialToolbarLayout();
   const { state } = useWorkspaceState();
 @@ -57,13 +65,22 @@ export function MaterialThreadListToolbar(props: {
   }, [onSearchQueryChange]);
   useEffect(() => {
-    if (!searching) return;
+    if (!searching || !listFocused) return;
     const subscription = BackHandler.addEventListener("hardwareBackPress", () => {
-      closeSearch();
+      // Frozen Home screens can keep effects alive after a detail route opens.
+      const state = navigation.getState();
+      if (
+        !state ||
+        state.routes[state.index]?.name !== "Home" ||
+        isTabActive?.("threads") === false
+      )
+        return false;
+      if (Keyboard.isVisible()) Keyboard.dismiss();
+      else closeSearch();
       return true;
     });
     return () => subscription.remove();
-  }, [closeSearch, searching]);
+  }, [closeSearch, searching, listFocused, navigation, isTabActive]);
   const filterIcon = props.filterCustomized
     ? "line.3.horizontal.decrease.circle.fill"

apps/mobile/src/features/home/home-thread-navigation.test.ts+2

...	@@ -19,6 +19,8 @@ function loadRouters() {	...	@@ -19,6 +19,8 @@ function loadRouters() {
19	};	19	};
20	}	20	}
21		21
		22	vi.mock("react-native", () => ({ Platform: { OS: "ios" }, Keyboard: { dismiss: vi.fn() } }));
		23
22	vi.mock("@react-navigation/native", () => {	24	vi.mock("@react-navigation/native", () => {
23	const { CommonActions, StackActions } = loadRouters();	25	const { CommonActions, StackActions } = loadRouters();
24	return { CommonActions, StackActions };	26	return { CommonActions, StackActions };

apps/mobile/src/features/home/home-thread-navigation.ts+11-1

...	@@ -7,6 +7,8 @@ import {	...	@@ -7,6 +7,8 @@ import {
7	} from "@react-navigation/native";	7	} from "@react-navigation/native";
8	import type { NativeStackNavigationProp } from "@react-navigation/native-stack";	8	import type { NativeStackNavigationProp } from "@react-navigation/native-stack";
9	import { useCallback, useEffect, useRef } from "react";	9	import { useCallback, useEffect, useRef } from "react";
		10	import { Platform } from "react-native";
		11	import { useAndroidWorkspaceSelection } from "../workspace/useAndroidWorkspaceSelection";
10		12
11	type ThreadSelection = Pick<EnvironmentThreadShell, "environmentId" \| "id">;	13	type ThreadSelection = Pick<EnvironmentThreadShell, "environmentId" \| "id">;
12		14
...	@@ -34,6 +36,7 @@ export function useHomeThreadSelection() {	...	@@ -34,6 +36,7 @@ export function useHomeThreadSelection() {
34	const navigation =	36	const navigation =
35	useNavigation<NativeStackNavigationProp<ReactNavigation.RootParamList, "Home">>();	37	useNavigation<NativeStackNavigationProp<ReactNavigation.RootParamList, "Home">>();
36	const dismissingRouteKey = useRef<string \| null>(null);	38	const dismissingRouteKey = useRef<string \| null>(null);
		39	const selectAndroidWorkspace = useAndroidWorkspaceSelection();
37		40
38	useEffect(() => {	41	useEffect(() => {
39	const clear = () => {	42	const clear = () => {
...	@@ -58,6 +61,13 @@ export function useHomeThreadSelection() {	...	@@ -58,6 +61,13 @@ export function useHomeThreadSelection() {
58		61
59	return useCallback(	62	return useCallback(
60	(thread: ThreadSelection) => {	63	(thread: ThreadSelection) => {
		64	if (Platform.OS === "android") {
		65	selectAndroidWorkspace({
		66	name: "Thread",
		67	params: { environmentId: String(thread.environmentId), threadId: String(thread.id) },
		68	});
		69	return;
		70	}
61	navigation.dispatch((state) =>	71	navigation.dispatch((state) =>
62	createHomeThreadNavigationAction({	72	createHomeThreadNavigationAction({
63	state,	73	state,
...	@@ -66,6 +76,6 @@ export function useHomeThreadSelection() {	...	@@ -66,6 +76,6 @@ export function useHomeThreadSelection() {
66	}),	76	}),
67	);	77	);
68	},	78	},
69	[navigation],	79	[navigation, selectAndroidWorkspace],
70	);	80	);
71	}	81	}

apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx+133-29

...	@@ -24,6 +24,7 @@ import {	...	@@ -24,6 +24,7 @@ import {
24	} from "react";	24	} from "react";
25	import { Platform, useWindowDimensions, View } from "react-native";	25	import { Platform, useWindowDimensions, View } from "react-native";
26	import Animated, {	26	import Animated, {
		27	runOnJS,
27	useAnimatedStyle,	28	useAnimatedStyle,
28	useDerivedValue,	29	useDerivedValue,
29	useSharedValue,	30	useSharedValue,
...	@@ -55,6 +56,13 @@ import {	...	@@ -55,6 +56,13 @@ import {
55	useHardwareKeyboardCommand,	56	useHardwareKeyboardCommand,
56	} from "../keyboard/hardwareKeyboardCommands";	57	} from "../keyboard/hardwareKeyboardCommands";
57	import { AndroidHomeFabLayout } from "../home/AndroidHomeFab";	58	import { AndroidHomeFabLayout } from "../home/AndroidHomeFab";
		59	import { useAndroidControlSizing } from "../../components/useAndroidControlSizing";
		60	import {
		61	AndroidWorkspaceNavigation,
		62	ANDROID_WORKSPACE_RAIL_WIDTH,
		63	} from "../workspace/AndroidWorkspaceNavigation";
		64	import { AndroidWorkspaceSidebar } from "../workspace/AndroidWorkspaceSidebar";
		65	import { useAndroidWorkspaceSelection } from "../workspace/useAndroidWorkspaceSelection";
58	import { HomeListOptionsProvider } from "../home/home-list-options";	66	import { HomeListOptionsProvider } from "../home/home-list-options";
59	import { ThreadNavigationSidebar } from "../threads/ThreadNavigationSidebar";	67	import { ThreadNavigationSidebar } from "../threads/ThreadNavigationSidebar";
60	import { RenderErrorBoundary, RenderFailureView } from "../../components/RenderErrorBoundary";	68	import { RenderErrorBoundary, RenderFailureView } from "../../components/RenderErrorBoundary";
...	@@ -243,7 +251,8 @@ function AdaptiveWorkspaceLayoutContent(	...	@@ -243,7 +251,8 @@ function AdaptiveWorkspaceLayoutContent(
243	const nativeWorkspace = use(NativeWorkspaceModeContext);	251	const nativeWorkspace = use(NativeWorkspaceModeContext);
244	const windowDimensions = useWindowDimensions();	252	const windowDimensions = useWindowDimensions();
245	const nativeMetrics = useNativeLayoutMetrics();	253	const nativeMetrics = useNativeLayoutMetrics();
246	const { width, height } = nativeMetrics ?? windowDimensions;	254	const { width: viewportWidth, height } = nativeMetrics ?? windowDimensions;
		255	const { scale: androidControlScale } = useAndroidControlSizing();
247	const pathname = props.pathname;	256	const pathname = props.pathname;
248	const navigation = useNavigation();	257	const navigation = useNavigation();
249	const activeRoleOwner = useRef<symbol \| null>(null);	258	const activeRoleOwner = useRef<symbol \| null>(null);
...	@@ -261,10 +270,18 @@ function AdaptiveWorkspaceLayoutContent(	...	@@ -261,10 +270,18 @@ function AdaptiveWorkspaceLayoutContent(
261	const [focusedAuxiliaryPaneRole, setFocusedAuxiliaryPaneRole] =	270	const [focusedAuxiliaryPaneRole, setFocusedAuxiliaryPaneRole] =
262	useState<WorkspaceAuxiliaryPaneRole \| null>(null);	271	useState<WorkspaceAuxiliaryPaneRole \| null>(null);
263	const baseLayout = useMemo(	272	const baseLayout = useMemo(
264	() => deriveLayout({ width, height, nativeMetrics }),	273	() => deriveLayout({ width: viewportWidth, height, nativeMetrics }),
265	[height, width, nativeMetrics],	274	[height, viewportWidth, nativeMetrics],
266	);	275	);
267	const layout = baseLayout;	276	const layout = baseLayout;
		277	// The rail consumes real space before either pane; inspectors and the detail
		278	// navigator must use the remaining viewport rather than clipping behind it.
		279	const shouldRenderNavigationRail = Platform.OS === "android" && layout.usesSplitView;
		280	const navigationRailWidth =
		281	shouldRenderNavigationRail && showPrimarySidebar
		282	? ANDROID_WORKSPACE_RAIL_WIDTH * Math.max(1, androidControlScale)
		283	: 0;
		284	const width = viewportWidth - navigationRailWidth;
268	// In split layouts the sidebar IS the thread list — it renders on every	285	// In split layouts the sidebar IS the thread list — it renders on every
269	// route, including Home (which shows an empty-detail pane instead of the	286	// route, including Home (which shows an empty-detail pane instead of the
270	// compact list).	287	// compact list).
...	@@ -478,22 +495,80 @@ function AdaptiveWorkspaceLayoutContent(	...	@@ -478,22 +495,80 @@ function AdaptiveWorkspaceLayoutContent(
478	[navigation],	495	[navigation],
479	);	496	);
480		497
		498	const inspectorColumnTargetWidth =
		499	workspaceInspector !== null && workspaceInspector.active && panes.auxiliaryPaneVisible
		500	? (panes.auxiliaryPaneWidth ?? 0)
		501	: 0;
		502	const contentTargetWidth = layout.usesSplitView
		503	? Math.max(0, panes.contentPaneWidth - inspectorColumnTargetWidth)
		504	: null;
		505	const [contentSizing, setContentSizing] = useState({
		506	viewportWidth,
		507	target: contentTargetWidth,
		508	sidebarVisible: panes.primarySidebarVisible,
		509	width: contentTargetWidth,
		510	revision: 0,
		511	});
		512	if (
		513	Platform.OS === "android" &&
		514	(contentSizing.viewportWidth !== viewportWidth \|\|
		515	contentSizing.target !== contentTargetWidth \|\|
		516	contentSizing.sidebarVisible !== panes.primarySidebarVisible)
		517	) {
		518	const openingSidebar =
		519	Platform.OS === "android" &&
		520	contentSizing.viewportWidth === viewportWidth &&
		521	!contentSizing.sidebarVisible &&
		522	panes.primarySidebarVisible &&
		523	contentSizing.width !== null &&
		524	contentTargetWidth !== null;
		525	setContentSizing({
		526	viewportWidth,
		527	target: contentTargetWidth,
		528	sidebarVisible: panes.primarySidebarVisible,
		529	// Clip the wide navigator during expansion, then reflow once at the end.
		530	// Narrowing it first exposes an empty strip before the sidebar arrives.
		531	width: openingSidebar
		532	? Math.max(contentSizing.width ?? 0, contentTargetWidth ?? 0)
		533	: contentTargetWidth,
		534	revision: contentSizing.revision + 1,
		535	});
		536	}
		537	const settleContentWidth = useCallback((revision: number) => {
		538	setContentSizing((current) =>
		539	current.revision !== revision \|\| current.width === current.target
		540	? current
		541	: { ...current, width: current.target },
		542	);
		543	}, []);
		544	const contentSettledWidth = Platform.OS === "android" ? contentSizing.width : contentTargetWidth;
		545	const contentRevision = contentSizing.revision;
		546
481	const renderedSidebarWidth = useSharedValue(	547	const renderedSidebarWidth = useSharedValue(
482	panes.primarySidebarVisible ? (layout.listPaneWidth ?? 0) + (layout.listPaneGap ?? 0) : 0,	548	panes.primarySidebarVisible ? (layout.listPaneWidth ?? 0) + (layout.listPaneGap ?? 0) : 0,
483	);	549	);
		550	const renderedRailWidth = useSharedValue(navigationRailWidth);
484	useEffect(() => {	551	useEffect(() => {
485	if (nativeWorkspace) return;	552	if (nativeWorkspace) return;
486	const targetWidth = panes.primarySidebarVisible	553	const targetWidth = panes.primarySidebarVisible
487	? (layout.listPaneWidth ?? 0) + (layout.listPaneGap ?? 0)	554	? (layout.listPaneWidth ?? 0) + (layout.listPaneGap ?? 0)
488	: 0;	555	: 0;
489	renderedSidebarWidth.value = withTiming(targetWidth, WORKSPACE_PANE_TIMING);	556	renderedSidebarWidth.value = withTiming(targetWidth, WORKSPACE_PANE_TIMING, (finished) => {
		557	if (finished && Platform.OS === "android") runOnJS(settleContentWidth)(contentRevision);
		558	});
		559	renderedRailWidth.set(withTiming(navigationRailWidth, WORKSPACE_PANE_TIMING));
490	}, [	560	}, [
491	nativeWorkspace,	561	nativeWorkspace,
		562	navigationRailWidth,
492	layout.listPaneWidth,	563	layout.listPaneWidth,
493	layout.listPaneGap,	564	layout.listPaneGap,
494	panes.primarySidebarVisible,	565	panes.primarySidebarVisible,
495	renderedSidebarWidth,	566	renderedSidebarWidth,
		567	renderedRailWidth,
		568	settleContentWidth,
		569	contentRevision,
496	]);	570	]);
		571	const railAnimatedStyle = useAnimatedStyle(() => ({ width: renderedRailWidth.value }));
497	const sidebarAnimatedStyle = useAnimatedStyle(() => ({	572	const sidebarAnimatedStyle = useAnimatedStyle(() => ({
498	// Fading a UIKit glass ancestor can leave remounted header effects missing.	573	// Fading a UIKit glass ancestor can leave remounted header effects missing.
499	// The clipped width already reveals and hides the iOS sidebar.	574	// The clipped width already reveals and hides the iOS sidebar.
...	@@ -507,24 +582,30 @@ function AdaptiveWorkspaceLayoutContent(	...	@@ -507,24 +582,30 @@ function AdaptiveWorkspaceLayoutContent(
507	// animating columns merely clip/reveal it over a matching background.	582	// animating columns merely clip/reveal it over a matching background.
508	// Continuously re-wrapping the chat feed was the main source of dropped	583	// Continuously re-wrapping the chat feed was the main source of dropped
509	// frames during sidebar/inspector transitions.	584	// frames during sidebar/inspector transitions.
510	const inspectorColumnTargetWidth =
511	workspaceInspector !== null && workspaceInspector.active && panes.auxiliaryPaneVisible
512	? (panes.auxiliaryPaneWidth ?? 0)
513	: 0;
514	const contentSettledWidth = layout.usesSplitView
515	? Math.max(0, panes.contentPaneWidth - inspectorColumnTargetWidth)
516	: null;
517	const renderedInspectorWidth = useSharedValue(inspectorColumnTargetWidth);	585	const renderedInspectorWidth = useSharedValue(inspectorColumnTargetWidth);
518	const renderedContentWidth = useDerivedValue(() =>	586	const renderedContentWidth = useDerivedValue(() =>
519	Math.max(0, width - renderedSidebarWidth.value - renderedInspectorWidth.value),	587	Math.max(
		588	0,
		589	viewportWidth -
		590	renderedRailWidth.value -
		591	renderedSidebarWidth.value -
		592	renderedInspectorWidth.value,
		593	),
520	);	594	);
521		595
		596	const selectAndroidWorkspace = useAndroidWorkspaceSelection();
522	const handleSelectThread = useCallback(	597	const handleSelectThread = useCallback(
523	(thread: EnvironmentThreadShell) => {	598	(thread: EnvironmentThreadShell) => {
524	const params = {	599	const params = {
525	environmentId: String(thread.environmentId),	600	environmentId: String(thread.environmentId),
526	threadId: String(thread.id),	601	threadId: String(thread.id),
527	};	602	};
		603	if (Platform.OS === "android") {
		604	// Selecting a sidebar row enters its base chat, including from that chat's nested screens.
		605	setFileInspectorPreferredVisible(false);
		606	selectAndroidWorkspace({ name: "Thread", params });
		607	return;
		608	}
528	const navigationAction = resolveThreadSelectionNavigationAction({	609	const navigationAction = resolveThreadSelectionNavigationAction({
529	usesSplitView: layout.usesSplitView,	610	usesSplitView: layout.usesSplitView,
530	pathname,	611	pathname,
...	@@ -556,7 +637,14 @@ function AdaptiveWorkspaceLayoutContent(	...	@@ -556,7 +637,14 @@ function AdaptiveWorkspaceLayoutContent(
556	}	637	}
557	navigation.navigate("Thread", params);	638	navigation.navigate("Thread", params);
558	},	639	},
559	[layout.usesSplitView, pathname, navigation, selectedThreadKey, props.workspaceRouteKey],	640	[
		641	layout.usesSplitView,
		642	pathname,
		643	navigation,
		644	selectedThreadKey,
		645	props.workspaceRouteKey,
		646	selectAndroidWorkspace,
		647	],
560	);	648	);
561		649
562	const contextValue = useMemo(	650	const contextValue = useMemo(
...	@@ -606,7 +694,21 @@ function AdaptiveWorkspaceLayoutContent(	...	@@ -606,7 +694,21 @@ function AdaptiveWorkspaceLayoutContent(
606	return (	694	return (
607	<HomeListOptionsProvider projectGroupingMode={projectGroupingMode}>	695	<HomeListOptionsProvider projectGroupingMode={projectGroupingMode}>
608	<AdaptiveWorkspaceContext.Provider value={contextValue}>	696	<AdaptiveWorkspaceContext.Provider value={contextValue}>
609	<View testID="adaptive-workspace-layout" className="flex-1 flex-row">	697	<View
		698	testID="adaptive-workspace-layout"
		699	className={Platform.OS === "android" ? "flex-1 flex-row bg-header" : "flex-1 flex-row"}
		700	>
		701	{shouldRenderNavigationRail ? (
		702	<Animated.View
		703	className="self-stretch overflow-hidden"
		704	accessibilityElementsHidden={navigationRailWidth === 0}
		705	importantForAccessibility={navigationRailWidth > 0 ? "auto" : "no-hide-descendants"}
		706	pointerEvents={navigationRailWidth > 0 ? "auto" : "none"}
		707	style={railAnimatedStyle}
		708	>
		709	<AndroidWorkspaceNavigation rail onSelect={revealPrimarySidebar} />
		710	</Animated.View>
		711	) : null}
610	{shouldRenderPrimarySidebar && layout.listPaneWidth !== null ? (	712	{shouldRenderPrimarySidebar && layout.listPaneWidth !== null ? (
611	<Animated.View	713	<Animated.View
612	className="self-stretch overflow-hidden"	714	className="self-stretch overflow-hidden"
...	@@ -628,21 +730,23 @@ function AdaptiveWorkspaceLayoutContent(	...	@@ -628,21 +730,23 @@ function AdaptiveWorkspaceLayoutContent(
628	/>	730	/>
629	)}	731	)}
630	>	732	>
631	<AndroidHomeFabLayout sidebar onStartNewTask={handleStartNewTask}>	733	<AndroidWorkspaceSidebar onRequestVisibility={revealPrimarySidebar}>
632	<ThreadNavigationSidebar	734	<AndroidHomeFabLayout sidebar onStartNewTask={handleStartNewTask}>
633	width={layout.listPaneWidth}	735	<ThreadNavigationSidebar
634	visible={panes.primarySidebarVisible}	736	width={layout.listPaneWidth}
635	onRequestVisibility={revealPrimarySidebar}	737	visible={panes.primarySidebarVisible}
636	selectedThreadKey={selectedThreadKey}	738	onRequestVisibility={revealPrimarySidebar}
637	onOpenSettings={handleOpenSettings}	739	selectedThreadKey={selectedThreadKey}
638	onOpenEnvironmentSettings={handleOpenEnvironmentSettings}	740	onOpenSettings={handleOpenSettings}
639	onNewThreadInProject={handleNewThreadInProject}	741	onOpenEnvironmentSettings={handleOpenEnvironmentSettings}
640	onNewThreadOnBranch={handleNewThreadOnBranch}	742	onNewThreadInProject={handleNewThreadInProject}
641	onSelectThread={handleSelectThread}	743	onNewThreadOnBranch={handleNewThreadOnBranch}
642	onSearchQueryChange={setPrimarySidebarSearchQuery}	744	onSelectThread={handleSelectThread}
643	searchQuery={primarySidebarSearchQuery}	745	onSearchQueryChange={setPrimarySidebarSearchQuery}
644	/>	746	searchQuery={primarySidebarSearchQuery}
645	</AndroidHomeFabLayout>	747	/>
		748	</AndroidHomeFabLayout>
		749	</AndroidWorkspaceSidebar>
646	</RenderErrorBoundary>	750	</RenderErrorBoundary>
647	</View>	751	</View>
648	</Animated.View>	752	</Animated.View>

apps/mobile/src/features/layout/workspace-sidebar-toolbar.tsx+1-1

...	@@ -10,7 +10,7 @@ export function AndroidWorkspaceSidebarButton() {	...	@@ -10,7 +10,7 @@ export function AndroidWorkspaceSidebarButton() {
10		10
11	return (	11	return (
12	<AndroidHeaderIconButton	12	<AndroidHeaderIconButton
13	accessibilityLabel={panes.primarySidebarVisible ? "Maximize content" : "Show thread sidebar"}	13	accessibilityLabel={panes.primarySidebarVisible ? "Maximize content" : "Show sidebar"}
14	icon={panes.primarySidebarVisible ? "arrow.up.left.and.arrow.down.right" : "sidebar.left"}	14	icon={panes.primarySidebarVisible ? "arrow.up.left.and.arrow.down.right" : "sidebar.left"}
15	onPress={togglePrimarySidebar}	15	onPress={togglePrimarySidebar}
16	/>	16	/>

apps/mobile/src/features/pull-requests/MaterialFloatingToolbar.android.tsx created+26

...	@@ -0,0 +1,26 @@
1	import { HorizontalFloatingToolbar, Host, RNHostView } from "@expo/ui/jetpack-compose";
2	import type { ReactElement } from "react";
3
4	import { useAppearancePreferences } from "../settings/appearance/AppearancePreferencesProvider";
5
6	/** Native toolbar surface; hosted RN controls retain their existing menus and accessibility. */
7	export function MaterialFloatingToolbar(props: { readonly children: ReactElement }) {
8	const { themeAppearance, themeVariables: colors } = useAppearancePreferences();
9	return (
10	<Host
11	matchContents
12	colorScheme={themeAppearance}
13	ignoreSafeAreaKeyboardInsets
14	style={{ alignSelf: "center", maxWidth: "100%" }}
15	>
16	<HorizontalFloatingToolbar
17	colors={{
18	toolbarContainerColor: colors["--color-card-alt"],
19	toolbarContentColor: colors["--color-foreground"],
20	}}
21	>
22	<RNHostView matchContents>{props.children}</RNHostView>
23	</HorizontalFloatingToolbar>
24	</Host>
25	);
26	}

apps/mobile/src/features/pull-requests/MaterialFloatingToolbar.tsx created+5

...	@@ -0,0 +1,5 @@
1	import type { ReactElement } from "react";
2
3	export function MaterialFloatingToolbar(props: { readonly children: ReactElement }) {
4	return props.children;
5	}

apps/mobile/src/features/pull-requests/MaterialPullRequestToolbar.android.tsx created+116

...	@@ -0,0 +1,116 @@
1	import { useNavigation, useNavigationState } from "@react-navigation/native";
2	import { useCallback, useEffect, useRef } from "react";
3	import { BackHandler, Keyboard, View, type TextInputInstance } from "react-native";
4	import { AndroidHeaderIconButton, AndroidScreenHeader } from "../../components/AndroidScreenHeader";
5	import { CompactBrandTitle } from "../../components/CompactBrandTitle";
6	import { MaterialSearchField } from "../../components/MaterialSearchField";
7	import { WorkspaceConnectionTitle } from "../home/WorkspaceConnectionTitle";
8	import { useHardwareKeyboardCommand } from "../keyboard/hardwareKeyboardCommands";
9	import { useWorkspaceTabs } from "../workspace/WorkspaceTabsContext";
10
11	/** PR search shares the thread list's native Android header placement. */
12	export function MaterialPullRequestToolbar(props: { readonly onRequestVisibility?: () => void }) {
13	const navigation = useNavigation();
14	const workspace = useWorkspaceTabs()!;
15	const { dispatch, getScrollOffset, recordScrollOffset, isTabActive } = workspace;
16	const homeFocused = useNavigationState((state) => state.routes[state.index]?.name === "Home");
17	const listFocused = homeFocused && workspace.state.selectedTab === "pullRequests";
18	const { onRequestVisibility } = props;
19	const tab = workspace.state.tabs.pullRequests;
20	const input = useRef<TextInputInstance>(null);
21	const searching = tab.searchMode !== "resting";
22	const openSearch = useCallback(() => {
23	onRequestVisibility?.();
24	dispatch({
25	type: "scroll",
26	tab: "pullRequests",
27	offset: getScrollOffset("pullRequests"),
28	});
29	dispatch({ type: "search", tab: "pullRequests" });
30	input.current?.focus();
31	return true;
32	}, [dispatch, getScrollOffset, onRequestVisibility]);
33	useHardwareKeyboardCommand("focusSearch", openSearch);
34	const closeSearch = useCallback(() => {
35	Keyboard.dismiss();
36	recordScrollOffset("pullRequests", tab.searchEntryOffset);
37	dispatch({ type: "cancel", tab: "pullRequests" });
38	}, [dispatch, recordScrollOffset, tab.searchEntryOffset]);
39	useEffect(() => {
40	if (!searching \|\| !listFocused) return;
41	const subscription = BackHandler.addEventListener("hardwareBackPress", () => {
42	// Frozen Home screens can keep effects alive after a detail route opens.
43	const state = navigation.getState();
44	if (!state \|\| state.routes[state.index]?.name !== "Home" \|\| !isTabActive("pullRequests"))
45	return false;
46	if (Keyboard.isVisible()) Keyboard.dismiss();
47	else closeSearch();
48	return true;
49	});
50	return () => subscription.remove();
51	}, [searching, closeSearch, listFocused, navigation, isTabActive]);
52	return (
53	<AndroidScreenHeader
54	title="Pull requests"
55	titleContent={
56	searching ? (
57	<MaterialSearchField
58	inputRef={input}
59	accessibilityLabel="Search pull requests"
60	clearAccessibilityLabel="Clear search"
61	placeholder="Search pull requests"
62	value={tab.query}
63	onChangeText={(query) => dispatch({ type: "query", tab: "pullRequests", query })}
64	/>
65	) : (
66	<View className="min-w-0 flex-1 pl-3">
67	<WorkspaceConnectionTitle
68	grow
69	brand={
70	<CompactBrandTitle
71	allowFontScaling={false}
72	accessibilityLabel="T3 Code, Pull requests"
73	/>
74	}
75	onPress={() =>
76	navigation.navigate("SettingsSheet", {
77	screen: "SettingsContent",
78	params: { screen: "SettingsEnvironments" },
79	})
80	}
81	/>
82	</View>
83	)
84	}
85	leading={
86	searching ? (
87	<AndroidHeaderIconButton
88	accessibilityLabel="Close search"
89	icon="arrow.left"
90	onPress={closeSearch}
91	/>
92	) : undefined
93	}
94	actions={
95	searching
96	? []
97	: [
98	{
99	accessibilityLabel: "Search pull requests",
100	icon: "magnifyingglass",
101	onPress: openSearch,
102	},
103	{
104	accessibilityLabel: "Open settings",
105	icon: "gearshape",
106	onPress: () =>
107	navigation.navigate("SettingsSheet", {
108	screen: "SettingsContent",
109	params: { screen: "Settings" },
110	}),
111	},
112	]
113	}
114	/>
115	);
116	}

apps/mobile/src/features/pull-requests/PullRequestControls.tsx+43-35

 @@ -9,6 +9,7 @@ import { AppText as Text } from "../../components/AppText";
 import { SymbolView, type AppSymbolName } from "../../components/AppSymbol";
 import { MaterialButton } from "../../components/MaterialButton";
 import { MaterialIconButton } from "../../components/MaterialIconButton";
+import { MaterialFloatingToolbar } from "./MaterialFloatingToolbar";
 import { ControlPillMenu } from "../../components/ControlPillMenu";
 import { NativeHeaderToolbar } from "../../native/StackHeader";
 import {
 @@ -110,6 +111,7 @@ export function PullRequestActionToolbar(props: {
   readonly params: PullRequestParams;
   readonly filePath?: string;
   readonly onOpenFiles?: () => void;
+  readonly onHeightChange?: (height: number) => void;
 }) {
   const navigation = useNavigation();
   const { draft } = usePullRequestReviewDraft(props.params);
 @@ -156,52 +158,57 @@ export function PullRequestActionToolbar(props: {
     const primary = (
       <MaterialButton
         label={primaryLabel}
-        tone="contrast"
+        tone="primary"
-        fullWidth
         disabled={primaryDisabled}
         onPress={primaryPress}
       />
     );
     return (
       <View
-        className="flex-row items-center justify-between gap-3 border-t border-border-subtle bg-screen px-4 pt-2"
+        pointerEvents="box-none"
-        style={{ paddingBottom: Math.max(insets.bottom, 8) }}
+        className="absolute inset-x-0 bottom-0 z-10 items-center px-4 pt-2"
+        style={{ paddingBottom: insets.bottom + 16 }}
+        onLayout={(event) => props.onHeightChange?.(event.nativeEvent.layout.height)}
       >
-        {showAgentControls ? (
+        <MaterialFloatingToolbar>
-          <ControlPillMenu
+          <View className="flex-row items-center gap-2">
-            title="AI helpers"
+            {showAgentControls ? (
-            actions={agentActions.map((action) => agent.menuAction(action.task))}
-            onPressAction={({ nativeEvent }) => agent.select(nativeEvent.event)}
-          >
-            <View pointerEvents="none">
-              <MaterialIconButton
-                icon="sparkles"
-                accessibilityLabel="PR agent actions"
-                disabled={agent.disabled}
-              />
-            </View>
-          </ControlPillMenu>
-        ) : null}
-        {showPrimary ? (
-          <View className="min-w-0 flex-1">
-            {!pendingReview && chooseThread ? (
               <ControlPillMenu
-                title="Open thread"
+                title="AI helpers"
-                actions={threadMenuItems}
+                actions={agentActions.map((action) => agent.menuAction(action.task))}
                 onPressAction={({ nativeEvent }) => agent.select(nativeEvent.event)}
               >
-                <View pointerEvents="none">{primary}</View>
+                <View pointerEvents="none">
+                  <MaterialIconButton
+                    icon="sparkles"
+                    accessibilityLabel="PR agent actions"
+                    disabled={agent.disabled}
+                  />
+                </View>
               </ControlPillMenu>
-            ) : (
+            ) : null}
-              primary
+            {showPrimary ? (
-            )}
+              <View className="min-w-0 shrink">
+                {!pendingReview && chooseThread ? (
+                  <ControlPillMenu
+                    title="Open thread"
+                    actions={threadMenuItems}
+                    onPressAction={({ nativeEvent }) => agent.select(nativeEvent.event)}
+                  >
+                    <View pointerEvents="none">{primary}</View>
+                  </ControlPillMenu>
+                ) : (
+                  primary
+                )}
+              </View>
+            ) : null}
+            <MaterialIconButton
+              icon="file.diff"
+              accessibilityLabel="Changed files"
+              onPress={openFiles}
+            />
           </View>
-        ) : null}
+        </MaterialFloatingToolbar>
-        <MaterialIconButton
-          icon="doc.on.doc"
-          accessibilityLabel="Changed files"
-          onPress={openFiles}
-        />
       </View>
     );
   }
 @@ -299,12 +306,13 @@ export function PullRequestActionToolbar(props: {
       )}
     </NativeHeaderToolbar.Menu>
   ) : null;
+  // Tabler file-diff geometry, rasterized at 1x/2x/3x for UIKit template images.
   const filesControl = (
     <NativeHeaderToolbar.Button
       identifier="workspace-trailing-action"
       width={controlSize}
       height={controlSize}
-      icon="document.on.document"
+      icon={{ type: "image", source: require("../../../assets/icons/file-diff.png") }}
       accessibilityLabel="Changed files"
       onPress={openFiles}
       separateBackground

apps/mobile/src/features/pull-requests/PullRequestMergeControls.tsx+65-36

 @@ -3,10 +3,12 @@ import { squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime"
 import type { PullRequestDetail, PullRequestMergeMethod } from "@t3tools/contracts";
 import { AsyncResult } from "effect/reactivity";
 import { useRef, useState } from "react";
-import { ActivityIndicator, Alert, Pressable, View } from "react-native";
+import { ActivityIndicator, Alert, Platform, Pressable, View } from "react-native";
 import { AppText as Text } from "../../components/AppText";
 import { SymbolView } from "../../components/AppSymbol";
 import { ControlPillMenu } from "../../components/ControlPillMenu";
+import { MaterialButton } from "../../components/MaterialButton";
+import { MaterialIconButton } from "../../components/MaterialIconButton";
 import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
 import { composerPullRequests } from "../../state/pull-requests";
 import { useAtomCommand } from "../../state/use-atom-command";
 @@ -164,33 +166,50 @@ export function PullRequestMergeControls(props: {
   return (
     <View className="gap-2 border-t border-border-subtle p-3">
       <View
-        className={`flex-row overflow-hidden rounded-xl border-continuous ${canMerge ? "bg-foreground" : "bg-subtle-strong"}`}
+        className={
+          Platform.OS === "android"
+            ? "flex-row items-center gap-2"
+            : `flex-row overflow-hidden rounded-xl border-continuous ${canMerge ? "bg-foreground" : "bg-subtle-strong"}`
+        }
       >
-        <Pressable
+        {Platform.OS === "android" ? (
-          accessibilityRole="button"
+          <View className="min-w-0 flex-1">
-          accessibilityLabel={
+            <MaterialButton
-            scope ? `${label}, ${scope.layers.length} stack layers through #${pr.number}` : label
+              label={busy ? "Working…" : !permissions.connected ? "Reconnect to merge" : label}
-          }
+              tone="primary"
-          accessibilityState={{ disabled: !canMerge, busy: busy || checkingStack }}
+              fullWidth
-          disabled={!canMerge}
+              disabled={!canMerge}
-          onPress={() => confirm("merge")}
+              loading={busy || checkingStack}
-          className="min-h-11 min-w-0 flex-1 flex-row items-center justify-center gap-2 px-3 py-2 active:opacity-70"
+              onPress={() => confirm("merge")}
-        >
-          {busy || checkingStack ? (
-            <ActivityIndicator size="small" colorClassName="accent-icon-muted" />
-          ) : (
-            <SymbolView
-              name="arrow.triangle.merge"
-              size={16}
-              tintColorClassName={canMerge ? "accent-screen" : "accent-icon-muted"}
             />
-          )}
+          </View>
-          <Text
+        ) : (
-            className={`shrink text-center text-sm font-t3-semibold ${canMerge ? "text-screen" : "text-foreground-muted"}`}
+          <Pressable
+            accessibilityRole="button"
+            accessibilityLabel={
+              scope ? `${label}, ${scope.layers.length} stack layers through #${pr.number}` : label
+            }
+            accessibilityState={{ disabled: !canMerge, busy: busy || checkingStack }}
+            disabled={!canMerge}
+            onPress={() => confirm("merge")}
+            className="min-h-11 min-w-0 flex-1 flex-row items-center justify-center gap-2 px-3 py-2 active:opacity-70"
           >
-            {busy ? "Working…" : !permissions.connected ? "Reconnect to merge" : label}
+            {busy || checkingStack ? (
-          </Text>
+              <ActivityIndicator size="small" colorClassName="accent-icon-muted" />
-        </Pressable>
+            ) : (
+              <SymbolView
+                name="arrow.triangle.merge"
+                size={16}
+                tintColorClassName={canMerge ? "accent-screen" : "accent-icon-muted"}
+              />
+            )}
+            <Text
+              className={`shrink text-center text-sm font-t3-semibold ${canMerge ? "text-screen" : "text-foreground-muted"}`}
+            >
+              {busy ? "Working…" : !permissions.connected ? "Reconnect to merge" : label}
+            </Text>
+          </Pressable>
+        )}
         {methods.length > 0 || canAutoMerge ? (
           <ControlPillMenu
             title="Merge options"
 @@ -219,17 +238,27 @@ export function PullRequestMergeControls(props: {
               } else if (nativeEvent.event === autoAction && canAutoMerge) confirm(autoAction);
             }}
           >
-            <Pressable
+            {Platform.OS === "android" ? (
-              accessibilityRole="button"
+              <View pointerEvents="none">
-              accessibilityLabel="Merge options"
+                <MaterialIconButton
-              className="min-h-11 w-11 items-center justify-center border-l border-border-subtle"
+                  accessibilityLabel="Merge options"
-            >
+                  icon="chevron.down"
-              <SymbolView
+                  variant="tonal"
-                name="chevron.down"
+                />
-                size={13}
+              </View>
-                tintColorClassName={canMerge ? "accent-screen" : "accent-icon-muted"}
+            ) : (
-              />
+              <Pressable
-            </Pressable>
+                accessibilityRole="button"
+                accessibilityLabel="Merge options"
+                className="min-h-11 w-11 items-center justify-center border-l border-border-subtle"
+              >
+                <SymbolView
+                  name="chevron.down"
+                  size={13}
+                  tintColorClassName={canMerge ? "accent-screen" : "accent-icon-muted"}
+                />
+              </Pressable>
+            )}
           </ControlPillMenu>
         ) : null}
       </View>

apps/mobile/src/features/pull-requests/PullRequestReviewSheet.tsx+2-2

apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx+48-9

 @@ -57,6 +57,10 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { AppText as Text } from "../../components/AppText";
 import { AndroidScreenHeader } from "../../components/AndroidScreenHeader";
+import { useAndroidControlSizing } from "../../components/useAndroidControlSizing";
+import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";
+import { AndroidWorkspaceSidebarButton } from "../layout/workspace-sidebar-toolbar";
+import { useAndroidWorkspaceBack } from "../workspace/useAndroidWorkspaceNavigation";
 import { EmptyState } from "../../components/EmptyState";
 import { SegmentedControl } from "../../components/SegmentedControl";
 import { SymbolView } from "../../components/AppSymbol";
 @@ -269,9 +273,18 @@ function PullRequestOverview(props: {
   );
 }
+function usePullRequestToolbarHeight(bottomInset: number) {
+  const { buttonSize } = useAndroidControlSizing();
+  // Reserve the controls, native toolbar padding, and outer gaps before onLayout measures them.
+  return useState(() => (Platform.OS === "android" ? bottomInset + buttonSize + 40 : 0));
+}
 export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestParams>) {
+  const returnToList = useAndroidWorkspaceBack("pullRequests");
+  const { layout } = useAdaptiveWorkspaceLayout();
   const navigation = useNavigation();
   const insets = useSafeAreaInsets();
+  const [toolbarHeight, setToolbarHeight] = usePullRequestToolbarHeight(insets.bottom);
   const params = route.params;
   const connected = usePullRequestConnected(params.environmentId);
   const [section, setSection] = useState<"overview" | "activity" | "guide">("overview");
 @@ -356,7 +369,7 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
       params={params}
       value={pr?.provider === "github" ? pr.url : null}
     >
-      <View className="flex-1 bg-screen">
+      <View className={Platform.OS === "android" ? "flex-1 bg-header" : "flex-1 bg-screen"}>
         <NativeStackScreenOptions
           options={{
             title: `#${params.number}`,
 @@ -369,7 +382,9 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
         {Platform.OS === "android" ? (
           <AndroidScreenHeader
             title={`#${params.number}${connected ? "" : " · Offline"}`}
-            onBack={() => navigation.goBack()}
+            subtitle={params.repository}
+            onBack={layout.usesSplitView ? undefined : returnToList}
+            leading={layout.usesSplitView ? <AndroidWorkspaceSidebarButton /> : undefined}
             actions={[
               ...(permissions.verdicts.length
                 ? [
 @@ -442,7 +457,15 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
           </NativeHeaderToolbar.Menu>
         </NativeHeaderToolbar>
         <View
-          style={{ flex: 1 }}
+          style={{
+            flex: 1,
+            marginHorizontal: Platform.OS === "android" && layout.usesSplitView ? 4 : 0,
+          }}
+          className={
+            Platform.OS === "android"
+              ? "overflow-hidden rounded-t-[28px] bg-sheet-solid"
+              : undefined
+          }
           onLayout={(event) => setViewportHeight(event.nativeEvent.layout.height)}
         >
           {(["overview", "guide", "activity"] as const)
 @@ -499,7 +522,7 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
                   contentContainerStyle={{
                     paddingHorizontal: 16,
                     paddingTop: 8,
-                    paddingBottom: 24,
+                    paddingBottom: 24 + (Platform.OS === "android" ? toolbarHeight : 0),
                     // Short tabs must still be tall enough to preserve the collapsed header.
                     minHeight: Math.max(
                       0,
 @@ -621,7 +644,7 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
                         >
                           <PullRequestIdentity pr={identity} params={params} />
                           <SegmentedControl
-                            className="bg-grouped-card"
+                            className={Platform.OS === "android" ? undefined : "bg-grouped-card"}
                             options={[
                               { value: "overview", label: "Overview" },
                               ...(guidesEnabled
 @@ -643,7 +666,12 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
               </View>
             ))}
         </View>
-        <PullRequestActionToolbar pr={pr} params={params} onOpenFiles={openFiles} />
+        <PullRequestActionToolbar
+          pr={pr}
+          params={params}
+          onOpenFiles={openFiles}
+          onHeightChange={setToolbarHeight}
+        />
       </View>
     </PullRequestMarkdownRepository>
   );
 @@ -685,8 +713,10 @@ export function PullRequestFileRouteScreen({
     readonly focus?: GuideDiffFocus;
   }
 >) {
+  const { layout } = useAdaptiveWorkspaceLayout();
   const navigation = useNavigation();
   const insets = useSafeAreaInsets();
+  const [toolbarHeight, setToolbarHeight] = usePullRequestToolbarHeight(insets.bottom);
   const commit = route.params.commit;
   const result = usePullRequestDiff(route.params);
   const filter = usePullRequestFileFilter(
 @@ -875,7 +905,7 @@ export function PullRequestFileRouteScreen({
   const seekingFile = !targetFile && result.nextCursor !== null;
   const loadingDiff = (result.isPending && !data.rows.length) || (seekingFile && !result.error);
   return (
-    <View className="flex-1 bg-screen">
+    <View className={Platform.OS === "android" ? "flex-1 bg-header" : "flex-1 bg-screen"}>
       <NativeStackScreenOptions
         options={{
           title,
 @@ -1022,7 +1052,15 @@ export function PullRequestFileRouteScreen({
           />
         </View>
       ) : null}
-      <View className="flex-1" collapsable={false}>
+      <View
+        className={
+          Platform.OS === "android"
+            ? "flex-1 overflow-hidden rounded-t-[28px] bg-sheet-solid"
+            : "flex-1"
+        }
+        collapsable={false}
+        style={{ marginHorizontal: Platform.OS === "android" && layout.usesSplitView ? 4 : 0 }}
+      >
         {loadingDiff || result.error ? (
           <View style={{ paddingTop: Platform.OS === "ios" && !staleDiff ? insets.top : 0 }}>
             <PullRequestReadStatus pending={loadingDiff} error={result.error} />
 @@ -1097,7 +1135,7 @@ export function PullRequestFileRouteScreen({
               rowHeight={nativeReviewDiffStyle.rowHeight}
               contentWidth={NATIVE_REVIEW_DIFF_CONTENT_WIDTH}
               contentInsetTop={Platform.OS === "ios" ? (staleDiff ? 0 : insets.top) : undefined}
-              contentInsetBottom={Platform.OS === "ios" ? insets.bottom : undefined}
+              contentInsetBottom={Platform.OS === "android" ? toolbarHeight : insets.bottom}
               contentResetKey={`pull-request:${route.params.environmentId}:${route.params.repository}:${route.params.number}:${commit ?? "all"}`}
             />
           </View>
 @@ -1147,6 +1185,7 @@ export function PullRequestFileRouteScreen({
         params={route.params}
         filePath={visibleFile?.path}
         onOpenFiles={() => navigation.navigate("PullRequestFiles", route.params)}
+        onHeightChange={setToolbarHeight}
       />
     </View>
   );

apps/mobile/src/features/pull-requests/PullRequestSheetContent.tsx+91-35

...	@@ -1,9 +1,12 @@	...	@@ -1,9 +1,12 @@
1	import { useNavigation } from "@react-navigation/native";	1	import { useNavigation } from "@react-navigation/native";
2	import type { ReactNode } from "react";	2	import type { ReactNode } from "react";
3	import { ScrollView, View } from "react-native";	3	import { Platform, ScrollView, useWindowDimensions, View } from "react-native";
4	import { KeyboardAvoidingView } from "react-native-keyboard-controller";	4	import { KeyboardAvoidingView } from "react-native-keyboard-controller";
5	import { useSafeAreaInsets } from "react-native-safe-area-context";	5	import { useSafeAreaInsets } from "react-native-safe-area-context";
6	import { AppText as Text } from "../../components/AppText";	6	import { AppText as Text } from "../../components/AppText";
		7	import { AndroidSheetHeader } from "../../components/AndroidScreenHeader";
		8	import { MaterialIconButton } from "../../components/MaterialIconButton";
		9	import { MaterialScreenContent } from "../../components/MaterialScreenContent";
7	import { ControlPill } from "../../components/ControlPill";	10	import { ControlPill } from "../../components/ControlPill";
8	import { NativeStackScreenOptions } from "../../native/StackHeader";	11	import { NativeStackScreenOptions } from "../../native/StackHeader";
9		12
...	@@ -17,44 +20,97 @@ export function PullRequestSheetContent(props: {	...	@@ -17,44 +20,97 @@ export function PullRequestSheetContent(props: {
17	}) {	20	}) {
18	const navigation = useNavigation();	21	const navigation = useNavigation();
19	const insets = useSafeAreaInsets();	22	const insets = useSafeAreaInsets();
20	return (	23	const { height: windowHeight } = useWindowDimensions();
21	<KeyboardAvoidingView automaticOffset behavior="padding" className="flex-1 bg-sheet">	24	const android = Platform.OS === "android";
22	<NativeStackScreenOptions options={{ gestureEnabled: !props.busy }} />	25	const fitToContents = android && props.scrollable !== false;
23	<View className="flex-row items-center gap-2 px-4 pt-5 pb-5">	26	const footer = props.footer ? (
24	<ControlPill	27	<View
25	icon="xmark"	28	className={
26	accessibilityLabel="Close"	29	android && props.scrollable !== false ? "bg-sheet-solid pt-3" : "bg-sheet px-4 pt-3"
27	disabled={props.busy}	30	}
28	onPress={() => navigation.goBack()}	31	style={{ paddingBottom: Math.max(insets.bottom, 16) }}
		32	>
		33	{android ? <View style={{ minHeight: 48 }}>{props.footer}</View> : props.footer}
		34	</View>
		35	) : null;
		36	const content = (
		37	<>
		38	{android ? (
		39	<AndroidSheetHeader
		40	title={props.title}
		41	subtitle={props.subtitle}
		42	hideBottomBorder
		43	leading={
		44	<MaterialIconButton
		45	icon="arrow.left"
		46	accessibilityLabel="Close"
		47	disabled={props.busy}
		48	tintColorClassName="accent-header-foreground"
		49	onPress={() => navigation.goBack()}
		50	/>
		51	}
29	/>	52	/>
30	<View className="min-w-0 flex-1 items-center gap-1">
31	<Text className="text-center text-base font-t3-bold">{props.title}</Text>
32	<Text numberOfLines={1} className="text-center text-xs text-foreground-muted">
33	{props.subtitle}
34	</Text>
35	</View>
36	<View className="w-11" />
37	</View>
38	{props.scrollable === false ? (
39	<View className="flex-1" pointerEvents={props.busy ? "none" : "auto"}>
40	{props.children}
41	</View>
42	) : (	53	) : (
43	<ScrollView	54	<View className="flex-row items-center gap-2 px-4 pt-5 pb-5">
44	className="flex-1"	55	<ControlPill
45	keyboardShouldPersistTaps="handled"	56	icon="xmark"
46	contentContainerStyle={{ paddingHorizontal: 16, paddingBottom: 20 }}	57	accessibilityLabel="Close"
47	>	58	disabled={props.busy}
48	<View className="gap-4" pointerEvents={props.busy ? "none" : "auto"}>	59	onPress={() => navigation.goBack()}
49	{props.children}	60	/>
		61	<View className="min-w-0 flex-1 items-center gap-1">
		62	<Text className="text-center text-base font-t3-bold">{props.title}</Text>
		63	<Text numberOfLines={1} className="text-center text-xs text-foreground-muted">
		64	{props.subtitle}
		65	</Text>
50	</View>	66	</View>
51	</ScrollView>	67	<View className="w-11" />
52	)}
53	{props.footer ? (
54	<View className="bg-sheet px-4 pt-3" style={{ paddingBottom: Math.max(insets.bottom, 16) }}>
55	{props.footer}
56	</View>	68	</View>
57	) : null}	69	)}
		70	<MaterialScreenContent fitToContents={fitToContents}>
		71	{props.scrollable === false ? (
		72	<View className="flex-1" pointerEvents={props.busy ? "none" : "auto"}>
		73	{props.children}
		74	</View>
		75	) : (
		76	<ScrollView
		77	nestedScrollEnabled
		78	className="android:shrink android:grow-0 ios:flex-1"
		79	keyboardShouldPersistTaps="handled"
		80	contentContainerStyle={{
		81	paddingHorizontal: 16,
		82	paddingTop: android ? 16 : 0,
		83	paddingBottom: 20,
		84	}}
		85	>
		86	<View className="gap-4" pointerEvents={props.busy ? "none" : "auto"}>
		87	{props.children}
		88	{/* Android partial-height sheets keep submit actions within the scrollable form. */}
		89	{android ? footer : null}
		90	</View>
		91	</ScrollView>
		92	)}
		93
		94	{!android \|\| props.scrollable === false ? footer : null}
		95	</MaterialScreenContent>
		96	</>
		97	);
		98	return (
		99	<KeyboardAvoidingView
		100	automaticOffset
		101	behavior="padding"
		102	collapsable={false}
		103	className={props.scrollable === false ? "flex-1 bg-sheet" : "bg-sheet ios:flex-1"}
		104	style={fitToContents ? { maxHeight: windowHeight * 0.92 } : undefined}
		105	>
		106	<NativeStackScreenOptions
		107	options={{
		108	gestureEnabled: !props.busy,
		109	...(android ? { sheetCornerRadius: 28 } : {}),
		110	...(fitToContents ? { sheetAllowedDetents: "fitToContents" } : {}),
		111	}}
		112	/>
		113	{content}
58	</KeyboardAvoidingView>	114	</KeyboardAvoidingView>
59	);	115	);
60	}	116	}

apps/mobile/src/features/pull-requests/PullRequestStackCard.tsx+9-8

 @@ -1,6 +1,7 @@
 import { StackActions, useNavigation } from "@react-navigation/native";
 import { useState } from "react";
-import { View } from "react-native";
+import { Platform, View } from "react-native";
+import { useAndroidWorkspaceSelection } from "../workspace/useAndroidWorkspaceSelection";
 import { AppText as Text } from "../../components/AppText";
 import { PullRequestCardGroup, PullRequestCardRow } from "./PullRequestControls";
 import { pullRequestStatus } from "./pullRequestStatus";
 @@ -12,6 +13,7 @@ export function PullRequestStackCard(props: {
   readonly state: PullRequestStackState;
 }) {
   const navigation = useNavigation();
+  const selectAndroidWorkspace = useAndroidWorkspaceSelection();
   const [expanded, setExpanded] = useState(false);
   const stack = props.state.stack;
   if (!stack) {
 @@ -62,13 +64,12 @@ export function PullRequestStackCard(props: {
                   onPress={
                     selected
                       ? undefined
-                      : () =>
+                      : () => {
-                          navigation.dispatch(
+                          const params = { ...props.params, number: layer.number };
-                            StackActions.push("PullRequest", {
+                          if (Platform.OS === "android")
-                              ...props.params,
+                            selectAndroidWorkspace({ name: "PullRequest", params });
-                              number: layer.number,
+                          else navigation.dispatch(StackActions.push("PullRequest", params));
-                            }),
+                        }
-                          )
                   }
                   last={index === stack.layers.length - 1}
                 />

apps/mobile/src/features/pull-requests/PullRequestsScreen.tsx+7-3

 @@ -36,6 +36,7 @@ import {
 } from "./pullRequestList";
 import { useDebouncedValue } from "../../state/queries";
 import { useWorkspaceTabs } from "../workspace/WorkspaceTabsContext";
+import { useAndroidWorkspaceSelection } from "../workspace/useAndroidWorkspaceSelection";
 function PullRequestScrollView(props: ScrollViewProps) {
   const insets = useSafeAreaInsets();
 @@ -77,19 +78,22 @@ export function PullRequestsScreen() {
   const environmentId = environments.some((item) => item.environmentId === selectedEnvironmentId)
     ? selectedEnvironmentId
     : null;
+  const selectAndroidWorkspace = useAndroidWorkspaceSelection();
   const selectPullRequest = useCallback(
     (item: EnvironmentPullRequestListEntry) => {
       Keyboard.dismiss();
-      navigation.navigate("PullRequest", {
+      const params = {
         environmentId: String(item.environmentId),
         projectId: String(item.projectId),
         repository: item.repository,
         number: item.number,
         host: item.host,
         initialSummary: item,
-      });
+      };
+      if (Platform.OS === "android") selectAndroidWorkspace({ name: "PullRequest", params });
+      else navigation.navigate("PullRequest", params);
     },
-    [navigation],
+    [navigation, selectAndroidWorkspace],
   );
   const controlsAtom = pullRequestListControlsAtom(environmentId ?? "");
   const controls = useAtomValue(controlsAtom);

apps/mobile/src/features/pull-requests/usePullRequestListActions.ts+10-4

...	@@ -16,6 +16,7 @@ import {	...	@@ -16,6 +16,7 @@ import {
16	} from "./pullRequestActions";	16	} from "./pullRequestActions";
17	import { scopedPullRequestListKey, type EnvironmentPullRequestListEntry } from "./pullRequestList";	17	import { scopedPullRequestListKey, type EnvironmentPullRequestListEntry } from "./pullRequestList";
18	import { pullRequestTarget } from "./usePullRequestDiff";	18	import { pullRequestTarget } from "./usePullRequestDiff";
		19	import { useAndroidWorkspaceSelection } from "../workspace/useAndroidWorkspaceSelection";
19		20
20	export function usePullRequestListActions(	21	export function usePullRequestListActions(
21	environmentIds: readonly EnvironmentId[],	22	environmentIds: readonly EnvironmentId[],
...	@@ -26,6 +27,7 @@ export function usePullRequestListActions(	...	@@ -26,6 +27,7 @@ export function usePullRequestListActions(
26	) {	27	) {
27	const registry = use(RegistryContext);	28	const registry = use(RegistryContext);
28	const navigation = useNavigation();	29	const navigation = useNavigation();
		30	const selectAndroidWorkspace = useAndroidWorkspaceSelection();
29	const permissionKey = JSON.stringify(environmentIds);	31	const permissionKey = JSON.stringify(environmentIds);
30	const permissionAtom = useMemo(() => {	32	const permissionAtom = useMemo(() => {
31	const ids: readonly EnvironmentId[] = JSON.parse(permissionKey);	33	const ids: readonly EnvironmentId[] = JSON.parse(permissionKey);
...	@@ -74,7 +76,9 @@ export function usePullRequestListActions(	...	@@ -74,7 +76,9 @@ export function usePullRequestListActions(
74	!pr.viewerPermissions.requestReviewers	76	!pr.viewerPermissions.requestReviewers
75	)	77	)
76	throw new Error("Review requests aren't available for this pull request.");	78	throw new Error("Review requests aren't available for this pull request.");
77	navigation.navigate("PullRequestReviewers", params(entry));	79	if (Platform.OS === "android") {
		80	selectAndroidWorkspace({ name: "PullRequest", params: params(entry) }, params(entry));
		81	} else navigation.navigate("PullRequestReviewers", params(entry));
78	return;	82	return;
79	}	83	}
80	if (	84	if (
...	@@ -102,12 +106,14 @@ export function usePullRequestListActions(	...	@@ -102,12 +106,14 @@ export function usePullRequestListActions(
102	setBusyKey(null);	106	setBusyKey(null);
103	}	107	}
104	},	108	},
105	[registry, navigation, params, run, onChanged],	109	[registry, navigation, params, run, onChanged, selectAndroidWorkspace],
106	);	110	);
107	const select = useCallback(	111	const select = useCallback(
108	(entry: EnvironmentPullRequestListEntry, action: string) => {	112	(entry: EnvironmentPullRequestListEntry, action: string) => {
109	if (action === "open") {	113	if (action === "open") {
110	navigation.navigate("PullRequest", params(entry));	114	if (Platform.OS === "android")
		115	selectAndroidWorkspace({ name: "PullRequest", params: params(entry) });
		116	else navigation.navigate("PullRequest", params(entry));
111	return;	117	return;
112	}	118	}
113	if (action === "request-review") {	119	if (action === "request-review") {
...	@@ -143,7 +149,7 @@ export function usePullRequestListActions(	...	@@ -143,7 +149,7 @@ export function usePullRequestListActions(
143	},	149	},
144	]);	150	]);
145	},	151	},
146	[navigation, params, perform],	152	[navigation, params, perform, selectAndroidWorkspace],
147	);	153	);
148	const actions = useCallback(	154	const actions = useCallback(
149	(entry: EnvironmentPullRequestListEntry): ControlPillMenuProps["actions"] => [	155	(entry: EnvironmentPullRequestListEntry): ControlPillMenuProps["actions"] => [

apps/mobile/src/features/pull-requests/usePullRequestThreads.ts+8-3

 @@ -11,7 +11,8 @@ import { formatComposerContextReference } from "@t3tools/shared/composerContextR
 import { parseChangeRequestUrl } from "@t3tools/shared/changeRequestUrl";
 import { normalizeThreadPullRequestKey } from "@t3tools/shared/threadPullRequests";
 import { useRef, useState } from "react";
-import { Alert } from "react-native";
+import { Alert, Platform } from "react-native";
+import { useAndroidWorkspaceSelection } from "../workspace/useAndroidWorkspaceSelection";
 import { pullRequestComposerContext } from "../../lib/composerContext";
 import { scopedThreadKey } from "../../lib/scopedEntities";
 import { uuidv4 } from "../../lib/uuid";
 @@ -70,10 +71,14 @@ export function usePullRequestThreads(
   const canAsk = !connected || canOperate;
   const canCheckout = useEnvironmentScope(target.environmentId, AuthSourceControlWriteScope);
   const navigation = useNavigation();
+  const selectAndroidWorkspace = useAndroidWorkspaceSelection();
   const pending = useRef(false);
   const previousPrompts = useRef(new Map<string, string>());
-  const openThread = (thread: LinkedThread) =>
+  const openThread = (thread: LinkedThread) => {
-    navigation.navigate("Thread", { environmentId: params.environmentId, threadId: thread.id });
+    const destination = { environmentId: params.environmentId, threadId: thread.id };
+    if (Platform.OS === "android") selectAndroidWorkspace({ name: "Thread", params: destination });
+    else navigation.navigate("Thread", destination);
+  };
   const [busy, setBusy] = useState(false);
   const ask = async (thread?: LinkedThread, task: PullRequestAgentTask = "ask") => {
     if (!pr || !canAsk || pending.current) return;

apps/mobile/src/features/threads/ThreadHeader.tsx+3-12

...	@@ -1,4 +1,3 @@	...	@@ -1,4 +1,3 @@
1	import { StackActions, useNavigation } from "@react-navigation/native";
2	import { useMemo } from "react";	1	import { useMemo } from "react";
3	import { ScreenHeader } from "../../components/ScreenHeader";	2	import { ScreenHeader } from "../../components/ScreenHeader";
4	import { ScreenHeaderButton } from "../../components/ScreenHeaderButton";	3	import { ScreenHeaderButton } from "../../components/ScreenHeaderButton";
...	@@ -6,6 +5,7 @@ import type { ScreenHeaderAction } from "../../components/ScreenHeader.types";	...	@@ -6,6 +5,7 @@ import type { ScreenHeaderAction } from "../../components/ScreenHeader.types";
6	import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";	5	import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";
7	import type { ThreadInspectorMode } from "./thread-inspector-content-stack";	6	import type { ThreadInspectorMode } from "./thread-inspector-content-stack";
8	import { useThreadHeaderOptions } from "./useThreadHeaderOptions";	7	import { useThreadHeaderOptions } from "./useThreadHeaderOptions";
		8	import { useWorkspaceListNavigation } from "../workspace/useAndroidWorkspaceNavigation";
9		9
10	export function ThreadHeader(	10	export function ThreadHeader(
11	props: Parameters<typeof useThreadHeaderOptions>[0] & {	11	props: Parameters<typeof useThreadHeaderOptions>[0] & {
...	@@ -18,7 +18,7 @@ export function ThreadHeader(	...	@@ -18,7 +18,7 @@ export function ThreadHeader(
18	readonly onOpenFilesInspector: () => void;	18	readonly onOpenFilesInspector: () => void;
19	},	19	},
20	) {	20	) {
21	const navigation = useNavigation();	21	const returnToList = useWorkspaceListNavigation("threads");
22	const { layout, panes, toggleAuxiliaryPane } = useAdaptiveWorkspaceLayout();	22	const { layout, panes, toggleAuxiliaryPane } = useAdaptiveWorkspaceLayout();
23	const { onOpenTerminal, onMergeBack } = props.gitControls;	23	const { onOpenTerminal, onMergeBack } = props.gitControls;
24	const native = useThreadHeaderOptions(props);	24	const native = useThreadHeaderOptions(props);
...	@@ -96,16 +96,7 @@ export function ThreadHeader(	...	@@ -96,16 +96,7 @@ export function ThreadHeader(
96	/>	96	/>
97	) : null	97	) : null
98	}	98	}
99	onBack={	99	onBack={layout.usesSplitView ? undefined : returnToList}
100	layout.usesSplitView
101	? undefined
102	: () => {
103	// A deep link or cold start has no previous route; Home is the way out.
104	// Read the history at press time: it changes without re-rendering this screen.
105	if (navigation.canGoBack()) navigation.goBack();
106	else navigation.dispatch(StackActions.replace("Home"));
107	}
108	}
109	actions={androidHeaderActions}	100	actions={androidHeaderActions}
110	hideBottomBorder	101	hideBottomBorder
111	/>	102	/>

apps/mobile/src/features/threads/ThreadRouteScreen.tsx+7-9

 @@ -87,6 +87,10 @@ import {
 } from "./thread-inspector-content-stack";
 import { threadRouteIsHydrating } from "./thread-route-hydration";
 import { ThreadHeader } from "./ThreadHeader";
+import {
+  useAndroidWorkspaceBack,
+  useWorkspaceListNavigation,
+} from "../workspace/useAndroidWorkspaceNavigation";
 interface ThreadInspectorSelection {
   readonly routeThreadIdentity: string | null;
 @@ -114,7 +118,7 @@ function ThreadPane(props: { readonly children: ReactNode }) {
 }
 function ThreadRouteFallbackLayout(props: { readonly children: ReactNode }) {
-  const navigation = useNavigation();
+  const returnToList = useWorkspaceListNavigation("threads");
   const { layout } = useAdaptiveWorkspaceLayout();
   const { themeVariables } = useAppearancePreferences();
   if (Platform.OS !== "android") return props.children;
 @@ -124,14 +128,7 @@ function ThreadRouteFallbackLayout(props: { readonly children: ReactNode }) {
       <ScreenHeader
         title="Thread"
         options={{ contentStyle: { backgroundColor: themeVariables["--color-header"] } }}
-        onBack={
+        onBack={layout.usesSplitView ? undefined : returnToList}
-          layout.usesSplitView
-            ? undefined
-            : () => {
-                if (navigation.canGoBack()) navigation.goBack();
-                else navigation.dispatch(StackActions.replace("Home"));
-              }
-        }
         hideBottomBorder
       />
       <ThreadPane>{props.children}</ThreadPane>
 @@ -190,6 +187,7 @@ function ThreadUnavailableScreen(props: {
 }
 export function ThreadRouteScreen(props: ThreadRouteScreenProps) {
+  useAndroidWorkspaceBack("threads");
   const connectionsReady = useConnectionsReady();
   const { connectionState } = useRemoteConnectionStatus();
   const { selectedThread } = useThreadSelection();

apps/mobile/src/features/workspace/AndroidWorkspaceNavigation.android.tsx created+98

...	@@ -0,0 +1,98 @@
1	import { requireNativeView } from "expo";
2	import { CommonActions, useNavigation } from "@react-navigation/native";
3	import { androidWorkspaceNavigationState } from "../../lib/android-workspace-navigation";
4	import {
5	Keyboard,
6	processColor,
7	View,
8	type NativeSyntheticEvent,
9	type ViewProps,
10	} from "react-native";
11	import { useSafeAreaInsets } from "react-native-safe-area-context";
12	import { useKeyboardState } from "react-native-keyboard-controller";
13
14	import { useAndroidControlSizing } from "../../components/useAndroidControlSizing";
15	import { flattenThemeColor, themeColorWithAlpha } from "../../lib/mobileTheme";
16	import { useAppearancePreferences } from "../settings/appearance/AppearancePreferencesProvider";
17	import { useWorkspaceTabs } from "./WorkspaceTabsContext";
18	import type { WorkspaceTab } from "./workspace-tabs-state";
19
20	export const ANDROID_WORKSPACE_RAIL_WIDTH = 80;
21
22	interface NativeNavigationProps extends ViewProps {
23	readonly rail: boolean;
24	readonly selectedTab: WorkspaceTab;
25	readonly dark: boolean;
26	readonly textScale: number;
27	readonly containerColor: number;
28	readonly selectedColor: number;
29	readonly indicatorColor: number;
30	readonly unselectedColor: number;
31	readonly onTabSelected: (event: NativeSyntheticEvent<{ readonly tab: WorkspaceTab }>) => void;
32	}
33
34	const NativeNavigation = requireNativeView<NativeNavigationProps>("T3WorkspaceNavigation");
35
36	function nativeColor(value: string) {
37	const color = processColor(value);
38	return typeof color === "number" ? color : 0;
39	}
40
41	export function AndroidWorkspaceNavigation(props: {
42	readonly rail?: boolean;
43	readonly onSelect?: () => void;
44	}) {
45	const workspace = useWorkspaceTabs()!;
46	const navigation = useNavigation();
47	const insets = useSafeAreaInsets();
48	const keyboardVisible = useKeyboardState((state) => state.isVisible);
49	const { themeAppearance, themeVariables: colors } = useAppearancePreferences();
50	const { scale } = useAndroidControlSizing();
51	const rail = Boolean(props.rail);
52	const containerColor = rail
53	? colors["--color-header"]
54	: flattenThemeColor(
55	themeColorWithAlpha(colors["--color-header-foreground"], 0.05),
56	flattenThemeColor(colors["--color-header"], colors["--color-screen"]),
57	);
58	if (!rail && keyboardVisible) return null;
59
60	return (
61	<View
62	style={{
63	backgroundColor: containerColor,
64	...(rail
65	? {
66	flex: 1,
67	width: ANDROID_WORKSPACE_RAIL_WIDTH * Math.max(1, scale),
68	paddingTop: insets.top,
69	paddingBottom: insets.bottom,
70	}
71	: { paddingBottom: insets.bottom }),
72	}}
73	>
74	<NativeNavigation
75	rail={rail}
76	selectedTab={workspace.state.selectedTab}
77	dark={themeAppearance === "dark"}
78	textScale={scale}
79	containerColor={nativeColor(containerColor)}
80	selectedColor={nativeColor(colors["--color-secondary-foreground"])}
81	indicatorColor={nativeColor(colors["--color-secondary"])}
82	unselectedColor={nativeColor(colors["--color-header-foreground"])}
83	onTabSelected={(event) => {
84	Keyboard.dismiss();
85	const tab = event.nativeEvent.tab;
86	if (tab !== workspace.state.selectedTab) {
87	workspace.dispatch({ type: "select", tab });
88	navigation.dispatch((state) =>
89	CommonActions.reset(androidWorkspaceNavigationState(state)),
90	);
91	}
92	props.onSelect?.();
93	}}
94	style={rail ? { flex: 1 } : { height: 80 * Math.max(1, scale) }}
95	/>
96	</View>
97	);
98	}

apps/mobile/src/features/workspace/AndroidWorkspaceNavigation.tsx created+9

...	@@ -0,0 +1,9 @@
1	/** Other clients own their workspace navigation chrome. */
2	export function AndroidWorkspaceNavigation(_props: {
3	readonly rail?: boolean;
4	readonly onSelect?: () => void;
5	}) {
6	return null;
7	}
8
9	export const ANDROID_WORKSPACE_RAIL_WIDTH = 80;

apps/mobile/src/features/workspace/AndroidWorkspaceSidebar.android.tsx created+26

...	@@ -0,0 +1,26 @@
1	import { useMemo, type ReactNode } from "react";
2	import { View } from "react-native";
3	import { MaterialScreenContent } from "../../components/MaterialScreenContent";
4	import { PullRequestsScreen } from "../pull-requests/PullRequestsScreen";
5	import { MaterialPullRequestToolbar } from "../pull-requests/MaterialPullRequestToolbar.android";
6	import { WorkspaceTabsContext, useWorkspaceTabs } from "./WorkspaceTabsContext";
7
8	export function AndroidWorkspaceSidebar(props: {
9	readonly children: ReactNode;
10	readonly onRequestVisibility: () => void;
11	}) {
12	const workspace = useWorkspaceTabs()!;
13	const context = useMemo(() => ({ ...workspace, bottomClearance: 16 }), [workspace]);
14	return workspace.state.selectedTab === "threads" ? (
15	props.children
16	) : (
17	<WorkspaceTabsContext value={context}>
18	<View className="flex-1 bg-header">
19	<MaterialPullRequestToolbar onRequestVisibility={props.onRequestVisibility} />
20	<MaterialScreenContent insetHorizontal>
21	<PullRequestsScreen />
22	</MaterialScreenContent>
23	</View>
24	</WorkspaceTabsContext>
25	);
26	}

apps/mobile/src/features/workspace/AndroidWorkspaceSidebar.tsx created+8

...	@@ -0,0 +1,8 @@
1	import type { ReactNode } from "react";
2
3	export function AndroidWorkspaceSidebar(props: {
4	readonly children: ReactNode;
5	readonly onRequestVisibility: () => void;
6	}) {
7	return props.children;
8	}

apps/mobile/src/features/workspace/AndroidWorkspaceTabsProvider.tsx created+12

...	@@ -0,0 +1,12 @@
1	import type { ReactNode } from "react";
2	import { Platform } from "react-native";
3	import { WorkspaceTabsProvider } from "./WorkspaceTabsContext";
4
5	/** Android's persistent sidebar and compact root share one tab controller. */
6	export function AndroidWorkspaceTabsProvider(props: { readonly children: ReactNode }) {
7	return Platform.OS === "android" ? (
8	<WorkspaceTabsProvider>{props.children}</WorkspaceTabsProvider>
9	) : (
10	props.children
11	);
12	}

apps/mobile/src/features/workspace/WorkspaceRootScreen.android.tsx created+70

...	@@ -0,0 +1,70 @@
1	import { useMemo } from "react";
2	import { View } from "react-native";
3	import { SafeAreaInsetsContext, useSafeAreaInsets } from "react-native-safe-area-context";
4	import { NativeStackScreenOptions } from "../../native/StackHeader";
5	import { AndroidScreenHeader } from "../../components/AndroidScreenHeader";
6	import { EmptyState } from "../../components/EmptyState";
7	import { MaterialScreenContent } from "../../components/MaterialScreenContent";
8	import { useAndroidControlSizing } from "../../components/useAndroidControlSizing";
9	import { HomeRouteScreen } from "../home/HomeRouteScreen";
10	import { PullRequestsScreen } from "../pull-requests/PullRequestsScreen";
11	import { MaterialPullRequestToolbar } from "../pull-requests/MaterialPullRequestToolbar.android";
12	import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";
13	import { AndroidWorkspaceNavigation } from "./AndroidWorkspaceNavigation";
14	import { WorkspaceTabsContext, useWorkspaceTabs } from "./WorkspaceTabsContext";
15
16	export function WorkspaceRootScreen() {
17	const { layout } = useAdaptiveWorkspaceLayout();
18	const workspace = useWorkspaceTabs()!;
19	const insets = useSafeAreaInsets();
20	const { fabClearance } = useAndroidControlSizing();
21	const context = useMemo(
22	() => ({
23	...workspace,
24	bottomClearance: workspace.state.selectedTab === "threads" ? fabClearance + 16 : 16,
25	}),
26	[workspace, fabClearance],
27	);
28
29	// Split lists live beside the navigator; Home remains an empty detail pane.
30	if (layout.usesSplitView) {
31	return workspace.state.selectedTab === "threads" ? (
32	<HomeRouteScreen />
33	) : (
34	<>
35	<NativeStackScreenOptions options={{ headerShown: false }} />
36	<AndroidScreenHeader title="Pull requests" />
37	<View className="flex-1 items-center justify-center px-10">
38	<EmptyState
39	title="Select a pull request"
40	detail="Choose a pull request from the sidebar to review it."
41	variant="plain"
42	/>
43	</View>
44	</>
45	);
46	}
47
48	return (
49	<WorkspaceTabsContext value={context}>
50	<View className="flex-1 bg-header">
51	<NativeStackScreenOptions options={{ headerShown: false }} />
52	<SafeAreaInsetsContext value={{ ...insets, bottom: 0 }}>
53	<View className="flex-1">
54	{workspace.state.selectedTab === "threads" ? (
55	<HomeRouteScreen />
56	) : (
57	<>
58	<MaterialPullRequestToolbar />
59	<MaterialScreenContent>
60	<PullRequestsScreen />
61	</MaterialScreenContent>
62	</>
63	)}
64	</View>
65	</SafeAreaInsetsContext>
66	<AndroidWorkspaceNavigation />
67	</View>
68	</WorkspaceTabsContext>
69	);
70	}

apps/mobile/src/features/workspace/useAndroidWorkspaceNavigation.ts created+42

...	@@ -0,0 +1,42 @@
1	import {
2	CommonActions,
3	StackActions,
4	useFocusEffect,
5	useNavigation,
6	} from "@react-navigation/native";
7	import { useCallback } from "react";
8	import { BackHandler, Keyboard, Platform } from "react-native";
9	import { androidWorkspaceNavigationState } from "../../lib/android-workspace-navigation";
10	import { useWorkspaceTabs } from "./WorkspaceTabsContext";
11	import type { WorkspaceTab } from "./workspace-tabs-state";
12
13	export function useWorkspaceListNavigation(tab: WorkspaceTab) {
14	const navigation = useNavigation();
15	const dispatch = useWorkspaceTabs()?.dispatch;
16	return useCallback(() => {
17	if (Platform.OS === "android") {
18	dispatch?.({ type: "select", tab });
19	navigation.dispatch((state) => CommonActions.reset(androidWorkspaceNavigationState(state)));
20	} else if (navigation.canGoBack()) navigation.goBack();
21	else navigation.dispatch(StackActions.replace("Home"));
22	}, [navigation, dispatch, tab]);
23	}
24
25	/** Only base details own this Back handler; focused sheets and nested screens take priority. */
26	export function useAndroidWorkspaceBack(tab: WorkspaceTab) {
27	const dispatch = useWorkspaceTabs()?.dispatch;
28	const returnToList = useWorkspaceListNavigation(tab);
29	useFocusEffect(
30	useCallback(() => {
31	if (Platform.OS !== "android") return;
32	dispatch?.({ type: "select", tab });
33	const subscription = BackHandler.addEventListener("hardwareBackPress", () => {
34	if (Keyboard.isVisible()) Keyboard.dismiss();
35	else returnToList();
36	return true;
37	});
38	return () => subscription.remove();
39	}, [returnToList, dispatch, tab]),
40	);
41	return returnToList;
42	}

apps/mobile/src/features/workspace/useAndroidWorkspaceSelection.ts created+29

...	@@ -0,0 +1,29 @@
1	import { CommonActions, useNavigation } from "@react-navigation/native";
2	import { useCallback } from "react";
3	import { Keyboard } from "react-native";
4	import {
5	androidWorkspaceNavigationState,
6	type AndroidWorkspaceDestination,
7	} from "../../lib/android-workspace-navigation";
8	import { useWorkspaceTabs } from "./WorkspaceTabsContext";
9
10	export function useAndroidWorkspaceSelection() {
11	const navigation = useNavigation();
12	const dispatch = useWorkspaceTabs()?.dispatch;
13	return useCallback(
14	(
15	destination: AndroidWorkspaceDestination,
16	reviewers?: ReactNavigation.RootParamList["PullRequestReviewers"],
17	) => {
18	Keyboard.dismiss();
19	dispatch?.({
20	type: "select",
21	tab: destination.name === "Thread" ? "threads" : "pullRequests",
22	});
23	navigation.dispatch((state) =>
24	CommonActions.reset(androidWorkspaceNavigationState(state, destination, reviewers)),
25	);
26	},
27	[navigation, dispatch],
28	);
29	}

apps/mobile/src/lib/android-workspace-navigation.test.ts created+186

...	@@ -0,0 +1,186 @@
1	import * as NodeModule from "node:module";
2	import { describe, expect, it } from "vite-plus/test";
3	import {
4	androidWorkspaceNavigationState,
5	type AndroidWorkspaceDestination,
6	} from "./android-workspace-navigation";
7
8	const require = NodeModule.createRequire(import.meta.url);
9	const nativePackage = require.resolve("@react-navigation/native/package.json");
10	const requireFromNative = NodeModule.createRequire(nativePackage);
11	const corePackage = requireFromNative.resolve("@react-navigation/core/package.json");
12	const requireFromCore = NodeModule.createRequire(corePackage);
13	const { CommonActions, StackActions, StackRouter } = requireFromCore(
14	"@react-navigation/routers",
15	) as {
16	readonly CommonActions: typeof import("@react-navigation/native").CommonActions;
17	readonly StackActions: typeof import("@react-navigation/native").StackActions;
18	readonly StackRouter: typeof import("@react-navigation/native").StackRouter;
19	};
20	const router = StackRouter({});
21	const options = {
22	routeNames: [
23	"Home",
24	"Thread",
25	"ThreadFiles",
26	"ThreadTerminal",
27	"GitOverview",
28	"PullRequest",
29	"PullRequestFile",
30	"PullRequestReviewers",
31	"SettingsSheet",
32	],
33	routeParamList: {},
34	routeGetIdList: {},
35	};
36	const thread = {
37	name: "Thread",
38	params: { environmentId: "environment-a", threadId: "thread-a" },
39	} as const;
40	const pullRequest = {
41	name: "PullRequest",
42	params: {
43	environmentId: "environment-a",
44	projectId: "project-a",
45	repository: "owner/repository",
46	number: 42,
47	host: "github.com",
48	},
49	} as const;
50
51	function apply(
52	state: ReturnType<typeof router.getInitialState>,
53	action: Parameters<typeof router.getStateForAction>[1],
54	) {
55	const result = router.getStateForAction(state, action, options);
56	if (!result) throw new Error(`Router rejected ${action.type}`);
57	return router.getRehydratedState(result, options);
58	}
59
60	function select(
61	state: ReturnType<typeof router.getInitialState>,
62	destination?: AndroidWorkspaceDestination,
63	reviewers?: ReactNavigation.RootParamList["PullRequestReviewers"],
64	) {
65	return apply(
66	state,
67	CommonActions.reset(androidWorkspaceNavigationState(state, destination, reviewers)),
68	);
69	}
70
71	function legacyHistory() {
72	let state = router.getInitialState(options);
73	state = apply(state, StackActions.push(thread.name, thread.params));
74	state = apply(state, StackActions.push(pullRequest.name, pullRequest.params));
75	return state;
76	}
77
78	function names(state: ReturnType<typeof router.getInitialState>) {
79	return state.routes.map((route) => route.name);
80	}
81
82	describe("Android workspace navigation", () => {
83	it("replaces cross-tab history with one detail and returns directly to its list", () => {
84	const previous = legacyHistory();
85	const state = select(previous, pullRequest);
86	expect(names(state)).toEqual(["Home", "PullRequest"]);
87	expect(state.routes[0]?.key).toBe(previous.routes[0]?.key);
88	expect(state.routes[1]?.key).toBe(previous.routes[2]?.key);
89	expect(names(apply(state, StackActions.pop()))).toEqual(["Home"]);
90	});
91
92	it("replaces peer thread selections without leaving the previous thread underneath", () => {
93	const first = select(router.getInitialState(options), thread);
94	const second = select(first, {
95	name: "Thread",
96	params: { ...thread.params, threadId: "thread-b" },
97	});
98	expect(names(second)).toEqual(["Home", "Thread"]);
99	expect(second.routes[1]?.params).toEqual({ ...thread.params, threadId: "thread-b" });
100	expect(second.routes[1]?.key).not.toBe(first.routes[1]?.key);
101	expect(names(apply(second, StackActions.pop()))).toEqual(["Home"]);
102	});
103
104	it("dismisses nested content and overlays when the sidebar selects a peer", () => {
105	let state = legacyHistory();
106	state = apply(
107	state,
108	StackActions.push("PullRequestFile", { ...pullRequest.params, path: "src/main.ts" }),
109	);
110	state = apply(state, StackActions.push("SettingsSheet"));
111	const selected = select(state, thread);
112	expect(names(selected)).toEqual(["Home", "Thread"]);
113	expect(selected.routes[1]?.params).toEqual(thread.params);
114	});
115
116	it("creates Home beneath cold-linked details and gives direct list escape", () => {
117	const initial = router.getInitialState(options);
118	const cold = apply(initial, CommonActions.reset({ index: 0, routes: [pullRequest] }));
119	expect(names(select(cold, pullRequest))).toEqual(["Home", "PullRequest"]);
120	expect(names(select(cold))).toEqual(["Home"]);
121	});
122
123	it("keeps a request-review flow above the chosen PR instead of an old chat", () => {
124	const state = select(legacyHistory(), pullRequest, pullRequest.params);
125	expect(names(state)).toEqual(["Home", "PullRequest", "PullRequestReviewers"]);
126	const back = apply(state, StackActions.pop());
127	expect(names(back)).toEqual(["Home", "PullRequest"]);
128	expect(back.routes[back.index]?.params).toEqual(pullRequest.params);
129	});
130
131	it("preserves normal nested PR Back behavior", () => {
132	const detail = select(legacyHistory(), pullRequest);
133	const nested = apply(
134	detail,
135	StackActions.push("PullRequestFile", { ...pullRequest.params, path: "file.ts" }),
136	);
137	const back = apply(nested, StackActions.pop());
138	expect(back.routes[back.index]?.key).toBe(detail.routes[detail.index]?.key);
139	expect(names(back)).toEqual(["Home", "PullRequest"]);
140	});
141
142	it.each(["ThreadFiles", "ThreadTerminal", "GitOverview"])(
143	"returns to chat when its sidebar row is selected from %s",
144	(route) => {
145	const detail = select(router.getInitialState(options), thread);
146	const nested = apply(detail, StackActions.push(route, thread.params));
147	const selected = select(nested, thread);
148	expect(names(selected)).toEqual(["Home", "Thread"]);
149	expect(selected.routes[1]?.key).toBe(detail.routes[1]?.key);
150	expect(names(apply(selected, StackActions.pop()))).toEqual(["Home"]);
151	},
152	);
153
154	it.each([
155	{ environmentId: "environment-b" },
156	{ projectId: "project-b" },
157	{ repository: "owner/other" },
158	{ host: "git.example.test" },
159	{ number: 43 },
160	])("does not reuse another PR's key when its scope differs: %o", (change) => {
161	const previous = select(router.getInitialState(options), pullRequest);
162	const state = select(previous, {
163	name: "PullRequest",
164	params: { ...pullRequest.params, ...change },
165	});
166	expect(state.routes[1]?.key).not.toBe(previous.routes[1]?.key);
167	expect(state.routes[1]?.params).toEqual({ ...pullRequest.params, ...change });
168	});
169
170	it("does not reuse a thread key from another environment", () => {
171	const previous = select(router.getInitialState(options), thread);
172	const state = select(previous, {
173	name: "Thread",
174	params: { ...thread.params, environmentId: "environment-b" },
175	});
176	expect(state.routes[1]?.key).not.toBe(previous.routes[1]?.key);
177	});
178
179	it("drops stale detail history on a tab switch while retaining Home", () => {
180	const previous = legacyHistory();
181	const state = select(previous);
182	expect(names(state)).toEqual(["Home"]);
183	expect(state.routes[0]?.key).toBe(previous.routes[0]?.key);
184	expect(state.index).toBe(0);
185	});
186	});

apps/mobile/src/lib/android-workspace-navigation.ts created+34

...	@@ -0,0 +1,34 @@
1	import type { NavigationState } from "@react-navigation/native";
2
3	export type AndroidWorkspaceDestination =
4	\| { readonly name: "Thread"; readonly params: ReactNavigation.RootParamList["Thread"] }
5	\| { readonly name: "PullRequest"; readonly params: ReactNavigation.RootParamList["PullRequest"] };
6
7	/** Peer details share one slot above Home; nested routes retain ordinary back navigation. */
8	export function androidWorkspaceNavigationState(
9	state: NavigationState,
10	destination?: AndroidWorkspaceDestination,
11	reviewers?: ReactNavigation.RootParamList["PullRequestReviewers"],
12	) {
13	const home = state.routes.find((route) => route.name === "Home") ?? { name: "Home" };
14	if (!destination) return { ...state, index: 0, routes: [home] };
15	const identity =
16	destination.name === "Thread"
17	? ["environmentId", "threadId"]
18	: ["environmentId", "projectId", "repository", "number", "host"];
19	const params = destination.params as Readonly<Record<string, unknown>>;
20	const existing = state.routes.findLast((route) => {
21	if (route.name !== destination.name) return false;
22	const current = route.params as Readonly<Record<string, unknown>> \| undefined;
23	return identity.every((key) => current?.[key] === params[key]);
24	});
25	return {
26	...state,
27	index: reviewers ? 2 : 1,
28	routes: [
29	home,
30	{ ...existing, ...destination },
31	...(reviewers ? [{ name: "PullRequestReviewers", params: reviewers }] : []),
32	],
33	};
34	}

apps/mobile/src/native/NativeHeaderToolbar.tsx+11-4

 @@ -49,10 +49,17 @@ type NativeStackOptionsWithToolbar = NativeStackNavigationOptions & {
 };
 function iconFromProp(icon: unknown): NativeStackHeaderIcon | undefined {
-  if (typeof icon !== "string") {
+  if (typeof icon === "string") return { type: "sfSymbol", name: icon as never };
-    return undefined;
+  if (
+    typeof icon === "object" &&
+    icon !== null &&
+    "type" in icon &&
+    icon.type === "image" &&
+    "source" in icon
+  ) {
+    return icon as NativeStackHeaderIcon;
   }
-  return { type: "sfSymbol", name: icon as never };
+  return undefined;
 }
 type ToolbarElementProps = Record<string, unknown> & { readonly children?: ReactNode };
 @@ -275,7 +282,7 @@ function NativeHeaderToolbarButton(_props: {
   readonly accessibilityLabel?: string;
   readonly axisBehavior?: NativeStackHeaderAxisBehavior;
   readonly disabled?: boolean;
-  readonly icon?: string;
+  readonly icon?: string | Extract<NativeStackHeaderIcon, { type: "image" }>;
   readonly label?: string;
   readonly onPress?: () => void;
   readonly separateBackground?: boolean;

apps/mobile/src/native/useOpenPullRequest.ts+10-1

 @@ -1,6 +1,9 @@
 import { useNavigation, useRoute, StackActions } from "@react-navigation/native";
 import { nativePullRequestDestination } from "../lib/pullRequestNavigation";
 import { useCallback } from "react";
+import { Platform } from "react-native";
+import { CommonActions } from "@react-navigation/native";
+import { androidWorkspaceNavigationState } from "../lib/android-workspace-navigation";
 import { EnvironmentId, ThreadId } from "@t3tools/contracts";
 import { useThreadShell } from "../state/entities";
 import { tryOpenExternalUrl } from "../lib/openExternalUrl";
 @@ -42,7 +45,13 @@ export function useOpenPullRequest(options?: {
           : null,
       );
       if (!params) return tryOpenExternalUrl(url, "pull-request");
-      if (replace) navigation.dispatch(StackActions.replace("PullRequest", params));
+      if (Platform.OS === "android")
+        navigation.dispatch((state) =>
+          CommonActions.reset(
+            androidWorkspaceNavigationState(state, { name: "PullRequest", params }),
+          ),
+        );
+      else if (replace) navigation.dispatch(StackActions.replace("PullRequest", params));
       else navigation.navigate("PullRequest", params);
       return true;
     },

author	Alex <me@pixp.cc> 2026-10-11 19:27:54-07:00
committer	GitHub <noreply@github.com> 2026-10-11 19:27:54-07:00
log	397a46123999ada6b9ddcbe85534631a241bb0ed
tree	f43751bd71c0d65c88dc263de6396aa561d27fa5
parent	f79f37a637bda257faa06a04184e368f78650d3d
signature	Signed by PGP key B5690EEEBB952194

...	@@ -5,6 +5,7 @@ import IconGitPullRequestClosed from "@tabler/icons-react-native/IconGitPullRequ	...	@@ -5,6 +5,7 @@ import IconGitPullRequestClosed from "@tabler/icons-react-native/IconGitPullRequ
5	import IconGitPullRequestDraft from "@tabler/icons-react-native/IconGitPullRequestDraft";	5	import IconGitPullRequestDraft from "@tabler/icons-react-native/IconGitPullRequestDraft";
6	import type { SFSymbol } from "expo-symbols";	6	import type { SFSymbol } from "expo-symbols";
7	import IconGitPullRequest from "@tabler/icons-react-native/IconGitPullRequest";	7	import IconGitPullRequest from "@tabler/icons-react-native/IconGitPullRequest";
		8	import IconFileDiff from "@tabler/icons-react-native/IconFileDiff";
8	import { SymbolView as ExpoSymbolView } from "expo-symbols";	9	import { SymbolView as ExpoSymbolView } from "expo-symbols";
9	import { withUniwind } from "uniwind";	10	import { withUniwind } from "uniwind";
10	import type { AppSymbolViewProps } from "./AppSymbol";	11	import type { AppSymbolViewProps } from "./AppSymbol";
...	@@ -12,7 +13,8 @@ import type { AppSymbolViewProps } from "./AppSymbol";	...	@@ -12,7 +13,8 @@ import type { AppSymbolViewProps } from "./AppSymbol";
12	export type { SFSymbol } from "expo-symbols";	13	export type { SFSymbol } from "expo-symbols";
13	export type { AppSymbolName } from "./AppSymbol";	14	export type { AppSymbolName } from "./AppSymbol";
14		15
15	const GIT_ICONS = {	16	const CUSTOM_ICONS = {
		17	"file.diff": IconFileDiff,
16	"arrow.triangle.pull": IconGitPullRequest,	18	"arrow.triangle.pull": IconGitPullRequest,
17	"arrow.triangle.merge": IconGitMerge,	19	"arrow.triangle.merge": IconGitMerge,
18	"arrow.triangle.branch": IconGitBranch,	20	"arrow.triangle.branch": IconGitBranch,
...	@@ -24,10 +26,10 @@ const GIT_ICONS = {	...	@@ -24,10 +26,10 @@ const GIT_ICONS = {
24		26
25	function AppSymbolView(props: AppSymbolViewProps) {	27	function AppSymbolView(props: AppSymbolViewProps) {
26	const name = typeof props.name === "string" ? props.name : props.name.ios;	28	const name = typeof props.name === "string" ? props.name : props.name.ios;
27	const GitIcon = GIT_ICONS[name as keyof typeof GIT_ICONS];	29	const CustomIcon = CUSTOM_ICONS[name as keyof typeof CUSTOM_ICONS];
28	if (GitIcon) {	30	if (CustomIcon) {
29	return (	31	return (
30	<GitIcon	32	<CustomIcon
31	accessibilityLabel={props.accessibilityLabel}	33	accessibilityLabel={props.accessibilityLabel}
32	color={props.tintColor}	34	color={props.tintColor}
33	size={props.size}	35	size={props.size}

...	@@ -4,7 +4,7 @@ import { squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime"	...	@@ -4,7 +4,7 @@ import { squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime"
4	import type { PullRequestReviewVerdict } from "@t3tools/contracts";	4	import type { PullRequestReviewVerdict } from "@t3tools/contracts";
5	import { useCallback, useRef, useState } from "react";	5	import { useCallback, useRef, useState } from "react";
6	import { useFocusEffect } from "@react-navigation/native";	6	import { useFocusEffect } from "@react-navigation/native";
7	import { Pressable, View } from "react-native";	7	import { Platform, Pressable, View } from "react-native";
8	import { clearSubmittedReview } from "./pullRequestReviewDrafts";	8	import { clearSubmittedReview } from "./pullRequestReviewDrafts";
9	import { usePullRequestReviewDraft } from "./usePullRequestReviewDraft";	9	import { usePullRequestReviewDraft } from "./usePullRequestReviewDraft";
10	import { reviewPositionLabel } from "./pullRequestDiffComments";	10	import { reviewPositionLabel } from "./pullRequestDiffComments";
...	@@ -137,7 +137,7 @@ export function PullRequestReviewSheet({	...	@@ -137,7 +137,7 @@ export function PullRequestReviewSheet({
137	: "Post comment"	137	: "Post comment"
138	}	138	}
139	fullWidth	139	fullWidth
140	tone="contrast"	140	tone={Platform.OS === "android" ? "primary" : "contrast"}
141	loading={submission.busy}	141	loading={submission.busy}
142	disabled={!canSubmit \|\| result.isPending \|\| result.error !== null}	142	disabled={!canSubmit \|\| result.isPending \|\| result.error !== null}
143	onPress={() => void perform()}	143	onPress={() => void perform()}

feat(android): add Pull Requests tab (#18372)