Skip to content

fix(mobile): use the Android sheet header for Add environment #23452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PixPMusic wants to merge 3 commits into
base: main
Choose a base branch
from
+22 −10
Open

fix(mobile): use the Android sheet header for Add environment #23452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d8f16e
fix(mobile): use the Android sheet header for Add environment
PixPMusic Oct 22, 2026
1c815d9
fix(mobile): round the Add environment sheet's outer corners
PixPMusic Oct 22, 2026
a3d33ec
chore(mobile): merge main into Android sheet header fix
maria-rcks Oct 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/mobile/src/Stack.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,6 +1018,7 @@ const RootStackConfig = createWorkspaceStackNavigator({
...HORIZONTAL_FORM_SHEET_OPTIONS,
sheetAllowedDetents: [0.55, 0.7],
sheetGrabberVisible: true,
sheetCornerRadius: Platform.OS === "android" ? 28 : undefined,
},
}),
NotFound: createNativeStackScreen({
Expand Down
31 changes: 21 additions & 10 deletions apps/mobile/src/features/settings/components/SettingsScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { useNavigation, useRoute } from "@react-navigation/native";
import type { ReactNode } from "react";
import { Platform, View } from "react-native";

import { AndroidSheetHeader } from "../../../components/ui/AndroidScreenHeader";
import type { AppBarProps } from "../../../components/ui/AppBar.types";
import { AppBar } from "../../../components/ui/AppBar";
import { ScreenContent as SettingsScreenContent } from "../../../components/ui/ScreenContent";
Expand Down Expand Up @@ -41,18 +42,28 @@ export function SettingsScreen(

return (
<View collapsable={false} className={`flex-1 ${surfaceClassName}`}>
<AppBar
title={props.title}
actions={props.actions}
search={props.search}
trailing={Platform.OS === "android" ? props.trailing : undefined}
sidebar={false}
onBack={workspaceRoot ? undefined : () => navigation.goBack()}
hideBottomBorder={!props.formSheet}
/>
{Platform.OS === "android" && props.formSheet ? (
<AndroidSheetHeader
title={props.title}
actions={props.actions}
trailing={props.trailing}
onBack={() => navigation.goBack()}
hideBottomBorder
/>
) : (
<AppBar
title={props.title}
actions={props.actions}
search={props.search}
trailing={Platform.OS === "android" ? props.trailing : undefined}
sidebar={false}
onBack={workspaceRoot ? undefined : () => navigation.goBack()}
hideBottomBorder={!props.formSheet}
/>
)}
<ScreenScrollViewBottomInset value={deviceType === "pad" || compactTabs ? 80 : 0}>
<ScreenScrollViewSurface value={surfaceClassName}>
{props.formSheet ? (
{props.formSheet && Platform.OS !== "android" ? (
props.children
) : (
<SettingsScreenContent>{props.children}</SettingsScreenContent>
Expand Down
Loading