From 3f2dc7078877066eef73978f46f9ccdc20a06e68 Mon Sep 17 00:00:00 2001 From: Acclorite <140836141+Acclorite@users.noreply.github.com> Date: Mon, 13 Jan 2025 13:57:22 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20Rename=20and=20move=20g?= =?UTF-8?q?ray(red=20gray)=20theme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ua/acclorite/book_story/ui/theme/Color.kt | 10 +++++----- .../acclorite/book_story/ui/theme/color/GrayTheme.kt | 2 +- app/src/main/res/values-ar/strings.xml | 2 +- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-ta/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/Color.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/Color.kt index 9704d3a3..ea194a30 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/theme/Color.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/Color.kt @@ -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.blueTheme 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.lavenderTheme 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.pinkTheme 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.yellow2Theme import ua.acclorite.book_story.ui.theme.color.yellowTheme @@ -29,10 +29,10 @@ enum class Theme( ) { DYNAMIC(hasThemeContrast = false, title = R.string.dynamic_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), MARSH(hasThemeContrast = true, title = R.string.marsh_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), LAVENDER(hasThemeContrast = true, title = R.string.lavender_theme), PINK(hasThemeContrast = true, title = R.string.pink_theme), @@ -128,9 +128,9 @@ fun colorScheme( redTheme(isDark = darkTheme, themeContrast = themeContrast) } - Theme.GRAY -> { - /* Gray Theme */ - grayTheme(isDark = darkTheme) + Theme.RED_GRAY -> { + /* Red Gray Theme */ + redGrayTheme(isDark = darkTheme) } Theme.AQUA -> { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/GrayTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/GrayTheme.kt index c3610c4e..1fa1e5b2 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/GrayTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/GrayTheme.kt @@ -81,7 +81,7 @@ private val surfaceContainerHighestDark = Color(0xFF383433) @Composable -fun grayTheme(isDark: Boolean): ColorScheme { +fun redGrayTheme(isDark: Boolean): ColorScheme { return if (isDark) { darkColorScheme( primary = primaryDark, diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index b18cce39..677fd1e1 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -244,7 +244,7 @@ التخزين الداخلي اخر مرة تم فيها فتح الملف فصول - كاليستو + كاليستو ايريس لا يوجد فصول اخفاء الشرائط عند التمرير السريع diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index fa1a20ea..ad1553fa 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -132,7 +132,7 @@ Pouze na šířku Vypnuté Zapnuté - Callisto + Callisto Žádné kapitoly Nahlásit chybu Zdroje diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index d34dbd02..b4f1179b 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -341,7 +341,7 @@ Kapitel Mehr Benutzerdefinierte Helligkeit - Kallisto + Kallisto 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. Kontrollpunkt zurück \ No newline at end of file diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 980ffdcf..499630b8 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -341,7 +341,7 @@ Aleatorio Buscar… Brillo - Calisto + Calisto Brillo personalizado Ganimedes \ No newline at end of file diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index de16c635..15e903e4 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -283,7 +283,7 @@ Come si utilizzano le preimpostazioni di colore? Verso un mondo in cui le parole incantano, insegnano e conducono verso avventure incredibili! Prepariamo un po\' di cose! Espansore della percezione - Callisto + Callisto Gesto orizzontale Allineamento del titolo del capitolo Nascondi barre e margini di sistema diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 0bcc1d5a..c8461682 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -136,7 +136,7 @@ Filtro Isso irá apagar o livro do banco de dados. Isso não irá apagar esse livro do dispositivo. Aleatório - Calisto + Calisto Linguagem do aplicativo Tema, cores Linguagem do aplicativo diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 3f627f43..54b8d9a6 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -271,7 +271,7 @@ பூமி செவ்வாய் சின்னங்கள் - காலிச்டோ + காலிச்டோ வியாழன் காரி கனிமீட் diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 45493eef..51040f32 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -291,7 +291,7 @@ Нептун Земля Марс - Каллісто + Каллісто Юпітер Сатурн Ганімед diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3e934226..0c04fbc8 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -348,7 +348,7 @@ 更多 随机颜色 过滤 - 木卫一 + 木卫一 木卫三 鸟神星 三叉戟 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 220b98ab..d0def73c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -350,7 +350,7 @@ Neptune Earth Mars - Callisto + Callisto Jupiter Saturn Ganymede