aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-03-29 11:53:34 +0200
committersteckbrief <steckbrief@chefmail.de>2016-03-29 11:53:34 +0200
commite388dfc0b8c32ea5916ae6f803217061dac58663 (patch)
tree64162bd7e68fbe0ae83b354ff7d6878948c2bee1 /src/main/res/values
parent77b1f2138e19545a48ea93c97f8518a87b065831 (diff)
parent6244834096727cfc1aaaeba7845a6d9cfe27d2b0 (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java
Diffstat (limited to 'src/main/res/values')
-rw-r--r--src/main/res/values/colors.xml14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 2d744395..2a0ad592 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -4,11 +4,23 @@
<color name="secondaryBackground">@color/grey200</color>
<color name="primaryText">@color/black87</color>
<color name="secondaryText">@color/black54</color>
+ <color name="tertiaryText">@color/black12</color>
+
+ <color name="primaryTextOnDark">@color/white</color>
+ <color name="secondaryTextOnDark">@color/white70</color>
+
<color name="warning">@color/red500</color>
<color name="error">@color/red500</color>
- <color name="online">@color/green500</color>
<color name="notification">@color/green500</color>
+ <!-- Colors for presence status -->
+ <color name="online">@color/green500</color>
+ <color name="chat">@color/green500</color>
+ <color name="away">@color/orange500</color>
+ <color name="xa">@color/orange500</color>
+ <color name="dnd">#ffe51c23</color>
+ <color name="offline">#ffcccccc</color>
+
<color name="primary">@color/green500</color>
<color name="primary_dark">@color/green700</color>
<color name="accent">#ff0091ea</color>