@@ -2,6 +2,7 @@ import { useNavigation, useNavigationState, useRoute } from "@react-navigation/n
22import type { ReactNode } from "react" ;
33import { Platform , View } from "react-native" ;
44
5+ import { AndroidSheetHeader } from "../../../components/ui/AndroidScreenHeader" ;
56import type { AppBarProps } from "../../../components/ui/AppBar.types" ;
67import { AppBar } from "../../../components/ui/AppBar" ;
78import { ScreenContent as SettingsScreenContent } from "../../../components/ui/ScreenContent" ;
@@ -25,15 +26,25 @@ export function SettingsScreen(
2526
2627 return (
2728 < View collapsable = { false } className = "flex-1 bg-sheet" >
28- < AppBar
29- title = { props . title }
30- actions = { props . actions }
31- trailing = { Platform . OS === "android" ? props . trailing : undefined }
32- sidebar = { false }
33- onBack = { workspaceRoot ? undefined : ( ) => navigation . goBack ( ) }
34- hideBottomBorder = { ! props . formSheet }
35- />
36- { props . formSheet ? (
29+ { Platform . OS === "android" && props . formSheet ? (
30+ < AndroidSheetHeader
31+ title = { props . title }
32+ actions = { props . actions }
33+ trailing = { props . trailing }
34+ onBack = { ( ) => navigation . goBack ( ) }
35+ hideBottomBorder
36+ />
37+ ) : (
38+ < AppBar
39+ title = { props . title }
40+ actions = { props . actions }
41+ trailing = { Platform . OS === "android" ? props . trailing : undefined }
42+ sidebar = { false }
43+ onBack = { workspaceRoot ? undefined : ( ) => navigation . goBack ( ) }
44+ hideBottomBorder = { ! props . formSheet }
45+ />
46+ ) }
47+ { props . formSheet && Platform . OS !== "android" ? (
3748 props . children
3849 ) : (
3950 < SettingsScreenContent > { props . children } </ SettingsScreenContent >
0 commit comments