Skip to content

Commit f7fa9e7

Browse files
committed
feat(mobile): split wide Android Settings into two panes
1 parent d2c4403 commit f7fa9e7

11 files changed

Lines changed: 133 additions & 14 deletions

‎apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ import {
9898
import { workspaceTabNavigationState } from "../workspace/workspace-tab-navigation";
9999
import type { WorkspaceTab } from "../workspace/workspace-tabs-state";
100100
import { workspaceRoutesOf } from "./workspace-overlay-routes";
101+
import { SettingsWorkspaceLayout } from "../settings/SettingsWorkspaceLayout";
101102

102103
export { useAdaptiveWorkspaceLayout };
103104

@@ -905,7 +906,9 @@ function AdaptiveWorkspaceLayoutContent(
905906
compactAndroidSettings ? { ...safeAreaInsets, bottom: 0 } : safeAreaInsets
906907
}
907908
>
908-
<View className="flex-1">{props.children}</View>
909+
<View className="flex-1">
910+
<SettingsWorkspaceLayout>{props.children}</SettingsWorkspaceLayout>
911+
</View>
909912
</SafeAreaInsetsContext>
910913
{compactAndroidSettings ? (
911914
<AndroidWorkspaceNavigation onNewThread={handleStartNewTask} />

‎apps/mobile/src/features/settings/SettingsRouteScreen.tsx‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import { deriveProjectGroupLabel } from "@t3tools/client-runtime/state/project-g
2828
import { useSafeAreaInsets } from "react-native-safe-area-context";
2929

3030
import { hasCloudPublicConfig } from "../cloud/publicConfig";
31-
import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";
31+
import { useAdaptiveWorkspaceLayout } from "../layout/adaptive-workspace-context";
3232
import { useSavedRemoteConnections } from "../../state/use-remote-environment-registry";
3333
import { SettingsRow } from "./components/SettingsRow";
3434
import { SettingsSection, SettingsSidebarContext } from "./components/SettingsSection";
@@ -43,10 +43,6 @@ import { filterSettingsSections } from "./settings-search";
4343
import { NativePrimaryColumnContext } from "../../native/v5-workspace-context";
4444

4545
export function SettingsRouteScreen() {
46-
const surface = useWorkspaceSurface();
47-
const deviceType = useDeviceType();
48-
const compactTabs = useCompactWorkspaceTabs();
49-
const workspace = useWorkspaceTabs();
5046
const { layout } = useAdaptiveWorkspaceLayout();
5147
const inSidebar = use(NativePrimaryColumnContext) !== null && layout.usesSplitView;
5248
// The page open beside the list: the route right above the Settings tab's route. While
@@ -58,6 +54,19 @@ export function SettingsRouteScreen() {
5854
? rememberedSettingsPage(currentWorkspaceSelections())
5955
: (state.routes[list + 1]?.name ?? null);
6056
});
57+
return <SettingsListScreen sidebar={inSidebar} selected={selected} />;
58+
}
59+
60+
export function SettingsListScreen(props: {
61+
readonly sidebar: boolean;
62+
readonly selected: string | null;
63+
}) {
64+
const surface = useWorkspaceSurface();
65+
const deviceType = useDeviceType();
66+
const compactTabs = useCompactWorkspaceTabs();
67+
const workspace = useWorkspaceTabs();
68+
const inSidebar = props.sidebar;
69+
const selected = props.selected;
6170
const sidebar = useMemo(() => (inSidebar ? { selected } : null), [inSidebar, selected]);
6271
const content = hasCloudPublicConfig() ? (
6372
<ConfiguredSettingsRouteScreen />
@@ -73,6 +82,7 @@ export function SettingsRouteScreen() {
7382
{Platform.OS === "android" ? (
7483
<SettingsScreen
7584
title="Settings"
85+
workspaceRoot={inSidebar}
7686
trailing={<AndroidSettingsEnvironmentFilter />}
7787
search={
7888
workspace
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
import { NavigationRouteContext } from "@react-navigation/native";
2+
import { Activity, useState, type ReactNode } from "react";
3+
import { View } from "react-native";
4+
5+
import { AppText } from "../../components/ui/AppText";
6+
import { useAdaptiveWorkspaceLayout } from "../layout/adaptive-workspace-context";
7+
import { useAndroidWorkspaceRoot } from "../workspace/AndroidWorkspaceTabsProvider";
8+
import { SettingsListScreen } from "./SettingsRouteScreen";
9+
import { SettingsScreen } from "./components/SettingsScreen";
10+
11+
const SETTINGS_LIST_ROUTE = { key: "settings-sidebar", name: "Settings" };
12+
13+
export function SettingsWorkspaceLayout(props: { readonly children: ReactNode }) {
14+
const root = useAndroidWorkspaceRoot();
15+
const { layout } = useAdaptiveWorkspaceLayout();
16+
const split = root?.settingsOpen === true && layout.usesSplitView;
17+
const [visited, setVisited] = useState(split);
18+
if (split && !visited) setVisited(true);
19+
const emptyDetail = split && root.settingsPage === null;
20+
const route = root?.settingsRoute ?? SETTINGS_LIST_ROUTE;
21+
22+
return (
23+
<View className="flex-1 flex-row">
24+
{visited ? (
25+
<Activity mode={split ? "visible" : "hidden"}>
26+
<View style={{ width: layout.listPaneWidth ?? 0, marginRight: layout.listPaneGap ?? 0 }}>
27+
<NavigationRouteContext value={route}>
28+
<SettingsListScreen sidebar selected={root?.settingsPage ?? null} />
29+
</NavigationRouteContext>
30+
</View>
31+
</Activity>
32+
) : null}
33+
<View className="flex-1">
34+
<View
35+
className="flex-1"
36+
pointerEvents={emptyDetail ? "none" : "auto"}
37+
accessibilityElementsHidden={emptyDetail}
38+
importantForAccessibility={emptyDetail ? "no-hide-descendants" : "auto"}
39+
style={emptyDetail ? { opacity: 0 } : undefined}
40+
>
41+
{props.children}
42+
</View>
43+
{emptyDetail ? (
44+
<View className="absolute inset-0">
45+
<NavigationRouteContext value={route}>
46+
<SettingsScreen title="Settings" workspaceRoot>
47+
<View className="flex-1 items-center justify-center p-6">
48+
<AppText className="text-foreground-muted">Select a setting</AppText>
49+
</View>
50+
</SettingsScreen>
51+
</NavigationRouteContext>
52+
</View>
53+
) : null}
54+
</View>
55+
</View>
56+
);
57+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import type { ReactNode } from "react";
2+
3+
export function SettingsWorkspaceLayout(props: { readonly children: ReactNode }) {
4+
return props.children;
5+
}

‎apps/mobile/src/features/settings/components/SettingsScreen.tsx‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { useWorkspaceTabs } from "../../workspace/WorkspaceTabsContext";
99
import { useWorkspaceSurface } from "../../workspace/useWorkspaceSurface";
1010
import { useDeviceType } from "../../../native/native-layout-metrics";
1111
import { useCompactWorkspaceTabs } from "../../workspace/useSystemWorkspaceTabBar";
12+
import { useAdaptiveWorkspaceLayout } from "../../layout/adaptive-workspace-context";
1213
import {
1314
ScreenScrollViewBottomInset,
1415
ScreenScrollViewSurface,
@@ -29,6 +30,7 @@ export function SettingsScreen(
2930
const surface = useWorkspaceSurface();
3031
const deviceType = useDeviceType();
3132
const compactTabs = useCompactWorkspaceTabs();
33+
const { layout } = useAdaptiveWorkspaceLayout();
3234
const cover = deviceType === "duo-folded";
3335
// Android opens Settings as a workspace tab; its root page has nothing to go back to.
3436
const workspaceRoot =
@@ -55,7 +57,11 @@ export function SettingsScreen(
5557
{props.formSheet ? (
5658
props.children
5759
) : (
58-
<SettingsScreenContent>{props.children}</SettingsScreenContent>
60+
<SettingsScreenContent
61+
insetHorizontal={Platform.OS === "android" && layout.usesSplitView}
62+
>
63+
{props.children}
64+
</SettingsScreenContent>
5965
)}
6066
</ScreenScrollViewSurface>
6167
</ScreenScrollViewBottomInset>

‎apps/mobile/src/features/workspace/AndroidWorkspaceNavigation.android.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,9 @@ export function AndroidWorkspaceNavigation(props: {
118118
// Reset the root stack even when a nested settings navigator has focus.
119119
if (root) {
120120
navigation.dispatch({
121-
...CommonActions.reset(androidWorkspaceTabNavigationState(root.getState(), tab)),
121+
...CommonActions.reset(
122+
androidWorkspaceTabNavigationState(root.getState(), tab, rail),
123+
),
122124
target: root.key,
123125
});
124126
}

‎apps/mobile/src/features/workspace/AndroidWorkspaceTabsProvider.tsx‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ interface AndroidWorkspaceRoot {
2121
readonly getState: () => NavigationState;
2222
/** Settings is derived from navigation rather than kept in the tab reducer. */
2323
readonly settingsOpen: boolean;
24+
readonly settingsRoute: NavigationState["routes"][number] | undefined;
25+
readonly settingsPage: string | null;
2426
}
2527

2628
const AndroidWorkspaceRootContext = createContext<AndroidWorkspaceRoot | null>(null);
@@ -41,7 +43,14 @@ export function AndroidWorkspaceTabsProvider(props: {
4143
const getState = useCallback(() => stateRef.current, []);
4244
const key = props.state.key;
4345
const settingsOpen = Platform.OS === "android" && androidWorkspaceSettingsOpen(props.state);
44-
const root = useMemo(() => ({ key, getState, settingsOpen }), [key, getState, settingsOpen]);
46+
const settingsIndex = props.state.routes.findIndex((route) => route.name === "Settings");
47+
const settingsRoute = settingsIndex < 0 ? undefined : props.state.routes[settingsIndex];
48+
const settingsPage =
49+
settingsIndex < 0 ? null : (props.state.routes[settingsIndex + 1]?.name ?? null);
50+
const root = useMemo(
51+
() => ({ key, getState, settingsOpen, settingsRoute, settingsPage }),
52+
[key, getState, settingsOpen, settingsRoute, settingsPage],
53+
);
4554
return Platform.OS === "android" ? (
4655
<WorkspaceTabsProvider>
4756
<AndroidWorkspaceRootContext value={root}>{props.children}</AndroidWorkspaceRootContext>

‎apps/mobile/src/features/workspace/android-workspace-tabs.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
settingsOpenIn,
77
} from "../settings/settings-navigation";
88
import type { WorkspaceTab } from "./workspace-tabs-state";
9+
import { rememberedSettingsPage, workspaceSelectionsIn } from "./workspace-tab-navigation";
910

1011
/** Settings joins the two list tabs as a top-level Android destination. */
1112
export type AndroidWorkspaceNavigationTab = WorkspaceTab | "settings";
@@ -16,9 +17,15 @@ const WORKSPACE_ROUTES = new Set(["Home", "Thread", "PullRequest"]);
1617
export function androidWorkspaceTabNavigationState(
1718
state: NavigationState,
1819
tab: AndroidWorkspaceNavigationTab,
20+
columns = false,
1921
) {
2022
const home = androidWorkspaceNavigationState(state);
21-
return tab === "settings" ? settingsNavigationState(home, undefined) : home;
23+
if (tab !== "settings") return home;
24+
const page = columns
25+
? rememberedSettingsPage(workspaceSelectionsIn(state.routes, {}))
26+
: undefined;
27+
const current = state.routes.find((route) => route.name === page);
28+
return settingsNavigationState(state, page, current?.params);
2229
}
2330

2431
/** Settings stays selected while one of its pages is the topmost workspace route. */

‎apps/mobile/src/features/workspace/useSelectWorkspaceTab.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useCallback } from "react";
22
import { Keyboard } from "react-native";
33

4-
import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";
4+
import { useAdaptiveWorkspaceLayout } from "../layout/adaptive-workspace-context";
55
import { useWorkspaceTabs } from "./WorkspaceTabsContext";
66
import type { WorkspaceTab } from "./workspace-tabs-state";
77

‎apps/mobile/src/features/workspace/useSystemWorkspaceTabBar.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { isDuoDevice } from "../../lib/device-type";
22
import { Platform } from "react-native";
3-
import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";
3+
import { useAdaptiveWorkspaceLayout } from "../layout/adaptive-workspace-context";
44
import { useDeviceType, useNativeLayoutMetrics } from "../../native/native-layout-metrics";
55
import { useWorkspaceTabs } from "./WorkspaceTabsContext";
66
import { workspaceUsesColumns } from "./workspace-tabs-state";

0 commit comments

Comments
 (0)