@momo-kits/foundation 0.169.9-beta.1 → 0.169.9

package/Application/Components/HeaderAnimated.tsx

@@ -1,5 +1,4 @@
-import { StyleSheet, View } from 'react-native';
-import LinearGradient from 'react-native-linear-gradient';
+import { StyleSheet } from 'react-native';
 import Animated, {
   Extrapolation,
   interpolate,
@@ -10,7 +9,6 @@ import React from 'react';
 import { Image } from '../../Image';
 import { Colors } from '../../Consts';
 import { useNormalizedSharedValue } from '../hooks';
-import { HeaderBarMetrics, useHeaderLayout } from '../headerLayout';
 
 const ASPECT_RATIOS: Record<
   NonNullable<HeaderAnimatedProps['aspectRatio']>,
@@ -23,20 +21,16 @@ const ASPECT_RATIOS: Record<
 
 /**
  * Parallax header image (or `children`): stretches when pulled down and fades out
- * as the content scrolls up. Wide windows and the iPhone Duo inner display keep
- * it at phone size, centered.
+ * as the content scrolls up.
  */
 const HeaderAnimated: React.FC<HeaderAnimatedProps> = ({
   animatedValue,
   image,
   useScale = true,
   aspectRatio = '16/9',
-  bannerBackgroundColor,
   children,
 }) => {
   const sharedValue = useNormalizedSharedValue(animatedValue);
-  const { isBannerCentered, bannerWidth } = useHeaderLayout();
-  const ratio = ASPECT_RATIOS[aspectRatio];
   const animatedStyle = useAnimatedStyle(() => {
     let scale = 1;
     if (useScale) {
@@ -65,36 +59,22 @@ const HeaderAnimated: React.FC<HeaderAnimatedProps> = ({
     };
   });
 
-  const content = children ?? (
-    <Image
-      source={{
-        uri: image,
-      }}
-      style={styles.full}
-    />
-  );
-
-  if (!isBannerCentered) {
-    return (
-      <Animated.View
-        style={[styles.container, { aspectRatio: ratio }, animatedStyle]}
-      >
-        {content}
-      </Animated.View>
-    );
-  }
-
   return (
     <Animated.View
-      style={[styles.container, { height: bannerWidth / ratio }, animatedStyle]}
+      style={[
+        styles.container,
+        { aspectRatio: ASPECT_RATIOS[aspectRatio] },
+        animatedStyle,
+      ]}
     >
-      {!!bannerBackgroundColor && (
-        <LinearGradient
-          colors={[bannerBackgroundColor, bannerBackgroundColor + '00']}
-          style={StyleSheet.absoluteFill}
+      {children ?? (
+        <Image
+          source={{
+            uri: image,
+          }}
+          style={styles.full}
         />
       )}
-      <View style={styles.phoneBanner}>{content}</View>
     </Animated.View>
   );
 };
@@ -110,11 +90,6 @@ const styles = StyleSheet.create({
     alignSelf: 'center',
   },
   full: { width: '100%', height: '100%' },
-  phoneBanner: {
-    width: HeaderBarMetrics.bannerWidth,
-    height: '100%',
-    alignSelf: 'center',
-  },
 });
 
 export { HeaderAnimated };

package/Application/Components/HeaderBackground.tsx

@@ -8,12 +8,10 @@ import { Colors, Styles } from '../../Consts';
 import { Image } from '../../Image';
 import BackgroundImageView from './BackgroundImageView';
 import { useNormalizedSharedValue } from '../hooks';
-import { HeaderBarMetrics, useHeaderLayout } from '../headerLayout';
 
 /**
  * Header background: surface and image that fade in on scroll, with an optional
- * gradient (custom or theme) on top, at phone height on wide windows. Outlined
- * when `showBaseLineDebug` is on.
+ * gradient (custom or theme) on top. Outlined when `showBaseLineDebug` is on.
  */
 const HeaderBackground: React.FC<HeaderBackgroundProps> = ({
   animatedValue,
@@ -27,7 +25,6 @@ const HeaderBackground: React.FC<HeaderBackgroundProps> = ({
   const gradientColor = customGradientColor ?? theme.colors.gradient;
   const headerImage = headerBackground ?? theme.assets?.headerBackground;
   const sharedValue = useNormalizedSharedValue(animatedValue);
-  const { isWide } = useHeaderLayout();
 
   const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
@@ -41,19 +38,14 @@ const HeaderBackground: React.FC<HeaderBackgroundProps> = ({
       />
       <View style={styles.gradientContainer}>
         {useGradient && !!gradientColor && (
-          <Animated.View
-            style={[styles.extendedHeader, isWide && styles.phoneHeight]}
-          >
+          <Animated.View style={styles.extendedHeader}>
             <LinearGradient
               colors={[gradientColor, gradientColor + '00']}
               style={StyleSheet.absoluteFill}
             >
               {!!headerImage && (
                 <Image
-                  style={[
-                    styles.headerBackground,
-                    isWide && styles.phoneHeight,
-                  ]}
+                  style={styles.headerBackground}
                   source={{ uri: headerImage }}
                   loading={false}
                 />
@@ -83,11 +75,6 @@ const styles = StyleSheet.create({
     position: 'absolute',
     aspectRatio: 375 / 154,
   },
-  // wide windows keep the phone gradient height instead of scaling with the width
-  phoneHeight: {
-    aspectRatio: undefined,
-    height: HeaderBarMetrics.gradientHeight,
-  },
   debugBaseLine: { borderWidth: 1, borderColor: Colors.green_06 },
 });
 

package/Application/Components/HeaderExtendHeader.tsx

@@ -17,16 +17,11 @@ import BackgroundImageView from './BackgroundImageView';
 import { type AnimatedCompatValue } from '../utils';
 import { useNormalizedSharedValue } from '../hooks';
 import { useScreenLayout } from '../../Layout';
-import { HeaderMetrics } from '../../Layout/utils';
-import {
-  HeaderBarMetrics,
-  type HeaderContentLayout,
-  useHeaderLayout,
-} from '../headerLayout';
+import { DuoMetrics, HeaderMetrics } from '../../Layout/utils';
 
-const { buttonSize, pillWidth, sidePadding, titleGap } = HeaderBarMetrics;
-const SCREEN_PADDING = sidePadding;
-const TOOLKIT_WIDTH = pillWidth + sidePadding;
+const SCREEN_PADDING = 12;
+const BACK_WIDTH = 28;
+const TOOLKIT_WIDTH = 73;
 
 /**
  * Extended header background: a gradient that collapses on scroll and, with
@@ -43,7 +38,6 @@ const HeaderExtendHeader: React.FC<{
   useShadowHeader?: boolean;
   gradientColor?: string;
   headerBackground?: string;
-  contentLayout?: HeaderContentLayout;
 }> = ({
   headerType = 'default',
   animatedValue,
@@ -54,7 +48,6 @@ const HeaderExtendHeader: React.FC<{
   useShadowHeader: useShadowHeaderProp = true,
   gradientColor: customGradientColor,
   headerBackground: customBackground,
-  contentLayout,
 }) => {
   const { theme } = useContext(ApplicationContext);
   const context = useContext<any>(MiniAppContext);
@@ -62,32 +55,29 @@ const HeaderExtendHeader: React.FC<{
   const gradientColor = customGradientColor ?? theme.colors.gradient;
   const headerBackground = customBackground ?? theme.assets?.headerBackground;
   const layout = useScreenLayout();
-  const headerLayout = useHeaderLayout(contentLayout);
-  // the stretch frame pulls the search in from both bar edges
-  const frameShift = headerLayout.frameInset - sidePadding;
 
-  const backLeft = buttonSize + sidePadding + titleGap;
-  const defaultLeft = layout.sideBar ? SCREEN_PADDING : backLeft;
+  // the iPhone Duo status bar row keeps side bar sized back and toolkit
+  const isStatusBarRow = !!layout.statusBarClearance;
+  const duoToolkitWidth = DuoMetrics.itemPitch * 2 + SCREEN_PADDING;
+  const backWidth = isStatusBarRow ? DuoMetrics.controlSize : BACK_WIDTH;
+  const toolkitWidth = isStatusBarRow ? duoToolkitWidth : TOOLKIT_WIDTH;
+  const defaultLeft = layout.sideBar ? SCREEN_PADDING : backWidth + 20;
   const leftPosition = inputSearchProps?.leftPosition || defaultLeft;
-  const defaultRightWidth = layout.sideBar ? 0 : TOOLKIT_WIDTH;
+  const defaultRightWidth = layout.sideBar ? 0 : toolkitWidth;
   const headerRightWidth = customHeaderRightWidth ?? defaultRightWidth;
-  const contentLeft = layout.insetLeft + SCREEN_PADDING + frameShift;
-  const contentRight = layout.insetLeft + layout.contentWidth - frameShift;
+  const contentLeft = layout.insetLeft + SCREEN_PADDING;
+  const contentRight = layout.insetLeft + layout.contentWidth;
   // collapsed on the status bar row, the search stays between its clusters
   const clearanceLeft = layout.statusBarClearance?.left ?? 0;
   const clearanceRight = layout.statusBarClearance?.right ?? 0;
-  const searchLeft = leftPosition + clearanceLeft + frameShift;
-  const collapsedLeft = layout.insetLeft + searchLeft;
+  const collapsedLeft = layout.insetLeft + leftPosition + clearanceLeft;
   const collapsedRight = contentRight - clearanceRight - headerRightWidth;
-  const searchWidth = contentRight - contentLeft - SCREEN_PADDING;
+  const searchWidth = layout.contentWidth - SCREEN_PADDING * 2;
   const collapsedSearchWidth = collapsedRight - collapsedLeft - SCREEN_PADDING;
   // a row taller than barHeight (iPhone Duo) centers the collapsed search on the title
   const titleRowHeight = layout.headerHeight - layout.headerStatusBarHeight;
   const collapsedRaise = (titleRowHeight - HeaderMetrics.barHeight) / 2;
 
-  // the iPhone Duo side bar keeps the content search size
-  const searchSize = layout.sideBar ? 'default' : 'header';
-
   let useShadowHeader = useShadowHeaderProp;
   if (inputSearchProps && Platform.OS === 'android') {
     useShadowHeader = false;
@@ -179,7 +169,6 @@ const HeaderExtendHeader: React.FC<{
             <Animated.View
               style={[
                 styles.extendedHeader,
-                headerLayout.isWide && styles.phoneHeight,
                 // fade out within the header box, as DuoScrollGradient does
                 !!layout.sideBar && styles.fillHeaderBox,
                 gradientOpacityStyle,
@@ -191,10 +180,7 @@ const HeaderExtendHeader: React.FC<{
               >
                 {!!theme.assets?.headerBackground && (
                   <Image
-                    style={[
-                      styles.headerBackground,
-                      headerLayout.isWide && styles.phoneHeight,
-                    ]}
+                    style={styles.headerBackground}
                     source={{ uri: theme.assets?.headerBackground }}
                     loading={false}
                   />
@@ -203,7 +189,9 @@ const HeaderExtendHeader: React.FC<{
             </Animated.View>
           )}
         </Animated.View>
-        <Animated.View style={[styles.searchContainer, heightStyle]}>
+        <Animated.View
+          style={[styles.searchContainer, heightStyle]}
+        >
           <Animated.View
             style={[{ marginVertical: Spacing.S }, searchTranslateStyle]}
           >
@@ -213,7 +201,6 @@ const HeaderExtendHeader: React.FC<{
               <InputSearch
                 {...inputSearchProps}
                 ref={inputSearchRef}
-                size={searchSize}
                 backgroundColor={'transparent'}
                 showButtonText={false}
               />
@@ -249,10 +236,7 @@ const HeaderExtendHeader: React.FC<{
             >
               {!!headerBackground && (
                 <Image
-                  style={[
-                    styles.headerBackground,
-                    headerLayout.isWide && styles.phoneHeight,
-                  ]}
+                  style={styles.headerBackground}
                   source={{ uri: headerBackground }}
                   loading={false}
                 />
@@ -280,11 +264,6 @@ const styles = StyleSheet.create({
     position: 'absolute',
     width: '100%',
   },
-  // wide windows keep the phone gradient height instead of scaling with the width
-  phoneHeight: {
-    aspectRatio: undefined,
-    height: HeaderBarMetrics.gradientHeight,
-  },
   fillHeaderBox: {
     aspectRatio: undefined,
     height: '100%',
@@ -294,6 +273,14 @@ const styles = StyleSheet.create({
     position: 'absolute',
     overflow: 'hidden',
   },
+  verifiedDot: {
+    width: 4,
+    height: 4,
+    borderRadius: 2,
+    backgroundColor: Colors.green_03,
+    position: 'absolute',
+    alignSelf: 'center',
+  },
   debugBaseLine: { borderWidth: 1, borderColor: Colors.green_06 },
   container: {
     zIndex: 0,

package/Application/Components/HeaderLeft.tsx

@@ -6,13 +6,12 @@ import { PopupNotify } from '../../Popup';
 import { NavigationButton } from './NavigationButton';
 import { SideBarButton } from './SideBarButton';
 import Animated from 'react-native-reanimated';
-import { useSideBarItemStyle } from '../../Layout/utils';
+import { useScreenLayout, useSideBarItemStyle } from '../../Layout/utils';
 import { useSideBarCounterStyle } from './DuoQuickReturnHeader';
-import { HeaderBarMetrics } from '../headerLayout';
 
 /**
  * Header back button, also bound to the Android hardware back. `preventBack`
- * confirms in a popup first; the iPhone Duo side bar uses the 48pt side bar button.
+ * confirms in a popup first; the iPhone Duo layouts use the 48pt side bar button.
  */
 const HeaderLeft: React.FC<HeaderBackProps> = ({
   tintColor,
@@ -25,6 +24,7 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
   const { navigator } = useContext(ApplicationContext);
   const sideBarStyle = useSideBarItemStyle('left', 0);
   const counterStyle = useSideBarCounterStyle();
+  const { statusBarClearance } = useScreenLayout();
 
   const goBack = useCallback(() => {
     const canGoBack = navigator?.ref?.current?.canGoBack?.();
@@ -97,6 +97,20 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
     );
   }
 
+  // on the status bar row the controls keep the side bar size
+  if (statusBarClearance) {
+    return (
+      <View style={styles.headerLeft}>
+        <SideBarButton
+          accessibilityLabel="btn_navigation_back"
+          icon="arrow-back"
+          tintColor={tintColor}
+          onPress={goBackSafe}
+        />
+      </View>
+    );
+  }
+
   return (
     <View style={styles.headerLeft}>
       <NavigationButton
@@ -111,7 +125,7 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
 
 const styles = StyleSheet.create({
   headerLeft: {
-    marginLeft: HeaderBarMetrics.sidePadding,
+    marginLeft: 12,
   },
 });
 

package/Application/Components/HeaderRight.styles.ts

@@ -1,14 +1,11 @@
 import { Platform, StyleSheet } from 'react-native';
 import { Colors, Spacing } from '../../Consts';
-import { HeaderBarMetrics } from '../headerLayout';
-
-const { buttonSize, pillWidth, pillHeight, sidePadding } = HeaderBarMetrics;
 
 export const styles = StyleSheet.create({
   navigationButton: {
-    height: buttonSize,
-    width: buttonSize,
-    borderRadius: buttonSize / 2,
+    height: 28,
+    width: 28,
+    borderRadius: 14,
     justifyContent: 'center',
     alignItems: 'center',
     backgroundColor: Colors.black_01 + '99',
@@ -48,11 +45,11 @@ export const styles = StyleSheet.create({
     flexDirection: 'row',
     justifyContent: 'center',
     alignItems: 'center',
-    paddingRight: sidePadding,
+    paddingRight: Spacing.M,
   },
   toolkitContainer: {
-    height: pillHeight,
-    borderRadius: pillHeight / 2,
+    height: 28,
+    borderRadius: 14,
     justifyContent: 'center',
     alignItems: 'center',
     flexDirection: 'row',
@@ -62,10 +59,7 @@ export const styles = StyleSheet.create({
     marginLeft: Spacing.S,
   },
   toolkitButton: {
-    flex: 1,
-    height: '100%',
-    justifyContent: 'center',
-    alignItems: 'center',
+    padding: 4,
   },
   divider: {
     width: 0.5,
@@ -74,6 +68,10 @@ export const styles = StyleSheet.create({
   sideBarColumn: {
     gap: Spacing.M,
   },
+  sideBarRow: {
+    flexDirection: 'row',
+    gap: Spacing.M,
+  },
   headerLeft: {
     marginLeft: 12,
   },
@@ -138,9 +136,9 @@ export const styles = StyleSheet.create({
     marginRight: Spacing.M,
   },
   toolkitWide: {
-    width: pillWidth,
+    width: 65,
   },
   toolkitNarrow: {
-    width: buttonSize,
+    width: 28,
   },
 });

package/Application/Components/HeaderTitle.shared.ts

@@ -3,9 +3,6 @@ import { MiniAppContext } from '../../Context';
 import { Spacing } from '../../Consts';
 import { isWhiteListDesignSystem } from '../utils';
 import { useScreenLayout } from '../../Layout';
-import { HeaderBarMetrics } from '../headerLayout';
-
-const { sidePadding, buttonSize, titleGap, clusterWidth } = HeaderBarMetrics;
 
 /**
  * Header title font: MoMoTrustDisplay for design-system whitelisted mini apps,
@@ -17,28 +14,32 @@ const useHeaderFontFamily = (): string => {
 };
 
 /**
- * side paddings, back button, title gaps and right cluster sharing the
- * navigation bar with the title
+ * back button and toolkit sharing the navigation bar with the title
+ */
+const HEADER_ACTIONS_WIDTH = 172;
+
+/**
+ * extra width the 48pt back and toolkit take on the iPhone Duo status bar row
  */
-const HEADER_ACTIONS_WIDTH =
-  sidePadding * 2 + buttonSize + titleGap * 2 + clusterWidth;
+const STATUS_BAR_ROW_ACTIONS_EXTRA = 55;
 
 /**
  * Max header title width. The iPhone Duo side bar takes back and toolkit out of
- * the bar, so the title gets the content width; otherwise it shares the bar with
- * them, minus the status bar clusters on the iPhone Duo inner portrait row.
+ * the bar, so the title gets the content width; otherwise it shares the bar with them.
  */
 const useTitleMaxWidth = () => {
   const layout = useScreenLayout();
   const { width, contentWidth, sideBar, statusBarClearance } = layout;
   let clearance = 0;
+  let rowActionsExtra = 0;
   if (statusBarClearance) {
     clearance = statusBarClearance.left + statusBarClearance.right;
+    rowActionsExtra = STATUS_BAR_ROW_ACTIONS_EXTRA;
   }
   if (sideBar) {
     return contentWidth - Spacing.M * 2 - clearance;
   }
-  return width - HEADER_ACTIONS_WIDTH - clearance;
+  return width - HEADER_ACTIONS_WIDTH - rowActionsExtra - clearance;
 };
 
 export { useHeaderFontFamily, HEADER_ACTIONS_WIDTH, useTitleMaxWidth };

package/Application/Components/HeaderToolkitAction.tsx

@@ -4,15 +4,18 @@ import { NavigationButton } from './NavigationButton';
 import { MiniAppContext } from '../../Context';
 import { Colors, Spacing, Styles } from '../../Consts';
 import { Icon } from '../../Icon';
-import { DuoMetrics } from '../../Layout/utils';
+import { DuoMetrics, useScreenLayout } from '../../Layout/utils';
 import { SideBarButton, SideBarGroup, SideBarGroupItem } from './SideBarButton';
 import { useDuoBarCompression } from '../BottomTab/DuoBarCompression';
 import { styles } from './HeaderRight.styles';
 import { useToolkitActions } from './useToolkitActions';
-import { HeaderBarMetrics } from '../headerLayout';
 
 const CLOSE_ICON = '16_navigation_close_circle';
 const HOME_ICON = '16_basic_home';
+const TOOLKIT_ICON_SIZE = 20;
+// the capsule's two buttons extend their touch area outward only
+const HELP_CENTER_HIT_SLOP = { top: 7, bottom: 7, left: 7, right: 0 };
+const CLOSE_HIT_SLOP = { top: 7, bottom: 7, left: 0, right: 7 };
 
 /**
  * Header toolkit: optional shortcut plus the help center / close capsule. When
@@ -32,13 +35,14 @@ const HeaderToolkitAction: React.FC<any> = ({
   const compression = useDuoBarCompression();
   const { toolbarCompressed, toolbarHidden } = compression;
   const { expandToolbar, setToolbarHeight } = compression;
+  const { statusBarClearance } = useScreenLayout();
   const {
     isLoading,
     iconShortcut,
     shortcutOnPress,
     showBadge,
-    onPressHelpCenter,
-    onClose,
+    handlePressHelpCenter,
+    handleClose,
   } = useToolkitActions({
     preventClose,
     useSystemTools,
@@ -56,14 +60,14 @@ const HeaderToolkitAction: React.FC<any> = ({
     };
   }
 
-  const useHelpCenter = context.appId !== 'vn.momo.helpcenter';
+  const hasHelpCenter = context.appId !== 'vn.momo.helpcenter';
   const closeIcon = useCloseIcon ? CLOSE_ICON : HOME_ICON;
   let toolkitWidthStyle: ViewStyle = styles.toolkitNarrow;
-  if (useHelpCenter) {
+  if (hasHelpCenter) {
     toolkitWidthStyle = styles.toolkitWide;
   }
 
-  const groupCount = useHelpCenter ? 2 : 1;
+  const groupCount = hasHelpCenter ? 2 : 1;
   let capsuleHeight = DuoMetrics.controlSize;
   if (groupCount > 1) {
     capsuleHeight = groupCount * DuoMetrics.itemPitch;
@@ -112,19 +116,52 @@ const HeaderToolkitAction: React.FC<any> = ({
           />
         )}
         <SideBarGroup tintColor={tintColor}>
-          {useHelpCenter && (
+          {hasHelpCenter && (
             <SideBarGroupItem
               accessibilityLabel={'btn_navigation_help_center'}
               icon={'help_center'}
               tintColor={tintColor}
-              onPress={onPressHelpCenter}
+              onPress={handlePressHelpCenter}
             />
           )}
           <SideBarGroupItem
             accessibilityLabel={'btn_navigation_close'}
             icon={closeIcon}
             tintColor={tintColor}
-            onPress={onClose}
+            onPress={handleClose}
+          />
+        </SideBarGroup>
+      </View>
+    );
+  }
+
+  // on the status bar row the controls keep the side bar size
+  if (statusBarClearance) {
+    return (
+      <View style={styles.sideBarRow}>
+        {useShortcut && (
+          <SideBarButton
+            disabled={isLoading}
+            icon={iconShortcut}
+            onPress={shortcutOnPress}
+            tintColor={tintColor}
+            showBadge={showBadge}
+          />
+        )}
+        <SideBarGroup tintColor={tintColor} horizontal>
+          {hasHelpCenter && (
+            <SideBarGroupItem
+              accessibilityLabel={'btn_navigation_help_center'}
+              icon={'help_center'}
+              tintColor={tintColor}
+              onPress={handlePressHelpCenter}
+            />
+          )}
+          <SideBarGroupItem
+            accessibilityLabel={'btn_navigation_close'}
+            icon={closeIcon}
+            tintColor={tintColor}
+            onPress={handleClose}
           />
         </SideBarGroup>
       </View>
@@ -143,18 +180,18 @@ const HeaderToolkitAction: React.FC<any> = ({
         />
       )}
       <View style={[styles.toolkitContainer, buttonStyle, toolkitWidthStyle]}>
-        {useHelpCenter && (
+        {hasHelpCenter && (
           <>
             <TouchableOpacity
               accessibilityLabel={'btn_navigation_help_center'}
               style={styles.toolkitButton}
-              onPress={onPressHelpCenter}
-              hitSlop={{ top: 7, bottom: 7, left: 7, right: 0 }}
+              onPress={handlePressHelpCenter}
+              hitSlop={HELP_CENTER_HIT_SLOP}
             >
               <Icon
                 color={tintColor}
                 source={'help_center'}
-                size={HeaderBarMetrics.iconSize}
+                size={TOOLKIT_ICON_SIZE}
               />
             </TouchableOpacity>
             <View style={[styles.divider, { backgroundColor: tintColor }]} />
@@ -162,15 +199,11 @@ const HeaderToolkitAction: React.FC<any> = ({
         )}
         <TouchableOpacity
           accessibilityLabel={'btn_navigation_close'}
-          onPress={onClose}
+          onPress={handleClose}
           style={styles.toolkitButton}
-          hitSlop={{ top: 7, bottom: 7, left: 0, right: 7 }}
+          hitSlop={CLOSE_HIT_SLOP}
         >
-          <Icon
-            color={tintColor}
-            source={closeIcon}
-            size={HeaderBarMetrics.iconSize}
-          />
+          <Icon color={tintColor} source={closeIcon} size={TOOLKIT_ICON_SIZE} />
         </TouchableOpacity>
       </View>
     </View>

package/Application/Components/NavigationButton.tsx

@@ -5,12 +5,9 @@ import { StyleSheet, TouchableOpacity, View, ViewStyle } from 'react-native';
 import { Colors, Spacing } from '../../Consts';
 import { Icon } from '../../Icon';
 import { BadgeDot } from '../../Badge';
-import { HeaderBarMetrics } from '../headerLayout';
-
-const { buttonSize, iconSize } = HeaderBarMetrics;
 
 /**
- * Round 32pt icon button of the header (back, shortcut) with an optional badge
+ * Round 28pt icon button of the header (back, shortcut) with an optional badge
  * dot; switches to a dark fill under a white tint so the icon stays readable.
  */
 const NavigationButton: React.FC<NavigationButtonProps> = ({
@@ -38,7 +35,7 @@ const NavigationButton: React.FC<NavigationButtonProps> = ({
         <Icon
           source={icon}
           color={tintColor ?? theme.colors.text.default}
-          size={iconSize}
+          size={20}
         />
       </TouchableOpacity>
       {showBadge && <BadgeDot size={'small'} style={styles.badgeDot} />}
@@ -48,12 +45,12 @@ const NavigationButton: React.FC<NavigationButtonProps> = ({
 
 const styles = StyleSheet.create({
   container: {
-    width: buttonSize,
+    width: 28,
   },
   navigationButton: {
-    height: buttonSize,
-    width: buttonSize,
-    borderRadius: buttonSize / 2,
+    height: 28,
+    width: 28,
+    borderRadius: 14,
     justifyContent: 'center',
     alignItems: 'center',
     backgroundColor: Colors.black_01 + '99',