expo-font 13.2.2 → 13.3.1

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ### 💡 Others
 
+## 13.3.1 — 2025-05-02
+
+### 🐛 Bug fixes
+
+- Bail out early when `getLoadedFonts` returns an empty array. ([#36586](https://github.com/expo/expo/pull/36586) by [@brentvatne](https://github.com/brentvatne))
+
+## 13.3.0 — 2025-04-30
+
+### 🎉 New features
+
+- [Android] Added support for font weight styles (through XML font definitions) to config plugin. ([#26082](https://github.com/expo/expo/pull/26082) by [@jongbelegen](https://github.com/jongbelegen))
+
 ## 13.2.2 — 2025-04-25
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -4,13 +4,13 @@ plugins {
 }
 
 group = 'host.exp.exponent'
-version = '13.2.2'
+version = '13.3.1'
 
 android {
   namespace "expo.modules.font"
   defaultConfig {
     versionCode 29
-    versionName "13.2.2"
+    versionName "13.3.1"
   }
 }
 

package/build/memory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../src/memory.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,YAAY,EAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAAO,CAAC;AAKlE,wBAAgB,UAAU,CAAC,UAAU,EAAE,MAAM,QAE5C;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAE3D;AAED,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAU1D;AAED,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAEjE;AAED,wBAAgB,UAAU,IAAI,IAAI,CAEjC"}
+{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../src/memory.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,YAAY,EAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAAO,CAAC;AAKlE,wBAAgB,UAAU,CAAC,UAAU,EAAE,MAAM,QAE5C;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAE3D;AAED,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAkB1D;AAED,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAEjE;AAED,wBAAgB,UAAU,IAAI,IAAI,CAEjC"}

package/build/memory.js

@@ -14,6 +14,12 @@ export function isLoadedNative(fontFamily) {
     }
     else {
         const loadedNativeFonts = ExpoFontLoader.getLoadedFonts();
+        // NOTE(brentvatne): Bail out here if there are no loaded fonts. This
+        // is functionally equivalent to the behavior below if the returned array
+        // is empty, but this handles improper mocking of `getLoadedFonts`.
+        if (!loadedNativeFonts?.length) {
+            return false;
+        }
         loadedNativeFonts.forEach((font) => {
             cache[font] = true;
         });

package/build/memory.js.map

@@ -1 +1 @@
-{"version":3,"file":"memory.js","sourceRoot":"","sources":["../src/memory.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C,MAAM,CAAC,MAAM,YAAY,GAAsC,EAAE,CAAC;AAElE,8EAA8E;AAC9E,IAAI,KAAK,GAAgC,EAAE,CAAC;AAE5C,MAAM,UAAU,UAAU,CAAC,UAAkB;IAC3C,KAAK,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,UAAkB;IAChD,OAAO,UAAU,IAAI,KAAK,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,UAAkB;IAC/C,IAAI,eAAe,CAAC,UAAU,CAAC,EAAE,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC;SAAM,CAAC;QACN,MAAM,iBAAiB,GAAa,cAAc,CAAC,cAAc,EAAE,CAAC;QACpE,iBAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACjC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QACrB,CAAC,CAAC,CAAC;QACH,OAAO,UAAU,IAAI,KAAK,CAAC;IAC7B,CAAC;AACH,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,UAAkB;IACzD,OAAO,KAAK,CAAC,UAAU,CAAC,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,UAAU;IACxB,KAAK,GAAG,EAAE,CAAC;AACb,CAAC","sourcesContent":["import ExpoFontLoader from './ExpoFontLoader';\n\nexport const loadPromises: { [name: string]: Promise<void> } = {};\n\n// cache the value on the js side for fast access to the fonts that are loaded\nlet cache: { [name: string]: boolean } = {};\n\nexport function markLoaded(fontFamily: string) {\n  cache[fontFamily] = true;\n}\n\nexport function isLoadedInCache(fontFamily: string): boolean {\n  return fontFamily in cache;\n}\n\nexport function isLoadedNative(fontFamily: string): boolean {\n  if (isLoadedInCache(fontFamily)) {\n    return true;\n  } else {\n    const loadedNativeFonts: string[] = ExpoFontLoader.getLoadedFonts();\n    loadedNativeFonts.forEach((font) => {\n      cache[font] = true;\n    });\n    return fontFamily in cache;\n  }\n}\n\nexport function purgeFontFamilyFromCache(fontFamily: string): void {\n  delete cache[fontFamily];\n}\n\nexport function purgeCache(): void {\n  cache = {};\n}\n"]}
+{"version":3,"file":"memory.js","sourceRoot":"","sources":["../src/memory.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C,MAAM,CAAC,MAAM,YAAY,GAAsC,EAAE,CAAC;AAElE,8EAA8E;AAC9E,IAAI,KAAK,GAAgC,EAAE,CAAC;AAE5C,MAAM,UAAU,UAAU,CAAC,UAAkB;IAC3C,KAAK,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,UAAkB;IAChD,OAAO,UAAU,IAAI,KAAK,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,UAAkB;IAC/C,IAAI,eAAe,CAAC,UAAU,CAAC,EAAE,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC;SAAM,CAAC;QACN,MAAM,iBAAiB,GAAa,cAAc,CAAC,cAAc,EAAE,CAAC;QAEpE,qEAAqE;QACrE,yEAAyE;QACzE,mEAAmE;QACnE,IAAI,CAAC,iBAAiB,EAAE,MAAM,EAAE,CAAC;YAC/B,OAAO,KAAK,CAAC;QACf,CAAC;QAED,iBAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACjC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QACrB,CAAC,CAAC,CAAC;QACH,OAAO,UAAU,IAAI,KAAK,CAAC;IAC7B,CAAC;AACH,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,UAAkB;IACzD,OAAO,KAAK,CAAC,UAAU,CAAC,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,UAAU;IACxB,KAAK,GAAG,EAAE,CAAC;AACb,CAAC","sourcesContent":["import ExpoFontLoader from './ExpoFontLoader';\n\nexport const loadPromises: { [name: string]: Promise<void> } = {};\n\n// cache the value on the js side for fast access to the fonts that are loaded\nlet cache: { [name: string]: boolean } = {};\n\nexport function markLoaded(fontFamily: string) {\n  cache[fontFamily] = true;\n}\n\nexport function isLoadedInCache(fontFamily: string): boolean {\n  return fontFamily in cache;\n}\n\nexport function isLoadedNative(fontFamily: string): boolean {\n  if (isLoadedInCache(fontFamily)) {\n    return true;\n  } else {\n    const loadedNativeFonts: string[] = ExpoFontLoader.getLoadedFonts();\n\n    // NOTE(brentvatne): Bail out here if there are no loaded fonts. This\n    // is functionally equivalent to the behavior below if the returned array\n    // is empty, but this handles improper mocking of `getLoadedFonts`.\n    if (!loadedNativeFonts?.length) {\n      return false;\n    }\n\n    loadedNativeFonts.forEach((font) => {\n      cache[font] = true;\n    });\n    return fontFamily in cache;\n  }\n}\n\nexport function purgeFontFamilyFromCache(fontFamily: string): void {\n  delete cache[fontFamily];\n}\n\nexport function purgeCache(): void {\n  cache = {};\n}\n"]}

package/expo-module.config.json

@@ -8,7 +8,7 @@
     "publication": {
       "groupId": "host.exp.exponent",
       "artifactId": "expo.modules.font",
-      "version": "13.2.2",
+      "version": "13.3.1",
       "repository": "local-maven-repo"
     }
   }

package/local-maven-repo/host/exp/exponent/expo.modules.font/{13.2.2/expo.modules.font-13.2.2.module → 13.3.1/expo.modules.font-13.3.1.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "host.exp.exponent",
     "module": "expo.modules.font",
-    "version": "13.2.2",
+    "version": "13.3.1",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -24,8 +24,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.font-13.2.2.aar",
-          "url": "expo.modules.font-13.2.2.aar",
+          "name": "expo.modules.font-13.3.1.aar",
+          "url": "expo.modules.font-13.3.1.aar",
           "size": 24048,
           "sha512": "68cf441a11928d7286379f1985698bdf3925a0dfd852a168968a955f21e32b1d95f1a65a330be805cee8b464cab97ff03a15ad7df77fef45aa25de193ca5b259",
           "sha256": "5274e21b1ff612d9defa01130a701dee5a7c2459b06d7a54b49d0b843d601120",
@@ -57,8 +57,8 @@
       ],
       "files": [
         {
-          "name": "expo.modules.font-13.2.2.aar",
-          "url": "expo.modules.font-13.2.2.aar",
+          "name": "expo.modules.font-13.3.1.aar",
+          "url": "expo.modules.font-13.3.1.aar",
           "size": 24048,
           "sha512": "68cf441a11928d7286379f1985698bdf3925a0dfd852a168968a955f21e32b1d95f1a65a330be805cee8b464cab97ff03a15ad7df77fef45aa25de193ca5b259",
           "sha256": "5274e21b1ff612d9defa01130a701dee5a7c2459b06d7a54b49d0b843d601120",
@@ -77,8 +77,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.font-13.2.2-sources.jar",
-          "url": "expo.modules.font-13.2.2-sources.jar",
+          "name": "expo.modules.font-13.3.1-sources.jar",
+          "url": "expo.modules.font-13.3.1-sources.jar",
           "size": 3643,
           "sha512": "04d8003327d266d74c7c2123206ff0c008db185c4fe9ce8518e6c47af1ed8d3118db35e094ceb19451c622318ac15e9fa9eaea609d7fae69cedec95e1656c20a",
           "sha256": "c029366141433ab312f41026590eb119ef648137f3b6cebeb416531fc0b4cccc",

package/local-maven-repo/host/exp/exponent/expo.modules.font/13.3.1/expo.modules.font-13.3.1.module.md5

@@ -0,0 +1 @@
+f3e81f184e30c3231a33561acb00d7b1

package/local-maven-repo/host/exp/exponent/expo.modules.font/13.3.1/expo.modules.font-13.3.1.module.sha1

@@ -0,0 +1 @@
+2deed22f48a94a8beabfb6aa00cc973ffb81e963

package/local-maven-repo/host/exp/exponent/expo.modules.font/13.3.1/expo.modules.font-13.3.1.module.sha256

@@ -0,0 +1 @@
+34f1703f7773b41917d37a7870b185613099323365667167142aa6322d4c505e

package/local-maven-repo/host/exp/exponent/expo.modules.font/13.3.1/expo.modules.font-13.3.1.module.sha512

@@ -0,0 +1 @@
+a00ab256f2f2d67f266a6db1a50aea9eadf4f0a588930796571cd94d5140263bd564054ed16e0ca56fc9239acb747f132662ca8f0dd9cc55b728348428167c5e

package/local-maven-repo/host/exp/exponent/expo.modules.font/{13.2.2/expo.modules.font-13.2.2.pom → 13.3.1/expo.modules.font-13.3.1.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>host.exp.exponent</groupId>
   <artifactId>expo.modules.font</artifactId>
-  <version>13.2.2</version>
+  <version>13.3.1</version>
   <packaging>aar</packaging>
   <name>expo.modules.font</name>
   <url>https://github.com/expo/expo</url>

package/local-maven-repo/host/exp/exponent/expo.modules.font/13.3.1/expo.modules.font-13.3.1.pom.md5

@@ -0,0 +1 @@
+eb5eccb96a2315de3539fbdafc7a1cf8

package/local-maven-repo/host/exp/exponent/expo.modules.font/13.3.1/expo.modules.font-13.3.1.pom.sha1

@@ -0,0 +1 @@
+9fc18b0c4078ed24d9d35a80744550b9c58cb48a

package/local-maven-repo/host/exp/exponent/expo.modules.font/13.3.1/expo.modules.font-13.3.1.pom.sha256

@@ -0,0 +1 @@
+a2eef95152116c5fe91674a3827f084261df83ff6a18a25707bdbba7d7e95e53

package/local-maven-repo/host/exp/exponent/expo.modules.font/13.3.1/expo.modules.font-13.3.1.pom.sha512

@@ -0,0 +1 @@
+bad17eaeabe9b7024e683c6ecc1c55e885bad0601ab304de4d5ecc5a631cfca27f3374531848efe506abc1698f719a838ba1d75c26c4fa9d3e1d2b99851e491c

package/local-maven-repo/host/exp/exponent/expo.modules.font/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>host.exp.exponent</groupId>
   <artifactId>expo.modules.font</artifactId>
   <versioning>
-    <latest>13.2.2</latest>
-    <release>13.2.2</release>
+    <latest>13.3.1</latest>
+    <release>13.3.1</release>
     <versions>
-      <version>13.2.2</version>
+      <version>13.3.1</version>
     </versions>
-    <lastUpdated>20250425210750</lastUpdated>
+    <lastUpdated>20250502214648</lastUpdated>
   </versioning>
 </metadata>

package/local-maven-repo/host/exp/exponent/expo.modules.font/maven-metadata.xml.md5

@@ -1 +1 @@
-13c1ddf0bdbf166d93108062a6195fde
+9ba2af880d4790bcccdae3bb676e35c6

package/local-maven-repo/host/exp/exponent/expo.modules.font/maven-metadata.xml.sha1

@@ -1 +1 @@
-f8490b928bd57fcbc167e59e798d53ac3fc948c6
+e83cfc06cb24b29b09be58f9caa0e26876ba824d

package/local-maven-repo/host/exp/exponent/expo.modules.font/maven-metadata.xml.sha256

@@ -1 +1 @@
-6ff751899979f35732c6e075e6f13865e174f3dcb076c6248696fe952fcc9084
+92854b3cb2d9c85e219e73a361349e2f14412159aa34d1dc281ec996cde9e2a4

package/local-maven-repo/host/exp/exponent/expo.modules.font/maven-metadata.xml.sha512

@@ -1 +1 @@
-4a0422a2cbc5c8d3872f425906efb3cd547be9251ff46c79a6f1d1e54707ece331c985cb53745dbf9c4ef95e0184fd961aff52e3f9726826a2b5bc498d8a909c
+7dfea10723592da7cf13ae86a670e87cbe6ca1611c65c2039caaa83e135beaf100efd6d626a656229f4e5e50632f962945f959a1e2fad7e5278686c2d2e6ef77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-font",
-  "version": "13.2.2",
+  "version": "13.3.1",
   "description": "Load fonts at runtime and use them in React Native components.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -10,6 +10,8 @@
     "clean": "expo-module clean",
     "lint": "expo-module lint",
     "test": "expo-module test",
+    "build:plugin": "expo-module build plugin",
+    "test:plugin": "expo-module test plugin",
     "test:rsc": "jest --config jest-rsc.config.js",
     "prepare": "expo-module prepare",
     "prepublishOnly": "expo-module prepublishOnly",
@@ -50,11 +52,11 @@
   "devDependencies": {
     "@testing-library/react-native": "^13.1.0",
     "@types/fontfaceobserver": "^2.1.3",
-    "expo-module-scripts": "^4.1.5"
+    "expo-module-scripts": "^4.1.6"
   },
   "peerDependencies": {
     "expo": "*",
     "react": "*"
   },
-  "gitHead": "3cd208465df78e385ca9380531bbbfe33ca68e81"
+  "gitHead": "5c98e5ee7c577209319bf91f515e65e256641d9c"
 }

package/plugin/build/utils.d.ts

@@ -1 +1,2 @@
+export declare function toValidAndroidResourceName(value: string): string;
 export declare function resolveFontPaths(fonts: string[], projectRoot: string): Promise<string[]>;

package/plugin/build/utils.js

@@ -3,9 +3,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.toValidAndroidResourceName = toValidAndroidResourceName;
 exports.resolveFontPaths = resolveFontPaths;
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
+// rule: File-based resource names must contain only lowercase a-z, 0-9, or underscore
+function toValidAndroidResourceName(value) {
+    const valueWithoutFileExtension = path_1.default.parse(value).name;
+    const withUnderscores = valueWithoutFileExtension
+        .replace(/([a-z])([A-Z])/g, '$1_$2')
+        .replace(/([A-Z])([A-Z][a-z])/g, '$1_$2');
+    return withUnderscores
+        .toLowerCase()
+        .replace(/[^a-z0-9]/g, '_')
+        .replace(/_+/g, '_');
+}
 async function resolveFontPaths(fonts, projectRoot) {
     const promises = fonts.map(async (p) => {
         const resolvedPath = path_1.default.resolve(projectRoot, p);

package/plugin/build/withFonts.d.ts

@@ -1,8 +1,17 @@
 import { type ConfigPlugin } from 'expo/config-plugins';
+export type FontObject = {
+    fontFamily: string;
+    fontDefinitions: {
+        path: string;
+        weight: number;
+        style?: 'normal' | 'italic' | undefined;
+    }[];
+};
+export type Font = string | FontObject;
 export type FontProps = {
     fonts?: string[];
     android?: {
-        fonts?: string[];
+        fonts?: Font[];
     };
     ios?: {
         fonts?: string[];

package/plugin/build/withFontsAndroid.d.ts

@@ -1,2 +1,24 @@
 import { type ConfigPlugin } from 'expo/config-plugins';
-export declare const withFontsAndroid: ConfigPlugin<string[]>;
+import type { Font, FontObject } from './withFonts';
+export declare const withFontsAndroid: ConfigPlugin<Font[]>;
+type GroupedFontObject = Record<string, FontObject['fontDefinitions']>;
+export declare function groupByFamily(array: FontObject[]): GroupedFontObject;
+export declare function getXmlSpecs(fontsDir: string, xmlFontObjects: GroupedFontObject): {
+    path: string;
+    xml: {
+        'font-family': {
+            $: {
+                'xmlns:app': string;
+            };
+            font: {
+                $: {
+                    'app:font': string;
+                    'app:fontStyle': "normal" | "italic";
+                    'app:fontWeight': string;
+                };
+            }[];
+        };
+    };
+}[];
+export declare function generateFontManagerCalls(xmlFontObjects: GroupedFontObject, language: 'java' | 'kt'): string[];
+export {};

package/plugin/build/withFontsAndroid.js

@@ -4,19 +4,123 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withFontsAndroid = void 0;
+exports.groupByFamily = groupByFamily;
+exports.getXmlSpecs = getXmlSpecs;
+exports.generateFontManagerCalls = generateFontManagerCalls;
+const codeMod_1 = require("@expo/config-plugins/build/android/codeMod");
+const generateCode_1 = require("@expo/config-plugins/build/utils/generateCode");
 const config_plugins_1 = require("expo/config-plugins");
 const promises_1 = __importDefault(require("fs/promises"));
+const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("./utils");
+const assetsFontsFir = 'app/src/main/assets/fonts';
+const resourcesFontsDir = 'app/src/main/res/font';
 const withFontsAndroid = (config, fonts) => {
+    const assetFontPaths = fonts.filter((it) => typeof it === 'string');
+    config = copyFontsToDir(config, assetFontPaths, assetsFontsFir);
+    const xmlFonts = fonts.filter((it) => typeof it === 'object');
+    config = addXmlFonts(config, xmlFonts);
+    return config;
+};
+exports.withFontsAndroid = withFontsAndroid;
+function groupByFamily(array) {
+    return array.reduce((result, item) => {
+        const keyValue = item['fontFamily'];
+        result[keyValue] ||= [];
+        result[keyValue].push(...item.fontDefinitions);
+        return result;
+    }, {});
+}
+function addXmlFonts(config, xmlFontObjects) {
+    const fontsByFamily = groupByFamily(xmlFontObjects);
+    const fontPaths = Object.values(fontsByFamily)
+        .map((font) => font.map((it) => it.path))
+        .flat();
+    config = copyFontsToDir(config, fontPaths, resourcesFontsDir, (filenameWithExt) => {
+        const filename = (0, utils_1.toValidAndroidResourceName)(filenameWithExt);
+        const ext = path_1.default.extname(filenameWithExt);
+        return `${filename}${ext}`;
+    });
+    config = addFontXmlToMainApplication(config, fontsByFamily);
+    return (0, config_plugins_1.withDangerousMod)(config, [
+        'android',
+        async (config) => {
+            const fontsDir = path_1.default.join(config.modRequest.platformProjectRoot, 'app/src/main/res/font');
+            const xmlSpecs = getXmlSpecs(fontsDir, fontsByFamily);
+            await Promise.all(xmlSpecs.map(config_plugins_1.XML.writeXMLAsync));
+            return config;
+        },
+    ]);
+}
+const resourceNameConflictAvoidancePrefix = 'xml_';
+function getXmlSpecs(fontsDir, xmlFontObjects) {
+    return Object.entries(xmlFontObjects).map(([fontFamily, fontDefinitions]) => {
+        const filePath = path_1.default.join(fontsDir, `${resourceNameConflictAvoidancePrefix + (0, utils_1.toValidAndroidResourceName)(fontFamily)}.xml`);
+        // each font family has one xml resource file with potentially multiple font definitions
+        // the font files (e.g. ttf) at `path` are copied to res/font
+        // with their name changed to be a valid resource and referenced in the xml file
+        return {
+            path: filePath,
+            xml: {
+                'font-family': {
+                    // using `app` namespace for better compat:
+                    // https://developer.android.com/develop/ui/views/text-and-emoji/fonts-in-xml#using-support-lib
+                    $: {
+                        'xmlns:app': 'http://schemas.android.com/apk/res-auto',
+                    },
+                    font: fontDefinitions.map((definition) => {
+                        return {
+                            $: {
+                                'app:font': `@font/${(0, utils_1.toValidAndroidResourceName)(definition.path)}`,
+                                'app:fontStyle': definition.style || 'normal',
+                                'app:fontWeight': String(definition.weight),
+                            },
+                        };
+                    }),
+                },
+            },
+        };
+    });
+}
+function addFontXmlToMainApplication(config, xmlFontObjects) {
+    return (0, config_plugins_1.withMainApplication)(config, (config) => {
+        const { modResults, modResults: { language }, } = config;
+        modResults.contents = (0, codeMod_1.addImports)(modResults.contents, ['com.facebook.react.common.assets.ReactFontManager'], language === 'java');
+        const fontManagerCalls = generateFontManagerCalls(xmlFontObjects, language).join(os_1.default.EOL);
+        const withInit = (0, generateCode_1.mergeContents)({
+            src: modResults.contents,
+            comment: '    //',
+            tag: 'xml-fonts-init',
+            offset: 1,
+            anchor: /super\.onCreate\(\)/,
+            newSrc: fontManagerCalls,
+        });
+        return {
+            ...config,
+            modResults: {
+                ...modResults,
+                contents: withInit.contents,
+            },
+        };
+    });
+}
+function generateFontManagerCalls(xmlFontObjects, language) {
+    const lineEnding = language === 'java' ? ';' : '';
+    const indent = '    ';
+    return Object.keys(xmlFontObjects).map((family) => `${indent}ReactFontManager.getInstance().addCustomFont(this, "${family}", R.font.${resourceNameConflictAvoidancePrefix + (0, utils_1.toValidAndroidResourceName)(family)})${lineEnding}`);
+}
+function copyFontsToDir(config, paths, inAppDestination, filenameProcessor = (filenameWithExt) => filenameWithExt) {
     return (0, config_plugins_1.withDangerousMod)(config, [
         'android',
         async (config) => {
-            const resolvedFonts = await (0, utils_1.resolveFontPaths)(fonts, config.modRequest.projectRoot);
+            const fontsDir = path_1.default.join(config.modRequest.platformProjectRoot, inAppDestination);
+            await promises_1.default.mkdir(fontsDir, { recursive: true });
+            const resolvedFonts = await (0, utils_1.resolveFontPaths)(paths, config.modRequest.projectRoot);
             await Promise.all(resolvedFonts.map(async (asset) => {
-                const fontsDir = path_1.default.join(config.modRequest.platformProjectRoot, 'app/src/main/assets/fonts');
-                await promises_1.default.mkdir(fontsDir, { recursive: true });
-                const output = path_1.default.join(fontsDir, path_1.default.basename(asset));
+                const filenameWithExt = path_1.default.basename(asset);
+                const outputFileName = filenameProcessor(filenameWithExt);
+                const output = path_1.default.join(fontsDir, outputFileName);
                 if (output.endsWith('.ttf') || output.endsWith('.otf')) {
                     await promises_1.default.copyFile(asset, output);
                 }
@@ -24,5 +128,4 @@ const withFontsAndroid = (config, fonts) => {
             return config;
         },
     ]);
-};
-exports.withFontsAndroid = withFontsAndroid;
+}

package/plugin/src/utils.ts

@@ -1,6 +1,20 @@
 import fs from 'fs/promises';
 import path from 'path';
 
+// rule: File-based resource names must contain only lowercase a-z, 0-9, or underscore
+export function toValidAndroidResourceName(value: string) {
+  const valueWithoutFileExtension = path.parse(value).name;
+
+  const withUnderscores = valueWithoutFileExtension
+    .replace(/([a-z])([A-Z])/g, '$1_$2')
+    .replace(/([A-Z])([A-Z][a-z])/g, '$1_$2');
+
+  return withUnderscores
+    .toLowerCase()
+    .replace(/[^a-z0-9]/g, '_')
+    .replace(/_+/g, '_');
+}
+
 export async function resolveFontPaths(fonts: string[], projectRoot: string) {
   const promises = fonts.map(async (p) => {
     const resolvedPath = path.resolve(projectRoot, p);

package/plugin/src/withFonts.ts

@@ -5,10 +5,21 @@ import { withFontsIos } from './withFontsIos';
 
 const pkg = require('expo-font/package.json');
 
+export type FontObject = {
+  fontFamily: string;
+  fontDefinitions: {
+    path: string;
+    weight: number;
+    style?: 'normal' | 'italic' | undefined;
+  }[];
+};
+
+export type Font = string | FontObject;
+
 export type FontProps = {
   fonts?: string[];
   android?: {
-    fonts?: string[];
+    fonts?: Font[];
   };
   ios?: {
     fonts?: string[];

package/plugin/src/withFontsAndroid.ts

@@ -1,22 +1,168 @@
-import { type ConfigPlugin, withDangerousMod } from 'expo/config-plugins';
+import { addImports } from '@expo/config-plugins/build/android/codeMod';
+import { mergeContents } from '@expo/config-plugins/build/utils/generateCode';
+import { type ExpoConfig } from '@expo/config-types';
+import { type ConfigPlugin, withDangerousMod, withMainApplication, XML } from 'expo/config-plugins';
 import fs from 'fs/promises';
+import os from 'os';
 import path from 'path';
 
-import { resolveFontPaths } from './utils';
+import { resolveFontPaths, toValidAndroidResourceName } from './utils';
+import type { Font, FontObject } from './withFonts';
+
+const assetsFontsFir = 'app/src/main/assets/fonts';
+const resourcesFontsDir = 'app/src/main/res/font';
+
+export const withFontsAndroid: ConfigPlugin<Font[]> = (config, fonts) => {
+  const assetFontPaths = fonts.filter((it) => typeof it === 'string');
+  config = copyFontsToDir(config, assetFontPaths, assetsFontsFir);
+
+  const xmlFonts = fonts.filter((it) => typeof it === 'object');
+  config = addXmlFonts(config, xmlFonts);
+
+  return config;
+};
+
+type GroupedFontObject = Record<string, FontObject['fontDefinitions']>;
+
+export function groupByFamily(array: FontObject[]): GroupedFontObject {
+  return array.reduce<GroupedFontObject>((result, item) => {
+    const keyValue = item['fontFamily'];
+    result[keyValue] ||= [];
+    result[keyValue].push(...item.fontDefinitions);
+    return result;
+  }, {});
+}
+
+function addXmlFonts(config: ExpoConfig, xmlFontObjects: FontObject[]) {
+  const fontsByFamily = groupByFamily(xmlFontObjects);
+
+  const fontPaths = Object.values(fontsByFamily)
+    .map((font) => font.map((it) => it.path))
+    .flat();
+
+  config = copyFontsToDir(config, fontPaths, resourcesFontsDir, (filenameWithExt) => {
+    const filename = toValidAndroidResourceName(filenameWithExt);
+    const ext = path.extname(filenameWithExt);
+    return `${filename}${ext}`;
+  });
+
+  config = addFontXmlToMainApplication(config, fontsByFamily);
 
-export const withFontsAndroid: ConfigPlugin<string[]> = (config, fonts) => {
   return withDangerousMod(config, [
     'android',
     async (config) => {
-      const resolvedFonts = await resolveFontPaths(fonts, config.modRequest.projectRoot);
+      const fontsDir = path.join(config.modRequest.platformProjectRoot, 'app/src/main/res/font');
+
+      const xmlSpecs = getXmlSpecs(fontsDir, fontsByFamily);
+
+      await Promise.all(xmlSpecs.map(XML.writeXMLAsync));
+
+      return config;
+    },
+  ]);
+}
+
+const resourceNameConflictAvoidancePrefix = 'xml_';
+
+export function getXmlSpecs(fontsDir: string, xmlFontObjects: GroupedFontObject) {
+  return Object.entries(xmlFontObjects).map(([fontFamily, fontDefinitions]) => {
+    const filePath = path.join(
+      fontsDir,
+      `${resourceNameConflictAvoidancePrefix + toValidAndroidResourceName(fontFamily)}.xml`
+    );
+    // each font family has one xml resource file with potentially multiple font definitions
+    // the font files (e.g. ttf) at `path` are copied to res/font
+    // with their name changed to be a valid resource and referenced in the xml file
+    return {
+      path: filePath,
+      xml: {
+        'font-family': {
+          // using `app` namespace for better compat:
+          // https://developer.android.com/develop/ui/views/text-and-emoji/fonts-in-xml#using-support-lib
+          $: {
+            'xmlns:app': 'http://schemas.android.com/apk/res-auto',
+          },
+          font: fontDefinitions.map((definition) => {
+            return {
+              $: {
+                'app:font': `@font/${toValidAndroidResourceName(definition.path)}`,
+                'app:fontStyle': definition.style || 'normal',
+                'app:fontWeight': String(definition.weight),
+              },
+            };
+          }),
+        },
+      },
+    };
+  });
+}
+
+function addFontXmlToMainApplication(config: ExpoConfig, xmlFontObjects: GroupedFontObject) {
+  return withMainApplication(config, (config) => {
+    const {
+      modResults,
+      modResults: { language },
+    } = config;
+
+    modResults.contents = addImports(
+      modResults.contents,
+      ['com.facebook.react.common.assets.ReactFontManager'],
+      language === 'java'
+    );
+
+    const fontManagerCalls = generateFontManagerCalls(xmlFontObjects, language).join(os.EOL);
+
+    const withInit = mergeContents({
+      src: modResults.contents,
+      comment: '    //',
+      tag: 'xml-fonts-init',
+      offset: 1,
+      anchor: /super\.onCreate\(\)/,
+      newSrc: fontManagerCalls,
+    });
+
+    return {
+      ...config,
+      modResults: {
+        ...modResults,
+        contents: withInit.contents,
+      },
+    };
+  });
+}
+
+export function generateFontManagerCalls(
+  xmlFontObjects: GroupedFontObject,
+  language: 'java' | 'kt'
+) {
+  const lineEnding = language === 'java' ? ';' : '';
+  const indent = '    ';
+
+  return Object.keys(xmlFontObjects).map(
+    (family) =>
+      `${indent}ReactFontManager.getInstance().addCustomFont(this, "${family}", R.font.${resourceNameConflictAvoidancePrefix + toValidAndroidResourceName(family)})${lineEnding}`
+  );
+}
+
+function copyFontsToDir(
+  config: ExpoConfig,
+  paths: string[],
+  inAppDestination: typeof assetsFontsFir | typeof resourcesFontsDir,
+  filenameProcessor = (filenameWithExt: string) => filenameWithExt
+) {
+  return withDangerousMod(config, [
+    'android',
+    async (config) => {
+      const fontsDir = path.join(config.modRequest.platformProjectRoot, inAppDestination);
+      await fs.mkdir(fontsDir, { recursive: true });
+
+      const resolvedFonts = await resolveFontPaths(paths, config.modRequest.projectRoot);
+
       await Promise.all(
         resolvedFonts.map(async (asset) => {
-          const fontsDir = path.join(
-            config.modRequest.platformProjectRoot,
-            'app/src/main/assets/fonts'
-          );
-          await fs.mkdir(fontsDir, { recursive: true });
-          const output = path.join(fontsDir, path.basename(asset));
+          const filenameWithExt = path.basename(asset);
+          const outputFileName = filenameProcessor(filenameWithExt);
+          const output = path.join(fontsDir, outputFileName);
           if (output.endsWith('.ttf') || output.endsWith('.otf')) {
             await fs.copyFile(asset, output);
           }
@@ -25,4 +171,4 @@ export const withFontsAndroid: ConfigPlugin<string[]> = (config, fonts) => {
       return config;
     },
   ]);
-};
+}

package/src/memory.ts

@@ -18,6 +18,14 @@ export function isLoadedNative(fontFamily: string): boolean {
     return true;
   } else {
     const loadedNativeFonts: string[] = ExpoFontLoader.getLoadedFonts();
+
+    // NOTE(brentvatne): Bail out here if there are no loaded fonts. This
+    // is functionally equivalent to the behavior below if the returned array
+    // is empty, but this handles improper mocking of `getLoadedFonts`.
+    if (!loadedNativeFonts?.length) {
+      return false;
+    }
+
     loadedNativeFonts.forEach((font) => {
       cache[font] = true;
     });

package/local-maven-repo/host/exp/exponent/expo.modules.font/13.2.2/expo.modules.font-13.2.2.module.md5

@@ -1 +0,0 @@
-3c3bfab591c6eaf8d55abca917121ceb

package/local-maven-repo/host/exp/exponent/expo.modules.font/13.2.2/expo.modules.font-13.2.2.module.sha1

@@ -1 +0,0 @@
-c88aaea1b7039c1983d418beddc284b8ab3972e8

package/local-maven-repo/host/exp/exponent/expo.modules.font/13.2.2/expo.modules.font-13.2.2.module.sha256

@@ -1 +0,0 @@
-fb673624fd34af3858128dae2e6fdf26b504ec6472ffe110dac02a0d10acf841

package/local-maven-repo/host/exp/exponent/expo.modules.font/13.2.2/expo.modules.font-13.2.2.module.sha512

@@ -1 +0,0 @@
-9e904727080e0c3fdcd3c5b5280ba784e8349ef510b4d3ed5d696a1f859a3285e35f82ce49f201718ccde70de8d4a21d2a4f5e897e9146fee3f1db56fedb0cff

package/local-maven-repo/host/exp/exponent/expo.modules.font/13.2.2/expo.modules.font-13.2.2.pom.md5

@@ -1 +0,0 @@
-f91325cf35afb69a21295ac0b210361b

package/local-maven-repo/host/exp/exponent/expo.modules.font/13.2.2/expo.modules.font-13.2.2.pom.sha1

@@ -1 +0,0 @@
-dfe68982373a40631ca860831eb9ca5bdf67f41a

package/local-maven-repo/host/exp/exponent/expo.modules.font/13.2.2/expo.modules.font-13.2.2.pom.sha256

@@ -1 +0,0 @@
-216496eebdbbf9e80a67a329c5384a90616a494c4063744b75e6e5e187fa73eb

package/local-maven-repo/host/exp/exponent/expo.modules.font/13.2.2/expo.modules.font-13.2.2.pom.sha512

@@ -1 +0,0 @@
-765424431b2e8be0fbe8d0a259f64a7a823f31885c9717339c375581d8aae0bd79bbeeb3b08975a4fa7369c066d499eb080ceb8bd271a72eb1a3051b1207a75e