Skip to content

Commit

Permalink
feat: 添加3种主题
Browse files Browse the repository at this point in the history
  • Loading branch information
@jing332
jing332 committed Jul 23, 2023
1 parent 14f2b35 commit 3bad341
Show file tree
Hide file tree
Showing 7 changed files with 483 additions and 28 deletions.
47 changes: 33 additions & 14 deletions app/src/main/java/com/github/jing332/tts_server_android/constant/AppTheme.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
}
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),

}
3 changes: 3 additions & 0 deletions app/src/main/res/values-en/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -416,4 +416,7 @@
<string name="import_config_type_not_match_msg">Format error (expected: %1$s).\nThe format you entered is %2$s, please go to the corresponding management interface for import.</string>
<string name="import_config_type_unknown_msg">Unknown format, please enter the correct configuration.</string>
<string name="still_to_import">Stil to Import</string>
<string name="theme_kite_crown_purple">鹞冠紫</string>
<string name="theme_beautiful_person_orange">美人焦橙</string>
<string name="theme_magenta">紫红</string>
</resources>
179 changes: 165 additions & 14 deletions app/src/main/res/values-night/themes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,11 +274,13 @@
<item name="colorSecondary">@color/md_theme_ink_grey_dark_secondary</item>
<item name="colorOnSecondary">@color/md_theme_ink_grey_dark_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_ink_grey_dark_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_ink_grey_dark_onSecondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_ink_grey_dark_onSecondaryContainer
</item>
<item name="colorTertiary">@color/md_theme_ink_grey_dark_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_ink_grey_dark_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_ink_grey_dark_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_ink_grey_dark_onTertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_ink_grey_dark_onTertiaryContainer
</item>
<item name="colorError">@color/md_theme_ink_grey_dark_error</item>
<item name="colorErrorContainer">@color/md_theme_ink_grey_dark_errorContainer</item>
<item name="colorOnError">@color/md_theme_ink_grey_dark_onError</item>
Expand All @@ -298,32 +300,43 @@
<style name="Theme.TtsServer.EmeraldGreen">
<item name="colorPrimary">@color/md_theme_emerald_green_dark_primary</item>
<item name="colorOnPrimary">@color/md_theme_emerald_green_dark_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_emerald_green_dark_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/md_theme_emerald_green_dark_onPrimaryContainer</item>
<item name="colorPrimaryContainer">@color/md_theme_emerald_green_dark_primaryContainer
</item>
<item name="colorOnPrimaryContainer">@color/md_theme_emerald_green_dark_onPrimaryContainer
</item>
<item name="colorSecondary">@color/md_theme_emerald_green_dark_secondary</item>
<item name="colorOnSecondary">@color/md_theme_emerald_green_dark_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_emerald_green_dark_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_emerald_green_dark_onSecondaryContainer</item>
<item name="colorSecondaryContainer">@color/md_theme_emerald_green_dark_secondaryContainer
</item>
<item name="colorOnSecondaryContainer">
@color/md_theme_emerald_green_dark_onSecondaryContainer
</item>
<item name="colorTertiary">@color/md_theme_emerald_green_dark_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_emerald_green_dark_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_emerald_green_dark_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_emerald_green_dark_onTertiaryContainer</item>
<item name="colorTertiaryContainer">@color/md_theme_emerald_green_dark_tertiaryContainer
</item>
<item name="colorOnTertiaryContainer">
@color/md_theme_emerald_green_dark_onTertiaryContainer
</item>
<item name="colorError">@color/md_theme_emerald_green_dark_error</item>
<item name="colorErrorContainer">@color/md_theme_emerald_green_dark_errorContainer</item>
<item name="colorOnError">@color/md_theme_emerald_green_dark_onError</item>
<item name="colorOnErrorContainer">@color/md_theme_emerald_green_dark_onErrorContainer</item>
<item name="colorOnErrorContainer">@color/md_theme_emerald_green_dark_onErrorContainer
</item>
<item name="android:colorBackground">@color/md_theme_emerald_green_dark_background</item>
<item name="colorOnBackground">@color/md_theme_emerald_green_dark_onBackground</item>
<item name="colorSurface">@color/md_theme_emerald_green_dark_surface</item>
<item name="colorOnSurface">@color/md_theme_emerald_green_dark_onSurface</item>
<item name="colorSurfaceVariant">@color/md_theme_emerald_green_dark_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/md_theme_emerald_green_dark_onSurfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/md_theme_emerald_green_dark_onSurfaceVariant
</item>
<item name="colorOutline">@color/md_theme_emerald_green_dark_outline</item>
<item name="colorOnSurfaceInverse">@color/md_theme_emerald_green_dark_inverseOnSurface</item>
<item name="colorOnSurfaceInverse">@color/md_theme_emerald_green_dark_inverseOnSurface
</item>
<item name="colorSurfaceInverse">@color/md_theme_emerald_green_dark_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_emerald_green_dark_inversePrimary</item>
</style>

<style name="Theme.TtsServer.RedGold">
<item name="colorPrimary">@color/md_theme_red_gold_dark_primary</item>
<item name="colorOnPrimary">@color/md_theme_red_gold_dark_onPrimary</item>
Expand All @@ -332,11 +345,13 @@
<item name="colorSecondary">@color/md_theme_red_gold_dark_secondary</item>
<item name="colorOnSecondary">@color/md_theme_red_gold_dark_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_red_gold_dark_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_red_gold_dark_onSecondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_red_gold_dark_onSecondaryContainer
</item>
<item name="colorTertiary">@color/md_theme_red_gold_dark_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_red_gold_dark_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_red_gold_dark_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_red_gold_dark_onTertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_red_gold_dark_onTertiaryContainer
</item>
<item name="colorError">@color/md_theme_red_gold_dark_error</item>
<item name="colorErrorContainer">@color/md_theme_red_gold_dark_errorContainer</item>
<item name="colorOnError">@color/md_theme_red_gold_dark_onError</item>
Expand All @@ -353,4 +368,140 @@
<item name="colorPrimaryInverse">@color/md_theme_red_gold_dark_inversePrimary</item>
</style>

<style name="Theme.TtsServer.KiteCrownPurple">
<item name="colorPrimary">@color/md_theme_kite_crown_purple_dark_primary</item>
<item name="colorOnPrimary">@color/md_theme_kite_crown_purple_dark_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_kite_crown_purple_dark_primaryContainer
</item>
<item name="colorOnPrimaryContainer">
@color/md_theme_kite_crown_purple_dark_onPrimaryContainer
</item>
<item name="colorSecondary">@color/md_theme_kite_crown_purple_dark_secondary</item>
<item name="colorOnSecondary">@color/md_theme_kite_crown_purple_dark_onSecondary</item>
<item name="colorSecondaryContainer">
@color/md_theme_kite_crown_purple_dark_secondaryContainer
</item>
<item name="colorOnSecondaryContainer">
@color/md_theme_kite_crown_purple_dark_onSecondaryContainer
</item>
<item name="colorTertiary">@color/md_theme_kite_crown_purple_dark_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_kite_crown_purple_dark_onTertiary</item>
<item name="colorTertiaryContainer">
@color/md_theme_kite_crown_purple_dark_tertiaryContainer
</item>
<item name="colorOnTertiaryContainer">
@color/md_theme_kite_crown_purple_dark_onTertiaryContainer
</item>
<item name="colorError">@color/md_theme_kite_crown_purple_dark_error</item>
<item name="colorErrorContainer">@color/md_theme_kite_crown_purple_dark_errorContainer
</item>
<item name="colorOnError">@color/md_theme_kite_crown_purple_dark_onError</item>
<item name="colorOnErrorContainer">@color/md_theme_kite_crown_purple_dark_onErrorContainer
</item>
<item name="android:colorBackground">@color/md_theme_kite_crown_purple_dark_background
</item>
<item name="colorOnBackground">@color/md_theme_kite_crown_purple_dark_onBackground</item>
<item name="colorSurface">@color/md_theme_kite_crown_purple_dark_surface</item>
<item name="colorOnSurface">@color/md_theme_kite_crown_purple_dark_onSurface</item>
<item name="colorSurfaceVariant">@color/md_theme_kite_crown_purple_dark_surfaceVariant
</item>
<item name="colorOnSurfaceVariant">@color/md_theme_kite_crown_purple_dark_onSurfaceVariant
</item>
<item name="colorOutline">@color/md_theme_kite_crown_purple_dark_outline</item>
<item name="colorOnSurfaceInverse">@color/md_theme_kite_crown_purple_dark_inverseOnSurface
</item>
<item name="colorSurfaceInverse">@color/md_theme_kite_crown_purple_dark_inverseSurface
</item>
<item name="colorPrimaryInverse">@color/md_theme_kite_crown_purple_dark_inversePrimary
</item>
</style>

<style name="Theme.TtsServer.BeautifulPersonOrange">
<item name="colorPrimary">@color/md_theme_beautiful_person_orange_dark_primary</item>
<item name="colorOnPrimary">@color/md_theme_beautiful_person_orange_dark_onPrimary</item>
<item name="colorPrimaryContainer">
@color/md_theme_beautiful_person_orange_dark_primaryContainer
</item>
<item name="colorOnPrimaryContainer">
@color/md_theme_beautiful_person_orange_dark_onPrimaryContainer
</item>
<item name="colorSecondary">@color/md_theme_beautiful_person_orange_dark_secondary</item>
<item name="colorOnSecondary">@color/md_theme_beautiful_person_orange_dark_onSecondary
</item>
<item name="colorSecondaryContainer">
@color/md_theme_beautiful_person_orange_dark_secondaryContainer
</item>
<item name="colorOnSecondaryContainer">
@color/md_theme_beautiful_person_orange_dark_onSecondaryContainer
</item>
<item name="colorTertiary">@color/md_theme_beautiful_person_orange_dark_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_beautiful_person_orange_dark_onTertiary</item>
<item name="colorTertiaryContainer">
@color/md_theme_beautiful_person_orange_dark_tertiaryContainer
</item>
<item name="colorOnTertiaryContainer">
@color/md_theme_beautiful_person_orange_dark_onTertiaryContainer
</item>
<item name="colorError">@color/md_theme_beautiful_person_orange_dark_error</item>
<item name="colorErrorContainer">
@color/md_theme_beautiful_person_orange_dark_errorContainer
</item>
<item name="colorOnError">@color/md_theme_beautiful_person_orange_dark_onError</item>
<item name="colorOnErrorContainer">
@color/md_theme_beautiful_person_orange_dark_onErrorContainer
</item>
<item name="android:colorBackground">
@color/md_theme_beautiful_person_orange_dark_background
</item>
<item name="colorOnBackground">@color/md_theme_beautiful_person_orange_dark_onBackground
</item>
<item name="colorSurface">@color/md_theme_beautiful_person_orange_dark_surface</item>
<item name="colorOnSurface">@color/md_theme_beautiful_person_orange_dark_onSurface</item>
<item name="colorSurfaceVariant">
@color/md_theme_beautiful_person_orange_dark_surfaceVariant
</item>
<item name="colorOnSurfaceVariant">
@color/md_theme_beautiful_person_orange_dark_onSurfaceVariant
</item>
<item name="colorOutline">@color/md_theme_beautiful_person_orange_dark_outline</item>
<item name="colorOnSurfaceInverse">
@color/md_theme_beautiful_person_orange_dark_inverseOnSurface
</item>
<item name="colorSurfaceInverse">
@color/md_theme_beautiful_person_orange_dark_inverseSurface
</item>
<item name="colorPrimaryInverse">
@color/md_theme_beautiful_person_orange_dark_inversePrimary
</item>
</style>

<style name="Theme.TtsServer.Magenta">
<item name="colorPrimary">@color/md_theme_magenta_dark_primary</item>
<item name="colorOnPrimary">@color/md_theme_magenta_dark_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_magenta_dark_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/md_theme_magenta_dark_onPrimaryContainer</item>
<item name="colorSecondary">@color/md_theme_magenta_dark_secondary</item>
<item name="colorOnSecondary">@color/md_theme_magenta_dark_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_magenta_dark_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_magenta_dark_onSecondaryContainer</item>
<item name="colorTertiary">@color/md_theme_magenta_dark_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_magenta_dark_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_magenta_dark_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_magenta_dark_onTertiaryContainer</item>
<item name="colorError">@color/md_theme_magenta_dark_error</item>
<item name="colorErrorContainer">@color/md_theme_magenta_dark_errorContainer</item>
<item name="colorOnError">@color/md_theme_magenta_dark_onError</item>
<item name="colorOnErrorContainer">@color/md_theme_magenta_dark_onErrorContainer</item>
<item name="android:colorBackground">@color/md_theme_magenta_dark_background</item>
<item name="colorOnBackground">@color/md_theme_magenta_dark_onBackground</item>
<item name="colorSurface">@color/md_theme_magenta_dark_surface</item>
<item name="colorOnSurface">@color/md_theme_magenta_dark_onSurface</item>
<item name="colorSurfaceVariant">@color/md_theme_magenta_dark_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/md_theme_magenta_dark_onSurfaceVariant</item>
<item name="colorOutline">@color/md_theme_magenta_dark_outline</item>
<item name="colorOnSurfaceInverse">@color/md_theme_magenta_dark_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_magenta_dark_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_magenta_dark_inversePrimary</item>
</style>

</resources>
3 changes: 3 additions & 0 deletions app/src/main/res/values-zh-rTW/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,4 +400,7 @@
<string name="import_config_type_not_match_msg">格式错误(预期为: %1$s)。\n您输入的格式为 %2$s, 请前往对应管理界面进行导入。</string>
<string name="import_config_type_unknown_msg">格式未知，请输入正确的配置。</string>
<string name="still_to_import">仍要导入</string>
<string name="theme_kite_crown_purple">鹞冠紫</string>
<string name="theme_beautiful_person_orange">美人焦橙</string>
<string name="theme_magenta">紫红</string>
</resources>
Loading

0 comments on commit 3bad341

Please sign in to comment.