Skip to content

Commit 68550f9

Browse files
committed
Merge remote-tracking branch 'origin/agent/fix-mobile-project-grouping' into agent/fix-mobile-project-grouping
# Conflicts: # apps/mobile/src/features/settings/SettingsProjectGroupingRouteScreen.tsx
2 parents 6147257 + 166040d commit 68550f9

4 files changed

Lines changed: 27 additions & 6 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export function AndroidScreenHeader(props: {
7070
accessibilityRole="button"
7171
hitSlop={8}
7272
onPress={props.onBack}
73-
className="size-11 items-center justify-center"
73+
className="-mr-2 size-11 items-center justify-center"
7474
>
7575
<SymbolView
7676
name="chevron.left"

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
1-
import { ScrollView, View } from "react-native";
1+
import { useNavigation } from "@react-navigation/native";
2+
import { Platform, ScrollView, View } from "react-native";
23
import { useSafeAreaInsets } from "react-native-safe-area-context";
34

5+
import { AndroidScreenHeader } from "../../components/AndroidScreenHeader";
6+
import { NativeStackScreenOptions } from "../../native/StackHeader";
47
import { CodeAppearanceSection } from "./appearance/sections/CodeAppearanceSection";
58
import { TerminalAppearanceSection } from "./appearance/sections/TerminalAppearanceSection";
69
import { TextAppearanceSection } from "./appearance/sections/TextAppearanceSection";
710

811
export function SettingsAppearanceRouteScreen() {
12+
const navigation = useNavigation();
913
const insets = useSafeAreaInsets();
1014

1115
return (
1216
<View collapsable={false} className="flex-1 bg-sheet">
17+
{Platform.OS === "android" ? (
18+
<>
19+
<NativeStackScreenOptions options={{ headerShown: false }} />
20+
<AndroidScreenHeader title="Appearance" onBack={() => navigation.goBack()} />
21+
</>
22+
) : null}
1323
<ScrollView
1424
contentInsetAdjustmentBehavior="automatic"
1525
showsVerticalScrollIndicator={false}

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

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
import { useAtomSet, useAtomValue } from "@effect/atom-react";
2+
import { useNavigation } from "@react-navigation/native";
23
import type { SidebarProjectGroupingMode } from "@t3tools/contracts";
34
import { AsyncResult } from "effect/unstable/reactivity";
4-
import { Pressable, ScrollView, View } from "react-native";
5+
import { Platform, Pressable, ScrollView, View } from "react-native";
56
import { useSafeAreaInsets } from "react-native-safe-area-context";
67

8+
import { AndroidScreenHeader } from "../../components/AndroidScreenHeader";
79
import { AppText as Text } from "../../components/AppText";
810
import { SymbolView } from "../../components/AppSymbol";
911
import { useThemeColor } from "../../lib/useThemeColor";
12+
import { NativeStackScreenOptions } from "../../native/StackHeader";
1013
import {
1114
mobileProjectGroupingModePatch,
1215
resolveMobileProjectGroupingSettings,
@@ -22,21 +25,22 @@ const GROUPING_OPTIONS: ReadonlyArray<{
2225
{
2326
mode: "repository",
2427
label: "Group by repository",
25-
description: "Matching repositories share a group while every workspace remains selectable.",
28+
description: "Matching repositories appear as one project.",
2629
},
2730
{
2831
mode: "repository_path",
2932
label: "Group by repository path",
30-
description: "Monorepo subprojects get their own groups while matching paths stay together.",
33+
description: "Keep monorepo paths separate.",
3134
},
3235
{
3336
mode: "separate",
3437
label: "Keep separate",
35-
description: "Every physical workspace appears as its own project.",
38+
description: "Show every workspace as its own project.",
3639
},
3740
];
3841

3942
export function SettingsProjectGroupingRouteScreen() {
43+
const navigation = useNavigation();
4044
const insets = useSafeAreaInsets();
4145
const checkmarkColor = useThemeColor("--color-icon");
4246
const preferencesResult = useAtomValue(mobilePreferencesAtom);
@@ -48,6 +52,12 @@ export function SettingsProjectGroupingRouteScreen() {
4852

4953
return (
5054
<View collapsable={false} className="flex-1 bg-sheet">
55+
{Platform.OS === "android" ? (
56+
<>
57+
<NativeStackScreenOptions options={{ headerShown: false }} />
58+
<AndroidScreenHeader title="Project Grouping" onBack={() => navigation.goBack()} />
59+
</>
60+
) : null}
5161
<ScrollView
5262
contentInsetAdjustmentBehavior="automatic"
5363
showsVerticalScrollIndicator={false}

‎apps/mobile/src/features/threads/NewTaskRouteScreen.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ export function NewTaskRouteScreen({ route }: StaticScreenProps<NewTaskRoutePara
238238
contentInset={{ bottom: Math.max(insets.bottom, 18) + 18 }}
239239
contentContainerStyle={{
240240
gap: 12,
241+
paddingBottom: 8,
241242
paddingHorizontal: 20,
242243
paddingTop: 8,
243244
}}

0 commit comments

Comments
 (0)