| ... | @@ -8,6 +8,7 @@ import { useSafeAreaInsets } from "react-native-safe-area-context"; | ... | @@ -8,6 +8,7 @@ import { useSafeAreaInsets } from "react-native-safe-area-context"; |
| 8 | | 8 | |
| 9 | import { AppText as Text } from "../../components/AppText"; | 9 | import { AppText as Text } from "../../components/AppText"; |
| 10 | import { APP_BAR_HEIGHT } from "../../lib/layoutMetrics"; | 10 | import { APP_BAR_HEIGHT } from "../../lib/layoutMetrics"; |
| | 11 | import { themeColorWithAlpha } from "../../lib/mobileTheme"; |
| 11 | import { tryOpenExternalUrl } from "../../lib/openExternalUrl"; | 12 | import { tryOpenExternalUrl } from "../../lib/openExternalUrl"; |
| 12 | import { useThemeColor } from "../../lib/useThemeColor"; | 13 | import { useThemeColor } from "../../lib/useThemeColor"; |
| 13 | import type { GitActionProgress } from "../../state/use-vcs-action-state"; | 14 | import type { GitActionProgress } from "../../state/use-vcs-action-state"; |
| ... | @@ -68,10 +69,13 @@ export function GitActionProgressOverlay(props: { | ... | @@ -68,10 +69,13 @@ export function GitActionProgressOverlay(props: { |
| 68 | function OverlayContent(props: { readonly progress: GitActionProgress }) { | 69 | function OverlayContent(props: { readonly progress: GitActionProgress }) { |
| 69 | const { progress } = props; | 70 | const { progress } = props; |
| 70 | const iconColor = useThemeColor("--color-icon"); | 71 | const iconColor = useThemeColor("--color-icon"); |
| 71 | const glassBorder = useThemeColor("--color-header-border"); | 72 | const glassSurface = useThemeColor("--color-glass-surface"); |
| 72 | const glassTint = useThemeColor("--color-glass-tint"); | 73 | const foreground = useThemeColor("--color-foreground"); |
| | 74 | const shadowColor = useThemeColor("--color-primary-shadow"); |
| 73 | const { themeAppearance } = useAppearancePreferences(); | 75 | const { themeAppearance } = useAppearancePreferences(); |
| 74 | const isDarkMode = themeAppearance === "dark"; | 76 | const isDarkMode = themeAppearance === "dark"; |
| | 77 | const glassTint = themeColorWithAlpha(String(glassSurface), isDarkMode ? 0.48 : 0.38); |
| | 78 | const glassBorder = themeColorWithAlpha(String(foreground), isDarkMode ? 0.18 : 0.12); |
| 75 | const content = ( | 79 | const content = ( |
| 76 | <> | 80 | <> |
| 77 | <OverlayIcon phase={progress.phase} iconColor={iconColor} /> | 81 | <OverlayIcon phase={progress.phase} iconColor={iconColor} /> |
| ... | @@ -100,12 +104,13 @@ function OverlayContent(props: { readonly progress: GitActionProgress }) { | ... | @@ -100,12 +104,13 @@ function OverlayContent(props: { readonly progress: GitActionProgress }) { |
| 100 | <Animated.View | 104 | <Animated.View |
| 101 | layout={OVERLAY_LAYOUT_TRANSITION} | 105 | layout={OVERLAY_LAYOUT_TRANSITION} |
| 102 | style={{ | 106 | style={{ |
| 103 | backgroundColor: glassTint, | | |
| 104 | borderColor: glassBorder, | | |
| 105 | borderCurve: "continuous", | 107 | borderCurve: "continuous", |
| 106 | borderRadius: 26, | 108 | borderRadius: 26, |
| 107 | borderWidth: StyleSheet.hairlineWidth, | 109 | elevation: 12, |
| 108 | overflow: "hidden", | 110 | shadowColor, |
| | 111 | shadowOffset: { width: 0, height: 8 }, |
| | 112 | shadowOpacity: isDarkMode ? 0.42 : 0.2, |
| | 113 | shadowRadius: 18, |
| 109 | }} | 114 | }} |
| 110 | > | 115 | > |
| 111 | <AnimatedLiquidGlassView | 116 | <AnimatedLiquidGlassView |
| ... | @@ -113,9 +118,12 @@ function OverlayContent(props: { readonly progress: GitActionProgress }) { | ... | @@ -113,9 +118,12 @@ function OverlayContent(props: { readonly progress: GitActionProgress }) { |
| 113 | effect="regular" | 118 | effect="regular" |
| 114 | interactive | 119 | interactive |
| 115 | layout={OVERLAY_LAYOUT_TRANSITION} | 120 | layout={OVERLAY_LAYOUT_TRANSITION} |
| | 121 | tintColor={glassTint} |
| 116 | style={{ | 122 | style={{ |
| | 123 | borderColor: glassBorder, |
| 117 | borderCurve: "continuous", | 124 | borderCurve: "continuous", |
| 118 | borderRadius: 26, | 125 | borderRadius: 26, |
| | 126 | borderWidth: StyleSheet.hairlineWidth, |
| 119 | overflow: "hidden", | 127 | overflow: "hidden", |
| 120 | }} | 128 | }} |
| 121 | > | 129 | > |