diff --git a/generate_themes.sh b/generate_themes.sh
index 542af5aa25..09fb9050a1 100755
--- a/generate_themes.sh
+++ b/generate_themes.sh
@@ -163,13 +163,20 @@ function generate_accent() {
generate_accent "Amber" "#ffa000" "#ffab00"
generate_accent "BlueLight" "#03a9f4" "#03a9f4" "Light blue"
-# TODO normal blue
+generate_accent "Carnation" "#fb83b2" "#ffa6c9"
generate_accent "Cyan" "#00bcd4" "#00bcd4"
+generate_accent "Denim" "#1560BD" "#1560BD"
generate_accent "Gold" "#CFB53B" "#CFB53B"
-#generate_accent "GreenLight" "#8bc34a" "#8bc34a"
+#generate_accent "GreenLight" "#8bc34a" "#8bc34a" "Light green"
+#generate_accent "Grey" "#808080" "#808080"
+#generate_accent "Hope" "#5fc72d" "#59ff3a"
+generate_accent "Indigo" "#536DFE" "#536DFE"
+generate_accent "Lava" "#B20120" "#EB0028"
generate_accent "Lime" "#cddc39" "#cddc39"
generate_accent "Orange" "#ff9800" "#ff9800"
+#generate_accent "Oxygen" "#53ADEF" "#53ADEF"
generate_accent "Pink" "#e91e63" "#f48fb1"
+#generate_accent "Pixel" "#4285f4" "#3367d6"
generate_accent "Purple" "#673ab7" "#673ab7"
generate_accent "Red" "#ff0000" "#ff0000"
generate_accent "Teal" "#008577" "#80cbc4"
diff --git a/library/ui-styles/src/main/res/values-v23/theme_sc_accent_carnation.xml b/library/ui-styles/src/main/res/values-v23/theme_sc_accent_carnation.xml
new file mode 100644
index 0000000000..b38f40ebab
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v23/theme_sc_accent_carnation.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values-v23/theme_sc_accent_denim.xml b/library/ui-styles/src/main/res/values-v23/theme_sc_accent_denim.xml
new file mode 100644
index 0000000000..11e1930164
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v23/theme_sc_accent_denim.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values-v23/theme_sc_accent_indigo.xml b/library/ui-styles/src/main/res/values-v23/theme_sc_accent_indigo.xml
new file mode 100644
index 0000000000..cc1e3767e6
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v23/theme_sc_accent_indigo.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values-v23/theme_sc_accent_lava.xml b/library/ui-styles/src/main/res/values-v23/theme_sc_accent_lava.xml
new file mode 100644
index 0000000000..263956c52d
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v23/theme_sc_accent_lava.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values-v23/theme_sc_light_accent_carnation.xml b/library/ui-styles/src/main/res/values-v23/theme_sc_light_accent_carnation.xml
new file mode 100644
index 0000000000..e7a9ffff50
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v23/theme_sc_light_accent_carnation.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values-v23/theme_sc_light_accent_denim.xml b/library/ui-styles/src/main/res/values-v23/theme_sc_light_accent_denim.xml
new file mode 100644
index 0000000000..f9066e8876
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v23/theme_sc_light_accent_denim.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values-v23/theme_sc_light_accent_indigo.xml b/library/ui-styles/src/main/res/values-v23/theme_sc_light_accent_indigo.xml
new file mode 100644
index 0000000000..e198eed0b7
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v23/theme_sc_light_accent_indigo.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values-v23/theme_sc_light_accent_lava.xml b/library/ui-styles/src/main/res/values-v23/theme_sc_light_accent_lava.xml
new file mode 100644
index 0000000000..8c6434fb94
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v23/theme_sc_light_accent_lava.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_accent_carnation.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_accent_carnation.xml
new file mode 100644
index 0000000000..359580adaa
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_accent_carnation.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_accent_denim.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_accent_denim.xml
new file mode 100644
index 0000000000..1aa1030303
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_accent_denim.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_accent_indigo.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_accent_indigo.xml
new file mode 100644
index 0000000000..89c383e118
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_accent_indigo.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_accent_lava.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_accent_lava.xml
new file mode 100644
index 0000000000..4de3433f3d
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_accent_lava.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_carnation.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_carnation.xml
new file mode 100644
index 0000000000..3c3cf5258b
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_carnation.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_denim.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_denim.xml
new file mode 100644
index 0000000000..35679d9bb8
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_denim.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_indigo.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_indigo.xml
new file mode 100644
index 0000000000..af910e715b
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_indigo.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_lava.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_lava.xml
new file mode 100644
index 0000000000..59fe166804
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_lava.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_carnation.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_carnation.xml
new file mode 100644
index 0000000000..e6224d2b76
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/theme_sc_accent_carnation.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+ #ffa6c9
+ #3fffa6c9
+ @color/accent_sc_dark_carnation
+ @color/accent_sc_dark_carnation_alpha25
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_denim.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_denim.xml
new file mode 100644
index 0000000000..1d2401e582
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/theme_sc_accent_denim.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+ #1560BD
+ #3f1560BD
+ @color/accent_sc_dark_denim
+ @color/accent_sc_dark_denim_alpha25
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_indigo.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_indigo.xml
new file mode 100644
index 0000000000..32c04035b2
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/theme_sc_accent_indigo.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+ #536DFE
+ #3f536DFE
+ @color/accent_sc_dark_indigo
+ @color/accent_sc_dark_indigo_alpha25
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_lava.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_lava.xml
new file mode 100644
index 0000000000..87dcec983c
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/theme_sc_accent_lava.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+ #EB0028
+ #3fEB0028
+ @color/accent_sc_dark_lava
+ @color/accent_sc_dark_lava_alpha25
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_carnation.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_carnation.xml
new file mode 100644
index 0000000000..ae4f72483a
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_carnation.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+ #fb83b2
+ #3ffb83b2
+ @color/accent_sc_light_carnation
+ @color/accent_sc_light_carnation_alpha25
+ #fef0f5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_denim.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_denim.xml
new file mode 100644
index 0000000000..9ec2c9a456
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_denim.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+ #1560BD
+ #3f1560BD
+ @color/accent_sc_light_denim
+ @color/accent_sc_light_denim_alpha25
+ #e2ebf7
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_indigo.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_indigo.xml
new file mode 100644
index 0000000000..e7748cc2b2
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_indigo.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+ #536DFE
+ #3f536DFE
+ @color/accent_sc_light_indigo
+ @color/accent_sc_light_indigo_alpha25
+ #eaedfe
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_lava.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_lava.xml
new file mode 100644
index 0000000000..76c7c5f37f
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_lava.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+ #B20120
+ #3fB20120
+ @color/accent_sc_light_lava
+ @color/accent_sc_light_lava_alpha25
+ #f5e0e4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
index e8d76cd586..53cf6be4bb 100644
--- a/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
@@ -396,6 +396,10 @@ object ThemeUtils {
"teal" -> R.style.AppTheme_SC_Light_Teal
"turquoise" -> R.style.AppTheme_SC_Light_Turquoise
"yellow" -> R.style.AppTheme_SC_Light_Yellow
+ "carnation" -> R.style.AppTheme_SC_Light_Carnation
+ "denim" -> R.style.AppTheme_SC_Light_Denim
+ "indigo" -> R.style.AppTheme_SC_Light_Indigo
+ "lava" -> R.style.AppTheme_SC_Light_Lava
// Do not change this comment for automatic light theme insertion
else -> resId
}
@@ -415,6 +419,10 @@ object ThemeUtils {
"teal" -> R.style.AppTheme_SC_Teal
"turquoise" -> R.style.AppTheme_SC_Turquoise
"yellow" -> R.style.AppTheme_SC_Yellow
+ "carnation" -> R.style.AppTheme_SC_Carnation
+ "denim" -> R.style.AppTheme_SC_Denim
+ "indigo" -> R.style.AppTheme_SC_Indigo
+ "lava" -> R.style.AppTheme_SC_Lava
// Do not change this comment for automatic black theme insertion
else -> resId
}
@@ -434,6 +442,10 @@ object ThemeUtils {
"teal" -> R.style.AppTheme_SC_Dark_Teal
"turquoise" -> R.style.AppTheme_SC_Dark_Turquoise
"yellow" -> R.style.AppTheme_SC_Dark_Yellow
+ "carnation" -> R.style.AppTheme_SC_Dark_Carnation
+ "denim" -> R.style.AppTheme_SC_Dark_Denim
+ "indigo" -> R.style.AppTheme_SC_Dark_Indigo
+ "lava" -> R.style.AppTheme_SC_Dark_Lava
// Do not change this comment for automatic dark theme insertion
else -> resId
}
@@ -453,6 +465,10 @@ object ThemeUtils {
"teal" -> R.style.AppTheme_SC_Colored_Teal
"turquoise" -> R.style.AppTheme_SC_Colored_Turquoise
"yellow" -> R.style.AppTheme_SC_Colored_Yellow
+ "carnation" -> R.style.AppTheme_SC_Colored_Carnation
+ "denim" -> R.style.AppTheme_SC_Colored_Denim
+ "indigo" -> R.style.AppTheme_SC_Colored_Indigo
+ "lava" -> R.style.AppTheme_SC_Colored_Lava
// Do not change this comment for automatic black colored theme insertion
else -> resId
}
@@ -472,6 +488,10 @@ object ThemeUtils {
"teal" -> R.style.AppTheme_SC_Dark_Colored_Teal
"turquoise" -> R.style.AppTheme_SC_Dark_Colored_Turquoise
"yellow" -> R.style.AppTheme_SC_Dark_Colored_Yellow
+ "carnation" -> R.style.AppTheme_SC_Dark_Colored_Carnation
+ "denim" -> R.style.AppTheme_SC_Dark_Colored_Denim
+ "indigo" -> R.style.AppTheme_SC_Dark_Colored_Indigo
+ "lava" -> R.style.AppTheme_SC_Dark_Colored_Lava
// Do not change this comment for automatic dark colored theme insertion
else -> resId
}
diff --git a/vector/src/main/res/values/arrays_sc.xml b/vector/src/main/res/values/arrays_sc.xml
index 8ef6b51caf..d1741262a9 100644
--- a/vector/src/main/res/values/arrays_sc.xml
+++ b/vector/src/main/res/values/arrays_sc.xml
@@ -63,6 +63,10 @@
- @string/sc_accent_teal
- @string/sc_accent_turquoise
- @string/sc_accent_yellow
+ - @string/sc_accent_carnation
+ - @string/sc_accent_denim
+ - @string/sc_accent_indigo
+ - @string/sc_accent_lava
@@ -80,6 +84,10 @@
- teal
- turquoise
- yellow
+ - carnation
+ - denim
+ - indigo
+ - lava
@@ -97,6 +105,10 @@
- #80cbc4
- #00FFFF
- #ffeb3b
+ - #ffa6c9
+ - #1560BD
+ - #536DFE
+ - #EB0028
@@ -114,6 +126,10 @@
- @string/sc_accent_teal
- @string/sc_accent_turquoise
- @string/sc_accent_yellow
+ - @string/sc_accent_carnation
+ - @string/sc_accent_denim
+ - @string/sc_accent_indigo
+ - @string/sc_accent_lava
@@ -131,6 +147,10 @@
- teal
- turquoise
- yellow
+ - carnation
+ - denim
+ - indigo
+ - lava
@@ -148,6 +168,10 @@
- #008577
- #00C1C1
- #fdd835
+ - #fb83b2
+ - #1560BD
+ - #536DFE
+ - #B20120
diff --git a/vector/src/main/res/values/strings_sc.xml b/vector/src/main/res/values/strings_sc.xml
index ab29615cfb..3deab1a47b 100644
--- a/vector/src/main/res/values/strings_sc.xml
+++ b/vector/src/main/res/values/strings_sc.xml
@@ -98,6 +98,10 @@
Teal
Turquoise
Yellow
+ Carnation
+ Denim
+ Indigo
+ Lava