aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2019-04-12 21:33:02 +0200
committerChristian Schneppe <christian@pix-art.de>2019-04-12 21:33:02 +0200
commit9459f89a1d54f4c978df627fb5aaa45365f778e0 (patch)
tree891f75be779d6379ae10378ca244748a49516d4a /src/main/res
parent51afe29aec302b1002b62acedf5afd1d07463b00 (diff)
use styled warning for message error
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/values/colors.xml4
-rw-r--r--src/main/res/values/styles.xml10
2 files changed, 11 insertions, 3 deletions
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 1d4c78b78..a3c95305c 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -29,7 +29,7 @@
<color name="grey900_40">#66212121</color>
<color name="red800">#ffc62828</color> <!-- red 800 -->
<color name="red500">#fff44336</color> <!-- red 500 -->
- <color name="red700">#ffd32f2f</color> <!-- red 700 -->
+ <color name="red700">#ffd50000</color> <!-- red 700 -->
<color name="orange500">#ffff9800</color> <!-- orange 500 -->
<color name="bubble">#ff37474f</color> <!-- blue grey 800 -->
<color name="realwhite">#ffffffff</color> <!-- white -->
@@ -51,5 +51,5 @@
<color name="warning_button_dark">#ffC62828</color> <!-- red 800 -->
<!-- scanner -->
- <color name="scan_result_dots">#ff4caf50</color> <!-- green 500 -->
+ <color name="scan_result_dots">#ff4caf50</color>
</resources>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 4418706e1..4b7b84c56 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -23,6 +23,10 @@
<item name="android:textColorLink">?android:textColorPrimary</item>
</style>
+ <style name="TextAppearance.Conversations.Body1.Warning" parent="TextAppearance.AppCompat.Body1">
+ <item name="android:textColor">?color_warning</item>
+ </style>
+
<style name="TextAppearance.Conversations.Body1.Linkified" parent="TextAppearance.AppCompat.Body1">
<item name="android:textSize">?TextSizeBody1</item>
</style>
@@ -99,7 +103,11 @@
</style>
<style name="TextAppearance.Conversations.Caption.Warning" parent="TextAppearance.Conversations.Caption">
- <item name="android:textColor">@color/red800</item>
+ <item name="android:textColor">@color/red700</item>
+ </style>
+
+ <style name="TextAppearance.Conversations.Caption.Warning.OnDark" parent="TextAppearance.Conversations.Caption">
+ <item name="android:textColor">@color/red500</item>
</style>
<style name="TextAppearance.Conversations.Caption.Highlight" parent="TextAppearance.Conversations.Caption">