diff options
| author | Christian Schneppe <christian@pix-art.de> | 2017-11-22 21:00:33 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2017-11-22 21:49:45 +0100 |
| commit | 72df864d41e91d184dd20178d48e7b68df13e725 (patch) | |
| tree | 0aae3068c35f175549d70232adf72e24ea393561 /src/main/res/values | |
| parent | acdb88839648405e0498d7774bcdc9f422ebc5c2 (diff) | |
send and show read markers in private, non-anonymous groups
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/values-v21/themes.xml | 3 | ||||
| -rw-r--r-- | src/main/res/values/attrs.xml | 3 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/main/res/values/themes.xml | 3 |
4 files changed, 11 insertions, 0 deletions
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml index 86346775f..bbb2184f1 100644 --- a/src/main/res/values-v21/themes.xml +++ b/src/main/res/values-v21/themes.xml @@ -16,6 +16,9 @@ <item name="TextSizeHeadline">18sp</item> <item name="TextSeparation">5sp</item> + <item name="attr/color_text_primary">@color/black87</item> + <item name="attr/color_text_secondary">@color/black54</item> + <item name="attr/dialog_horizontal_padding">24dp</item> <item name="attr/dialog_vertical_padding">16dp</item> diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index a315ab796..3154a8443 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -7,6 +7,9 @@ <attr name="TextSeparation" format="dimension"/> <attr name="IconSize" format="dimension" /> + <attr name="color_text_primary" format="reference|color" /> + <attr name="color_text_secondary" format="reference|color" /> + <attr name="icon_add_group" format="reference" /> <attr name="icon_add_person" format="reference" /> <attr name="icon_cancel" format="reference" /> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index f92be75bb..272f18a4e 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -736,4 +736,6 @@ <string name="install_update">Install update?</string> <string name="highlight_in_muc">highlight user</string> <string name="no_application_found_to_open_link">No application found to open link</string> + <string name="contacts_have_read_up_to_this_point">%s have read up to this point</string> + <string name="contact_has_read_up_to_this_point">%s has read up to this point</string> </resources> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 61ffc19ae..4dc939b2d 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -12,6 +12,9 @@ <item name="TextSizeHeadline">18sp</item> <item name="TextSeparation">5sp</item> + <item name="attr/color_text_primary">@color/black87</item> + <item name="attr/color_text_secondary">@color/black54</item> + <item name="attr/icon_add_group">@drawable/ic_group_add_white_24dp</item> <item name="attr/icon_add_person">@drawable/ic_person_add_white_24dp</item> <item name="attr/icon_cancel">@drawable/ic_cancel_white_24dp</item> |