Warning as a dynamic color (#866) (#877)

Co-authored-by: ThomasSession <thomas.r@getsession.org>
pull/1709/head
SessionHero01 4 months ago committed by GitHub
parent d869c76626
commit 6b7afb8969
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -397,7 +397,7 @@ class VisibleMessageView : FrameLayout {
message.isSyncFailed ->
MessageStatusInfo(
R.drawable.ic_delivery_status_failed,
context.getColor(R.color.accent_orange),
context.getColorFromAttr(R.attr.warning),
R.string.messageStatusFailedToSync
)
message.isPending -> {

@ -44,6 +44,8 @@ val primaryRed = Color(0xFFFF9C8E)
val primaryOrange = Color(0xFFFCB159)
val primaryYellow = Color(0xFFFAD657)
val rust = Color(0xFFA64B00)
val dangerDark = Color(0xFFFF3A3A)
val dangerLight = Color(0xFFE12D19)
val disabledDark = Color(0xFFA1A2A1)

@ -124,7 +124,7 @@ data class ClassicDark(override val primary: Color = primaryGreen) : ThemeColors
data class ClassicLight(override val primary: Color = primaryGreen) : ThemeColors {
override val isLight = true
override val danger = dangerLight
override val warning = primaryOrange
override val warning = rust
override val disabled = disabledLight
override val background = classicLight6
override val backgroundSecondary = classicLight5
@ -166,7 +166,7 @@ data class OceanDark(override val primary: Color = primaryBlue) : ThemeColors {
data class OceanLight(override val primary: Color = primaryBlue) : ThemeColors {
override val isLight = true
override val danger = dangerLight
override val warning = primaryOrange
override val warning = rust
override val disabled = disabledLight
override val background = oceanLight7
override val backgroundSecondary = oceanLight6

@ -32,6 +32,7 @@
<attr name="accentColor" format="reference|color"/>
<attr name="onInvertedBackgroundPrimary" format="reference|color"/>
<attr name="warning" format="reference|color"/>
<attr name="danger" format="reference|color"/>
<attr name="backgroundSecondary" format="reference|color"/>
<attr name="prominentButtonColor" format="reference|color"/>

@ -1,6 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<color name="warning">#FCB159</color>
<color name="unimportant">#D8D8D8</color>
<color name="profile_picture_background">#353535</color>
<color name="action_bar_background">#161616</color>

@ -313,6 +313,7 @@
<item name="backgroundSecondary">@color/classic_dark_1</item>
<item name="colorControlNormal">?android:textColorPrimary</item>
<item name="colorControlActivated">?colorAccent</item>
<item name="warning">@color/accent_orange</item>
<item name="danger">@color/danger_dark</item>
<item name="android:textColorPrimary">@color/classic_dark_6</item>
<item name="android:textColorSecondary">?android:textColorPrimary</item>
@ -396,6 +397,7 @@
<item name="colorPrimaryDark">@color/classic_light_6</item>
<item name="colorControlNormal">?android:textColorPrimary</item>
<item name="colorControlActivated">?colorAccent</item>
<item name="warning">@color/rust</item>
<item name="danger">@color/danger_light</item>
<item name="android:textColorPrimary">@color/classic_light_0</item>
<item name="android:textColorSecondary">@color/classic_light_1</item>
@ -487,6 +489,7 @@
<item name="backgroundSecondary">@color/ocean_dark_1</item>
<item name="colorControlNormal">@color/ocean_dark_7</item>
<item name="colorControlActivated">?colorAccent</item>
<item name="warning">@color/accent_orange</item>
<item name="danger">@color/danger_dark</item>
<item name="android:textColorPrimary">@color/ocean_dark_7</item>
<item name="android:textColorSecondary">@color/ocean_dark_5</item>
@ -573,6 +576,7 @@
<item name="backgroundSecondary">@color/ocean_light_6</item>
<item name="colorControlNormal">@color/ocean_light_1</item>
<item name="colorControlActivated">?colorAccent</item>
<item name="warning">@color/rust</item>
<item name="danger">@color/danger_light</item>
<item name="android:textColorPrimary">@color/ocean_light_1</item>
<item name="android:textColorSecondary">@color/ocean_light_2</item>
@ -686,6 +690,7 @@
<item name="actionBarStyle">@style/Widget.Session.ActionBar</item>
<item name="prominentButtonColor">?colorAccent</item>
<item name="elementBorderColor">@color/classic_dark_3</item>
<item name="warning">@color/accent_orange</item>
<item name="danger">@color/danger_dark</item>
<item name="textColorAlert">@color/classic_dark_6</item>

@ -59,4 +59,6 @@
<color name="accent_orange">#ffFCB159</color>
<color name="accent_yellow">#ffFAD657</color>
<color name="rust">#A64B00</color>
</resources>

Loading…
Cancel
Save