diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ea28bd4f..af3f4190 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -24,6 +24,7 @@ plugins {
id("com.android.application")
id("androidx.navigation.safeargs")
id("dev.rikka.tools.autoresconfig")
+ id("dev.rikka.tools.materialthemebuilder")
}
val defaultManagerPackageName: String by rootProject.extra
@@ -99,6 +100,47 @@ autoResConfig {
generatedArrayFirstItem.set("SYSTEM")
}
+materialThemeBuilder {
+// fun Theme.emplace() {
+// lightThemeFormat.set("ThemeOverlay.Light.%s")
+// darkThemeFormat.set("ThemeOverlay.Dark.%s")
+//
+// themes.add(this)
+// }
+ themes {
+ for ((name, color) in listOf(
+ "Red" to "F44336",
+ "Pink" to "E91E63",
+ "Purple" to "9C27B0",
+ "DeepPurple" to "673AB7",
+ "Indigo" to "3F51B5",
+ "Blue" to "2196F3",
+ "LightBlue" to "03A9F4",
+ "Cyan" to "00BCD4",
+ "Teal" to "009688",
+ "Green" to "4FAF50",
+ "LightGreen" to "8BC3A4",
+ "Lime" to "CDDC39",
+ "Yellow" to "FFEB3B",
+ "Amber" to "FFC107",
+ "Orange" to "FF9800",
+ "DeepOrange" to "FF5722",
+ "Brown" to "795548",
+ "BlueGrey" to "607D8F",
+ "Sakura" to "FF9CA8"
+ )) {
+ create("Material$name") {
+ lightThemeFormat = "ThemeOverlay.Light.%s"
+ darkThemeFormat = "ThemeOverlay.Dark.%s"
+ primaryColor = "#$color"
+ }
+ }
+ }
+ // Add Material Design 3 color tokens (such as palettePrimary100) in generated theme
+ // rikka.material >= 2.0.0 provides such attributes
+ generatePalette = false
+}
+
dependencies {
val glideVersion = "4.13.1"
val navVersion: String by project
@@ -114,7 +156,7 @@ dependencies {
implementation("androidx.recyclerview:recyclerview:1.2.1")
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01")
implementation("com.github.bumptech.glide:glide:$glideVersion")
- implementation("com.google.android.material:material:1.6.0-alpha03")
+ implementation("com.google.android.material:material:1.6.0-beta01")
implementation("com.google.code.gson:gson:2.9.0")
implementation(platform("com.squareup.okhttp3:okhttp-bom:4.9.3"))
implementation("com.squareup.okhttp3:okhttp")
diff --git a/app/src/main/java/org/lsposed/manager/util/ThemeUtil.java b/app/src/main/java/org/lsposed/manager/util/ThemeUtil.java
index 13460c9a..41b8a349 100644
--- a/app/src/main/java/org/lsposed/manager/util/ThemeUtil.java
+++ b/app/src/main/java/org/lsposed/manager/util/ThemeUtil.java
@@ -45,25 +45,25 @@ public class ThemeUtil {
static {
preferences = App.getPreferences();
- colorThemeMap.put("SAKURA", R.style.ThemeOverlay_sakura);
- colorThemeMap.put("MATERIAL_RED", R.style.ThemeOverlay_material_red);
- colorThemeMap.put("MATERIAL_PINK", R.style.ThemeOverlay_material_pink);
- colorThemeMap.put("MATERIAL_PURPLE", R.style.ThemeOverlay_material_purple);
- colorThemeMap.put("MATERIAL_DEEP_PURPLE", R.style.ThemeOverlay_material_deep_purple);
- colorThemeMap.put("MATERIAL_INDIGO", R.style.ThemeOverlay_material_indigo);
- colorThemeMap.put("MATERIAL_BLUE", R.style.ThemeOverlay_material_blue);
- colorThemeMap.put("MATERIAL_LIGHT_BLUE", R.style.ThemeOverlay_material_light_blue);
- colorThemeMap.put("MATERIAL_CYAN", R.style.ThemeOverlay_material_cyan);
- colorThemeMap.put("MATERIAL_TEAL", R.style.ThemeOverlay_material_teal);
- colorThemeMap.put("MATERIAL_GREEN", R.style.ThemeOverlay_material_green);
- colorThemeMap.put("MATERIAL_LIGHT_GREEN", R.style.ThemeOverlay_material_light_green);
- colorThemeMap.put("MATERIAL_LIME", R.style.ThemeOverlay_material_lime);
- colorThemeMap.put("MATERIAL_YELLOW", R.style.ThemeOverlay_material_yellow);
- colorThemeMap.put("MATERIAL_AMBER", R.style.ThemeOverlay_material_amber);
- colorThemeMap.put("MATERIAL_ORANGE", R.style.ThemeOverlay_material_orange);
- colorThemeMap.put("MATERIAL_DEEP_ORANGE", R.style.ThemeOverlay_material_deep_orange);
- colorThemeMap.put("MATERIAL_BROWN", R.style.ThemeOverlay_material_brown);
- colorThemeMap.put("MATERIAL_BLUE_GREY", R.style.ThemeOverlay_material_blue_grey);
+ colorThemeMap.put("SAKURA", R.style.ThemeOverlay_MaterialSakura);
+ colorThemeMap.put("MATERIAL_RED", R.style.ThemeOverlay_MaterialRed);
+ colorThemeMap.put("MATERIAL_PINK", R.style.ThemeOverlay_MaterialPink);
+ colorThemeMap.put("MATERIAL_PURPLE", R.style.ThemeOverlay_MaterialPurple);
+ colorThemeMap.put("MATERIAL_DEEP_PURPLE", R.style.ThemeOverlay_MaterialDeepPurple);
+ colorThemeMap.put("MATERIAL_INDIGO", R.style.ThemeOverlay_MaterialIndigo);
+ colorThemeMap.put("MATERIAL_BLUE", R.style.ThemeOverlay_MaterialBlue);
+ colorThemeMap.put("MATERIAL_LIGHT_BLUE", R.style.ThemeOverlay_MaterialLightBlue);
+ colorThemeMap.put("MATERIAL_CYAN", R.style.ThemeOverlay_MaterialCyan);
+ colorThemeMap.put("MATERIAL_TEAL", R.style.ThemeOverlay_MaterialTeal);
+ colorThemeMap.put("MATERIAL_GREEN", R.style.ThemeOverlay_MaterialGreen);
+ colorThemeMap.put("MATERIAL_LIGHT_GREEN", R.style.ThemeOverlay_MaterialLightGreen);
+ colorThemeMap.put("MATERIAL_LIME", R.style.ThemeOverlay_MaterialLime);
+ colorThemeMap.put("MATERIAL_YELLOW", R.style.ThemeOverlay_MaterialYellow);
+ colorThemeMap.put("MATERIAL_AMBER", R.style.ThemeOverlay_MaterialAmber);
+ colorThemeMap.put("MATERIAL_ORANGE", R.style.ThemeOverlay_MaterialOrange);
+ colorThemeMap.put("MATERIAL_DEEP_ORANGE", R.style.ThemeOverlay_MaterialDeepOrange);
+ colorThemeMap.put("MATERIAL_BROWN", R.style.ThemeOverlay_MaterialBrown);
+ colorThemeMap.put("MATERIAL_BLUE_GREY", R.style.ThemeOverlay_MaterialBlueGrey);
}
private static final String THEME_DEFAULT = "DEFAULT";
@@ -107,7 +107,7 @@ public class ThemeUtil {
public static int getColorThemeStyleRes() {
Integer theme = colorThemeMap.get(getColorTheme());
if (theme == null) {
- return R.style.ThemeOverlay_material_blue;
+ return R.style.ThemeOverlay_MaterialBlue;
}
return theme;
}
diff --git a/app/src/main/res/values-night/colors_custom.xml b/app/src/main/res/values-night/colors_custom.xml
deleted file mode 100644
index be11f010..00000000
--- a/app/src/main/res/values-night/colors_custom.xml
+++ /dev/null
@@ -1,535 +0,0 @@
-
-
-
-
-
- #FFB4A8
- #680001
- #940002
- #FFDAD3
- #E7BCB6
- #442A26
- #5D3F3B
- #FFDAD4
- #DFC38C
- #3F2E04
- #574419
- #FCDFA6
- #FFB4A9
- #930006
- #680003
- #FFDAD4
- #211A19
- #EDE0DE
- #211A19
- #EDE0DE
- #534341
- #D8C2BF
- #A08C89
- #211A19
- #EDE0DE
- #BC1714
-
- #FFB2C0
- #670024
- #900036
- #FFD9DF
- #E5BDC2
- #43292D
- #5C3F43
- #FFD9DE
- #EBBF90
- #452B08
- #5F411C
- #FFDDB8
- #FFB4A9
- #930006
- #680003
- #FFDAD4
- #201A1B
- #ECE0E0
- #201A1B
- #ECE0E0
- #524345
- #D6C1C3
- #9F8C8E
- #201A1B
- #ECE0E0
- #BC0049
-
- #FBAAFF
- #570068
- #7B0091
- #FFD5FF
- #D7BFD5
- #3B2B3B
- #534153
- #F5DBF2
- #F6B8AE
- #4C251F
- #663B34
- #FFDAD2
- #FFB4A9
- #930006
- #680003
- #FFDAD4
- #1E1A1D
- #E9E0E5
- #1E1A1D
- #E9E0E5
- #4D444C
- #D0C3CC
- #998E96
- #1E1A1D
- #E9E0E5
- #9A25AE
-
- #D4BAFF
- #3E008E
- #5727A7
- #ECDCFF
- #CDC2DB
- #342D41
- #4B4358
- #E9DEF7
- #F0B8C5
- #4A2530
- #643B46
- #FFD9E2
- #FFB4A9
- #930006
- #680003
- #FFDAD4
- #1D1B1F
- #E6E1E5
- #1D1B1F
- #E6E1E5
- #49454E
- #CBC4CF
- #948E99
- #1D1B1F
- #E6E1E5
- #6F43BF
-
- #B9C3FF
- #08218A
- #293CA0
- #DDE0FF
- #C4C5DD
- #2D2F42
- #43465A
- #E0E1FA
- #E5BAD7
- #45263E
- #5D3C55
- #FFD7F3
- #FFB4A9
- #930006
- #680003
- #FFDAD4
- #1B1B1F
- #E4E1E6
- #1B1B1F
- #E4E1E6
- #46464F
- #C6C5D0
- #90909A
- #1B1B1F
- #E4E1E6
- #4355B9
-
- #9CCAFF
- #00325A
- #00497F
- #D0E4FF
- #BBC8DB
- #253140
- #3C4858
- #D6E3F7
- #D6BEE4
- #3B2948
- #523F5F
- #F3DAFF
- #FFB4A9
- #930006
- #680003
- #FFDAD4
- #1B1B1B
- #E2E2E6
- #1B1B1B
- #E2E2E6
- #42474E
- #C3C7D0
- #8D9199
- #1B1B1B
- #E2E2E6
- #0061A6
-
- #8BCEFF
- #003450
- #004B71
- #C8E6FF
- #B7C8D8
- #22323F
- #384956
- #D3E4F5
- #CFBFE8
- #362B4B
- #4D4162
- #ECDCFF
- #FFB4A9
- #930006
- #680003
- #FFDAD4
- #1A1C1E
- #E2E2E5
- #1A1C1E
- #E2E2E5
- #41474D
- #C1C7CE
- #8B9198
- #1A1C1E
- #E2E2E5
- #006494
-
- #44D8F1
- #00363F
- #004E5A
- #9CEFFF
- #B1CBD1
- #1C3439
- #334A4F
- #CDE7ED
- #BCC5EA
- #262F4D
- #3D4665
- #DAE1FF
- #FFB4A9
- #930006
- #680003
- #FFDAD4
- #191C1D
- #E1E3E3
- #191C1D
- #E1E3E3
- #3F484A
- #BFC8CA
- #899294
- #191C1D
- #E1E3E3
- #006877
-
- #53DBC9
- #003730
- #005047
- #74F7E5
- #B1CCC6
- #1C3531
- #334B47
- #CDE8E2
- #ADCAE6
- #153349
- #2D4960
- #CBE5FF
- #FFB4A9
- #930006
- #680003
- #FFDAD4
- #191C1B
- #E0E3E1
- #191C1B
- #E0E3E1
- #3F4947
- #BFC9C6
- #889390
- #191C1B
- #E0E3E1
- #006A5F
-
- #7BDC77
- #003907
- #00530C
- #96F990
- #BACCB3
- #253423
- #3C4B39
- #D5E8CE
- #A1CFD4
- #00363A
- #1E4D52
- #BCEBF0
- #FFB4A9
- #930006
- #680003
- #FFDAD4
- #1A1C19
- #E2E3DD
- #1A1C19
- #E2E3DD
- #424840
- #C2C8BD
- #8C9288
- #1A1C19
- #E2E3DD
- #006E17
-
- #71DBA8
- #003822
- #005234
- #8DF7C2
- #B4CCBC
- #20352A
- #364B3F
- #D0E9D8
- #A5CDDE
- #063542
- #234C5A
- #C0E9FA
- #FFB4A9
- #930006
- #680003
- #FFDAD4
- #191C1A
- #E1E3DF
- #191C1A
- #E1E3DF
- #404943
- #C0C9C1
- #8A938C
- #191C1A
- #E1E3DF
- #006C46
-
- #C1D02C
- #2E3400
- #434B00
- #DEED49
- #C7C9A6
- #30321A
- #46492E
- #E4E5C1
- #A3D0C1
- #06372C
- #234E43
- #BEECDC
- #FFB4A9
- #930006
- #680003
- #FFDAD4
- #1C1C17
- #E5E2DA
- #1C1C17
- #E5E2DA
- #47473B
- #C8C7B7
- #929282
- #1C1C17
- #E5E2DA
- #5A6400
-
- #DBC808
- #373100
- #504700
- #F9E534
- #CEC7A3
- #353117
- #4B472B
- #EBE3BD
- #A6D0B7
- #113726
- #284E3B
- #C2ECD2
- #FFB4A9
- #930006
- #680003
- #FFDAD4
- #1D1C16
- #E7E2D9
- #1D1C16
- #E7E2D9
- #4A473A
- #CBC6B5
- #959181
- #1D1C16
- #E7E2D9
- #6A5F00
-
- #FABD00
- #402D00
- #5C4300
- #FFDF99
- #D7C4A0
- #3B2F15
- #52452A
- #F4E0BB
- #B0CFA9
- #1D361C
- #334D31
- #CCEBC5
- #FFB4A9
- #930006
- #680003
- #FFDAD4
- #1E1B16
- #E9E1D8
- #1E1B16
- #E9E1D8
- #4D4639
- #D0C5B4
- #999080
- #1E1B16
- #E9E1D8
- #795900
-
- #FFB86D
- #4B2800
- #6A3B00
- #FFDCBB
- #E2C1A4
- #402C18
- #59422C
- #FEDCBE
- #C0CC9A
- #2B3410
- #414B25
- #DCE8B4
- #FFB4A9
- #930006
- #680003
- #FFDAD4
- #1F1B17
- #EBE0D9
- #1F1B17
- #EBE0D9
- #51453A
- #D5C3B5
- #9E8E81
- #1F1B17
- #EBE0D9
- #8C5000
-
- #FFB49D
- #601400
- #882000
- #FFDACF
- #E7BDB2
- #442A22
- #5D3F37
- #FFDACF
- #D8C58D
- #3A2F04
- #53461A
- #F5E1A6
- #FFB4A9
- #930006
- #680003
- #FFDAD4
- #201A18
- #EDE0DD
- #201A18
- #EDE0DD
- #53433F
- #D8C2BC
- #A08C87
- #201A18
- #EDE0DD
- #B22D00
-
- #FFB598
- #5C1A00
- #7B2E0D
- #FFDBCD
- #E7BEB0
- #442A20
- #5D4035
- #FFDBCD
- #D5C78E
- #383005
- #50461A
- #F1E2A7
- #FFB4A9
- #930006
- #680003
- #FFDAD4
- #201A18
- #EDE0DC
- #201A18
- #EDE0DC
- #52433E
- #D8C2BB
- #A08C86
- #201A18
- #EDE0DC
- #9A4523
-
- #79D0FF
- #00344A
- #004C69
- #C2E8FF
- #B5C9D7
- #20333E
- #374955
- #D1E5F3
- #CAC1EA
- #322C4C
- #484264
- #E7DEFF
- #FFB4A9
- #930006
- #680003
- #FFDAD4
- #191C1E
- #E1E2E5
- #191C1E
- #E1E2E5
- #41484D
- #C0C7CD
- #8B9298
- #191C1E
- #E1E2E5
- #00668B
-
- #FFB2BC
- #5F1123
- #7D2939
- #FFDADE
- #E5BDC0
- #44292C
- #5C3F42
- #FFD9DC
- #E8BF8E
- #442B06
- #5D411B
- #FFDDB4
- #FFB4A9
- #930006
- #680003
- #FFDAD4
- #201A1A
- #ECE0E0
- #201A1A
- #ECE0E0
- #524344
- #D7C2C3
- #9F8C8D
- #201A1A
- #ECE0E0
- #9B404F
-
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 4444b296..e36ab278 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -21,4 +21,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/colors_custom.xml b/app/src/main/res/values/colors_custom.xml
deleted file mode 100644
index ca2abf8c..00000000
--- a/app/src/main/res/values/colors_custom.xml
+++ /dev/null
@@ -1,555 +0,0 @@
-
-
-
-
-
- #BC1714
- #FFFFFF
- #FFDAD3
- #410001
- #775652
- #FFFFFF
- #FFDAD4
- #2C1512
- #715C2E
- #FFFFFF
- #FCDFA6
- #261A00
- #BA1B1B
- #FFDAD4
- #FFFFFF
- #410001
- #FCFCFC
- #211A19
- #FCFCFC
- #211A19
- #F4DDDA
- #534341
- #857370
- #FBEEEC
- #362F2E
- #FFB4A8
- #F44336
-
- #BC0049
- #FFFFFF
- #FFD9DF
- #400013
- #76565B
- #FFFFFF
- #FFD9DE
- #2B1519
- #795831
- #FFFFFF
- #FFDDB8
- #2C1700
- #BA1B1B
- #FFDAD4
- #FFFFFF
- #410001
- #FCFCFC
- #201A1B
- #FCFCFC
- #201A1B
- #F4DDDF
- #524345
- #847375
- #FAEEEE
- #362F30
- #FFB2C0
- #E91E63
-
- #9A25AE
- #FFFFFF
- #FFD5FF
- #350040
- #6B586B
- #FFFFFF
- #F5DBF2
- #251626
- #82524A
- #FFFFFF
- #FFDAD2
- #32110C
- #BA1B1B
- #FFDAD4
- #FFFFFF
- #410001
- #FCFCFC
- #1E1A1D
- #FCFCFC
- #1E1A1D
- #ECDEE8
- #4D444C
- #7E747C
- #F7EEF3
- #332F32
- #FBAAFF
- #9C27B0
-
- #6F43BF
- #FFFFFF
- #ECDCFF
- #25005A
- #635B70
- #FFFFFF
- #E9DEF7
- #1F182B
- #7F525E
- #FFFFFF
- #FFD9E2
- #32101B
- #BA1B1B
- #FFDAD4
- #FFFFFF
- #410001
- #FFFBFD
- #1D1B1F
- #FFFBFD
- #1D1B1F
- #E7E0EB
- #49454E
- #7A757F
- #F5EFF4
- #323033
- #D4BAFF
- #673AB7
-
- #4355B9
- #FFFFFF
- #DDE0FF
- #000D61
- #5B5D71
- #FFFFFF
- #E0E1FA
- #171A2C
- #77536D
- #FFFFFF
- #FFD7F3
- #2D1228
- #BA1B1B
- #FFDAD4
- #FFFFFF
- #410001
- #FEFBFF
- #1B1B1F
- #FEFBFF
- #1B1B1F
- #E3E1EC
- #46464F
- #767680
- #F3F0F5
- #303034
- #B9C3FF
- #3F51B5
-
-
- #0061A6
- #FFFFFF
- #D0E4FF
- #001D36
- #535F70
- #FFFFFF
- #D6E3F7
- #101C2B
- #6B5778
- #FFFFFF
- #F3DAFF
- #251432
- #BA1B1B
- #FFDAD4
- #FFFFFF
- #410001
- #FDFCFF
- #1B1B1B
- #FDFCFF
- #1B1B1B
- #DFE2EB
- #42474E
- #73777F
- #F1F0F4
- #2F3033
- #9CCAFF
- #2196F3
-
- #006494
- #FFFFFF
- #C8E6FF
- #001E31
- #50606E
- #FFFFFF
- #D3E4F5
- #0C1D29
- #65597B
- #FFFFFF
- #ECDCFF
- #201634
- #BA1B1B
- #FFDAD4
- #FFFFFF
- #410001
- #FCFCFF
- #1A1C1E
- #FCFCFF
- #1A1C1E
- #DEE3EA
- #41474D
- #72787E
- #F0F0F3
- #2F3032
- #8BCEFF
- #03A9F4
-
- #006877
- #FFFFFF
- #9CEFFF
- #001F25
- #4A6267
- #FFFFFF
- #CDE7ED
- #051F23
- #545D7D
- #FFFFFF
- #DAE1FF
- #101A37
- #BA1B1B
- #FFDAD4
- #FFFFFF
- #410001
- #FBFDFE
- #191C1D
- #FBFDFE
- #191C1D
- #DBE4E6
- #3F484A
- #70797B
- #EFF1F2
- #2D3132
- #44D8F1
- #00BCD4
-
- #006A5F
- #FFFFFF
- #74F7E5
- #00201C
- #4A635F
- #FFFFFF
- #CDE8E2
- #05201C
- #466179
- #FFFFFF
- #CBE5FF
- #001D31
- #BA1B1B
- #FFDAD4
- #FFFFFF
- #410001
- #FAFDFA
- #191C1B
- #FAFDFA
- #191C1B
- #DBE5E2
- #3F4947
- #6E7976
- #EFF1EF
- #2D3130
- #53DBC9
- #009688
-
- #006E17
- #FFFFFF
- #96F990
- #002202
- #52634E
- #FFFFFF
- #D5E8CE
- #101F0F
- #38656A
- #FFFFFF
- #BCEBF0
- #011F22
- #BA1B1B
- #FFDAD4
- #FFFFFF
- #410001
- #FCFDF6
- #1A1C19
- #FCFDF6
- #1A1C19
- #DEE4D8
- #424840
- #73796F
- #F1F1EB
- #2F312D
- #7BDC77
- #4FAF50
-
- #006C46
- #FFFFFF
- #8DF7C2
- #002112
- #4D6356
- #FFFFFF
- #D0E9D8
- #0A2015
- #3D6473
- #FFFFFF
- #C0E9FA
- #001F29
- #BA1B1B
- #FFDAD4
- #FFFFFF
- #410001
- #FBFDF8
- #191C1A
- #FBFDF8
- #191C1A
- #DCE5DD
- #404943
- #707972
- #F0F1ED
- #2D312E
- #71DBA8
- #8BC3A4
-
- #5A6400
- #FFFFFF
- #DEED49
- #1A1E00
- #5E6044
- #FFFFFF
- #E4E5C1
- #1B1D07
- #3C665A
- #FFFFFF
- #BEECDC
- #002019
- #BA1B1B
- #FFDAD4
- #FFFFFF
- #410001
- #FFFCF3
- #1C1C17
- #FFFCF3
- #1C1C17
- #E5E3D2
- #47473B
- #787869
- #F3F0E8
- #31312B
- #C1D02C
- #CDDC39
-
- #6A5F00
- #FFFFFF
- #F9E534
- #201C00
- #645F41
- #FFFFFF
- #EBE3BD
- #1F1C05
- #406652
- #FFFFFF
- #C2ECD2
- #002112
- #BA1B1B
- #FFDAD4
- #FFFFFF
- #410001
- #FFFBF7
- #1D1C16
- #FFFBF7
- #1D1C16
- #E8E2D0
- #4A473A
- #7B7768
- #F5F0E7
- #32302A
- #DBC808
- #FFEB3B
-
- #795900
- #FFFFFF
- #FFDF99
- #261A00
- #6B5C3F
- #FFFFFF
- #F4E0BB
- #241A04
- #496546
- #FFFFFF
- #CCEBC5
- #082009
- #BA1B1B
- #FFDAD4
- #FFFFFF
- #410001
- #FFFBF8
- #1E1B16
- #FFFBF8
- #1E1B16
- #EDE1CF
- #4D4639
- #7F7667
- #F8F0E7
- #34302A
- #FABD00
- #FFC107
-
- #8C5000
- #FFFFFF
- #FFDCBB
- #2D1600
- #735A42
- #FFFFFF
- #FEDCBE
- #291806
- #586339
- #FFFFFF
- #DCE8B4
- #161E01
- #BA1B1B
- #FFDAD4
- #FFFFFF
- #410001
- #FCFCFC
- #1F1B17
- #FCFCFC
- #1F1B17
- #F2DFD1
- #51453A
- #837569
- #FAEFE7
- #352F2A
- #FFB86D
- #FF9800
-
- #B22D00
- #FFFFFF
- #FFDACF
- #3C0800
- #77574E
- #FFFFFF
- #FFDACF
- #2C160F
- #6B5D2F
- #FFFFFF
- #F5E1A6
- #231B00
- #BA1B1B
- #FFDAD4
- #FFFFFF
- #410001
- #FCFCFC
- #201A18
- #FCFCFC
- #201A18
- #F5DED8
- #53433F
- #86736E
- #FBEEEB
- #362F2D
- #FFB49D
- #FF5722
-
- #9A4523
- #FFFFFF
- #FFDBCD
- #380C00
- #77574C
- #FFFFFF
- #FFDBCD
- #2C160D
- #695E2F
- #FFFFFF
- #F1E2A7
- #221B00
- #BA1B1B
- #FFDAD4
- #FFFFFF
- #410001
- #FCFCFC
- #201A18
- #FCFCFC
- #201A18
- #F5DED6
- #52433E
- #85736D
- #FCEEEA
- #362F2D
- #FFB598
- #795548
-
- #00668B
- #FFFFFF
- #C2E8FF
- #001E2C
- #4E616D
- #FFFFFF
- #D1E5F3
- #0A1E28
- #615A7D
- #FFFFFF
- #E7DEFF
- #1D1736
- #BA1B1B
- #FFDAD4
- #FFFFFF
- #410001
- #FBFCFF
- #191C1E
- #FBFCFF
- #191C1E
- #DDE3E9
- #41484D
- #71787D
- #F0F1F4
- #2E3133
- #79D0FF
- #607D8F
-
- #9B404F
- #FFFFFF
- #FFDADE
- #400010
- #765659
- #FFFFFF
- #FFD9DC
- #2C1518
- #785931
- #FFFFFF
- #FFDDB4
- #2A1700
- #BA1B1B
- #FFDAD4
- #FFFFFF
- #410001
- #FCFCFC
- #201A1A
- #FCFCFC
- #201A1A
- #F3DDDE
- #524344
- #847374
- #FAEEEE
- #362F2F
- #FFB2BC
- #ff9ca8
-
diff --git a/app/src/main/res/values/themes_custom.xml b/app/src/main/res/values/themes_custom.xml
index c386fa98..2e3cd58e 100644
--- a/app/src/main/res/values/themes_custom.xml
+++ b/app/src/main/res/values/themes_custom.xml
@@ -18,555 +18,23 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build.gradle.kts b/build.gradle.kts
index 73f6ad37..6734ef31 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -28,8 +28,6 @@ import org.gradle.internal.os.OperatingSystem
plugins {
id("com.android.application") apply false
id("com.android.library") apply false
- id("androidx.navigation.safeargs") apply false
- id("dev.rikka.tools.autoresconfig") apply false
}
buildscript {
@@ -186,7 +184,7 @@ fun Project.configureBaseExtension() {
androidComponents.sdkComponents.sdkDirectory.get().asFile,
"build-tools/${androidBuildToolsVersion}/aapt2"
)
- val zip = java.nio.file.Paths.get(
+ val zip = Paths.get(
project.buildDir.path,
"intermediates",
"optimized_processed_res",
diff --git a/magisk-loader/build.gradle.kts b/magisk-loader/build.gradle.kts
index bc48d1ba..ed176824 100644
--- a/magisk-loader/build.gradle.kts
+++ b/magisk-loader/build.gradle.kts
@@ -282,7 +282,7 @@ val pushDaemonNative = task("pushDaemonNative") {
}
outputStream.toString().trim()
}
- workingDir("${project(":daemon").buildDir}/intermediates/ndkBuild/debug/obj/local/$abi")
+ workingDir("${project(":daemon").buildDir}/intermediates/cmake/debug/obj/$abi")
}
commandLine(adb, "push", "libdaemon.so", "/data/local/tmp/libdaemon.so")
}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 31fab6d7..5a0963c0 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -13,6 +13,7 @@ pluginManagement {
id("com.android.application") version agpVersion
id("androidx.navigation.safeargs") version navVersion
id("dev.rikka.tools.autoresconfig") version "1.1.0"
+ id("dev.rikka.tools.materialthemebuilder") version "1.1.0"
}
}