🛠️ Rename and move gray(red gray) theme
This commit is contained in:
parent
98a0f30c0c
commit
3f2dc70788
12 changed files with 16 additions and 16 deletions
|
|
@ -10,13 +10,13 @@ import ua.acclorite.book_story.ui.theme.color.aquaTheme
|
||||||
import ua.acclorite.book_story.ui.theme.color.blackTheme
|
import ua.acclorite.book_story.ui.theme.color.blackTheme
|
||||||
import ua.acclorite.book_story.ui.theme.color.blueTheme
|
import ua.acclorite.book_story.ui.theme.color.blueTheme
|
||||||
import ua.acclorite.book_story.ui.theme.color.dynamicTheme
|
import ua.acclorite.book_story.ui.theme.color.dynamicTheme
|
||||||
import ua.acclorite.book_story.ui.theme.color.grayTheme
|
|
||||||
import ua.acclorite.book_story.ui.theme.color.greenTheme
|
import ua.acclorite.book_story.ui.theme.color.greenTheme
|
||||||
import ua.acclorite.book_story.ui.theme.color.lavenderTheme
|
import ua.acclorite.book_story.ui.theme.color.lavenderTheme
|
||||||
import ua.acclorite.book_story.ui.theme.color.marshTheme
|
import ua.acclorite.book_story.ui.theme.color.marshTheme
|
||||||
import ua.acclorite.book_story.ui.theme.color.pink2Theme
|
import ua.acclorite.book_story.ui.theme.color.pink2Theme
|
||||||
import ua.acclorite.book_story.ui.theme.color.pinkTheme
|
import ua.acclorite.book_story.ui.theme.color.pinkTheme
|
||||||
import ua.acclorite.book_story.ui.theme.color.purpleTheme
|
import ua.acclorite.book_story.ui.theme.color.purpleTheme
|
||||||
|
import ua.acclorite.book_story.ui.theme.color.redGrayTheme
|
||||||
import ua.acclorite.book_story.ui.theme.color.redTheme
|
import ua.acclorite.book_story.ui.theme.color.redTheme
|
||||||
import ua.acclorite.book_story.ui.theme.color.yellow2Theme
|
import ua.acclorite.book_story.ui.theme.color.yellow2Theme
|
||||||
import ua.acclorite.book_story.ui.theme.color.yellowTheme
|
import ua.acclorite.book_story.ui.theme.color.yellowTheme
|
||||||
|
|
@ -29,10 +29,10 @@ enum class Theme(
|
||||||
) {
|
) {
|
||||||
DYNAMIC(hasThemeContrast = false, title = R.string.dynamic_theme),
|
DYNAMIC(hasThemeContrast = false, title = R.string.dynamic_theme),
|
||||||
BLUE(hasThemeContrast = true, title = R.string.blue_theme),
|
BLUE(hasThemeContrast = true, title = R.string.blue_theme),
|
||||||
GRAY(hasThemeContrast = false, title = R.string.gray_theme),
|
|
||||||
GREEN(hasThemeContrast = true, title = R.string.green_theme),
|
GREEN(hasThemeContrast = true, title = R.string.green_theme),
|
||||||
MARSH(hasThemeContrast = true, title = R.string.marsh_theme),
|
MARSH(hasThemeContrast = true, title = R.string.marsh_theme),
|
||||||
RED(hasThemeContrast = true, title = R.string.red_theme),
|
RED(hasThemeContrast = true, title = R.string.red_theme),
|
||||||
|
RED_GRAY(hasThemeContrast = false, title = R.string.red_gray_theme),
|
||||||
PURPLE(hasThemeContrast = true, title = R.string.purple_theme),
|
PURPLE(hasThemeContrast = true, title = R.string.purple_theme),
|
||||||
LAVENDER(hasThemeContrast = true, title = R.string.lavender_theme),
|
LAVENDER(hasThemeContrast = true, title = R.string.lavender_theme),
|
||||||
PINK(hasThemeContrast = true, title = R.string.pink_theme),
|
PINK(hasThemeContrast = true, title = R.string.pink_theme),
|
||||||
|
|
@ -128,9 +128,9 @@ fun colorScheme(
|
||||||
redTheme(isDark = darkTheme, themeContrast = themeContrast)
|
redTheme(isDark = darkTheme, themeContrast = themeContrast)
|
||||||
}
|
}
|
||||||
|
|
||||||
Theme.GRAY -> {
|
Theme.RED_GRAY -> {
|
||||||
/* Gray Theme */
|
/* Red Gray Theme */
|
||||||
grayTheme(isDark = darkTheme)
|
redGrayTheme(isDark = darkTheme)
|
||||||
}
|
}
|
||||||
|
|
||||||
Theme.AQUA -> {
|
Theme.AQUA -> {
|
||||||
|
|
|
||||||
|
|
@ -81,7 +81,7 @@ private val surfaceContainerHighestDark = Color(0xFF383433)
|
||||||
|
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun grayTheme(isDark: Boolean): ColorScheme {
|
fun redGrayTheme(isDark: Boolean): ColorScheme {
|
||||||
return if (isDark) {
|
return if (isDark) {
|
||||||
darkColorScheme(
|
darkColorScheme(
|
||||||
primary = primaryDark,
|
primary = primaryDark,
|
||||||
|
|
|
||||||
|
|
@ -244,7 +244,7 @@
|
||||||
<string name="internal_storage">التخزين الداخلي</string>
|
<string name="internal_storage">التخزين الداخلي</string>
|
||||||
<string name="file_last_opened">اخر مرة تم فيها فتح الملف</string>
|
<string name="file_last_opened">اخر مرة تم فيها فتح الملف</string>
|
||||||
<string name="chapters">فصول</string>
|
<string name="chapters">فصول</string>
|
||||||
<string name="gray_theme">كاليستو</string>
|
<string name="red_gray_theme">كاليستو</string>
|
||||||
<string name="lavender_theme">ايريس</string>
|
<string name="lavender_theme">ايريس</string>
|
||||||
<string name="no_chapters">لا يوجد فصول</string>
|
<string name="no_chapters">لا يوجد فصول</string>
|
||||||
<string name="hide_bars_on_fast_scroll_option">اخفاء الشرائط عند التمرير السريع</string>
|
<string name="hide_bars_on_fast_scroll_option">اخفاء الشرائط عند التمرير السريع</string>
|
||||||
|
|
|
||||||
|
|
@ -132,7 +132,7 @@
|
||||||
<string name="screen_orientation_locked_landscape">Pouze na šířku</string>
|
<string name="screen_orientation_locked_landscape">Pouze na šířku</string>
|
||||||
<string name="horizontal_gesture_off">Vypnuté</string>
|
<string name="horizontal_gesture_off">Vypnuté</string>
|
||||||
<string name="horizontal_gesture_on">Zapnuté</string>
|
<string name="horizontal_gesture_on">Zapnuté</string>
|
||||||
<string name="gray_theme">Callisto</string>
|
<string name="red_gray_theme">Callisto</string>
|
||||||
<string name="no_chapters">Žádné kapitoly</string>
|
<string name="no_chapters">Žádné kapitoly</string>
|
||||||
<string name="report_bug_option">Nahlásit chybu</string>
|
<string name="report_bug_option">Nahlásit chybu</string>
|
||||||
<string name="credits_option">Zdroje</string>
|
<string name="credits_option">Zdroje</string>
|
||||||
|
|
|
||||||
|
|
@ -341,7 +341,7 @@
|
||||||
<string name="chapters_content_desc">Kapitel</string>
|
<string name="chapters_content_desc">Kapitel</string>
|
||||||
<string name="more_content_desc">Mehr</string>
|
<string name="more_content_desc">Mehr</string>
|
||||||
<string name="custom_screen_brightness_option">Benutzerdefinierte Helligkeit</string>
|
<string name="custom_screen_brightness_option">Benutzerdefinierte Helligkeit</string>
|
||||||
<string name="gray_theme">Kallisto</string>
|
<string name="red_gray_theme">Kallisto</string>
|
||||||
<string name="help_desc_how_to_use_perception_expander_1">Der Wahrnehmungsexpander kann Ihnen helfen, schneller zu lesen. Aktivieren Sie ihn zunächst in den Reader-Einstellungen (siehe: Wie passe ich den Reader an?). Sobald er aktiviert ist, werden auf beiden Seiten des Readers zwei vertikale Linien angezeigt. Um Ihre Lesegeschwindigkeit weiter zu optimieren, passen Sie die Polsterung an, um weniger Platz um die Mitte herum zu schaffen. Konzentrieren Sie sich bei der Verwendung auf die Bildschirmmitte, während Sie mit Ihrem peripheren Sehen den Text an den Seiten erfassen. Konzentrieren Sie sich beim Lesen weiterhin auf die Mitte, ohne nach jeder Zeile direkt an die Seiten zu blicken.</string>
|
<string name="help_desc_how_to_use_perception_expander_1">Der Wahrnehmungsexpander kann Ihnen helfen, schneller zu lesen. Aktivieren Sie ihn zunächst in den Reader-Einstellungen (siehe: Wie passe ich den Reader an?). Sobald er aktiviert ist, werden auf beiden Seiten des Readers zwei vertikale Linien angezeigt. Um Ihre Lesegeschwindigkeit weiter zu optimieren, passen Sie die Polsterung an, um weniger Platz um die Mitte herum zu schaffen. Konzentrieren Sie sich bei der Verwendung auf die Bildschirmmitte, während Sie mit Ihrem peripheren Sehen den Text an den Seiten erfassen. Konzentrieren Sie sich beim Lesen weiterhin auf die Mitte, ohne nach jeder Zeile direkt an die Seiten zu blicken.</string>
|
||||||
<string name="checkpoint_back_content_desc">Kontrollpunkt zurück</string>
|
<string name="checkpoint_back_content_desc">Kontrollpunkt zurück</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
@ -341,7 +341,7 @@
|
||||||
<string name="random_string">Aleatorio</string>
|
<string name="random_string">Aleatorio</string>
|
||||||
<string name="search_field_empty">Buscar…</string>
|
<string name="search_field_empty">Buscar…</string>
|
||||||
<string name="screen_brightness_option">Brillo</string>
|
<string name="screen_brightness_option">Brillo</string>
|
||||||
<string name="gray_theme">Calisto</string>
|
<string name="red_gray_theme">Calisto</string>
|
||||||
<string name="custom_screen_brightness_option">Brillo personalizado</string>
|
<string name="custom_screen_brightness_option">Brillo personalizado</string>
|
||||||
<string name="pink2_theme">Ganimedes</string>
|
<string name="pink2_theme">Ganimedes</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
@ -283,7 +283,7 @@
|
||||||
<string name="help_title_how_to_use_color_presets">Come si utilizzano le preimpostazioni di colore?</string>
|
<string name="help_title_how_to_use_color_presets">Come si utilizzano le preimpostazioni di colore?</string>
|
||||||
<string name="start_welcome_desc">Verso un mondo in cui le parole incantano, insegnano e conducono verso avventure incredibili! Prepariamo un po\' di cose!</string>
|
<string name="start_welcome_desc">Verso un mondo in cui le parole incantano, insegnano e conducono verso avventure incredibili! Prepariamo un po\' di cose!</string>
|
||||||
<string name="perception_expander_option">Espansore della percezione</string>
|
<string name="perception_expander_option">Espansore della percezione</string>
|
||||||
<string name="gray_theme">Callisto</string>
|
<string name="red_gray_theme">Callisto</string>
|
||||||
<string name="horizontal_gesture_option">Gesto orizzontale</string>
|
<string name="horizontal_gesture_option">Gesto orizzontale</string>
|
||||||
<string name="chapter_title_alignment_option">Allineamento del titolo del capitolo</string>
|
<string name="chapter_title_alignment_option">Allineamento del titolo del capitolo</string>
|
||||||
<string name="fullscreen_option_desc">Nascondi barre e margini di sistema</string>
|
<string name="fullscreen_option_desc">Nascondi barre e margini di sistema</string>
|
||||||
|
|
|
||||||
|
|
@ -136,7 +136,7 @@
|
||||||
<string name="filter_content_desc">Filtro</string>
|
<string name="filter_content_desc">Filtro</string>
|
||||||
<string name="delete_book_description">Isso irá apagar o livro do banco de dados. Isso não irá apagar esse livro do dispositivo.</string>
|
<string name="delete_book_description">Isso irá apagar o livro do banco de dados. Isso não irá apagar esse livro do dispositivo.</string>
|
||||||
<string name="random_string">Aleatório</string>
|
<string name="random_string">Aleatório</string>
|
||||||
<string name="gray_theme">Calisto</string>
|
<string name="red_gray_theme">Calisto</string>
|
||||||
<string name="general_settings_desc">Linguagem do aplicativo</string>
|
<string name="general_settings_desc">Linguagem do aplicativo</string>
|
||||||
<string name="appearance_settings_desc">Tema, cores</string>
|
<string name="appearance_settings_desc">Tema, cores</string>
|
||||||
<string name="language_option">Linguagem do aplicativo</string>
|
<string name="language_option">Linguagem do aplicativo</string>
|
||||||
|
|
|
||||||
|
|
@ -271,7 +271,7 @@
|
||||||
<string name="green_theme">பூமி</string>
|
<string name="green_theme">பூமி</string>
|
||||||
<string name="red_theme">செவ்வாய்</string>
|
<string name="red_theme">செவ்வாய்</string>
|
||||||
<string name="credits_icon">சின்னங்கள்</string>
|
<string name="credits_icon">சின்னங்கள்</string>
|
||||||
<string name="gray_theme">காலிச்டோ</string>
|
<string name="red_gray_theme">காலிச்டோ</string>
|
||||||
<string name="purple_theme">வியாழன்</string>
|
<string name="purple_theme">வியாழன்</string>
|
||||||
<string name="pink_theme">காரி</string>
|
<string name="pink_theme">காரி</string>
|
||||||
<string name="pink2_theme">கனிமீட்</string>
|
<string name="pink2_theme">கனிமீட்</string>
|
||||||
|
|
|
||||||
|
|
@ -291,7 +291,7 @@
|
||||||
<string name="blue_theme">Нептун</string>
|
<string name="blue_theme">Нептун</string>
|
||||||
<string name="green_theme">Земля</string>
|
<string name="green_theme">Земля</string>
|
||||||
<string name="red_theme">Марс</string>
|
<string name="red_theme">Марс</string>
|
||||||
<string name="gray_theme">Каллісто</string>
|
<string name="red_gray_theme">Каллісто</string>
|
||||||
<string name="purple_theme">Юпітер</string>
|
<string name="purple_theme">Юпітер</string>
|
||||||
<string name="pink_theme">Сатурн</string>
|
<string name="pink_theme">Сатурн</string>
|
||||||
<string name="pink2_theme">Ганімед</string>
|
<string name="pink2_theme">Ганімед</string>
|
||||||
|
|
|
||||||
|
|
@ -348,7 +348,7 @@
|
||||||
<string name="more_content_desc">更多</string>
|
<string name="more_content_desc">更多</string>
|
||||||
<string name="shuffle_color_preset_content_desc">随机颜色</string>
|
<string name="shuffle_color_preset_content_desc">随机颜色</string>
|
||||||
<string name="filter_content_desc">过滤</string>
|
<string name="filter_content_desc">过滤</string>
|
||||||
<string name="gray_theme">木卫一</string>
|
<string name="red_gray_theme">木卫一</string>
|
||||||
<string name="pink2_theme">木卫三</string>
|
<string name="pink2_theme">木卫三</string>
|
||||||
<string name="yellow2_theme">鸟神星</string>
|
<string name="yellow2_theme">鸟神星</string>
|
||||||
<string name="tryzub_content_desc">三叉戟</string>
|
<string name="tryzub_content_desc">三叉戟</string>
|
||||||
|
|
|
||||||
|
|
@ -350,7 +350,7 @@
|
||||||
<string name="blue_theme">Neptune</string>
|
<string name="blue_theme">Neptune</string>
|
||||||
<string name="green_theme">Earth</string>
|
<string name="green_theme">Earth</string>
|
||||||
<string name="red_theme">Mars</string>
|
<string name="red_theme">Mars</string>
|
||||||
<string name="gray_theme">Callisto</string>
|
<string name="red_gray_theme">Callisto</string>
|
||||||
<string name="purple_theme">Jupiter</string>
|
<string name="purple_theme">Jupiter</string>
|
||||||
<string name="pink_theme">Saturn</string>
|
<string name="pink_theme">Saturn</string>
|
||||||
<string name="pink2_theme">Ganymede</string>
|
<string name="pink2_theme">Ganymede</string>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue