From 3bad3418062b4445ce83142c2027db7b0a2fb85d Mon Sep 17 00:00:00 2001
From: Jing <42014615+jing332@users.noreply.github.com>
Date: Sun, 23 Jul 2023 21:49:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A03=E7=A7=8D=E4=B8=BB?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tts_server_android/constant/AppTheme.kt | 47 +++--
app/src/main/res/values-en/strings.xml | 3 +
app/src/main/res/values-night/themes.xml | 179 +++++++++++++++--
app/src/main/res/values-zh-rTW/strings.xml | 3 +
app/src/main/res/values/colors.xml | 189 ++++++++++++++++++
app/src/main/res/values/strings.xml | 3 +
app/src/main/res/values/themes.xml | 87 ++++++++
7 files changed, 483 insertions(+), 28 deletions(-)
diff --git a/app/src/main/java/com/github/jing332/tts_server_android/constant/AppTheme.kt b/app/src/main/java/com/github/jing332/tts_server_android/constant/AppTheme.kt
index 6c7ba4fb3..555f3b4ce 100644
--- a/app/src/main/java/com/github/jing332/tts_server_android/constant/AppTheme.kt
+++ b/app/src/main/java/com/github/jing332/tts_server_android/constant/AppTheme.kt
@@ -11,34 +11,53 @@ enum class AppTheme(
@ColorRes val colorId: Int = 0
) {
Default(R.style.Theme_TtsServer, R.string.default_str, R.color.seed),
- SkyBlue(R.style.Theme_TtsServer_SkyBlue, R.string.theme_sky_blue, R.color.sky_blue_seed),
+ SorghumRed(
+ R.style.Theme_TtsServer_SorghumRed,
+ R.string.theme_sorghum_red,
+ R.color.sorghum_red_seed
+ ),
+
+
SakuraPink(
R.style.Theme_TtsServer_SakuraPink,
R.string.theme_sakura_pink,
R.color.sakura_pink_seed
),
- Cyan(R.style.Theme_TtsServer_Cyan, R.string.theme_cyan, R.color.cyan_seed),
- LilacBrown(
- R.style.Theme_TtsServer_LilacBrown,
- R.string.theme_lilac_brown,
- R.color.lilac_brown_seed
+
+ Golden(R.style.Theme_TtsServer_Golden, R.string.theme_golden, R.color.golden_seed),
+ RedGold(R.style.Theme_TtsServer_RedGold, R.string.theme_red_gold, R.color.red_gold_seed),
+ BeautifulPersonOrange(
+ R.style.Theme_TtsServer_BeautifulPersonOrange,
+ R.string.theme_beautiful_person_orange,
+ R.color.beautiful_person_orange_seed
),
+
PeacockGreen(
R.style.Theme_TtsServer_PeacockGreen,
R.string.theme_peacock_green,
R.color.peacock_green_seed
),
- Golden(R.style.Theme_TtsServer_Golden, R.string.theme_golden, R.color.golden_seed),
- SorghumRed(
- R.style.Theme_TtsServer_SorghumRed,
- R.string.theme_sorghum_red,
- R.color.sorghum_red_seed
- ),
EmeraldGreen(
R.style.Theme_TtsServer_EmeraldGreen,
R.string.theme_emerald_green,
R.color.emerald_green_seed
),
- RedGold(R.style.Theme_TtsServer_RedGold, R.string.theme_red_gold, R.color.red_gold_seed),
+
+ SkyBlue(R.style.Theme_TtsServer_SkyBlue, R.string.theme_sky_blue, R.color.sky_blue_seed),
+ Cyan(R.style.Theme_TtsServer_Cyan, R.string.theme_cyan, R.color.cyan_seed),
+ LilacBrown(
+ R.style.Theme_TtsServer_LilacBrown,
+ R.string.theme_lilac_brown,
+ R.color.lilac_brown_seed
+ ),
+
InkGrey(R.style.Theme_TtsServer_InkGrey, R.string.theme_ink_grey, R.color.ink_grey_seed),
-}
\ No newline at end of file
+ KiteCrownPurple(
+ R.style.Theme_TtsServer_KiteCrownPurple,
+ R.string.theme_kite_crown_purple,
+ R.color.kite_crown_purple_seed
+ ),
+
+ Magenta(R.style.Theme_TtsServer_Magenta, R.string.theme_magenta, R.color.magenta_seed),
+
+}
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 504c34d55..ac8fe374a 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -416,4 +416,7 @@
Format error (expected: %1$s).\nThe format you entered is %2$s, please go to the corresponding management interface for import.
Unknown format, please enter the correct configuration.
Stil to Import
+ 鹞冠紫
+ 美人焦橙
+ 紫红
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 7308b9b19..87028eb90 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -274,11 +274,13 @@
- @color/md_theme_ink_grey_dark_secondary
- @color/md_theme_ink_grey_dark_onSecondary
- @color/md_theme_ink_grey_dark_secondaryContainer
- - @color/md_theme_ink_grey_dark_onSecondaryContainer
+ - @color/md_theme_ink_grey_dark_onSecondaryContainer
+
- @color/md_theme_ink_grey_dark_tertiary
- @color/md_theme_ink_grey_dark_onTertiary
- @color/md_theme_ink_grey_dark_tertiaryContainer
- - @color/md_theme_ink_grey_dark_onTertiaryContainer
+ - @color/md_theme_ink_grey_dark_onTertiaryContainer
+
- @color/md_theme_ink_grey_dark_error
- @color/md_theme_ink_grey_dark_errorContainer
- @color/md_theme_ink_grey_dark_onError
@@ -298,32 +300,43 @@
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index db6b38501..9aa984939 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -400,4 +400,7 @@
格式错误(预期为: %1$s)。\n您输入的格式为 %2$s, 请前往对应管理界面进行导入。
格式未知，请输入正确的配置。
仍要导入
+ 鹞冠紫
+ 美人焦橙
+ 紫红
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 420fe815e..08ad15982 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -700,4 +700,193 @@
#F3BF46
#4D4639
#000000
+
+
+ #621d34
+ #9A405B
+ #FFFFFF
+ #FFD9E0
+ #3F0019
+ #75565D
+ #FFFFFF
+ #FFD9E0
+ #2B151B
+ #7B5733
+ #FFFFFF
+ #FFDCBE
+ #2D1600
+ #BA1A1A
+ #FFDAD6
+ #FFFFFF
+ #410002
+ #FFFBFF
+ #201A1B
+ #FFFBFF
+ #201A1B
+ #F3DDE0
+ #514346
+ #847376
+ #FAEEEF
+ #352F30
+ #FFB1C3
+ #000000
+ #9A405B
+ #D6C2C5
+ #000000
+ #FFB1C3
+ #5E112E
+ #7C2944
+ #FFD9E0
+ #E3BDC4
+ #43292F
+ #5B3F46
+ #FFD9E0
+ #EDBD92
+ #472A0A
+ #60401E
+ #FFDCBE
+ #FFB4AB
+ #93000A
+ #690005
+ #FFDAD6
+ #201A1B
+ #ECE0E1
+ #201A1B
+ #ECE0E1
+ #514346
+ #D6C2C5
+ #9E8C8F
+ #201A1B
+ #ECE0E1
+ #9A405B
+ #000000
+ #FFB1C3
+ #514346
+ #000000
+
+
+ #fa7e23
+ #9A4600
+ #FFFFFF
+ #FFDBC9
+ #321200
+ #765847
+ #FFFFFF
+ #FFDBC9
+ #2B1609
+ #626033
+ #FFFFFF
+ #E9E5AC
+ #1E1D00
+ #BA1A1A
+ #FFDAD6
+ #FFFFFF
+ #410002
+ #FFFBFF
+ #201A17
+ #FFFBFF
+ #201A17
+ #F4DED4
+ #52443C
+ #85746B
+ #FBEEE9
+ #362F2C
+ #FFB68C
+ #000000
+ #9A4600
+ #D7C2B8
+ #000000
+ #FFB68C
+ #532200
+ #753400
+ #FFDBC9
+ #E5BFAA
+ #432B1C
+ #5C4131
+ #FFDBC9
+ #CCC992
+ #333209
+ #4A481D
+ #E9E5AC
+ #FFB4AB
+ #93000A
+ #690005
+ #FFDAD6
+ #201A17
+ #ECE0DB
+ #201A17
+ #ECE0DB
+ #52443C
+ #D7C2B8
+ #9F8D84
+ #201A17
+ #ECE0DB
+ #9A4600
+ #000000
+ #FFB68C
+ #52443C
+ #000000
+
+
+ #FF00FF
+ #A900A9
+ #FFFFFF
+ #FFD7F5
+ #380038
+ #6E5869
+ #FFFFFF
+ #F7DAEF
+ #271624
+ #825345
+ #FFFFFF
+ #FFDBD1
+ #321208
+ #BA1A1A
+ #FFDAD6
+ #FFFFFF
+ #410002
+ #FFFBFF
+ #1E1A1D
+ #FFFBFF
+ #1E1A1D
+ #EEDEE7
+ #4E444B
+ #80747C
+ #F8EEF2
+ #342F32
+ #FFABF3
+ #000000
+ #A900A9
+ #D1C2CB
+ #000000
+ #FFABF3
+ #5B005B
+ #810081
+ #FFD7F5
+ #DABFD2
+ #3D2B3A
+ #554151
+ #F7DAEF
+ #F5B8A7
+ #4C261B
+ #663C2F
+ #FFDBD1
+ #FFB4AB
+ #93000A
+ #690005
+ #FFDAD6
+ #1E1A1D
+ #E9E0E4
+ #1E1A1D
+ #E9E0E4
+ #4E444B
+ #D1C2CB
+ #9A8D95
+ #1E1A1D
+ #E9E0E4
+ #A900A9
+ #000000
+ #FFABF3
+ #4E444B
+ #000000
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5c5a78113..b864bb9dc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -412,4 +412,7 @@
格式错误(预期为: %1$s)。\n您输入的格式为 %2$s, 请前往对应管理界面进行导入。
格式未知，请输入正确的配置。
仍要导入
+ 鹞冠紫
+ 美人焦橙
+ 紫红
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index bd98782a9..9ebba607a 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -403,6 +403,93 @@
- @color/md_theme_red_gold_light_inversePrimary
+
+
+
+
+
+