diff --git a/vector/src/main/java/im/vector/riotx/core/resources/ColorProvider.kt b/vector/src/main/java/im/vector/riotx/core/resources/ColorProvider.kt
index a7ab368a98..0ecc81740d 100644
--- a/vector/src/main/java/im/vector/riotx/core/resources/ColorProvider.kt
+++ b/vector/src/main/java/im/vector/riotx/core/resources/ColorProvider.kt
@@ -29,9 +29,12 @@ class ColorProvider @Inject constructor(private val context: Context) {
@ColorInt
fun getColor(@ColorRes colorRes: Int): Int {
- if (colorRes == R.color.riotx_accent)
- return getColorFromAttribute(R.attr.colorAccent)
- return ContextCompat.getColor(context, colorRes)
+ return when(colorRes) {
+ R.color.riotx_accent -> getColorFromAttribute(R.attr.colorAccent)
+ R.color.riotx_positive_accent -> getColorFromAttribute(R.attr.riotx_positive_accent)
+ R.color.riotx_positive_accent_alpha12 -> getColorFromAttribute(R.attr.riotx_positive_accent_alpha12)
+ else -> ContextCompat.getColor(context, colorRes)
+ }
}
/**
diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt
index a4304a7f27..214b31a61f 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt
@@ -40,6 +40,7 @@ import im.vector.riotx.core.extensions.replaceFragment
import im.vector.riotx.core.platform.ToolbarConfigurable
import im.vector.riotx.core.platform.VectorBaseActivity
import im.vector.riotx.core.pushers.PushersManager
+import im.vector.riotx.core.resources.ColorProvider
import im.vector.riotx.features.disclaimer.showDisclaimerDialog
import im.vector.riotx.features.notifications.NotificationDrawerManager
import im.vector.riotx.features.popup.PopupAlertManager
@@ -202,7 +203,7 @@ class HomeActivity : VectorBaseActivity(), ToolbarConfigurable, UnknownDeviceDet
iconId = R.drawable.ic_shield_warning
).apply {
matrixItem = userItem
- colorInt = ContextCompat.getColor(this@HomeActivity, R.color.riotx_positive_accent)
+ colorInt = ColorProvider(this@HomeActivity).getColor(R.color.riotx_positive_accent)
contentAction = Runnable {
(weakCurrentActivity?.get() as? VectorBaseActivity)?.let {
action(it)
diff --git a/vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt b/vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt
index 165cb94c90..dbdc22bbc9 100644
--- a/vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt
+++ b/vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt
@@ -28,7 +28,6 @@ import androidx.core.content.ContextCompat
import androidx.core.graphics.drawable.DrawableCompat
import androidx.preference.PreferenceManager
import im.vector.riotx.R
-import im.vector.riotx.features.configuration.VectorConfiguration
import timber.log.Timber
/**
@@ -232,8 +231,16 @@ object ThemeUtils {
c.theme.resolveAttribute(colorAttribute, color, true)
color.data
} catch (e: Exception) {
- Timber.e(e, "Unable to get color")
- ContextCompat.getColor(c, android.R.color.holo_red_dark)
+ when (colorAttribute) {
+ android.R.attr.colorAccent -> ContextCompat.getColor(c, R.color.riotx_accent)
+ R.attr.colorAccent -> ContextCompat.getColor(c, R.color.riotx_accent)
+ R.attr.riotx_positive_accent -> ContextCompat.getColor(c, R.color.riotx_positive_accent)
+ R.attr.riotx_positive_accent_alpha12 -> ContextCompat.getColor(c, R.color.riotx_positive_accent_alpha12)
+ else -> {
+ Timber.e(e, "Unable to get color")
+ ContextCompat.getColor(c, android.R.color.holo_red_dark)
+ }
+ }
}
}
}
diff --git a/vector/src/main/res/color/button_positive_background_selector.xml b/vector/src/main/res/color/button_positive_background_selector.xml
index bb119fdf1a..b58fe06155 100644
--- a/vector/src/main/res/color/button_positive_background_selector.xml
+++ b/vector/src/main/res/color/button_positive_background_selector.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/vector/src/main/res/color/button_positive_text_color_selector.xml b/vector/src/main/res/color/button_positive_text_color_selector.xml
index 6c60e18ac3..d354e86823 100644
--- a/vector/src/main/res/color/button_positive_text_color_selector.xml
+++ b/vector/src/main/res/color/button_positive_text_color_selector.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/oval_positive.xml b/vector/src/main/res/drawable/oval_positive.xml
index d2e17d746b..3e3f9274f6 100644
--- a/vector/src/main/res/drawable/oval_positive.xml
+++ b/vector/src/main/res/drawable/oval_positive.xml
@@ -6,6 +6,6 @@
android:width="40dp"
android:height="40dp" />
-
+
-
\ No newline at end of file
+
diff --git a/vector/src/main/res/layout/item_generic_with_value.xml b/vector/src/main/res/layout/item_generic_with_value.xml
index 6fd45fa2ae..608937ec66 100644
--- a/vector/src/main/res/layout/item_generic_with_value.xml
+++ b/vector/src/main/res/layout/item_generic_with_value.xml
@@ -37,7 +37,7 @@
android:textColor="?riotx_text_primary"
android:layout_marginStart="8dp"
android:layout_marginEnd="0dp"
- tools:textColor="@color/riotx_positive_accent"
+ tools:textColor="?riotx_positive_accent"
tools:text="Value" />
diff --git a/vector/src/main/res/values/attrs_sc.xml b/vector/src/main/res/values/attrs_sc.xml
index cafd386c83..858168dc2b 100644
--- a/vector/src/main/res/values/attrs_sc.xml
+++ b/vector/src/main/res/values/attrs_sc.xml
@@ -6,6 +6,9 @@
+
+
+
diff --git a/vector/src/main/res/values/colors_sc.xml b/vector/src/main/res/values/colors_sc.xml
index 8b902aa375..51f09b6249 100644
--- a/vector/src/main/res/values/colors_sc.xml
+++ b/vector/src/main/res/values/colors_sc.xml
@@ -3,6 +3,7 @@
#8BC34A
#3F8BC34A
+ #1E8BC34A
#689F38
@color/accent_sc
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 61f90ad287..a982e86f6b 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -225,6 +225,8 @@
- #FF465561
- #ff343b47
+ - @color/riotx_positive_accent
+ - @color/riotx_positive_accent_alpha12
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index b37e6a70f3..7c3405589f 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -225,6 +225,8 @@
- #FFEEEEEE
- #FFDDDDDD
+ - @color/riotx_positive_accent
+ - @color/riotx_positive_accent_alpha12
diff --git a/vector/src/main/res/values/theme_sc.xml b/vector/src/main/res/values/theme_sc.xml
index ab771c8beb..12a8a9a2e0 100644
--- a/vector/src/main/res/values/theme_sc.xml
+++ b/vector/src/main/res/values/theme_sc.xml
@@ -208,6 +208,8 @@
- @color/background_floating_sc
- @color/background_sc
+ - @color/accent_sc
+ - @color/accent_sc_alpha12