Skip to content

Commit 8ef6423

Browse files
committed
manager: Add more monet key colors
- Includes new colors such as Sakura, Deep Purple, Indigo, Cyan, Yellow, Amber, and Blue Grey. - Updates the color definitions and order in the settings screen.
1 parent d047ee7 commit 8ef6423

3 files changed

Lines changed: 39 additions & 11 deletions

File tree

manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Settings.kt

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -224,25 +224,39 @@ fun SettingPager(
224224
) {
225225
val colorItems = listOf(
226226
stringResource(id = R.string.settings_key_color_default),
227-
stringResource(id = R.string.color_blue),
228227
stringResource(id = R.string.color_red),
229-
stringResource(id = R.string.color_green),
228+
stringResource(id = R.string.color_pink),
230229
stringResource(id = R.string.color_purple),
231-
stringResource(id = R.string.color_orange),
230+
stringResource(id = R.string.color_deep_purple),
231+
stringResource(id = R.string.color_indigo),
232+
stringResource(id = R.string.color_blue),
233+
stringResource(id = R.string.color_cyan),
232234
stringResource(id = R.string.color_teal),
233-
stringResource(id = R.string.color_pink),
235+
stringResource(id = R.string.color_green),
236+
stringResource(id = R.string.color_yellow),
237+
stringResource(id = R.string.color_amber),
238+
stringResource(id = R.string.color_orange),
234239
stringResource(id = R.string.color_brown),
240+
stringResource(id = R.string.color_blue_grey),
241+
stringResource(id = R.string.color_sakura),
235242
)
236243
val colorValues = listOf(
237244
0,
238-
Color(0xFF1A73E8).toArgb(),
239-
Color(0xFFEA4335).toArgb(),
240-
Color(0xFF34A853).toArgb(),
241-
Color(0xFF9333EA).toArgb(),
242-
Color(0xFFFB8C00).toArgb(),
243-
Color(0xFF009688).toArgb(),
245+
Color(0xFFF44336).toArgb(),
244246
Color(0xFFE91E63).toArgb(),
247+
Color(0xFF9C27B0).toArgb(),
248+
Color(0xFF673AB7).toArgb(),
249+
Color(0xFF3F51B5).toArgb(),
250+
Color(0xFF2196F3).toArgb(),
251+
Color(0xFF00BCD4).toArgb(),
252+
Color(0xFF009688).toArgb(),
253+
Color(0xFF4FAF50).toArgb(),
254+
Color(0xFFFFEB3B).toArgb(),
255+
Color(0xFFFFC107).toArgb(),
256+
Color(0xFFFF9800).toArgb(),
245257
Color(0xFF795548).toArgb(),
258+
Color(0xFF607D8F).toArgb(),
259+
Color(0xFFFF9CA8).toArgb(),
246260
)
247261
var keyColorIndex by rememberSaveable {
248262
mutableIntStateOf(

manager/app/src/main/res/values-zh-rCN/strings.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,16 @@
169169
<string name="color_green">绿色</string>
170170
<string name="color_purple">紫色</string>
171171
<string name="color_orange">橙色</string>
172-
<string name="color_teal">青色</string>
172+
<string name="color_teal">青绿</string>
173173
<string name="color_pink">粉色</string>
174174
<string name="color_brown">棕色</string>
175+
<string name="color_sakura">樱花</string>
176+
<string name="color_deep_purple">深紫</string>
177+
<string name="color_indigo">靛青</string>
178+
<string name="color_cyan">青色</string>
179+
<string name="color_yellow">黄色</string>
180+
<string name="color_amber">琥珀</string>
181+
<string name="color_blue_grey">灰蓝</string>
175182
<string name="network_offline">未连接到网络</string>
176183
<string name="network_retry">重试</string>
177184
<string name="tab_readme">自述</string>

manager/app/src/main/res/values/strings.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,13 @@
177177
<string name="color_teal">Teal</string>
178178
<string name="color_pink">Pink</string>
179179
<string name="color_brown">Brown</string>
180+
<string name="color_deep_purple">Deep Purple</string>
181+
<string name="color_indigo">Indigo</string>
182+
<string name="color_cyan">Cyan</string>
183+
<string name="color_yellow">Yellow</string>
184+
<string name="color_amber">Amber</string>
185+
<string name="color_blue_grey">Blue Grey</string>
186+
<string name="color_sakura">Sakura</string>
180187
<string name="network_offline">Not connected to network</string>
181188
<string name="network_retry">Retry</string>
182189
<string name="tab_readme">README</string>

0 commit comments

Comments
 (0)