diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-05-02 20:06:38 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-05-02 20:06:38 +0200 |
| commit | 419504eaecd538561307d2b10ef08bdc3a47b137 (patch) | |
| tree | d1ee23fcd088b2fc08b4949d8dd637305ebf8eac /src/main/res/values | |
| parent | c5d9b50dabbeef2a1e2d72490cc1cbcade8633a4 (diff) | |
use styled colors for online/offline text
Diffstat (limited to 'src/main/res/values')
| -rw-r--r-- | src/main/res/values/attrs.xml | 3 | ||||
| -rw-r--r-- | src/main/res/values/colors.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/styles.xml | 2 | ||||
| -rw-r--r-- | src/main/res/values/themes.xml | 4 |
4 files changed, 9 insertions, 1 deletions
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 919e14b8f..264af344f 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -25,6 +25,9 @@ <attr name="activity_background_search" format="reference" /> <attr name="activity_background_no_results" format="reference" /> + <attr name="TextColorOnline" format="reference|color" /> + <attr name="TextColorError" format="reference|color" /> + <attr name="ic_send_cancel_offline" format="reference" /> <attr name="ic_send_location_offline" format="reference" /> <attr name="ic_send_photo_offline" format="reference" /> diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index c573107f1..f5d7d69ec 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -13,6 +13,7 @@ <color name="white12">#1fffffff</color> <color name="white70">#b2e2e7f1</color> <color name="white87">#deffffff</color> + <color name="green500">#ff4CAF50</color> <color name="grey50">#fafafa</color> <color name="grey200">#ffeeeeee</color> <color name="grey300">#ffe0e0e0</color> diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index 11430e064..6346dfcc0 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -90,7 +90,7 @@ <item name="android:textStyle">bold</item> </style> - <style name="TextAppearance.Conversations.Caption.Waring" parent="TextAppearance.Conversations.Caption"> + <style name="TextAppearance.Conversations.Caption.Warning" parent="TextAppearance.Conversations.Caption"> <item name="android:textColor">@color/red800</item> </style> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index aef7c7daa..031e775a3 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -13,6 +13,8 @@ <item name="color_background_primary">@color/grey50</item> <item name="color_background_secondary">@color/grey200</item> <item name="color_warning">@color/red_a700</item> + <item name="TextColorOnline">@color/green500</item> + <item name="TextColorError">@color/red800</item> <item name="activity_background_search">@drawable/search_background_light</item> <item name="activity_background_no_results">@drawable/no_results_background_light</item> @@ -132,6 +134,8 @@ <item name="color_background_primary">@color/grey900</item> <item name="color_background_secondary">@color/realblack</item> <item name="color_warning">@color/red_a700</item> + <item name="TextColorOnline">@color/green500</item> + <item name="TextColorError">@color/red500</item> <item name="activity_background_search">@drawable/search_background_dark</item> <item name="activity_background_no_results">@drawable/no_results_background_dark</item> |