From 2feb2067f86b3a0845503e615849ebe497ce5bbb Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Tue, 2 May 2023 14:51:07 +0800 Subject: [PATCH] Add new fonts to Android Some new fonts: - Atkinson Hyperlegible - Newsreader - LXGW WenKai --- .../src/main/assets}/AtkinsonHyperlegible-Bold.ttf | Bin .../main/assets}/AtkinsonHyperlegible-Italic.ttf | Bin .../main/assets}/AtkinsonHyperlegible-Regular.ttf | Bin .../app/src/main/assets}/LXGWWenKai-Bold.ttf | Bin .../app/src/main/assets}/LXGWWenKai-Regular.ttf | Bin .../app/src/main/assets}/Newsreader-Bold.ttf | Bin .../app/src/main/assets}/Newsreader-Italic.ttf | Bin .../app/src/main/assets}/Newsreader-Regular.ttf | Bin .../omnivore/omnivore/ui/reader/WebReaderContent.kt | 3 +++ .../omnivore/ui/reader/WebReaderViewModel.kt | 2 +- 10 files changed, 4 insertions(+), 1 deletion(-) rename {apple/OmnivoreKit/Sources/Views/Resources/Fonts => android/Omnivore/app/src/main/assets}/AtkinsonHyperlegible-Bold.ttf (100%) rename {apple/OmnivoreKit/Sources/Views/Resources/Fonts => android/Omnivore/app/src/main/assets}/AtkinsonHyperlegible-Italic.ttf (100%) rename {apple/OmnivoreKit/Sources/Views/Resources/Fonts => android/Omnivore/app/src/main/assets}/AtkinsonHyperlegible-Regular.ttf (100%) rename {apple/OmnivoreKit/Sources/Views/Resources/Fonts => android/Omnivore/app/src/main/assets}/LXGWWenKai-Bold.ttf (100%) rename {apple/OmnivoreKit/Sources/Views/Resources/Fonts => android/Omnivore/app/src/main/assets}/LXGWWenKai-Regular.ttf (100%) rename {apple/OmnivoreKit/Sources/Views/Resources/Fonts => android/Omnivore/app/src/main/assets}/Newsreader-Bold.ttf (100%) rename {apple/OmnivoreKit/Sources/Views/Resources/Fonts => android/Omnivore/app/src/main/assets}/Newsreader-Italic.ttf (100%) rename {apple/OmnivoreKit/Sources/Views/Resources/Fonts => android/Omnivore/app/src/main/assets}/Newsreader-Regular.ttf (100%) diff --git a/apple/OmnivoreKit/Sources/Views/Resources/Fonts/AtkinsonHyperlegible-Bold.ttf b/android/Omnivore/app/src/main/assets/AtkinsonHyperlegible-Bold.ttf similarity index 100% rename from apple/OmnivoreKit/Sources/Views/Resources/Fonts/AtkinsonHyperlegible-Bold.ttf rename to android/Omnivore/app/src/main/assets/AtkinsonHyperlegible-Bold.ttf diff --git a/apple/OmnivoreKit/Sources/Views/Resources/Fonts/AtkinsonHyperlegible-Italic.ttf b/android/Omnivore/app/src/main/assets/AtkinsonHyperlegible-Italic.ttf similarity index 100% rename from apple/OmnivoreKit/Sources/Views/Resources/Fonts/AtkinsonHyperlegible-Italic.ttf rename to android/Omnivore/app/src/main/assets/AtkinsonHyperlegible-Italic.ttf diff --git a/apple/OmnivoreKit/Sources/Views/Resources/Fonts/AtkinsonHyperlegible-Regular.ttf b/android/Omnivore/app/src/main/assets/AtkinsonHyperlegible-Regular.ttf similarity index 100% rename from apple/OmnivoreKit/Sources/Views/Resources/Fonts/AtkinsonHyperlegible-Regular.ttf rename to android/Omnivore/app/src/main/assets/AtkinsonHyperlegible-Regular.ttf diff --git a/apple/OmnivoreKit/Sources/Views/Resources/Fonts/LXGWWenKai-Bold.ttf b/android/Omnivore/app/src/main/assets/LXGWWenKai-Bold.ttf similarity index 100% rename from apple/OmnivoreKit/Sources/Views/Resources/Fonts/LXGWWenKai-Bold.ttf rename to android/Omnivore/app/src/main/assets/LXGWWenKai-Bold.ttf diff --git a/apple/OmnivoreKit/Sources/Views/Resources/Fonts/LXGWWenKai-Regular.ttf b/android/Omnivore/app/src/main/assets/LXGWWenKai-Regular.ttf similarity index 100% rename from apple/OmnivoreKit/Sources/Views/Resources/Fonts/LXGWWenKai-Regular.ttf rename to android/Omnivore/app/src/main/assets/LXGWWenKai-Regular.ttf diff --git a/apple/OmnivoreKit/Sources/Views/Resources/Fonts/Newsreader-Bold.ttf b/android/Omnivore/app/src/main/assets/Newsreader-Bold.ttf similarity index 100% rename from apple/OmnivoreKit/Sources/Views/Resources/Fonts/Newsreader-Bold.ttf rename to android/Omnivore/app/src/main/assets/Newsreader-Bold.ttf diff --git a/apple/OmnivoreKit/Sources/Views/Resources/Fonts/Newsreader-Italic.ttf b/android/Omnivore/app/src/main/assets/Newsreader-Italic.ttf similarity index 100% rename from apple/OmnivoreKit/Sources/Views/Resources/Fonts/Newsreader-Italic.ttf rename to android/Omnivore/app/src/main/assets/Newsreader-Italic.ttf diff --git a/apple/OmnivoreKit/Sources/Views/Resources/Fonts/Newsreader-Regular.ttf b/android/Omnivore/app/src/main/assets/Newsreader-Regular.ttf similarity index 100% rename from apple/OmnivoreKit/Sources/Views/Resources/Fonts/Newsreader-Regular.ttf rename to android/Omnivore/app/src/main/assets/Newsreader-Regular.ttf diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderContent.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderContent.kt index aaf518016..7bd68e74d 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderContent.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderContent.kt @@ -15,6 +15,9 @@ enum class WebFont(val displayText: String, val rawValue: String) { ROBOTO("Roboto", "Roboto"), CRIMSON_TEXT("Crimson Text", "Crimson Text"), SOURCE_SERIF_PRO("Source Serif Pro", "Source Serif Pro"), + NEWSREADER("Newsreader", "Newsreader"), + LXGWWENKAI("LXGW WenKai", "LXGWWenKai"), + ATKINSON_HYPERLEGIBLE("Atkinson Hyperlegible", "AtkinsonHyperlegible"), } enum class ArticleContentStatus(val rawValue: String) { diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderViewModel.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderViewModel.kt index adfe7f46b..417304f5c 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderViewModel.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderViewModel.kt @@ -263,7 +263,7 @@ class WebReaderViewModel @Inject constructor( val storedFontFamily = datastoreRepo.getString(DatastoreKeys.preferredWebFontFamily) ?: WebFont.SYSTEM.rawValue val storedThemePreference = datastoreRepo.getString(DatastoreKeys.preferredTheme) ?: "System" - val storedWebFont = WebFont.values().first { it.rawValue == storedFontFamily } + val storedWebFont = WebFont.values().firstOrNull { it.rawValue == storedFontFamily } ?: WebFont.values().first() val prefersHighContrastFont = datastoreRepo.getString(DatastoreKeys.prefersWebHighContrastText) == "true" val prefersJustifyText = datastoreRepo.getString(DatastoreKeys.prefersJustifyText) == "true"