@@ -17,10 +17,10 @@ import { SymbolView } from "../../../components/ui/AppSymbol";
1717import { useCallback , useEffect , useMemo , useState } from "react" ;
1818import { Platform , Pressable , RefreshControl , ScrollView , View } from "react-native" ;
1919
20- import { Screen , ScreenStack , ScreenStackHeaderConfig } from "react-native-screens" ;
20+ import { ScreenStack } from "react-native-screens" ;
2121import { useSafeAreaInsets } from "react-native-safe-area-context" ;
2222import { NativeSheetContent } from "../../../native/NativeSheetContent" ;
23- import { useUniwindTheme } from "../../../lib/useUniwindTheme " ;
23+ import { NativeHeader , NativeScreen } from "../../../native/ThemedScreenStack " ;
2424import {
2525 AndroidHeaderIconButton ,
2626 AndroidSheetHeader ,
@@ -93,9 +93,6 @@ function GitOverviewSheetContent(props: GitOverviewSheetProps) {
9393 const gitState = useSelectedThreadGitState ( ) ;
9494 const gitActions = useSelectedThreadGitActions ( ) ;
9595 const { canWriteSourceControl, canChangeThreadBranch } = gitActions ;
96- const theme = useUniwindTheme ( ) ;
97- const foregroundColor = theme [ "--color-foreground" ] ;
98- const sheetColor = theme [ "--color-sheet" ] ;
9996
10097 const gitStatus = useEnvironmentQuery (
10198 selectedThread !== null && selectedThreadCwd !== null
@@ -393,28 +390,28 @@ function GitOverviewSheetContent(props: GitOverviewSheetProps) {
393390 return (
394391 < View collapsable = { false } className = "flex-1 border-l border-border bg-sheet" >
395392 < ScreenStack style = { { flex : 1 } } >
396- < Screen
393+ < NativeScreen
397394 activityState = { 2 }
398395 enabled
399396 isNativeStack
400397 screenId = "thread-git-inspector-native"
401398 scrollEdgeEffects = { HEADER_SCROLL_EDGE_EFFECTS }
402- style = { { backgroundColor : sheetColor , flex : 1 } }
399+ className = " flex-1 bg-sheet"
403400 >
404401 < NativeSheetContent > { content } </ NativeSheetContent >
405- < ScreenStackHeaderConfig
402+ < NativeHeader
406403 backgroundColor = "rgba(0,0,0,0)"
407- color = { foregroundColor }
404+ tintColorClassName = "accent-foreground"
408405 hideBackButton
409406 hideShadow = { false }
410407 navigationItemStyle = "editor"
411408 title = { currentBranchLabel }
412- titleColor = { foregroundColor }
409+ titleColorClassName = "accent-foreground"
413410 titleFontSize = { 17 }
414411 titleFontWeight = "700"
415412 translucent
416413 />
417- </ Screen >
414+ </ NativeScreen >
418415 </ ScreenStack >
419416 </ View >
420417 ) ;
@@ -427,28 +424,28 @@ function GitOverviewSheetContent(props: GitOverviewSheetProps) {
427424 return (
428425 < View collapsable = { false } className = "flex-1 bg-sheet" >
429426 < ScreenStack style = { { flex : 1 } } >
430- < Screen
427+ < NativeScreen
431428 activityState = { 2 }
432429 enabled
433430 isNativeStack
434431 screenId = "thread-git-sheet-native"
435432 scrollEdgeEffects = { HEADER_SCROLL_EDGE_EFFECTS }
436- style = { { backgroundColor : sheetColor , flex : 1 } }
433+ className = " flex-1 bg-sheet"
437434 >
438435 < NativeSheetContent > { content } </ NativeSheetContent >
439- < ScreenStackHeaderConfig
436+ < NativeHeader
440437 backgroundColor = "rgba(0,0,0,0)"
441- color = { foregroundColor }
438+ tintColorClassName = "accent-foreground"
442439 hideBackButton
443440 hideShadow = { false }
444441 navigationItemStyle = "editor"
445442 title = { currentBranchLabel }
446- titleColor = { foregroundColor }
443+ titleColorClassName = "accent-foreground"
447444 titleFontSize = { 18 }
448445 titleFontWeight = "800"
449446 translucent
450447 />
451- </ Screen >
448+ </ NativeScreen >
452449 </ ScreenStack >
453450 </ View >
454451 ) ;
0 commit comments