@apps-in-toss/framework 0.0.30 → 0.0.31

package/dist/index.cjs

@@ -1180,10 +1180,132 @@ __export(event_bridges_exports, {
 // src/hooks/useCreateUserAgent.ts
 var import_react_native14 = require("react-native");
 var import_react_native_bedrock10 = require("react-native-bedrock");
+var FontA11yCategory = {
+  Large: "Large",
+  xLarge: "xLarge",
+  xxLarge: "xxLarge",
+  xxxLarge: "xxxLarge",
+  A11y_Medium: "A11y_Medium",
+  A11y_Large: "A11y_Large",
+  A11y_xLarge: "A11y_xLarge",
+  A11y_xxLarge: "A11y_xxLarge",
+  A11y_xxxLarge: "A11y_xxxLarge"
+};
+var androidFontScaleMap = {
+  100: FontA11yCategory.Large,
+  110: FontA11yCategory.xLarge,
+  120: FontA11yCategory.xxLarge,
+  135: FontA11yCategory.xxxLarge,
+  160: FontA11yCategory.A11y_Medium,
+  190: FontA11yCategory.A11y_Large,
+  235: FontA11yCategory.A11y_xLarge,
+  275: FontA11yCategory.A11y_xxLarge,
+  310: FontA11yCategory.A11y_xxxLarge
+};
+var iosScaleToAndroidScale = {
+  0.823: 100,
+  0.882: 100,
+  0.941: 100,
+  1: 100,
+  1.118: 110,
+  1.235: 120,
+  1.353: 135,
+  1.786: 160,
+  2.143: 190,
+  2.643: 235,
+  3.143: 275,
+  3.571: 310
+};
+function convertToAndroidStyleScale(fontScale, platform) {
+  if (platform === "android") {
+    if (fontScale <= 1) {
+      return 100;
+    }
+    const scaledValue = Math.round(fontScale * 100);
+    const keys = Object.keys(androidFontScaleMap).map(Number).sort((a, b) => a - b);
+    let closestKey = keys[0];
+    let minDiff = Math.abs(scaledValue - closestKey);
+    for (const key of keys) {
+      const diff = Math.abs(scaledValue - key);
+      if (diff < minDiff) {
+        minDiff = diff;
+        closestKey = key;
+      }
+    }
+    return closestKey;
+  } else {
+    const iosScales = Object.keys(iosScaleToAndroidScale).map(Number);
+    let closestScale = iosScales[0];
+    let minDiff = Math.abs(fontScale - closestScale);
+    for (const scale of iosScales) {
+      const diff = Math.abs(fontScale - scale);
+      if (diff < minDiff) {
+        minDiff = diff;
+        closestScale = scale;
+      }
+    }
+    return iosScaleToAndroidScale[closestScale];
+  }
+}
+function mapIOSFontScaleToCategory(fontScale) {
+  if (fontScale < 1) {
+    return FontA11yCategory.Large;
+  }
+  if (Math.abs(fontScale - 1) < 0.05) {
+    return FontA11yCategory.Large;
+  }
+  if (Math.abs(fontScale - 1.118) < 0.05) {
+    return FontA11yCategory.xLarge;
+  }
+  if (Math.abs(fontScale - 1.235) < 0.05) {
+    return FontA11yCategory.xxLarge;
+  }
+  if (Math.abs(fontScale - 1.353) < 0.05) {
+    return FontA11yCategory.xxxLarge;
+  }
+  if (Math.abs(fontScale - 1.786) < 0.05) {
+    return FontA11yCategory.A11y_Medium;
+  }
+  if (Math.abs(fontScale - 2.143) < 0.05) {
+    return FontA11yCategory.A11y_Large;
+  }
+  if (Math.abs(fontScale - 2.643) < 0.05) {
+    return FontA11yCategory.A11y_xLarge;
+  }
+  if (Math.abs(fontScale - 3.143) < 0.05) {
+    return FontA11yCategory.A11y_xxLarge;
+  }
+  if (Math.abs(fontScale - 3.571) < 0.05) {
+    return FontA11yCategory.A11y_xxxLarge;
+  }
+  return FontA11yCategory.Large;
+}
+function mapAndroidFontScaleToCategory(fontScale) {
+  if (fontScale <= 1) {
+    return androidFontScaleMap[100];
+  }
+  const scaledValue = Math.round(fontScale * 100);
+  const keys = Object.keys(androidFontScaleMap).map(Number).sort((a, b) => a - b);
+  if (keys.length === 0) {
+    return androidFontScaleMap[100];
+  }
+  let closestKey = keys[0];
+  let minDiff = Math.abs(scaledValue - closestKey);
+  for (const key of keys) {
+    const diff = Math.abs(scaledValue - key);
+    if (diff < minDiff) {
+      minDiff = diff;
+      closestKey = key;
+    }
+  }
+  return androidFontScaleMap[closestKey];
+}
+function mapFontScaleToCategory(fontScale, platform) {
+  return platform === "ios" ? mapIOSFontScaleToCategory(fontScale) : mapAndroidFontScaleToCategory(fontScale);
+}
 function useCreateUserAgent({
   batteryModePreference,
   colorPreference,
-  fontA11y,
   locale,
   navbarPreference,
   pureSafeArea,
@@ -1192,14 +1314,16 @@ function useCreateUserAgent({
 }) {
   const platform = (0, import_react_native_bedrock10.getPlatformOS)();
   const appVersion = getTossAppVersion();
-  const fontScale = (0, import_react_native14.useWindowDimensions)().fontScale;
+  const { fontScale } = (0, import_react_native14.useWindowDimensions)();
   const platformString = platform === "ios" ? "iPhone" : "Android";
+  const fontA11y = mapFontScaleToCategory(fontScale, platform);
+  const normalizedFontScale = convertToAndroidStyleScale(fontScale, platform);
   return [
     `TossApp/${appVersion}`,
     batteryModePreference && `TossBatteryModePreference/${batteryModePreference}`,
     colorPreference && `TossColorPreference/${colorPreference}`,
-    fontA11y && `TossFontAccessibility/${fontA11y}`,
-    fontScale && `TossFontScale/${fontScale}`,
+    `TossFontAccessibility/${fontA11y}`,
+    `TossFontScale/${normalizedFontScale}`,
     locale && `TossLocale/${locale}`,
     navbarPreference && `TossNavbarPreference/${navbarPreference}`,
     pureSafeArea && `TossPureSafeArea/${pureSafeArea}`,

package/dist/index.d.cts

@@ -1963,10 +1963,9 @@ interface LocalNetwork {
 type InternalProps = 'source' | 'cacheEnabled' | 'sharedCookiesEnabled' | 'thirdPartyCookiesEnabled' | 'injectedJavaScriptBeforeContentLoaded';
 declare function WebView({ type, local, onMessage, ...props }: WebViewProps): react_jsx_runtime.JSX.Element;
 
-declare function useCreateUserAgent({ batteryModePreference, colorPreference, fontA11y, locale, navbarPreference, pureSafeArea, safeArea, safeAreaBottomTransparency, }: {
+declare function useCreateUserAgent({ batteryModePreference, colorPreference, locale, navbarPreference, pureSafeArea, safeArea, safeAreaBottomTransparency, }: {
     batteryModePreference?: string;
     colorPreference?: string;
-    fontA11y?: string;
     locale?: string;
     navbarPreference?: string;
     pureSafeArea?: string;

package/dist/index.d.ts

@@ -1963,10 +1963,9 @@ interface LocalNetwork {
 type InternalProps = 'source' | 'cacheEnabled' | 'sharedCookiesEnabled' | 'thirdPartyCookiesEnabled' | 'injectedJavaScriptBeforeContentLoaded';
 declare function WebView({ type, local, onMessage, ...props }: WebViewProps): react_jsx_runtime.JSX.Element;
 
-declare function useCreateUserAgent({ batteryModePreference, colorPreference, fontA11y, locale, navbarPreference, pureSafeArea, safeArea, safeAreaBottomTransparency, }: {
+declare function useCreateUserAgent({ batteryModePreference, colorPreference, locale, navbarPreference, pureSafeArea, safeArea, safeAreaBottomTransparency, }: {
     batteryModePreference?: string;
     colorPreference?: string;
-    fontA11y?: string;
     locale?: string;
     navbarPreference?: string;
     pureSafeArea?: string;

package/dist/index.js

@@ -1128,10 +1128,132 @@ __export(event_bridges_exports, {
 // src/hooks/useCreateUserAgent.ts
 import { useWindowDimensions } from "react-native";
 import { getPlatformOS } from "react-native-bedrock";
+var FontA11yCategory = {
+  Large: "Large",
+  xLarge: "xLarge",
+  xxLarge: "xxLarge",
+  xxxLarge: "xxxLarge",
+  A11y_Medium: "A11y_Medium",
+  A11y_Large: "A11y_Large",
+  A11y_xLarge: "A11y_xLarge",
+  A11y_xxLarge: "A11y_xxLarge",
+  A11y_xxxLarge: "A11y_xxxLarge"
+};
+var androidFontScaleMap = {
+  100: FontA11yCategory.Large,
+  110: FontA11yCategory.xLarge,
+  120: FontA11yCategory.xxLarge,
+  135: FontA11yCategory.xxxLarge,
+  160: FontA11yCategory.A11y_Medium,
+  190: FontA11yCategory.A11y_Large,
+  235: FontA11yCategory.A11y_xLarge,
+  275: FontA11yCategory.A11y_xxLarge,
+  310: FontA11yCategory.A11y_xxxLarge
+};
+var iosScaleToAndroidScale = {
+  0.823: 100,
+  0.882: 100,
+  0.941: 100,
+  1: 100,
+  1.118: 110,
+  1.235: 120,
+  1.353: 135,
+  1.786: 160,
+  2.143: 190,
+  2.643: 235,
+  3.143: 275,
+  3.571: 310
+};
+function convertToAndroidStyleScale(fontScale, platform) {
+  if (platform === "android") {
+    if (fontScale <= 1) {
+      return 100;
+    }
+    const scaledValue = Math.round(fontScale * 100);
+    const keys = Object.keys(androidFontScaleMap).map(Number).sort((a, b) => a - b);
+    let closestKey = keys[0];
+    let minDiff = Math.abs(scaledValue - closestKey);
+    for (const key of keys) {
+      const diff = Math.abs(scaledValue - key);
+      if (diff < minDiff) {
+        minDiff = diff;
+        closestKey = key;
+      }
+    }
+    return closestKey;
+  } else {
+    const iosScales = Object.keys(iosScaleToAndroidScale).map(Number);
+    let closestScale = iosScales[0];
+    let minDiff = Math.abs(fontScale - closestScale);
+    for (const scale of iosScales) {
+      const diff = Math.abs(fontScale - scale);
+      if (diff < minDiff) {
+        minDiff = diff;
+        closestScale = scale;
+      }
+    }
+    return iosScaleToAndroidScale[closestScale];
+  }
+}
+function mapIOSFontScaleToCategory(fontScale) {
+  if (fontScale < 1) {
+    return FontA11yCategory.Large;
+  }
+  if (Math.abs(fontScale - 1) < 0.05) {
+    return FontA11yCategory.Large;
+  }
+  if (Math.abs(fontScale - 1.118) < 0.05) {
+    return FontA11yCategory.xLarge;
+  }
+  if (Math.abs(fontScale - 1.235) < 0.05) {
+    return FontA11yCategory.xxLarge;
+  }
+  if (Math.abs(fontScale - 1.353) < 0.05) {
+    return FontA11yCategory.xxxLarge;
+  }
+  if (Math.abs(fontScale - 1.786) < 0.05) {
+    return FontA11yCategory.A11y_Medium;
+  }
+  if (Math.abs(fontScale - 2.143) < 0.05) {
+    return FontA11yCategory.A11y_Large;
+  }
+  if (Math.abs(fontScale - 2.643) < 0.05) {
+    return FontA11yCategory.A11y_xLarge;
+  }
+  if (Math.abs(fontScale - 3.143) < 0.05) {
+    return FontA11yCategory.A11y_xxLarge;
+  }
+  if (Math.abs(fontScale - 3.571) < 0.05) {
+    return FontA11yCategory.A11y_xxxLarge;
+  }
+  return FontA11yCategory.Large;
+}
+function mapAndroidFontScaleToCategory(fontScale) {
+  if (fontScale <= 1) {
+    return androidFontScaleMap[100];
+  }
+  const scaledValue = Math.round(fontScale * 100);
+  const keys = Object.keys(androidFontScaleMap).map(Number).sort((a, b) => a - b);
+  if (keys.length === 0) {
+    return androidFontScaleMap[100];
+  }
+  let closestKey = keys[0];
+  let minDiff = Math.abs(scaledValue - closestKey);
+  for (const key of keys) {
+    const diff = Math.abs(scaledValue - key);
+    if (diff < minDiff) {
+      minDiff = diff;
+      closestKey = key;
+    }
+  }
+  return androidFontScaleMap[closestKey];
+}
+function mapFontScaleToCategory(fontScale, platform) {
+  return platform === "ios" ? mapIOSFontScaleToCategory(fontScale) : mapAndroidFontScaleToCategory(fontScale);
+}
 function useCreateUserAgent({
   batteryModePreference,
   colorPreference,
-  fontA11y,
   locale,
   navbarPreference,
   pureSafeArea,
@@ -1140,14 +1262,16 @@ function useCreateUserAgent({
 }) {
   const platform = getPlatformOS();
   const appVersion = getTossAppVersion();
-  const fontScale = useWindowDimensions().fontScale;
+  const { fontScale } = useWindowDimensions();
   const platformString = platform === "ios" ? "iPhone" : "Android";
+  const fontA11y = mapFontScaleToCategory(fontScale, platform);
+  const normalizedFontScale = convertToAndroidStyleScale(fontScale, platform);
   return [
     `TossApp/${appVersion}`,
     batteryModePreference && `TossBatteryModePreference/${batteryModePreference}`,
     colorPreference && `TossColorPreference/${colorPreference}`,
-    fontA11y && `TossFontAccessibility/${fontA11y}`,
-    fontScale && `TossFontScale/${fontScale}`,
+    `TossFontAccessibility/${fontA11y}`,
+    `TossFontScale/${normalizedFontScale}`,
     locale && `TossLocale/${locale}`,
     navbarPreference && `TossNavbarPreference/${navbarPreference}`,
     pureSafeArea && `TossPureSafeArea/${pureSafeArea}`,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@apps-in-toss/framework",
   "type": "module",
-  "version": "0.0.30",
+  "version": "0.0.31",
   "description": "The framework for Apps In Toss",
   "scripts": {
     "prepack": "yarn build",
@@ -57,9 +57,9 @@
     "ait": "./bin/ait.js"
   },
   "dependencies": {
-    "@apps-in-toss/analytics": "0.0.30",
-    "@apps-in-toss/cli": "0.0.30",
-    "@apps-in-toss/plugins": "0.0.30",
+    "@apps-in-toss/analytics": "0.0.31",
+    "@apps-in-toss/cli": "0.0.31",
+    "@apps-in-toss/plugins": "0.0.31",
     "es-hangul": "^2.3.2"
   },
   "devDependencies": {
@@ -94,5 +94,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7390d4ed0f09dec042523a302bc1aa0d21474512"
+  "gitHead": "d4fa62f4014162182181b9911e0a2912fdec318d"
 }