diff --git a/apps/readest-app/public/locales/ar/translation.json b/apps/readest-app/public/locales/ar/translation.json index 5798531c..2c445129 100644 --- a/apps/readest-app/public/locales/ar/translation.json +++ b/apps/readest-app/public/locales/ar/translation.json @@ -291,5 +291,6 @@ "Descending": "تنازلي", "Sort by...": "ترتيب حسب...", "Added:": "تاريخ الإضافة:", - "Format:": "التنسيق:" + "Format:": "التنسيق:", + "GuanKiapTsingKhai-T": "GuanKiapTsingKhai-T" } diff --git a/apps/readest-app/public/locales/de/translation.json b/apps/readest-app/public/locales/de/translation.json index 1b3ea42a..0486d20d 100644 --- a/apps/readest-app/public/locales/de/translation.json +++ b/apps/readest-app/public/locales/de/translation.json @@ -291,5 +291,6 @@ "Descending": "Absteigend", "Sort by...": "Sortieren nach...", "Added:": "Hinzugefügt:", - "Format:": "Format:" + "Format:": "Format:", + "GuanKiapTsingKhai-T": "GuanKiapTsingKhai-T" } diff --git a/apps/readest-app/public/locales/el/translation.json b/apps/readest-app/public/locales/el/translation.json index 1b57df5f..2c158036 100644 --- a/apps/readest-app/public/locales/el/translation.json +++ b/apps/readest-app/public/locales/el/translation.json @@ -291,5 +291,6 @@ "Descending": "Φθίνουσα", "Sort by...": "Ταξινόμηση κατά...", "Added:": "Προστέθηκε:", - "Format:": "Μορφή:" + "Format:": "Μορφή:", + "GuanKiapTsingKhai-T": "GuanKiapTsingKhai-T" } diff --git a/apps/readest-app/public/locales/es/translation.json b/apps/readest-app/public/locales/es/translation.json index 7de2b568..9a64b36e 100644 --- a/apps/readest-app/public/locales/es/translation.json +++ b/apps/readest-app/public/locales/es/translation.json @@ -291,5 +291,6 @@ "Descending": "Descendente", "Sort by...": "Ordenar por...", "Added:": "Agregado:", - "Format:": "Formato:" + "Format:": "Formato:", + "GuanKiapTsingKhai-T": "GuanKiapTsingKhai-T" } diff --git a/apps/readest-app/public/locales/fr/translation.json b/apps/readest-app/public/locales/fr/translation.json index 38fc866f..2e061d5f 100644 --- a/apps/readest-app/public/locales/fr/translation.json +++ b/apps/readest-app/public/locales/fr/translation.json @@ -291,5 +291,6 @@ "Descending": "Descendant", "Sort by...": "Trier par...", "Added:": "Ajouté :", - "Format:": "Format :" + "Format:": "Format :", + "GuanKiapTsingKhai-T": "GuanKiapTsingKhai-T" } diff --git a/apps/readest-app/public/locales/hi/translation.json b/apps/readest-app/public/locales/hi/translation.json index 1f3c3ac7..f6c858c5 100644 --- a/apps/readest-app/public/locales/hi/translation.json +++ b/apps/readest-app/public/locales/hi/translation.json @@ -291,5 +291,6 @@ "Descending": "अवरोही", "Sort by...": "द्वारा क्रमबद्ध करें...", "Added:": "जोड़ा गया:", - "Format:": "फॉर्मेट:" + "Format:": "फॉर्मेट:", + "GuanKiapTsingKhai-T": "GuanKiapTsingKhai-T" } diff --git a/apps/readest-app/public/locales/id/translation.json b/apps/readest-app/public/locales/id/translation.json index af94ef97..14cfa6f2 100644 --- a/apps/readest-app/public/locales/id/translation.json +++ b/apps/readest-app/public/locales/id/translation.json @@ -291,5 +291,6 @@ "Descending": "Turun", "Sort by...": "Urutkan berdasarkan...", "Added:": "Ditambahkan:", - "Format:": "Format:" + "Format:": "Format:", + "GuanKiapTsingKhai-T": "GuanKiapTsingKhai-T" } diff --git a/apps/readest-app/public/locales/it/translation.json b/apps/readest-app/public/locales/it/translation.json index 36137cd8..1a0641d0 100644 --- a/apps/readest-app/public/locales/it/translation.json +++ b/apps/readest-app/public/locales/it/translation.json @@ -291,5 +291,6 @@ "Descending": "Decrescente", "Sort by...": "Ordina per...", "Added:": "Aggiunto:", - "Format:": "Formato:" + "Format:": "Formato:", + "GuanKiapTsingKhai-T": "GuanKiapTsingKhai-T" } diff --git a/apps/readest-app/public/locales/ja/translation.json b/apps/readest-app/public/locales/ja/translation.json index 97c413e6..6a9e28df 100644 --- a/apps/readest-app/public/locales/ja/translation.json +++ b/apps/readest-app/public/locales/ja/translation.json @@ -291,5 +291,6 @@ "Descending": "降順", "Sort by...": "並べ替え...", "Added:": "追加日：", - "Format:": "形式：" + "Format:": "形式：", + "GuanKiapTsingKhai-T": "GuanKiapTsingKhai-T" } diff --git a/apps/readest-app/public/locales/ko/translation.json b/apps/readest-app/public/locales/ko/translation.json index 4b542fb9..7b5a4131 100644 --- a/apps/readest-app/public/locales/ko/translation.json +++ b/apps/readest-app/public/locales/ko/translation.json @@ -291,5 +291,6 @@ "Descending": "내림차순", "Sort by...": "정렬 기준...", "Added:": "추가됨:", - "Format:": "형식:" + "Format:": "형식:", + "GuanKiapTsingKhai-T": "GuanKiapTsingKhai-T" } diff --git a/apps/readest-app/public/locales/pl/translation.json b/apps/readest-app/public/locales/pl/translation.json index a6e14d00..06d2614d 100644 --- a/apps/readest-app/public/locales/pl/translation.json +++ b/apps/readest-app/public/locales/pl/translation.json @@ -291,5 +291,6 @@ "Descending": "Malejąco", "Sort by...": "Sortuj według...", "Added:": "Data dodania:", - "Format:": "Format:" + "Format:": "Format:", + "GuanKiapTsingKhai-T": "GuanKiapTsingKhai-T" } diff --git a/apps/readest-app/public/locales/pt/translation.json b/apps/readest-app/public/locales/pt/translation.json index 6268265e..a8021702 100644 --- a/apps/readest-app/public/locales/pt/translation.json +++ b/apps/readest-app/public/locales/pt/translation.json @@ -291,5 +291,6 @@ "Descending": "Decrescente", "Sort by...": "Ordenar por...", "Added:": "Adicionado:", - "Format:": "Formato:" + "Format:": "Formato:", + "GuanKiapTsingKhai-T": "GuanKiapTsingKhai-T" } diff --git a/apps/readest-app/public/locales/ru/translation.json b/apps/readest-app/public/locales/ru/translation.json index c7162b51..1eefad9d 100644 --- a/apps/readest-app/public/locales/ru/translation.json +++ b/apps/readest-app/public/locales/ru/translation.json @@ -291,5 +291,6 @@ "Descending": "По убыванию", "Sort by...": "Сортировать по...", "Added:": "Добавлено:", - "Format:": "Формат:" + "Format:": "Формат:", + "GuanKiapTsingKhai-T": "GuanKiapTsingKhai-T" } diff --git a/apps/readest-app/public/locales/tr/translation.json b/apps/readest-app/public/locales/tr/translation.json index 11e71bca..2e63a958 100644 --- a/apps/readest-app/public/locales/tr/translation.json +++ b/apps/readest-app/public/locales/tr/translation.json @@ -291,5 +291,6 @@ "Descending": "Azalan", "Sort by...": "Şuna göre sırala...", "Added:": "Eklenme:", - "Format:": "Biçim:" + "Format:": "Biçim:", + "GuanKiapTsingKhai-T": "GuanKiapTsingKhai-T" } diff --git a/apps/readest-app/public/locales/uk/translation.json b/apps/readest-app/public/locales/uk/translation.json index 554730cf..c5dd236b 100644 --- a/apps/readest-app/public/locales/uk/translation.json +++ b/apps/readest-app/public/locales/uk/translation.json @@ -291,5 +291,6 @@ "Descending": "За спаданням", "Sort by...": "Сортувати за...", "Added:": "Додано:", - "Format:": "Формат:" + "Format:": "Формат:", + "GuanKiapTsingKhai-T": "GuanKiapTsingKhai-T" } diff --git a/apps/readest-app/public/locales/vi/translation.json b/apps/readest-app/public/locales/vi/translation.json index 73078f1d..5fe22565 100644 --- a/apps/readest-app/public/locales/vi/translation.json +++ b/apps/readest-app/public/locales/vi/translation.json @@ -291,5 +291,6 @@ "Descending": "Giảm dần", "Sort by...": "Sắp xếp theo...", "Added:": "Đã thêm:", - "Format:": "Định dạng:" + "Format:": "Định dạng:", + "GuanKiapTsingKhai-T": "GuanKiapTsingKhai-T" } diff --git a/apps/readest-app/public/locales/zh-CN/translation.json b/apps/readest-app/public/locales/zh-CN/translation.json index 11fc7705..34a834d6 100644 --- a/apps/readest-app/public/locales/zh-CN/translation.json +++ b/apps/readest-app/public/locales/zh-CN/translation.json @@ -291,5 +291,6 @@ "Descending": "降序", "Sort by...": "排序方式...", "Added:": "添加日期", - "Format:": "格式" + "Format:": "格式", + "GuanKiapTsingKhai-T": "原俠正楷-T" } diff --git a/apps/readest-app/public/locales/zh-TW/translation.json b/apps/readest-app/public/locales/zh-TW/translation.json index 7eb8817e..c344a9bd 100644 --- a/apps/readest-app/public/locales/zh-TW/translation.json +++ b/apps/readest-app/public/locales/zh-TW/translation.json @@ -291,5 +291,6 @@ "Descending": "降序", "Sort by...": "排序方式...", "Added:": "添加日期", - "Format:": "格式" + "Format:": "格式", + "GuanKiapTsingKhai-T": "原俠正楷-T" } diff --git a/apps/readest-app/src-tauri/tauri.conf.json b/apps/readest-app/src-tauri/tauri.conf.json index 650d5fe1..44397b7e 100644 --- a/apps/readest-app/src-tauri/tauri.conf.json +++ b/apps/readest-app/src-tauri/tauri.conf.json @@ -17,8 +17,8 @@ "default-src": "'self' 'unsafe-inline' blob: data: customprotocol: asset: http://asset.localhost ipc: http://ipc.localhost", "connect-src": "'self' blob: data: asset: http://asset.localhost ipc: http://ipc.localhost https://*.sentry.io https://*.posthog.com https://*.deepl.com https://*.wikipedia.org https://*.wiktionary.org https://*.supabase.co https://*.readest.com wss://speech.platform.bing.com https://*.cloudflarestorage.com", "img-src": "'self' blob: data: asset: http://asset.localhost https://*", - "style-src": "'self' 'unsafe-inline' blob: asset: http://asset.localhost https://cdn.jsdelivr.net https://fonts.googleapis.com", - "font-src": "'self' blob: data: asset: http://asset.localhost tauri: https://fonts.gstatic.com https://db.onlinewebfonts.com https://cdn.jsdelivr.net", + "style-src": "'self' 'unsafe-inline' blob: asset: http://asset.localhost https://cdn.jsdelivr.net https://fonts.googleapis.com https://fontsapi.zeoseven.com", + "font-src": "'self' blob: data: asset: http://asset.localhost tauri: https://db.onlinewebfonts.com https://cdn.jsdelivr.net https://fonts.gstatic.com https://fontsapi.zeoseven.com", "frame-src": "'self' blob: asset: http://asset.localhost", "script-src": "'self' 'unsafe-inline' 'unsafe-eval' blob: asset: http://asset.localhost https://*.sentry.io https://*.posthog.com" }, diff --git a/apps/readest-app/src/hooks/useTheme.ts b/apps/readest-app/src/hooks/useTheme.ts index 4fc72bbc..36b95b44 100644 --- a/apps/readest-app/src/hooks/useTheme.ts +++ b/apps/readest-app/src/hooks/useTheme.ts @@ -1,4 +1,5 @@ import { useEffect } from 'react'; +import { useEnv } from '@/context/EnvContext'; import { useThemeStore } from '@/store/themeStore'; import { useSettingsStore } from '@/store/settingsStore'; import { applyCustomTheme, Palette } from '@/styles/themes'; @@ -13,13 +14,15 @@ export const useTheme = ({ systemUIVisible = true, appThemeColor = 'base-100', }: UseThemeProps = {}) => { + const { appService } = useEnv(); const { settings } = useSettingsStore(); const { themeColor, isDarkMode, updateAppTheme } = useThemeStore(); useEffect(() => { updateAppTheme(appThemeColor); - console.log('useTheme systemUIVisible', systemUIVisible); - setSystemUIVisibility({ visible: systemUIVisible, darkMode: isDarkMode }); + if (appService?.isMobile) { + setSystemUIVisibility({ visible: systemUIVisible, darkMode: isDarkMode }); + } // eslint-disable-next-line react-hooks/exhaustive-deps }, [isDarkMode]); diff --git a/apps/readest-app/src/services/constants.ts b/apps/readest-app/src/services/constants.ts index 3df03be2..a04e1c42 100644 --- a/apps/readest-app/src/services/constants.ts +++ b/apps/readest-app/src/services/constants.ts @@ -150,7 +150,11 @@ export const SERIF_FONTS = [ 'Times New Roman', ]; -export const CJK_SERIF_FONTS = [_('LXGW WenKai GB Screen'), _('LXGW WenKai TC')]; +export const CJK_SERIF_FONTS = [ + _('LXGW WenKai GB Screen'), + _('LXGW WenKai TC'), + _('GuanKiapTsingKhai-T'), +]; export const CJK_SANS_SERIF_FONTS = ['Noto Sans SC', 'Noto Sans TC']; @@ -437,6 +441,7 @@ export const CJK_FONTS_PATTENS = new RegExp( 'Hei', 'Yan', 'Min', + 'Khai', 'Yuan', 'Song', 'Ming', diff --git a/apps/readest-app/src/utils/style.ts b/apps/readest-app/src/utils/style.ts index 4b89ad79..a3f474d5 100644 --- a/apps/readest-app/src/utils/style.ts +++ b/apps/readest-app/src/utils/style.ts @@ -110,6 +110,7 @@ const getFontStyles = ( const getAdditionalFontLinks = () => ` +