diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/settings/SegmentedButtonWithTitle.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/settings/SegmentedButtonWithTitle.kt index 1a5dc583..a76e858d 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/settings/SegmentedButtonWithTitle.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/settings/SegmentedButtonWithTitle.kt @@ -34,7 +34,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R @@ -177,7 +176,6 @@ private fun SegmentedButton( Text( text = button.title, style = button.textStyle, - fontWeight = FontWeight.Medium, color = if (button.selected) colors.activeContentColor else colors.inactiveContentColor ) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/FontConstants.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/FontConstants.kt index 4266d854..0bdafd29 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/FontConstants.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/FontConstants.kt @@ -1,14 +1,18 @@ package ua.acclorite.book_story.presentation.core.constants +import androidx.annotation.FontRes +import androidx.compose.ui.text.ExperimentalTextApi import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontStyle +import androidx.compose.ui.text.font.FontVariation import androidx.compose.ui.text.font.FontWeight import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.reader.FontWithName import ua.acclorite.book_story.domain.ui.UIText -fun Constants.provideFonts(withRandom: Boolean): List { +@OptIn(ExperimentalTextApi::class) +fun Constants.provideFonts(): List { return mutableListOf( FontWithName( "default", @@ -18,175 +22,163 @@ fun Constants.provideFonts(withRandom: Boolean): List { FontWithName( "raleway", UIText.StringValue("Raleway"), - FontFamily( - Font(R.font.raleway_regular), - Font(R.font.raleway_regular_italic, style = FontStyle.Italic), - Font(R.font.raleway_medium, weight = FontWeight.Medium), - Font(R.font.raleway_semibold, weight = FontWeight.SemiBold), - Font(R.font.raleway_bold, weight = FontWeight.Bold), + provideVariableFontFamily( + normalResId = R.font.raleway_variable, + italicResId = R.font.raleway_variable_italic ) ), FontWithName( "open_sans", UIText.StringValue("Open Sans"), - FontFamily( - Font(R.font.opensans_regular), - Font(R.font.opensans_regular_italic, style = FontStyle.Italic), - Font(R.font.opensans_medium, weight = FontWeight.Medium), - Font(R.font.opensans_semibold, weight = FontWeight.SemiBold), - Font(R.font.opensans_bold, weight = FontWeight.Bold), + provideVariableFontFamily( + normalResId = R.font.opensans_variable, + italicResId = R.font.opensans_variable_italic ) ), FontWithName( "mulish", UIText.StringValue("Mulish"), - FontFamily( - Font(R.font.mulish_regular), - Font(R.font.mulish_regular_italic, style = FontStyle.Italic), - Font(R.font.mulish_medium, weight = FontWeight.Medium), - Font(R.font.mulish_semibold, weight = FontWeight.SemiBold), - Font(R.font.mulish_bold, weight = FontWeight.Bold), + provideVariableFontFamily( + normalResId = R.font.mulish_variable, + italicResId = R.font.mulish_variable_italic ) ), FontWithName( "arimo", UIText.StringValue("Arimo"), - FontFamily( - Font(R.font.arimo_regular), - Font(R.font.arimo_regular_italic, style = FontStyle.Italic), - Font(R.font.arimo_medium, weight = FontWeight.Medium), - Font(R.font.arimo_semibold, weight = FontWeight.SemiBold), - Font(R.font.arimo_bold, weight = FontWeight.Bold), + provideVariableFontFamily( + normalResId = R.font.arimo_variable, + italicResId = R.font.arimo_variable_italic ) ), FontWithName( "garamond", UIText.StringValue("Garamond"), - FontFamily( - Font(R.font.garamond_regular), - Font(R.font.garamond_regular_italic, style = FontStyle.Italic), - Font(R.font.garamond_medium, weight = FontWeight.Medium), - Font(R.font.garamond_semibold, weight = FontWeight.SemiBold), - Font(R.font.garamond_bold, weight = FontWeight.Bold), + provideVariableFontFamily( + normalResId = R.font.garamond_variable, + italicResId = R.font.garamond_variable_italic ) ), FontWithName( "roboto_serif", UIText.StringValue("Roboto Serif"), - FontFamily( - Font(R.font.robotoserif_regular), - Font(R.font.robotoserif_regular_italic, style = FontStyle.Italic), - Font(R.font.robotoserif_medium, weight = FontWeight.Medium), - Font(R.font.robotoserif_semibold, weight = FontWeight.SemiBold), - Font(R.font.robotoserif_bold, weight = FontWeight.Bold), + provideVariableFontFamily( + normalResId = R.font.robotoserif_variable, + italicResId = R.font.robotoserif_variable_italic ) ), FontWithName( "noto_serif", UIText.StringValue("Noto Serif"), - FontFamily( - Font(R.font.notoserif_regular), - Font(R.font.notoserif_regular_italic, style = FontStyle.Italic), - Font(R.font.notoserif_medium, weight = FontWeight.Medium), - Font(R.font.notoserif_semibold, weight = FontWeight.SemiBold), - Font(R.font.notoserif_bold, weight = FontWeight.Bold), + provideVariableFontFamily( + normalResId = R.font.notoserif_variable, + italicResId = R.font.notoserif_variable_italic ) ), FontWithName( "noto_sans", UIText.StringValue("Noto Sans"), - FontFamily( - Font(R.font.notosans_regular), - Font(R.font.notosans_regular_italic, style = FontStyle.Italic), - Font(R.font.notosans_medium, weight = FontWeight.Medium), - Font(R.font.notosans_semibold, weight = FontWeight.SemiBold), - Font(R.font.notosans_bold, weight = FontWeight.Bold), + provideVariableFontFamily( + normalResId = R.font.notosans_variable, + italicResId = R.font.notosans_variable_italic ) ), FontWithName( "roboto", UIText.StringValue("Roboto"), - FontFamily( - Font(R.font.roboto_regular), - Font(R.font.roboto_regular_italic, style = FontStyle.Italic), - Font(R.font.roboto_medium, weight = FontWeight.Medium), - Font(R.font.roboto_bold, weight = FontWeight.Bold), + provideVariableFontFamily( + normalResId = R.font.roboto_variable_with_italic, + italicResId = R.font.roboto_variable_with_italic ) ), FontWithName( "jost", UIText.StringValue("Jost"), - FontFamily( - Font(R.font.jost_regular), - Font(R.font.jost_regular_italic, style = FontStyle.Italic), - Font(R.font.jost_medium, weight = FontWeight.Medium), - Font(R.font.jost_semibold, weight = FontWeight.SemiBold), - Font(R.font.jost_bold, weight = FontWeight.Bold), + provideVariableFontFamily( + normalResId = R.font.jost_variable, + italicResId = R.font.jost_variable_italic ) ), FontWithName( "merriweather", UIText.StringValue("Merriweather"), - FontFamily( - Font(R.font.merriweather_regular), - Font(R.font.merriweather_regular_italic, style = FontStyle.Italic), - Font(R.font.merriweather_medium, weight = FontWeight.Medium), - Font(R.font.merriweather_bold, weight = FontWeight.Bold), + provideVariableFontFamily( + normalResId = R.font.merriweather_variable, + italicResId = R.font.merriweather_variable_italic ) ), FontWithName( "montserrat", UIText.StringValue("Montserrat"), - FontFamily( - Font(R.font.montserrat_regular), - Font(R.font.montserrat_regular_italic, style = FontStyle.Italic), - Font(R.font.montserrat_medium, weight = FontWeight.Medium), - Font(R.font.montserrat_semibold, weight = FontWeight.SemiBold), - Font(R.font.montserrat_bold, weight = FontWeight.Bold), + provideVariableFontFamily( + normalResId = R.font.montserrat_variable, + italicResId = R.font.montserrat_variable_italic ) ), FontWithName( "nunito", UIText.StringValue("Nunito"), - FontFamily( - Font(R.font.nunito_regular), - Font(R.font.nunito_regular_italic, style = FontStyle.Italic), - Font(R.font.nunito_medium, weight = FontWeight.Medium), - Font(R.font.nunito_semibold, weight = FontWeight.SemiBold), - Font(R.font.nunito_bold, weight = FontWeight.Bold), + provideVariableFontFamily( + normalResId = R.font.nunito_variable, + italicResId = R.font.nunito_variable_italic ) ), FontWithName( "roboto_slab", UIText.StringValue("Roboto Slab"), - FontFamily( - Font(R.font.robotoslab_regular), - Font(R.font.robotoslab_medium, weight = FontWeight.Medium), - Font(R.font.robotoslab_semibold, weight = FontWeight.SemiBold), - Font(R.font.robotoslab_bold, weight = FontWeight.Bold), + provideVariableFontFamily( + normalResId = R.font.robotoslab_variable_with_italic, + italicResId = R.font.robotoslab_variable_with_italic ) ), FontWithName( "lora", UIText.StringValue("Lora"), - FontFamily( - Font(R.font.lora_regular), - Font(R.font.lora_regular_italic, style = FontStyle.Italic), - Font(R.font.lora_medium, weight = FontWeight.Medium), - Font(R.font.lora_semibold, weight = FontWeight.SemiBold), - Font(R.font.lora_bold, weight = FontWeight.Bold), + provideVariableFontFamily( + normalResId = R.font.lora_variable, + italicResId = R.font.lora_variable_italic ) ) - ).apply { - if (withRandom) { - add( - 1, - FontWithName( - "random", - UIText.StringResource(R.string.random_string), - provideFonts(withRandom = false).random().font + ) +} + +@OptIn(ExperimentalTextApi::class) +private fun provideVariableFontFamily( + @FontRes normalResId: Int, + @FontRes italicResId: Int +): FontFamily { + fun provideVariableFont(weight: FontWeight): Array { + return arrayOf( + Font( + resId = normalResId, + weight = weight, + style = FontStyle.Normal, + variationSettings = FontVariation.Settings( + weight = weight, + style = FontStyle.Normal + ) + ), + Font( + resId = italicResId, + weight = weight, + style = FontStyle.Italic, + variationSettings = FontVariation.Settings( + weight = weight, + style = FontStyle.Italic ) ) - } + ) } + + return FontFamily( + *provideVariableFont(weight = FontWeight.W100), + *provideVariableFont(weight = FontWeight.W200), + *provideVariableFont(weight = FontWeight.W300), + *provideVariableFont(weight = FontWeight.W400), + *provideVariableFont(weight = FontWeight.W500), + *provideVariableFont(weight = FontWeight.W600), + *provideVariableFont(weight = FontWeight.W700), + *provideVariableFont(weight = FontWeight.W800), + *provideVariableFont(weight = FontWeight.W900) + ) } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontFamilyOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontFamilyOption.kt index 8516babf..83afe4b2 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontFamilyOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontFamilyOption.kt @@ -4,7 +4,6 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.font.FontFamily import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R @@ -21,29 +20,32 @@ fun FontFamilyOption() { val state = mainModel.state.collectAsStateWithLifecycle() val fontFamily = remember(state.value.fontFamily) { - Constants.provideFonts(withRandom = true).find { - it.id == state.value.fontFamily - } ?: Constants.provideFonts(withRandom = false)[0] + Constants.provideFonts().run { + find { + it.id == state.value.fontFamily + } ?: get(0) + } } ChipsWithTitle( title = stringResource(id = R.string.font_family_option), - chips = Constants.provideFonts(withRandom = true) + chips = Constants.provideFonts() .map { ButtonItem( id = it.id, title = it.fontName.asString(), textStyle = MaterialTheme.typography.labelLarge.copy( - fontFamily = when (it.id) { - "random" -> FontFamily.Default - else -> it.font - } + fontFamily = it.font ), selected = it.id == fontFamily.id ) }, onClick = { - mainModel.onEvent(MainEvent.OnChangeFontFamily(it.id)) + mainModel.onEvent( + MainEvent.OnChangeFontFamily( + it.id + ) + ) } ) } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontStyleOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontStyleOption.kt index 5093cd2f..8492e182 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontStyleOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontStyleOption.kt @@ -21,9 +21,11 @@ fun FontStyleOption() { val state = mainModel.state.collectAsStateWithLifecycle() val fontFamily = remember(state.value.fontFamily) { - Constants.provideFonts(withRandom = false).find { - it.id == state.value.fontFamily - } ?: Constants.provideFonts(withRandom = false)[0] + Constants.provideFonts().run { + find { + it.id == state.value.fontFamily + } ?: get(0) + } } SegmentedButtonWithTitle( diff --git a/app/src/main/java/ua/acclorite/book_story/ui/main/MainModel.kt b/app/src/main/java/ua/acclorite/book_story/ui/main/MainModel.kt index f5d7cf3f..a063caa9 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/main/MainModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/main/MainModel.kt @@ -101,9 +101,11 @@ class MainModel @Inject constructor( value = event.value, updateState = { it.copy( - fontFamily = Constants.provideFonts(withRandom = true) - .find { font -> font.id == event.value }?.id - ?: Constants.provideFonts(withRandom = false)[0].id + fontFamily = Constants.provideFonts().run { + find { font -> + font.id == event.value + }?.id ?: get(0).id + } ) } ) diff --git a/app/src/main/java/ua/acclorite/book_story/ui/main/MainState.kt b/app/src/main/java/ua/acclorite/book_story/ui/main/MainState.kt index 452fdfab..bc8e0b6f 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/main/MainState.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/main/MainState.kt @@ -63,6 +63,7 @@ data class MainState( // Reader Settings val fontFamily: String = provideDefaultValue { Constants.provideFonts(withRandom = false)[0].id }, + val fontFamily: String = provideDefaultValue { Constants.provideFonts()[0].id }, val isItalic: Boolean = provideDefaultValue { false }, val fontSize: Int = provideDefaultValue { 16 }, val lineHeight: Int = provideDefaultValue { 4 }, diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScreen.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScreen.kt index 7c63ad80..66cdc652 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScreen.kt @@ -110,9 +110,11 @@ data class ReaderScreen(val bookId: Int) : Screen, Parcelable { } val fontFamily = remember(mainState.value.fontFamily) { - Constants.provideFonts(withRandom = true).find { - it.id == mainState.value.fontFamily - } ?: Constants.provideFonts(withRandom = false)[0] + Constants.provideFonts().run { + find { + it.id == mainState.value.fontFamily + } ?: get(0) + } } val backgroundColor = animateColorAsState( targetValue = settingsState.value.selectedColorPreset.backgroundColor diff --git a/app/src/main/res/font/arimo_bold.ttf b/app/src/main/res/font/arimo_bold.ttf deleted file mode 100644 index c26951c1..00000000 Binary files a/app/src/main/res/font/arimo_bold.ttf and /dev/null differ diff --git a/app/src/main/res/font/arimo_medium.ttf b/app/src/main/res/font/arimo_medium.ttf deleted file mode 100644 index f2223e20..00000000 Binary files a/app/src/main/res/font/arimo_medium.ttf and /dev/null differ diff --git a/app/src/main/res/font/arimo_regular.ttf b/app/src/main/res/font/arimo_regular.ttf deleted file mode 100644 index 7872b35a..00000000 Binary files a/app/src/main/res/font/arimo_regular.ttf and /dev/null differ diff --git a/app/src/main/res/font/arimo_regular_italic.ttf b/app/src/main/res/font/arimo_regular_italic.ttf deleted file mode 100644 index 49a03256..00000000 Binary files a/app/src/main/res/font/arimo_regular_italic.ttf and /dev/null differ diff --git a/app/src/main/res/font/arimo_semibold.ttf b/app/src/main/res/font/arimo_semibold.ttf deleted file mode 100644 index 170ab85d..00000000 Binary files a/app/src/main/res/font/arimo_semibold.ttf and /dev/null differ diff --git a/app/src/main/res/font/arimo_variable.ttf b/app/src/main/res/font/arimo_variable.ttf new file mode 100644 index 00000000..2fec9028 Binary files /dev/null and b/app/src/main/res/font/arimo_variable.ttf differ diff --git a/app/src/main/res/font/arimo_variable_italic.ttf b/app/src/main/res/font/arimo_variable_italic.ttf new file mode 100644 index 00000000..04c338a5 Binary files /dev/null and b/app/src/main/res/font/arimo_variable_italic.ttf differ diff --git a/app/src/main/res/font/garamond_bold.ttf b/app/src/main/res/font/garamond_bold.ttf deleted file mode 100644 index 9112c7bc..00000000 Binary files a/app/src/main/res/font/garamond_bold.ttf and /dev/null differ diff --git a/app/src/main/res/font/garamond_medium.ttf b/app/src/main/res/font/garamond_medium.ttf deleted file mode 100644 index eb127af9..00000000 Binary files a/app/src/main/res/font/garamond_medium.ttf and /dev/null differ diff --git a/app/src/main/res/font/garamond_regular.ttf b/app/src/main/res/font/garamond_regular.ttf deleted file mode 100644 index f8c490b1..00000000 Binary files a/app/src/main/res/font/garamond_regular.ttf and /dev/null differ diff --git a/app/src/main/res/font/garamond_regular_italic.ttf b/app/src/main/res/font/garamond_regular_italic.ttf deleted file mode 100644 index 5c44af14..00000000 Binary files a/app/src/main/res/font/garamond_regular_italic.ttf and /dev/null differ diff --git a/app/src/main/res/font/garamond_semibold.ttf b/app/src/main/res/font/garamond_semibold.ttf deleted file mode 100644 index fa145fb1..00000000 Binary files a/app/src/main/res/font/garamond_semibold.ttf and /dev/null differ diff --git a/app/src/main/res/font/garamond_variable.ttf b/app/src/main/res/font/garamond_variable.ttf new file mode 100644 index 00000000..14663111 Binary files /dev/null and b/app/src/main/res/font/garamond_variable.ttf differ diff --git a/app/src/main/res/font/garamond_variable_italic.ttf b/app/src/main/res/font/garamond_variable_italic.ttf new file mode 100644 index 00000000..ab46e3f6 Binary files /dev/null and b/app/src/main/res/font/garamond_variable_italic.ttf differ diff --git a/app/src/main/res/font/jost_bold.ttf b/app/src/main/res/font/jost_bold.ttf deleted file mode 100644 index 4d2b589e..00000000 Binary files a/app/src/main/res/font/jost_bold.ttf and /dev/null differ diff --git a/app/src/main/res/font/jost_medium.ttf b/app/src/main/res/font/jost_medium.ttf deleted file mode 100644 index 2f74a13d..00000000 Binary files a/app/src/main/res/font/jost_medium.ttf and /dev/null differ diff --git a/app/src/main/res/font/jost_regular.ttf b/app/src/main/res/font/jost_regular.ttf deleted file mode 100644 index 32695631..00000000 Binary files a/app/src/main/res/font/jost_regular.ttf and /dev/null differ diff --git a/app/src/main/res/font/jost_regular_italic.ttf b/app/src/main/res/font/jost_regular_italic.ttf deleted file mode 100644 index 01090bb7..00000000 Binary files a/app/src/main/res/font/jost_regular_italic.ttf and /dev/null differ diff --git a/app/src/main/res/font/jost_semibold.ttf b/app/src/main/res/font/jost_semibold.ttf deleted file mode 100644 index b3a3c4fd..00000000 Binary files a/app/src/main/res/font/jost_semibold.ttf and /dev/null differ diff --git a/app/src/main/res/font/jost_variable.ttf b/app/src/main/res/font/jost_variable.ttf new file mode 100644 index 00000000..59b1908b Binary files /dev/null and b/app/src/main/res/font/jost_variable.ttf differ diff --git a/app/src/main/res/font/jost_variable_italic.ttf b/app/src/main/res/font/jost_variable_italic.ttf new file mode 100644 index 00000000..c18457a0 Binary files /dev/null and b/app/src/main/res/font/jost_variable_italic.ttf differ diff --git a/app/src/main/res/font/lora_bold.ttf b/app/src/main/res/font/lora_bold.ttf deleted file mode 100644 index 530c9e11..00000000 Binary files a/app/src/main/res/font/lora_bold.ttf and /dev/null differ diff --git a/app/src/main/res/font/lora_medium.ttf b/app/src/main/res/font/lora_medium.ttf deleted file mode 100644 index 85ca5a27..00000000 Binary files a/app/src/main/res/font/lora_medium.ttf and /dev/null differ diff --git a/app/src/main/res/font/lora_regular.ttf b/app/src/main/res/font/lora_regular.ttf deleted file mode 100644 index 2b1dab45..00000000 Binary files a/app/src/main/res/font/lora_regular.ttf and /dev/null differ diff --git a/app/src/main/res/font/lora_regular_italic.ttf b/app/src/main/res/font/lora_regular_italic.ttf deleted file mode 100644 index d93bc5fc..00000000 Binary files a/app/src/main/res/font/lora_regular_italic.ttf and /dev/null differ diff --git a/app/src/main/res/font/lora_semibold.ttf b/app/src/main/res/font/lora_semibold.ttf deleted file mode 100644 index 3a7c6d75..00000000 Binary files a/app/src/main/res/font/lora_semibold.ttf and /dev/null differ diff --git a/app/src/main/res/font/lora_variable.ttf b/app/src/main/res/font/lora_variable.ttf new file mode 100644 index 00000000..b23ea948 Binary files /dev/null and b/app/src/main/res/font/lora_variable.ttf differ diff --git a/app/src/main/res/font/lora_variable_italic.ttf b/app/src/main/res/font/lora_variable_italic.ttf new file mode 100644 index 00000000..05cbde29 Binary files /dev/null and b/app/src/main/res/font/lora_variable_italic.ttf differ diff --git a/app/src/main/res/font/merriweather_bold.ttf b/app/src/main/res/font/merriweather_bold.ttf deleted file mode 100644 index 3e10e02f..00000000 Binary files a/app/src/main/res/font/merriweather_bold.ttf and /dev/null differ diff --git a/app/src/main/res/font/merriweather_medium.ttf b/app/src/main/res/font/merriweather_medium.ttf deleted file mode 100644 index 3e10e02f..00000000 Binary files a/app/src/main/res/font/merriweather_medium.ttf and /dev/null differ diff --git a/app/src/main/res/font/merriweather_regular.ttf b/app/src/main/res/font/merriweather_regular.ttf deleted file mode 100644 index 3fecc777..00000000 Binary files a/app/src/main/res/font/merriweather_regular.ttf and /dev/null differ diff --git a/app/src/main/res/font/merriweather_regular_italic.ttf b/app/src/main/res/font/merriweather_regular_italic.ttf deleted file mode 100644 index 8e9d03d3..00000000 Binary files a/app/src/main/res/font/merriweather_regular_italic.ttf and /dev/null differ diff --git a/app/src/main/res/font/merriweather_variable.ttf b/app/src/main/res/font/merriweather_variable.ttf new file mode 100644 index 00000000..3682c65a Binary files /dev/null and b/app/src/main/res/font/merriweather_variable.ttf differ diff --git a/app/src/main/res/font/merriweather_variable_italic.ttf b/app/src/main/res/font/merriweather_variable_italic.ttf new file mode 100644 index 00000000..886ed00c Binary files /dev/null and b/app/src/main/res/font/merriweather_variable_italic.ttf differ diff --git a/app/src/main/res/font/montserrat_bold.ttf b/app/src/main/res/font/montserrat_bold.ttf deleted file mode 100644 index 0927b813..00000000 Binary files a/app/src/main/res/font/montserrat_bold.ttf and /dev/null differ diff --git a/app/src/main/res/font/montserrat_medium.ttf b/app/src/main/res/font/montserrat_medium.ttf deleted file mode 100644 index 4012225c..00000000 Binary files a/app/src/main/res/font/montserrat_medium.ttf and /dev/null differ diff --git a/app/src/main/res/font/montserrat_regular.ttf b/app/src/main/res/font/montserrat_regular.ttf deleted file mode 100644 index f4a266dd..00000000 Binary files a/app/src/main/res/font/montserrat_regular.ttf and /dev/null differ diff --git a/app/src/main/res/font/montserrat_regular_italic.ttf b/app/src/main/res/font/montserrat_regular_italic.ttf deleted file mode 100644 index cff3cebc..00000000 Binary files a/app/src/main/res/font/montserrat_regular_italic.ttf and /dev/null differ diff --git a/app/src/main/res/font/montserrat_semibold.ttf b/app/src/main/res/font/montserrat_semibold.ttf deleted file mode 100644 index 189ce9d0..00000000 Binary files a/app/src/main/res/font/montserrat_semibold.ttf and /dev/null differ diff --git a/app/src/main/res/font/montserrat_variable.ttf b/app/src/main/res/font/montserrat_variable.ttf new file mode 100644 index 00000000..797c4a57 Binary files /dev/null and b/app/src/main/res/font/montserrat_variable.ttf differ diff --git a/app/src/main/res/font/montserrat_variable_italic.ttf b/app/src/main/res/font/montserrat_variable_italic.ttf new file mode 100644 index 00000000..81cc3263 Binary files /dev/null and b/app/src/main/res/font/montserrat_variable_italic.ttf differ diff --git a/app/src/main/res/font/mulish_bold.ttf b/app/src/main/res/font/mulish_bold.ttf deleted file mode 100644 index 0c1eed73..00000000 Binary files a/app/src/main/res/font/mulish_bold.ttf and /dev/null differ diff --git a/app/src/main/res/font/mulish_medium.ttf b/app/src/main/res/font/mulish_medium.ttf deleted file mode 100644 index be50c597..00000000 Binary files a/app/src/main/res/font/mulish_medium.ttf and /dev/null differ diff --git a/app/src/main/res/font/mulish_regular.ttf b/app/src/main/res/font/mulish_regular.ttf deleted file mode 100644 index 0971518b..00000000 Binary files a/app/src/main/res/font/mulish_regular.ttf and /dev/null differ diff --git a/app/src/main/res/font/mulish_regular_italic.ttf b/app/src/main/res/font/mulish_regular_italic.ttf deleted file mode 100644 index a42d8759..00000000 Binary files a/app/src/main/res/font/mulish_regular_italic.ttf and /dev/null differ diff --git a/app/src/main/res/font/mulish_semibold.ttf b/app/src/main/res/font/mulish_semibold.ttf deleted file mode 100644 index 9ac1fc8f..00000000 Binary files a/app/src/main/res/font/mulish_semibold.ttf and /dev/null differ diff --git a/app/src/main/res/font/mulish_variable.ttf b/app/src/main/res/font/mulish_variable.ttf new file mode 100644 index 00000000..410f7aa6 Binary files /dev/null and b/app/src/main/res/font/mulish_variable.ttf differ diff --git a/app/src/main/res/font/mulish_variable_italic.ttf b/app/src/main/res/font/mulish_variable_italic.ttf new file mode 100644 index 00000000..e5425c75 Binary files /dev/null and b/app/src/main/res/font/mulish_variable_italic.ttf differ diff --git a/app/src/main/res/font/notosans_bold.ttf b/app/src/main/res/font/notosans_bold.ttf deleted file mode 100644 index d84248ed..00000000 Binary files a/app/src/main/res/font/notosans_bold.ttf and /dev/null differ diff --git a/app/src/main/res/font/notosans_medium.ttf b/app/src/main/res/font/notosans_medium.ttf deleted file mode 100644 index a799b74d..00000000 Binary files a/app/src/main/res/font/notosans_medium.ttf and /dev/null differ diff --git a/app/src/main/res/font/notosans_regular.ttf b/app/src/main/res/font/notosans_regular.ttf deleted file mode 100644 index fa4cff50..00000000 Binary files a/app/src/main/res/font/notosans_regular.ttf and /dev/null differ diff --git a/app/src/main/res/font/notosans_regular_italic.ttf b/app/src/main/res/font/notosans_regular_italic.ttf deleted file mode 100644 index c40c3562..00000000 Binary files a/app/src/main/res/font/notosans_regular_italic.ttf and /dev/null differ diff --git a/app/src/main/res/font/notosans_semibold.ttf b/app/src/main/res/font/notosans_semibold.ttf deleted file mode 100644 index d3ed423e..00000000 Binary files a/app/src/main/res/font/notosans_semibold.ttf and /dev/null differ diff --git a/app/src/main/res/font/notosans_variable.ttf b/app/src/main/res/font/notosans_variable.ttf new file mode 100644 index 00000000..f7d0d78e Binary files /dev/null and b/app/src/main/res/font/notosans_variable.ttf differ diff --git a/app/src/main/res/font/notosans_variable_italic.ttf b/app/src/main/res/font/notosans_variable_italic.ttf new file mode 100644 index 00000000..4e962ee8 Binary files /dev/null and b/app/src/main/res/font/notosans_variable_italic.ttf differ diff --git a/app/src/main/res/font/notoserif_bold.ttf b/app/src/main/res/font/notoserif_bold.ttf deleted file mode 100644 index aa21d44e..00000000 Binary files a/app/src/main/res/font/notoserif_bold.ttf and /dev/null differ diff --git a/app/src/main/res/font/notoserif_medium.ttf b/app/src/main/res/font/notoserif_medium.ttf deleted file mode 100644 index 7a177074..00000000 Binary files a/app/src/main/res/font/notoserif_medium.ttf and /dev/null differ diff --git a/app/src/main/res/font/notoserif_regular.ttf b/app/src/main/res/font/notoserif_regular.ttf deleted file mode 100644 index dc30297e..00000000 Binary files a/app/src/main/res/font/notoserif_regular.ttf and /dev/null differ diff --git a/app/src/main/res/font/notoserif_regular_italic.ttf b/app/src/main/res/font/notoserif_regular_italic.ttf deleted file mode 100644 index 786ecc73..00000000 Binary files a/app/src/main/res/font/notoserif_regular_italic.ttf and /dev/null differ diff --git a/app/src/main/res/font/notoserif_semibold.ttf b/app/src/main/res/font/notoserif_semibold.ttf deleted file mode 100644 index 9ece80ac..00000000 Binary files a/app/src/main/res/font/notoserif_semibold.ttf and /dev/null differ diff --git a/app/src/main/res/font/notoserif_variable.ttf b/app/src/main/res/font/notoserif_variable.ttf new file mode 100644 index 00000000..debad169 Binary files /dev/null and b/app/src/main/res/font/notoserif_variable.ttf differ diff --git a/app/src/main/res/font/notoserif_variable_italic.ttf b/app/src/main/res/font/notoserif_variable_italic.ttf new file mode 100644 index 00000000..f4bd4379 Binary files /dev/null and b/app/src/main/res/font/notoserif_variable_italic.ttf differ diff --git a/app/src/main/res/font/nunito_bold.ttf b/app/src/main/res/font/nunito_bold.ttf deleted file mode 100644 index 886134dc..00000000 Binary files a/app/src/main/res/font/nunito_bold.ttf and /dev/null differ diff --git a/app/src/main/res/font/nunito_medium.ttf b/app/src/main/res/font/nunito_medium.ttf deleted file mode 100644 index e24c1d61..00000000 Binary files a/app/src/main/res/font/nunito_medium.ttf and /dev/null differ diff --git a/app/src/main/res/font/nunito_regular.ttf b/app/src/main/res/font/nunito_regular.ttf deleted file mode 100644 index 9411bfbe..00000000 Binary files a/app/src/main/res/font/nunito_regular.ttf and /dev/null differ diff --git a/app/src/main/res/font/nunito_regular_italic.ttf b/app/src/main/res/font/nunito_regular_italic.ttf deleted file mode 100644 index f4ab1149..00000000 Binary files a/app/src/main/res/font/nunito_regular_italic.ttf and /dev/null differ diff --git a/app/src/main/res/font/nunito_semibold.ttf b/app/src/main/res/font/nunito_semibold.ttf deleted file mode 100644 index 1326a7dc..00000000 Binary files a/app/src/main/res/font/nunito_semibold.ttf and /dev/null differ diff --git a/app/src/main/res/font/nunito_variable.ttf b/app/src/main/res/font/nunito_variable.ttf new file mode 100644 index 00000000..0a00f63f Binary files /dev/null and b/app/src/main/res/font/nunito_variable.ttf differ diff --git a/app/src/main/res/font/nunito_variable_italic.ttf b/app/src/main/res/font/nunito_variable_italic.ttf new file mode 100644 index 00000000..08ec228a Binary files /dev/null and b/app/src/main/res/font/nunito_variable_italic.ttf differ diff --git a/app/src/main/res/font/opensans_bold.ttf b/app/src/main/res/font/opensans_bold.ttf deleted file mode 100644 index 98c74e0a..00000000 Binary files a/app/src/main/res/font/opensans_bold.ttf and /dev/null differ diff --git a/app/src/main/res/font/opensans_medium.ttf b/app/src/main/res/font/opensans_medium.ttf deleted file mode 100644 index ae716936..00000000 Binary files a/app/src/main/res/font/opensans_medium.ttf and /dev/null differ diff --git a/app/src/main/res/font/opensans_regular.ttf b/app/src/main/res/font/opensans_regular.ttf deleted file mode 100644 index 67803bb6..00000000 Binary files a/app/src/main/res/font/opensans_regular.ttf and /dev/null differ diff --git a/app/src/main/res/font/opensans_regular_italic.ttf b/app/src/main/res/font/opensans_regular_italic.ttf deleted file mode 100644 index 29ff6938..00000000 Binary files a/app/src/main/res/font/opensans_regular_italic.ttf and /dev/null differ diff --git a/app/src/main/res/font/opensans_semibold.ttf b/app/src/main/res/font/opensans_semibold.ttf deleted file mode 100644 index e5ab4644..00000000 Binary files a/app/src/main/res/font/opensans_semibold.ttf and /dev/null differ diff --git a/app/src/main/res/font/opensans_variable.ttf b/app/src/main/res/font/opensans_variable.ttf new file mode 100644 index 00000000..ac587b48 Binary files /dev/null and b/app/src/main/res/font/opensans_variable.ttf differ diff --git a/app/src/main/res/font/opensans_variable_italic.ttf b/app/src/main/res/font/opensans_variable_italic.ttf new file mode 100644 index 00000000..8312b2ce Binary files /dev/null and b/app/src/main/res/font/opensans_variable_italic.ttf differ diff --git a/app/src/main/res/font/raleway_bold.ttf b/app/src/main/res/font/raleway_bold.ttf deleted file mode 100644 index 4e1e5495..00000000 Binary files a/app/src/main/res/font/raleway_bold.ttf and /dev/null differ diff --git a/app/src/main/res/font/raleway_medium.ttf b/app/src/main/res/font/raleway_medium.ttf deleted file mode 100644 index c6fa5335..00000000 Binary files a/app/src/main/res/font/raleway_medium.ttf and /dev/null differ diff --git a/app/src/main/res/font/raleway_regular.ttf b/app/src/main/res/font/raleway_regular.ttf deleted file mode 100644 index 9a70667f..00000000 Binary files a/app/src/main/res/font/raleway_regular.ttf and /dev/null differ diff --git a/app/src/main/res/font/raleway_regular_italic.ttf b/app/src/main/res/font/raleway_regular_italic.ttf deleted file mode 100644 index fa7ca30c..00000000 Binary files a/app/src/main/res/font/raleway_regular_italic.ttf and /dev/null differ diff --git a/app/src/main/res/font/raleway_semibold.ttf b/app/src/main/res/font/raleway_semibold.ttf deleted file mode 100644 index 359f89bf..00000000 Binary files a/app/src/main/res/font/raleway_semibold.ttf and /dev/null differ diff --git a/app/src/main/res/font/raleway_variable.ttf b/app/src/main/res/font/raleway_variable.ttf new file mode 100644 index 00000000..33969e85 Binary files /dev/null and b/app/src/main/res/font/raleway_variable.ttf differ diff --git a/app/src/main/res/font/raleway_variable_italic.ttf b/app/src/main/res/font/raleway_variable_italic.ttf new file mode 100644 index 00000000..59d63b27 Binary files /dev/null and b/app/src/main/res/font/raleway_variable_italic.ttf differ diff --git a/app/src/main/res/font/roboto_bold.ttf b/app/src/main/res/font/roboto_bold.ttf deleted file mode 100644 index e64db796..00000000 Binary files a/app/src/main/res/font/roboto_bold.ttf and /dev/null differ diff --git a/app/src/main/res/font/roboto_medium.ttf b/app/src/main/res/font/roboto_medium.ttf deleted file mode 100644 index 0707e15c..00000000 Binary files a/app/src/main/res/font/roboto_medium.ttf and /dev/null differ diff --git a/app/src/main/res/font/roboto_regular.ttf b/app/src/main/res/font/roboto_regular.ttf deleted file mode 100644 index ddf4bfac..00000000 Binary files a/app/src/main/res/font/roboto_regular.ttf and /dev/null differ diff --git a/app/src/main/res/font/roboto_regular_italic.ttf b/app/src/main/res/font/roboto_regular_italic.ttf deleted file mode 100644 index 1b5eaa36..00000000 Binary files a/app/src/main/res/font/roboto_regular_italic.ttf and /dev/null differ diff --git a/app/src/main/res/font/roboto_variable_with_italic.ttf b/app/src/main/res/font/roboto_variable_with_italic.ttf new file mode 100644 index 00000000..737eefe8 Binary files /dev/null and b/app/src/main/res/font/roboto_variable_with_italic.ttf differ diff --git a/app/src/main/res/font/robotoserif_bold.ttf b/app/src/main/res/font/robotoserif_bold.ttf deleted file mode 100644 index 862bd519..00000000 Binary files a/app/src/main/res/font/robotoserif_bold.ttf and /dev/null differ diff --git a/app/src/main/res/font/robotoserif_medium.ttf b/app/src/main/res/font/robotoserif_medium.ttf deleted file mode 100644 index 119187c4..00000000 Binary files a/app/src/main/res/font/robotoserif_medium.ttf and /dev/null differ diff --git a/app/src/main/res/font/robotoserif_regular.ttf b/app/src/main/res/font/robotoserif_regular.ttf deleted file mode 100644 index 48773aec..00000000 Binary files a/app/src/main/res/font/robotoserif_regular.ttf and /dev/null differ diff --git a/app/src/main/res/font/robotoserif_regular_italic.ttf b/app/src/main/res/font/robotoserif_regular_italic.ttf deleted file mode 100644 index fcc48dfd..00000000 Binary files a/app/src/main/res/font/robotoserif_regular_italic.ttf and /dev/null differ diff --git a/app/src/main/res/font/robotoserif_semibold.ttf b/app/src/main/res/font/robotoserif_semibold.ttf deleted file mode 100644 index eee70071..00000000 Binary files a/app/src/main/res/font/robotoserif_semibold.ttf and /dev/null differ diff --git a/app/src/main/res/font/robotoserif_variable.ttf b/app/src/main/res/font/robotoserif_variable.ttf new file mode 100644 index 00000000..2ae12da0 Binary files /dev/null and b/app/src/main/res/font/robotoserif_variable.ttf differ diff --git a/app/src/main/res/font/robotoserif_variable_italic.ttf b/app/src/main/res/font/robotoserif_variable_italic.ttf new file mode 100644 index 00000000..86d11b7c Binary files /dev/null and b/app/src/main/res/font/robotoserif_variable_italic.ttf differ diff --git a/app/src/main/res/font/robotoslab_bold.ttf b/app/src/main/res/font/robotoslab_bold.ttf deleted file mode 100644 index 8a597f2d..00000000 Binary files a/app/src/main/res/font/robotoslab_bold.ttf and /dev/null differ diff --git a/app/src/main/res/font/robotoslab_medium.ttf b/app/src/main/res/font/robotoslab_medium.ttf deleted file mode 100644 index 44377207..00000000 Binary files a/app/src/main/res/font/robotoslab_medium.ttf and /dev/null differ diff --git a/app/src/main/res/font/robotoslab_regular.ttf b/app/src/main/res/font/robotoslab_regular.ttf deleted file mode 100644 index faaa4463..00000000 Binary files a/app/src/main/res/font/robotoslab_regular.ttf and /dev/null differ diff --git a/app/src/main/res/font/robotoslab_semibold.ttf b/app/src/main/res/font/robotoslab_semibold.ttf deleted file mode 100644 index 28f71ee0..00000000 Binary files a/app/src/main/res/font/robotoslab_semibold.ttf and /dev/null differ diff --git a/app/src/main/res/font/robotoslab_variable_with_italic.ttf b/app/src/main/res/font/robotoslab_variable_with_italic.ttf new file mode 100644 index 00000000..d78883c1 Binary files /dev/null and b/app/src/main/res/font/robotoslab_variable_with_italic.ttf differ