diff --git a/README.md b/README.md index a9434e2..073c437 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,8 @@ Contributions are welcome! Please open an issue or pull request on [GitHub](http This project is licensed under the GNU General Public License v3.0 - see the [LICENSE](LICENSE) file for details. +Third-party font notices are listed in [licenses/THIRD_PARTY_LICENSES.md](licenses/THIRD_PARTY_LICENSES.md). + ## Support - **Issues**: [GitHub Issues](https://github.com/usamaiqb/mark-reader/issues) @@ -112,6 +114,7 @@ Built with: - [Markwon](https://github.com/noties/Markwon) - Markdown rendering for Android - [Prism4j](https://github.com/noties/Prism4j) - Syntax highlighting - [Merriweather](https://github.com/SorkinType/Merriweather) - Reading font (OFL) +- [Merriweather Sans](https://github.com/SorkinType/Merriweather-Sans) - Sans-serif reading font (OFL) - [JetBrains Mono](https://github.com/JetBrains/JetBrainsMono) - Code font (OFL) ## Changelog diff --git a/app/src/main/java/com/markreader/data/PreferencesRepository.kt b/app/src/main/java/com/markreader/data/PreferencesRepository.kt index 497ef8a..5996f58 100644 --- a/app/src/main/java/com/markreader/data/PreferencesRepository.kt +++ b/app/src/main/java/com/markreader/data/PreferencesRepository.kt @@ -65,13 +65,22 @@ class PreferencesRepository private constructor(private val context: Context) { ReaderThemePreference.Amoled -> ReaderThemePreference.Amoled else -> ReaderThemePreference.Dark } - val readingFont = prefs[Keys.READING_FONT]?.let { ReadingFontPreference.valueOf(it) } + val readingFont = prefs[Keys.READING_FONT]?.let { + when (it) { + "SystemSans" -> ReadingFontPreference.MerriweatherSans + else -> runCatching { ReadingFontPreference.valueOf(it) }.getOrNull() + } + } ?: ReadingFontPreference.Merriweather - val codeFont = prefs[Keys.CODE_FONT]?.let { CodeFontPreference.valueOf(it) } + val codeFont = prefs[Keys.CODE_FONT]?.let { + runCatching { CodeFontPreference.valueOf(it) }.getOrNull() + } ?: CodeFontPreference.JetBrainsMono val fontSize = prefs[Keys.FONT_SIZE] ?: 18f val lineHeight = prefs[Keys.LINE_HEIGHT] ?: 1.6f - val alignment = prefs[Keys.TEXT_ALIGNMENT]?.let { TextAlignmentPreference.valueOf(it) } + val alignment = prefs[Keys.TEXT_ALIGNMENT]?.let { + runCatching { TextAlignmentPreference.valueOf(it) }.getOrNull() + } ?: TextAlignmentPreference.Left UserPreferences( diff --git a/app/src/main/java/com/markreader/data/UserPreferences.kt b/app/src/main/java/com/markreader/data/UserPreferences.kt index 08da062..a937547 100644 --- a/app/src/main/java/com/markreader/data/UserPreferences.kt +++ b/app/src/main/java/com/markreader/data/UserPreferences.kt @@ -15,7 +15,8 @@ enum class ReaderThemePreference { enum class ReadingFontPreference { Merriweather, - SystemSerif + SystemSerif, + MerriweatherSans } enum class CodeFontPreference { diff --git a/app/src/main/java/com/markreader/ui/screens/EditorScreen.kt b/app/src/main/java/com/markreader/ui/screens/EditorScreen.kt index 50bfa7e..769840d 100644 --- a/app/src/main/java/com/markreader/ui/screens/EditorScreen.kt +++ b/app/src/main/java/com/markreader/ui/screens/EditorScreen.kt @@ -85,6 +85,7 @@ import com.markreader.data.CodeFontPreference import com.markreader.data.ReadingFontPreference import com.markreader.ui.theme.CodeFontFamily import com.markreader.ui.theme.ReadingFontFamily +import com.markreader.ui.theme.SansReadingFontFamily @OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class) @Composable @@ -226,6 +227,7 @@ fun EditorScreen( when (prefs.readingFont) { ReadingFontPreference.Merriweather -> ReadingFontFamily ReadingFontPreference.SystemSerif -> FontFamily.Serif + ReadingFontPreference.MerriweatherSans -> SansReadingFontFamily } } else { when (prefs.codeFont) { diff --git a/app/src/main/java/com/markreader/ui/screens/SettingsScreen.kt b/app/src/main/java/com/markreader/ui/screens/SettingsScreen.kt index af8fb37..e364150 100644 --- a/app/src/main/java/com/markreader/ui/screens/SettingsScreen.kt +++ b/app/src/main/java/com/markreader/ui/screens/SettingsScreen.kt @@ -97,6 +97,7 @@ import com.markreader.ui.components.SegmentPosition import com.markreader.ui.components.segmentShape import com.markreader.ui.theme.CodeFontFamily import com.markreader.ui.theme.ReadingFontFamily +import com.markreader.ui.theme.SansReadingFontFamily import java.util.Locale import kotlin.math.abs @@ -702,7 +703,8 @@ fun SettingsScreen( subtitle = "Typeface for prose and headings", options = listOf( ReadingFontPreference.Merriweather, - ReadingFontPreference.SystemSerif + ReadingFontPreference.SystemSerif, + ReadingFontPreference.MerriweatherSans ), optionLabel = { it.displayLabel() }, selectedLabel = preferences.readingFont.displayLabel(), @@ -951,6 +953,7 @@ private fun ReaderThemePreference.displayLabel(): String = when (this) { private fun ReadingFontPreference.displayLabel(): String = when (this) { ReadingFontPreference.Merriweather -> "Merriweather" ReadingFontPreference.SystemSerif -> "System serif" + ReadingFontPreference.MerriweatherSans -> "Merriweather Sans" } private fun CodeFontPreference.displayLabel(): String = when (this) { @@ -961,6 +964,7 @@ private fun CodeFontPreference.displayLabel(): String = when (this) { private fun ReadingFontPreference.fontFamily(): FontFamily = when (this) { ReadingFontPreference.Merriweather -> ReadingFontFamily ReadingFontPreference.SystemSerif -> FontFamily.Serif + ReadingFontPreference.MerriweatherSans -> SansReadingFontFamily } private fun CodeFontPreference.fontFamily(): FontFamily = when (this) { diff --git a/app/src/main/java/com/markreader/ui/screens/ViewerTextInterop.kt b/app/src/main/java/com/markreader/ui/screens/ViewerTextInterop.kt index ddfcf7a..deec71e 100644 --- a/app/src/main/java/com/markreader/ui/screens/ViewerTextInterop.kt +++ b/app/src/main/java/com/markreader/ui/screens/ViewerTextInterop.kt @@ -948,6 +948,11 @@ private fun resolveTypeface( ) ?: Typeface.SERIF } catch (_: Exception) { Typeface.SERIF } ReadingFontPreference.SystemSerif -> Typeface.SERIF + ReadingFontPreference.MerriweatherSans -> try { + ResourcesCompat.getFont( + context, R.font.merriweather_sans_regular + ) ?: Typeface.SANS_SERIF + } catch (_: Exception) { Typeface.SANS_SERIF } } } diff --git a/app/src/main/java/com/markreader/ui/theme/Type.kt b/app/src/main/java/com/markreader/ui/theme/Type.kt index 6ecc275..f65315b 100644 --- a/app/src/main/java/com/markreader/ui/theme/Type.kt +++ b/app/src/main/java/com/markreader/ui/theme/Type.kt @@ -13,6 +13,11 @@ val ReadingFontFamily = FontFamily( Font(R.font.merriweather_bold, weight = FontWeight.Bold) ) +val SansReadingFontFamily = FontFamily( + Font(R.font.merriweather_sans_regular, weight = FontWeight.Normal), + Font(R.font.merriweather_sans_bold, weight = FontWeight.Bold) +) + val CodeFontFamily = FontFamily( Font(R.font.jetbrains_mono_regular, weight = FontWeight.Normal) ) diff --git a/app/src/main/res/font/merriweather_sans_bold.ttf b/app/src/main/res/font/merriweather_sans_bold.ttf new file mode 100644 index 0000000..d02e90b Binary files /dev/null and b/app/src/main/res/font/merriweather_sans_bold.ttf differ diff --git a/app/src/main/res/font/merriweather_sans_regular.ttf b/app/src/main/res/font/merriweather_sans_regular.ttf new file mode 100644 index 0000000..d4695d6 Binary files /dev/null and b/app/src/main/res/font/merriweather_sans_regular.ttf differ diff --git a/licenses/THIRD_PARTY_LICENSES.md b/licenses/THIRD_PARTY_LICENSES.md new file mode 100644 index 0000000..2fe1a09 --- /dev/null +++ b/licenses/THIRD_PARTY_LICENSES.md @@ -0,0 +1,125 @@ +# Third-Party Licenses + +MarkReader includes the following third-party font files in +`app/src/main/res/font`. + +## Merriweather + +- Files: `merriweather_regular.ttf`, `merriweather_bold.ttf` +- Source: https://github.com/SorkinType/Merriweather +- License: SIL Open Font License, Version 1.1 +- Copyright: Copyright 2020 The Merriweather Project Authors + (https://github.com/SorkinType/Merriweather/), with Reserved Font Name + "Merriweather". + +## Merriweather Sans + +- Files: `merriweather_sans_regular.ttf`, `merriweather_sans_bold.ttf` +- Source: https://github.com/SorkinType/Merriweather-Sans +- License: SIL Open Font License, Version 1.1 +- Copyright: Copyright 2019 The Merriweather Project Authors + (https://github.com/SorkinType/Merriweather-Sans) + +## JetBrains Mono + +- File: `jetbrains_mono_regular.ttf` +- Source: https://github.com/JetBrains/JetBrainsMono +- License: SIL Open Font License, Version 1.1 +- Copyright: Copyright 2020 The JetBrains Mono Project Authors + (https://github.com/JetBrains/JetBrainsMono) + +## SIL Open Font License, Version 1.1 + +Copyright (c) 2007, SIL International (https://scripts.sil.org/), +with Reserved Font Names "SIL" and "Open Font License". + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE.