From 2ef042b53b4b02b2232a6f00fbacff8afee5f873 Mon Sep 17 00:00:00 2001
From: shuixx <shuixx@shuixx.com>
Date: Sun, 2 Feb 2025 13:01:36 +0800
Subject: [PATCH] update

---
 fonts/Android.bp                              |  14 -----------
 fonts/fonts.xml                               |  23 ------------------
 overlay/fonts/AndroidManifest.xml             |   8 ++++++
 .../fonts/res/font}/LXGWWenKai-Light.ttf      | Bin
 .../fonts/res/font}/LXGWWenKai-Medium.ttf     | Bin
 .../fonts/res/font}/LXGWWenKai-Regular.ttf    | Bin
 .../fonts/res/font}/LXGWWenKaiMono-Light.ttf  | Bin
 .../fonts/res/font}/LXGWWenKaiMono-Medium.ttf | Bin
 .../res/font}/LXGWWenKaiMono-Regular.ttf      | Bin
 overlay/fonts/res/values/fonts.xml            |  10 ++++++++
 10 files changed, 18 insertions(+), 37 deletions(-)
 delete mode 100644 fonts/Android.bp
 delete mode 100644 fonts/fonts.xml
 create mode 100644 overlay/fonts/AndroidManifest.xml
 rename {fonts/fonts => overlay/fonts/res/font}/LXGWWenKai-Light.ttf (100%)
 rename {fonts/fonts => overlay/fonts/res/font}/LXGWWenKai-Medium.ttf (100%)
 rename {fonts/fonts => overlay/fonts/res/font}/LXGWWenKai-Regular.ttf (100%)
 rename {fonts/fonts => overlay/fonts/res/font}/LXGWWenKaiMono-Light.ttf (100%)
 rename {fonts/fonts => overlay/fonts/res/font}/LXGWWenKaiMono-Medium.ttf (100%)
 rename {fonts/fonts => overlay/fonts/res/font}/LXGWWenKaiMono-Regular.ttf (100%)
 create mode 100644 overlay/fonts/res/values/fonts.xml

diff --git a/fonts/Android.bp b/fonts/Android.bp
deleted file mode 100644
index f8de1e0..0000000
--- a/fonts/Android.bp
+++ /dev/null
@@ -1,14 +0,0 @@
-prebuilt_etc {
-    name: "my_fonts",
-    srcs: [
-        "fonts/LXGWWenKai-Light.ttf",
-        "fonts/LXGWWenKai-Medium.ttf",
-        "fonts/LXGWWenKai-Regular.ttf",
-        "fonts/LXGWWenKaiMono-Light.ttf",
-        "fonts/LXGWWenKaiMono-Medium.ttf",
-        "fonts/LXGWWenKaiMono-Regular.ttf",
-    ],
-    dst: "fonts/",
-    installable: true,
-    permissions: "0644",
-}
diff --git a/fonts/fonts.xml b/fonts/fonts.xml
deleted file mode 100644
index b0b6371..0000000
--- a/fonts/fonts.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<family>
-    <nameset>
-        <name>LXGWWenKai</name>
-    </nameset>
-    <fileset>
-        <file>LXGWWenKai-Light.ttf</file>
-        <file weight="300">LXGWWenKai-Light.ttf</file>
-        <file weight="400">LXGWWenKai-Regular.ttf</file>
-        <file weight="700">LXGWWenKai-Medium.ttf</file>
-    </fileset>
-</family>
-
-<family>
-    <nameset>
-        <name>LXGWWenKaiMono</name>
-    </nameset>
-    <fileset>
-        <file>LXGWWenKaiMono-Light.ttf</file>
-        <file weight="300">LXGWWenKaiMono-Light.ttf</file>
-        <file weight="400">LXGWWenKaiMono-Regular.ttf</file>
-        <file weight="700">LXGWWenKaiMono-Medium.ttf</file>
-    </fileset>
-</family>
\ No newline at end of file
diff --git a/overlay/fonts/AndroidManifest.xml b/overlay/fonts/AndroidManifest.xml
new file mode 100644
index 0000000..f242ee7
--- /dev/null
+++ b/overlay/fonts/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.custom.fonts">
+    <application android:hasCode="false">
+        <overlay android:targetPackage="android"
+            android:priority="1"
+            android:isStatic="true" />
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/fonts/fonts/LXGWWenKai-Light.ttf b/overlay/fonts/res/font/LXGWWenKai-Light.ttf
similarity index 100%
rename from fonts/fonts/LXGWWenKai-Light.ttf
rename to overlay/fonts/res/font/LXGWWenKai-Light.ttf
diff --git a/fonts/fonts/LXGWWenKai-Medium.ttf b/overlay/fonts/res/font/LXGWWenKai-Medium.ttf
similarity index 100%
rename from fonts/fonts/LXGWWenKai-Medium.ttf
rename to overlay/fonts/res/font/LXGWWenKai-Medium.ttf
diff --git a/fonts/fonts/LXGWWenKai-Regular.ttf b/overlay/fonts/res/font/LXGWWenKai-Regular.ttf
similarity index 100%
rename from fonts/fonts/LXGWWenKai-Regular.ttf
rename to overlay/fonts/res/font/LXGWWenKai-Regular.ttf
diff --git a/fonts/fonts/LXGWWenKaiMono-Light.ttf b/overlay/fonts/res/font/LXGWWenKaiMono-Light.ttf
similarity index 100%
rename from fonts/fonts/LXGWWenKaiMono-Light.ttf
rename to overlay/fonts/res/font/LXGWWenKaiMono-Light.ttf
diff --git a/fonts/fonts/LXGWWenKaiMono-Medium.ttf b/overlay/fonts/res/font/LXGWWenKaiMono-Medium.ttf
similarity index 100%
rename from fonts/fonts/LXGWWenKaiMono-Medium.ttf
rename to overlay/fonts/res/font/LXGWWenKaiMono-Medium.ttf
diff --git a/fonts/fonts/LXGWWenKaiMono-Regular.ttf b/overlay/fonts/res/font/LXGWWenKaiMono-Regular.ttf
similarity index 100%
rename from fonts/fonts/LXGWWenKaiMono-Regular.ttf
rename to overlay/fonts/res/font/LXGWWenKaiMono-Regular.ttf
diff --git a/overlay/fonts/res/values/fonts.xml b/overlay/fonts/res/values/fonts.xml
new file mode 100644
index 0000000..053f831
--- /dev/null
+++ b/overlay/fonts/res/values/fonts.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family>
+    <font android:fontFamily="@font/>LXGWWenKai-Light.ttf" android:weight="300" android:style="normal" />
+    <font android:fontFamily="@font/>LXGWWenKai-Regular.ttf" android:weight="400" android:style="normal" />
+    <font android:fontFamily="@font/LXGWWenKai-Medium.ttf" android:weight="700" android:style="normal" />
+
+    <font android:fontFamily="@font/LXGWWenKaiMono-Light.ttf" android:weight="300" android:style="normal" />
+    <font android:fontFamily="@font/LXGWWenKaiMono-Regular.ttf" android:weight="400" android:style="normal" />
+    <font android:fontFamily="@font/LXGWWenKaiMono-Medium.ttf" android:weight="700" android:style="normal" />
+</font-family>
\ No newline at end of file