Skip to content

Commit 900f318

Browse files
jing332jing332
committed
feat: 新增主题色
1 parent 5a91cf0 commit 900f318

8 files changed

Lines changed: 398 additions & 26 deletions

File tree

‎app/src/main/java/com/github/jing332/tts_server_android/constant/AppTheme.kt‎

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,36 +12,33 @@ enum class AppTheme(
1212
) {
1313
Default(R.style.Theme_TtsServer, R.string.default_str, R.color.seed),
1414
SkyBlue(R.style.Theme_TtsServer_SkyBlue, R.string.theme_sky_blue, R.color.sky_blue_seed),
15-
SorghumRed(
16-
R.style.Theme_TtsServer_SorghumRed,
17-
R.string.theme_sorghum_red,
18-
R.color.sorghum_red_seed
15+
SakuraPink(
16+
R.style.Theme_TtsServer_SakuraPink,
17+
R.string.theme_sakura_pink,
18+
R.color.sakura_pink_seed
19+
),
20+
Cyan(R.style.Theme_TtsServer_Cyan, R.string.theme_cyan, R.color.cyan_seed),
21+
LilacBrown(
22+
R.style.Theme_TtsServer_LilacBrown,
23+
R.string.theme_lilac_brown,
24+
R.color.lilac_brown_seed
1925
),
2026
PeacockGreen(
2127
R.style.Theme_TtsServer_PeacockGreen,
2228
R.string.theme_peacock_green,
2329
R.color.peacock_green_seed
2430
),
25-
Golden(
26-
R.style.Theme_TtsServer_Golden,
27-
R.string.theme_golden,
28-
R.color.golden_seed
29-
),
30-
LilacBrown(
31-
R.style.Theme_TtsServer_LilacBrown,
32-
R.string.theme_lilac_brown,
33-
R.color.lilac_brown_seed
31+
Golden(R.style.Theme_TtsServer_Golden, R.string.theme_golden, R.color.golden_seed),
32+
SorghumRed(
33+
R.style.Theme_TtsServer_SorghumRed,
34+
R.string.theme_sorghum_red,
35+
R.color.sorghum_red_seed
3436
),
35-
36-
Cyan(
37-
R.style.Theme_TtsServer_Cyan,
38-
R.string.theme_cyan,
39-
R.color.cyan_seed
37+
EmeraldGreen(
38+
R.style.Theme_TtsServer_EmeraldGreen,
39+
R.string.theme_emerald_green,
40+
R.color.emerald_green_seed
4041
),
41-
42-
SakuraPink(
43-
R.style.Theme_TtsServer_SakuraPink,
44-
R.string.theme_sakura_pink,
45-
R.color.sakura_pink_seed
46-
)
42+
RedGold(R.style.Theme_TtsServer_RedGold, R.string.theme_red_gold, R.color.red_gold_seed),
43+
InkGrey(R.style.Theme_TtsServer_InkGrey, R.string.theme_ink_grey, R.color.ink_grey_seed),
4744
}

‎app/src/main/java/com/github/jing332/tts_server_android/ui/MainActivity.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,9 @@ class MainActivity : AppCompatActivity(R.layout.main_activity),
142142
navHeaderBinding.subtitle.text = BuildConfig.VERSION_NAME
143143
navHeaderBinding.btnTheme.clickWithThrottle {
144144
val scrollView = NestedScrollView(this)
145-
val chipGroup = ChipGroup(this).apply { setPadding(16.dp) }
145+
val chipGroup = ChipGroup(this).apply {
146+
setPadding(16.dp)
147+
}
146148
scrollView.addView(chipGroup)
147149
val dlg = MaterialAlertDialogBuilder(this)
148150
.setTitle(R.string.theme)

‎app/src/main/res/values-en/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,4 +410,7 @@
410410
<string name="theme_lilac_brown">丁香棕</string>
411411
<string name="theme_cyan">白青</string>
412412
<string name="theme_sakura_pink">樱花粉</string>
413+
<string name="theme_ink_grey">墨灰</string>
414+
<string name="theme_emerald_green">碧绿</string>
415+
<string name="theme_red_gold">赤金</string>
413416
</resources>

‎app/src/main/res/values-night/themes.xml‎

Lines changed: 88 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@
9696
<item name="colorSurfaceInverse">@color/md_theme_sorghum_red_dark_inverseSurface</item>
9797
<item name="colorPrimaryInverse">@color/md_theme_sorghum_red_dark_inversePrimary</item>
9898
</style>
99-
10099
<!-- 孔雀绿 -->
101100
<style name="Theme.TtsServer.PeacockGreen">
102101
<item name="colorPrimary">@color/md_theme_peacock_green_dark_primary</item>
@@ -266,4 +265,92 @@
266265
<item name="colorPrimaryInverse">@color/md_theme_sakura_pink_dark_inversePrimary</item>
267266
</style>
268267

268+
<!-- 墨灰 -->
269+
<style name="Theme.TtsServer.InkGrey">
270+
<item name="colorPrimary">@color/md_theme_ink_grey_dark_primary</item>
271+
<item name="colorOnPrimary">@color/md_theme_ink_grey_dark_onPrimary</item>
272+
<item name="colorPrimaryContainer">@color/md_theme_ink_grey_dark_primaryContainer</item>
273+
<item name="colorOnPrimaryContainer">@color/md_theme_ink_grey_dark_onPrimaryContainer</item>
274+
<item name="colorSecondary">@color/md_theme_ink_grey_dark_secondary</item>
275+
<item name="colorOnSecondary">@color/md_theme_ink_grey_dark_onSecondary</item>
276+
<item name="colorSecondaryContainer">@color/md_theme_ink_grey_dark_secondaryContainer</item>
277+
<item name="colorOnSecondaryContainer">@color/md_theme_ink_grey_dark_onSecondaryContainer</item>
278+
<item name="colorTertiary">@color/md_theme_ink_grey_dark_tertiary</item>
279+
<item name="colorOnTertiary">@color/md_theme_ink_grey_dark_onTertiary</item>
280+
<item name="colorTertiaryContainer">@color/md_theme_ink_grey_dark_tertiaryContainer</item>
281+
<item name="colorOnTertiaryContainer">@color/md_theme_ink_grey_dark_onTertiaryContainer</item>
282+
<item name="colorError">@color/md_theme_ink_grey_dark_error</item>
283+
<item name="colorErrorContainer">@color/md_theme_ink_grey_dark_errorContainer</item>
284+
<item name="colorOnError">@color/md_theme_ink_grey_dark_onError</item>
285+
<item name="colorOnErrorContainer">@color/md_theme_ink_grey_dark_onErrorContainer</item>
286+
<item name="android:colorBackground">@color/md_theme_ink_grey_dark_background</item>
287+
<item name="colorOnBackground">@color/md_theme_ink_grey_dark_onBackground</item>
288+
<item name="colorSurface">@color/md_theme_ink_grey_dark_surface</item>
289+
<item name="colorOnSurface">@color/md_theme_ink_grey_dark_onSurface</item>
290+
<item name="colorSurfaceVariant">@color/md_theme_ink_grey_dark_surfaceVariant</item>
291+
<item name="colorOnSurfaceVariant">@color/md_theme_ink_grey_dark_onSurfaceVariant</item>
292+
<item name="colorOutline">@color/md_theme_ink_grey_dark_outline</item>
293+
<item name="colorOnSurfaceInverse">@color/md_theme_ink_grey_dark_inverseOnSurface</item>
294+
<item name="colorSurfaceInverse">@color/md_theme_ink_grey_dark_inverseSurface</item>
295+
<item name="colorPrimaryInverse">@color/md_theme_ink_grey_dark_inversePrimary</item>
296+
</style>
297+
298+
<style name="Theme.TtsServer.EmeraldGreen">
299+
<item name="colorPrimary">@color/md_theme_emerald_green_dark_primary</item>
300+
<item name="colorOnPrimary">@color/md_theme_emerald_green_dark_onPrimary</item>
301+
<item name="colorPrimaryContainer">@color/md_theme_emerald_green_dark_primaryContainer</item>
302+
<item name="colorOnPrimaryContainer">@color/md_theme_emerald_green_dark_onPrimaryContainer</item>
303+
<item name="colorSecondary">@color/md_theme_emerald_green_dark_secondary</item>
304+
<item name="colorOnSecondary">@color/md_theme_emerald_green_dark_onSecondary</item>
305+
<item name="colorSecondaryContainer">@color/md_theme_emerald_green_dark_secondaryContainer</item>
306+
<item name="colorOnSecondaryContainer">@color/md_theme_emerald_green_dark_onSecondaryContainer</item>
307+
<item name="colorTertiary">@color/md_theme_emerald_green_dark_tertiary</item>
308+
<item name="colorOnTertiary">@color/md_theme_emerald_green_dark_onTertiary</item>
309+
<item name="colorTertiaryContainer">@color/md_theme_emerald_green_dark_tertiaryContainer</item>
310+
<item name="colorOnTertiaryContainer">@color/md_theme_emerald_green_dark_onTertiaryContainer</item>
311+
<item name="colorError">@color/md_theme_emerald_green_dark_error</item>
312+
<item name="colorErrorContainer">@color/md_theme_emerald_green_dark_errorContainer</item>
313+
<item name="colorOnError">@color/md_theme_emerald_green_dark_onError</item>
314+
<item name="colorOnErrorContainer">@color/md_theme_emerald_green_dark_onErrorContainer</item>
315+
<item name="android:colorBackground">@color/md_theme_emerald_green_dark_background</item>
316+
<item name="colorOnBackground">@color/md_theme_emerald_green_dark_onBackground</item>
317+
<item name="colorSurface">@color/md_theme_emerald_green_dark_surface</item>
318+
<item name="colorOnSurface">@color/md_theme_emerald_green_dark_onSurface</item>
319+
<item name="colorSurfaceVariant">@color/md_theme_emerald_green_dark_surfaceVariant</item>
320+
<item name="colorOnSurfaceVariant">@color/md_theme_emerald_green_dark_onSurfaceVariant</item>
321+
<item name="colorOutline">@color/md_theme_emerald_green_dark_outline</item>
322+
<item name="colorOnSurfaceInverse">@color/md_theme_emerald_green_dark_inverseOnSurface</item>
323+
<item name="colorSurfaceInverse">@color/md_theme_emerald_green_dark_inverseSurface</item>
324+
<item name="colorPrimaryInverse">@color/md_theme_emerald_green_dark_inversePrimary</item>
325+
</style>
326+
327+
<style name="Theme.TtsServer.RedGold">
328+
<item name="colorPrimary">@color/md_theme_red_gold_dark_primary</item>
329+
<item name="colorOnPrimary">@color/md_theme_red_gold_dark_onPrimary</item>
330+
<item name="colorPrimaryContainer">@color/md_theme_red_gold_dark_primaryContainer</item>
331+
<item name="colorOnPrimaryContainer">@color/md_theme_red_gold_dark_onPrimaryContainer</item>
332+
<item name="colorSecondary">@color/md_theme_red_gold_dark_secondary</item>
333+
<item name="colorOnSecondary">@color/md_theme_red_gold_dark_onSecondary</item>
334+
<item name="colorSecondaryContainer">@color/md_theme_red_gold_dark_secondaryContainer</item>
335+
<item name="colorOnSecondaryContainer">@color/md_theme_red_gold_dark_onSecondaryContainer</item>
336+
<item name="colorTertiary">@color/md_theme_red_gold_dark_tertiary</item>
337+
<item name="colorOnTertiary">@color/md_theme_red_gold_dark_onTertiary</item>
338+
<item name="colorTertiaryContainer">@color/md_theme_red_gold_dark_tertiaryContainer</item>
339+
<item name="colorOnTertiaryContainer">@color/md_theme_red_gold_dark_onTertiaryContainer</item>
340+
<item name="colorError">@color/md_theme_red_gold_dark_error</item>
341+
<item name="colorErrorContainer">@color/md_theme_red_gold_dark_errorContainer</item>
342+
<item name="colorOnError">@color/md_theme_red_gold_dark_onError</item>
343+
<item name="colorOnErrorContainer">@color/md_theme_red_gold_dark_onErrorContainer</item>
344+
<item name="android:colorBackground">@color/md_theme_red_gold_dark_background</item>
345+
<item name="colorOnBackground">@color/md_theme_red_gold_dark_onBackground</item>
346+
<item name="colorSurface">@color/md_theme_red_gold_dark_surface</item>
347+
<item name="colorOnSurface">@color/md_theme_red_gold_dark_onSurface</item>
348+
<item name="colorSurfaceVariant">@color/md_theme_red_gold_dark_surfaceVariant</item>
349+
<item name="colorOnSurfaceVariant">@color/md_theme_red_gold_dark_onSurfaceVariant</item>
350+
<item name="colorOutline">@color/md_theme_red_gold_dark_outline</item>
351+
<item name="colorOnSurfaceInverse">@color/md_theme_red_gold_dark_inverseOnSurface</item>
352+
<item name="colorSurfaceInverse">@color/md_theme_red_gold_dark_inverseSurface</item>
353+
<item name="colorPrimaryInverse">@color/md_theme_red_gold_dark_inversePrimary</item>
354+
</style>
355+
269356
</resources>

‎app/src/main/res/values-zh-rTW/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,4 +394,7 @@
394394
<string name="theme_lilac_brown">丁香棕</string>
395395
<string name="theme_cyan">白青</string>
396396
<string name="theme_sakura_pink">樱花粉</string>
397+
<string name="theme_ink_grey">墨灰</string>
398+
<string name="theme_emerald_green">碧绿</string>
399+
<string name="theme_red_gold">赤金</string>
397400
</resources>

0 commit comments

Comments
 (0)