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 1c4ac7cd..4266d854 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 @@ -21,7 +21,9 @@ fun Constants.provideFonts(withRandom: Boolean): List { 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_medium, weight = FontWeight.Medium), + Font(R.font.raleway_semibold, weight = FontWeight.SemiBold), + Font(R.font.raleway_bold, weight = FontWeight.Bold), ) ), FontWithName( @@ -30,7 +32,9 @@ fun Constants.provideFonts(withRandom: Boolean): List { 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_medium, weight = FontWeight.Medium), + Font(R.font.opensans_semibold, weight = FontWeight.SemiBold), + Font(R.font.opensans_bold, weight = FontWeight.Bold), ) ), FontWithName( @@ -39,7 +43,9 @@ fun Constants.provideFonts(withRandom: Boolean): List { 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_medium, weight = FontWeight.Medium), + Font(R.font.mulish_semibold, weight = FontWeight.SemiBold), + Font(R.font.mulish_bold, weight = FontWeight.Bold), ) ), FontWithName( @@ -48,7 +54,9 @@ fun Constants.provideFonts(withRandom: Boolean): List { 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_medium, weight = FontWeight.Medium), + Font(R.font.arimo_semibold, weight = FontWeight.SemiBold), + Font(R.font.arimo_bold, weight = FontWeight.Bold), ) ), FontWithName( @@ -57,7 +65,9 @@ fun Constants.provideFonts(withRandom: Boolean): List { 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_medium, weight = FontWeight.Medium), + Font(R.font.garamond_semibold, weight = FontWeight.SemiBold), + Font(R.font.garamond_bold, weight = FontWeight.Bold), ) ), FontWithName( @@ -66,7 +76,9 @@ fun Constants.provideFonts(withRandom: Boolean): List { 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_medium, weight = FontWeight.Medium), + Font(R.font.robotoserif_semibold, weight = FontWeight.SemiBold), + Font(R.font.robotoserif_bold, weight = FontWeight.Bold), ) ), FontWithName( @@ -75,7 +87,9 @@ fun Constants.provideFonts(withRandom: Boolean): List { 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_medium, weight = FontWeight.Medium), + Font(R.font.notoserif_semibold, weight = FontWeight.SemiBold), + Font(R.font.notoserif_bold, weight = FontWeight.Bold), ) ), FontWithName( @@ -84,7 +98,9 @@ fun Constants.provideFonts(withRandom: Boolean): List { 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_medium, weight = FontWeight.Medium), + Font(R.font.notosans_semibold, weight = FontWeight.SemiBold), + Font(R.font.notosans_bold, weight = FontWeight.Bold), ) ), FontWithName( @@ -93,7 +109,8 @@ fun Constants.provideFonts(withRandom: Boolean): List { 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_medium, weight = FontWeight.Medium), + Font(R.font.roboto_bold, weight = FontWeight.Bold), ) ), FontWithName( @@ -102,7 +119,9 @@ fun Constants.provideFonts(withRandom: Boolean): List { 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_medium, weight = FontWeight.Medium), + Font(R.font.jost_semibold, weight = FontWeight.SemiBold), + Font(R.font.jost_bold, weight = FontWeight.Bold), ) ), FontWithName( @@ -111,7 +130,8 @@ fun Constants.provideFonts(withRandom: Boolean): List { 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_medium, weight = FontWeight.Medium), + Font(R.font.merriweather_bold, weight = FontWeight.Bold), ) ), FontWithName( @@ -120,7 +140,9 @@ fun Constants.provideFonts(withRandom: Boolean): List { 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_medium, weight = FontWeight.Medium), + Font(R.font.montserrat_semibold, weight = FontWeight.SemiBold), + Font(R.font.montserrat_bold, weight = FontWeight.Bold), ) ), FontWithName( @@ -129,7 +151,9 @@ fun Constants.provideFonts(withRandom: Boolean): List { 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_medium, weight = FontWeight.Medium), + Font(R.font.nunito_semibold, weight = FontWeight.SemiBold), + Font(R.font.nunito_bold, weight = FontWeight.Bold), ) ), FontWithName( @@ -138,6 +162,8 @@ fun Constants.provideFonts(withRandom: Boolean): List { 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), ) ), FontWithName( @@ -146,7 +172,9 @@ fun Constants.provideFonts(withRandom: Boolean): List { 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_medium, weight = FontWeight.Medium), + Font(R.font.lora_semibold, weight = FontWeight.SemiBold), + Font(R.font.lora_bold, weight = FontWeight.Bold), ) ) ).apply { diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt index ffeb2cac..135a1be0 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt @@ -17,9 +17,11 @@ fun HighlightedReadingThicknessOption() { ExpandingTransition(visible = state.value.highlightedReading) { SliderWithTitle( - value = state.value.highlightedReadingThickness to "pt", + value = state.value.highlightedReadingThickness.to( + " ${stringResource(R.string.highlighted_reading_level)}" + ), fromValue = 1, - toValue = 5, + toValue = 3, title = stringResource(id = R.string.highlighted_reading_thickness_option), onValueChange = { mainModel.onEvent( 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 62f52e6b..39973ebe 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 @@ -91,7 +91,7 @@ data class MainState( val horizontalGestureSensitivity: Float = provideDefaultValue { 0.6f }, val bottomBarPadding: Int = provideDefaultValue { 0 }, val highlightedReading: Boolean = provideDefaultValue { false }, - val highlightedReadingThickness: Int = provideDefaultValue { 3 }, + val highlightedReadingThickness: Int = provideDefaultValue { 2 }, // Browse Settings val browseFilesStructure: BrowseFilesStructure = provideDefaultValue { 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 6a298719..677c2a67 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 @@ -172,11 +172,9 @@ data class ReaderScreen(val bookId: Int) : Screen, Parcelable { } val highlightedReadingThickness = remember(mainState.value.highlightedReadingThickness) { when (mainState.value.highlightedReadingThickness) { - 2 -> FontWeight.W600 - 3 -> FontWeight.W700 - 4 -> FontWeight.W800 - 5 -> FontWeight.W900 - else -> FontWeight.W500 + 2 -> FontWeight.SemiBold + 3 -> FontWeight.Bold + else -> FontWeight.Medium } } val horizontalAlignment = remember(mainState.value.textAlignment) { diff --git a/app/src/main/res/font/arimo_bold.ttf b/app/src/main/res/font/arimo_bold.ttf new file mode 100644 index 00000000..c26951c1 Binary files /dev/null and b/app/src/main/res/font/arimo_bold.ttf differ diff --git a/app/src/main/res/font/arimo_semibold.ttf b/app/src/main/res/font/arimo_semibold.ttf new file mode 100644 index 00000000..170ab85d Binary files /dev/null and b/app/src/main/res/font/arimo_semibold.ttf differ diff --git a/app/src/main/res/font/garamond_bold.ttf b/app/src/main/res/font/garamond_bold.ttf new file mode 100644 index 00000000..9112c7bc Binary files /dev/null and b/app/src/main/res/font/garamond_bold.ttf differ diff --git a/app/src/main/res/font/garamond_semibold.ttf b/app/src/main/res/font/garamond_semibold.ttf new file mode 100644 index 00000000..fa145fb1 Binary files /dev/null and b/app/src/main/res/font/garamond_semibold.ttf differ diff --git a/app/src/main/res/font/jost_bold.ttf b/app/src/main/res/font/jost_bold.ttf new file mode 100644 index 00000000..4d2b589e Binary files /dev/null and b/app/src/main/res/font/jost_bold.ttf differ diff --git a/app/src/main/res/font/jost_semibold.ttf b/app/src/main/res/font/jost_semibold.ttf new file mode 100644 index 00000000..b3a3c4fd Binary files /dev/null and b/app/src/main/res/font/jost_semibold.ttf differ diff --git a/app/src/main/res/font/lora_bold.ttf b/app/src/main/res/font/lora_bold.ttf new file mode 100644 index 00000000..530c9e11 Binary files /dev/null and b/app/src/main/res/font/lora_bold.ttf differ diff --git a/app/src/main/res/font/lora_semibold.ttf b/app/src/main/res/font/lora_semibold.ttf new file mode 100644 index 00000000..3a7c6d75 Binary files /dev/null and b/app/src/main/res/font/lora_semibold.ttf differ diff --git a/app/src/main/res/font/merriweather_bold.ttf b/app/src/main/res/font/merriweather_bold.ttf new file mode 100644 index 00000000..3e10e02f Binary files /dev/null and b/app/src/main/res/font/merriweather_bold.ttf differ diff --git a/app/src/main/res/font/montserrat_bold.ttf b/app/src/main/res/font/montserrat_bold.ttf new file mode 100644 index 00000000..0927b813 Binary files /dev/null and b/app/src/main/res/font/montserrat_bold.ttf differ diff --git a/app/src/main/res/font/montserrat_semibold.ttf b/app/src/main/res/font/montserrat_semibold.ttf new file mode 100644 index 00000000..189ce9d0 Binary files /dev/null and b/app/src/main/res/font/montserrat_semibold.ttf differ diff --git a/app/src/main/res/font/mulish_bold.ttf b/app/src/main/res/font/mulish_bold.ttf new file mode 100644 index 00000000..0c1eed73 Binary files /dev/null and b/app/src/main/res/font/mulish_bold.ttf differ diff --git a/app/src/main/res/font/mulish_semibold.ttf b/app/src/main/res/font/mulish_semibold.ttf new file mode 100644 index 00000000..9ac1fc8f Binary files /dev/null and b/app/src/main/res/font/mulish_semibold.ttf differ diff --git a/app/src/main/res/font/notosans_bold.ttf b/app/src/main/res/font/notosans_bold.ttf new file mode 100644 index 00000000..d84248ed Binary files /dev/null and b/app/src/main/res/font/notosans_bold.ttf differ diff --git a/app/src/main/res/font/notosans_semibold.ttf b/app/src/main/res/font/notosans_semibold.ttf new file mode 100644 index 00000000..d3ed423e Binary files /dev/null and b/app/src/main/res/font/notosans_semibold.ttf differ diff --git a/app/src/main/res/font/notoserif_bold.ttf b/app/src/main/res/font/notoserif_bold.ttf new file mode 100644 index 00000000..aa21d44e Binary files /dev/null and b/app/src/main/res/font/notoserif_bold.ttf differ diff --git a/app/src/main/res/font/notoserif_semibold.ttf b/app/src/main/res/font/notoserif_semibold.ttf new file mode 100644 index 00000000..9ece80ac Binary files /dev/null and b/app/src/main/res/font/notoserif_semibold.ttf differ diff --git a/app/src/main/res/font/nunito_bold.ttf b/app/src/main/res/font/nunito_bold.ttf new file mode 100644 index 00000000..886134dc Binary files /dev/null and b/app/src/main/res/font/nunito_bold.ttf differ diff --git a/app/src/main/res/font/nunito_semibold.ttf b/app/src/main/res/font/nunito_semibold.ttf new file mode 100644 index 00000000..1326a7dc Binary files /dev/null and b/app/src/main/res/font/nunito_semibold.ttf differ diff --git a/app/src/main/res/font/opensans_bold.ttf b/app/src/main/res/font/opensans_bold.ttf new file mode 100644 index 00000000..98c74e0a Binary files /dev/null and b/app/src/main/res/font/opensans_bold.ttf differ diff --git a/app/src/main/res/font/opensans_semibold.ttf b/app/src/main/res/font/opensans_semibold.ttf new file mode 100644 index 00000000..e5ab4644 Binary files /dev/null and b/app/src/main/res/font/opensans_semibold.ttf differ diff --git a/app/src/main/res/font/raleway_bold.ttf b/app/src/main/res/font/raleway_bold.ttf new file mode 100644 index 00000000..4e1e5495 Binary files /dev/null and b/app/src/main/res/font/raleway_bold.ttf differ diff --git a/app/src/main/res/font/raleway_semibold.ttf b/app/src/main/res/font/raleway_semibold.ttf new file mode 100644 index 00000000..359f89bf Binary files /dev/null and b/app/src/main/res/font/raleway_semibold.ttf differ diff --git a/app/src/main/res/font/roboto_bold.ttf b/app/src/main/res/font/roboto_bold.ttf new file mode 100644 index 00000000..e64db796 Binary files /dev/null and b/app/src/main/res/font/roboto_bold.ttf differ diff --git a/app/src/main/res/font/robotoserif_bold.ttf b/app/src/main/res/font/robotoserif_bold.ttf new file mode 100644 index 00000000..862bd519 Binary files /dev/null and b/app/src/main/res/font/robotoserif_bold.ttf differ diff --git a/app/src/main/res/font/robotoserif_semibold.ttf b/app/src/main/res/font/robotoserif_semibold.ttf new file mode 100644 index 00000000..eee70071 Binary files /dev/null and b/app/src/main/res/font/robotoserif_semibold.ttf differ diff --git a/app/src/main/res/font/robotoslab_bold.ttf b/app/src/main/res/font/robotoslab_bold.ttf new file mode 100644 index 00000000..8a597f2d Binary files /dev/null and b/app/src/main/res/font/robotoslab_bold.ttf differ diff --git a/app/src/main/res/font/robotoslab_semibold.ttf b/app/src/main/res/font/robotoslab_semibold.ttf new file mode 100644 index 00000000..28f71ee0 Binary files /dev/null and b/app/src/main/res/font/robotoslab_semibold.ttf differ diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 48b695d5..5a79edca 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -264,6 +264,9 @@ Ввімкнений Ввімкнений (Інвертований) + + рівень + Меркурій Нептун diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4ab4dba7..1f780e97 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -321,6 +321,9 @@ On On (Inverse) + + level + Mercury Neptune