Skip to content

Commit 8991664

Browse files
Merge branch 'main' into t3code/ios-nav-bar-height-token
2 parents c3d256a + 8f9ab08 commit 8991664

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ import Animated, { FadeIn, FadeOut, LinearTransition } from "react-native-reanim
77
import { useSafeAreaInsets } from "react-native-safe-area-context";
88

99
import { AppText as Text } from "../../components/AppText";
10+
import { APP_BAR_HEIGHT } from "../../lib/layoutMetrics";
1011
import { tryOpenExternalUrl } from "../../lib/openExternalUrl";
1112
import { useThemeColor } from "../../lib/useThemeColor";
1213
import type { GitActionProgress } from "../../state/use-vcs-action-state";
1314

1415
const OVERLAY_LAYOUT_TRANSITION = LinearTransition.duration(220);
16+
const OVERLAY_TOP_GAP = 8;
1517
const AnimatedLiquidGlassView = Animated.createAnimatedComponent(LiquidGlassView);
1618

1719
export function GitActionProgressOverlay(props: {
@@ -52,7 +54,7 @@ export function GitActionProgressOverlay(props: {
5254
entering={isLiquidGlassSupported ? undefined : FadeIn.duration(200)}
5355
exiting={FadeOut.duration(150)}
5456
className="absolute inset-x-3 z-[100]"
55-
style={{ top: insets.top + 48 }}
57+
style={{ top: insets.top + APP_BAR_HEIGHT + OVERLAY_TOP_GAP }}
5658
pointerEvents="box-none"
5759
>
5860
<Pressable onPress={handlePress}>

‎apps/mobile/src/lib/layoutMetrics.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,9 @@ export const IPAD_HOME_TITLE_OFFSET = 10;
99
* a fallback when the measured HeaderHeightContext is unavailable.
1010
*/
1111
export const IOS_NAV_BAR_HEIGHT = 44;
12+
13+
/* Height of the app's own header chrome below the safe-area inset, on every
14+
* platform (matches the `min-h-12` AndroidScreenHeader). Distinct from the
15+
* 44pt native iOS navigation bar.
16+
*/
17+
export const APP_BAR_HEIGHT = 48;

0 commit comments

Comments
 (0)