prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add new fonts to Android

Browse source 
Some new fonts:

- Atkinson Hyperlegible
- Newsreader
- LXGW WenKai
This commit is contained in:
Jackson Harper 2023-05-02 14:51:07 +08:00
parent 3041cd0517
commit 2feb2067f8
10 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
apple/OmnivoreKit/Sources/Views/Resources/Fonts/AtkinsonHyperlegible-Bold.ttf → android/Omnivore/app/src/main/assets/AtkinsonHyperlegible-Bold.ttf
View file

0
apple/OmnivoreKit/Sources/Views/Resources/Fonts/AtkinsonHyperlegible-Italic.ttf → android/Omnivore/app/src/main/assets/AtkinsonHyperlegible-Italic.ttf
View file

0
apple/OmnivoreKit/Sources/Views/Resources/Fonts/AtkinsonHyperlegible-Regular.ttf → android/Omnivore/app/src/main/assets/AtkinsonHyperlegible-Regular.ttf
View file

0
apple/OmnivoreKit/Sources/Views/Resources/Fonts/LXGWWenKai-Bold.ttf → android/Omnivore/app/src/main/assets/LXGWWenKai-Bold.ttf
View file

0
apple/OmnivoreKit/Sources/Views/Resources/Fonts/LXGWWenKai-Regular.ttf → android/Omnivore/app/src/main/assets/LXGWWenKai-Regular.ttf
View file

0
apple/OmnivoreKit/Sources/Views/Resources/Fonts/Newsreader-Bold.ttf → android/Omnivore/app/src/main/assets/Newsreader-Bold.ttf
View file

0
apple/OmnivoreKit/Sources/Views/Resources/Fonts/Newsreader-Italic.ttf → android/Omnivore/app/src/main/assets/Newsreader-Italic.ttf
View file

0
apple/OmnivoreKit/Sources/Views/Resources/Fonts/Newsreader-Regular.ttf → android/Omnivore/app/src/main/assets/Newsreader-Regular.ttf
View file

3
android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderContent.kt
View file

@ -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) {

2
android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderViewModel.kt
View file

@ -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"