From 59f0cede39265c10e0287e5bbabb16a6fde6b69c Mon Sep 17 00:00:00 2001 From: Huang Xin Date: Wed, 30 Apr 2025 01:14:03 +0800 Subject: [PATCH] fix: import system fonts list on Android (#998) Note that the system fonts might not be available in Android webview --- .../android/src/main/java/NativeBridgePlugin.kt | 1 + .../src/app/reader/components/settings/FontPanel.tsx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/android/src/main/java/NativeBridgePlugin.kt b/apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/android/src/main/java/NativeBridgePlugin.kt index 0ce22ba9..7db8f5dd 100644 --- a/apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/android/src/main/java/NativeBridgePlugin.kt +++ b/apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/android/src/main/java/NativeBridgePlugin.kt @@ -294,6 +294,7 @@ class NativeBridgePlugin(private val activity: Activity): Plugin(activity) { var fontName = fileFileName .replace(Regex("\\.(ttf|otf)$", RegexOption.IGNORE_CASE), "") .trim() + fontList.add(fontName) } ret.put("fonts", JSONArray(fontList)) } catch (e: Exception) { diff --git a/apps/readest-app/src/app/reader/components/settings/FontPanel.tsx b/apps/readest-app/src/app/reader/components/settings/FontPanel.tsx index d710c62f..f3db1bbb 100644 --- a/apps/readest-app/src/app/reader/components/settings/FontPanel.tsx +++ b/apps/readest-app/src/app/reader/components/settings/FontPanel.tsx @@ -137,7 +137,7 @@ const FontPanel: React.FC<{ bookKey: string }> = ({ bookKey }) => { useEffect(() => { if (isTauriAppPlatform()) { getSysFontsList().then((res) => { - if (res.error) { + if (res.error || res.fonts.length === 0) { console.error('Failed to get system fonts list:', res.error); return; }