diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-12-02 14:01:26 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-12-02 14:01:26 +0100 |
| commit | 599f7dad2c994e91a2a42def38c02785e099830d (patch) | |
| tree | db4878c5cb34796f33e305b158265d5dafd9d115 /src/main/res/values | |
| parent | d4b1119240acf86dd1051adff7c9b42de7bb2a1d (diff) | |
| parent | f4a769080b70571a2805ea53d712bb350cfacb63 (diff) | |
Merge branch 'feature-quotation' of https://github.com/Mishiranu/Conversations into Mishiranu-feature-quotation
Diffstat (limited to 'src/main/res/values')
| -rw-r--r-- | src/main/res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/colors.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/themes.xml | 2 |
4 files changed, 5 insertions, 0 deletions
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 7b7d2c5a..39787f36 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -40,6 +40,7 @@ <attr name="icon_new" format="reference"/> <attr name="icon_new_attachment" format="reference"/> <attr name="icon_not_secure" format="reference"/> + <attr name="icon_quote" format="reference"/> <attr name="icon_refresh" format="reference"/> <attr name="icon_remove" format="reference"/> <attr name="icon_search" format="reference"/> diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 2d97bd41..60db84dd 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -21,4 +21,5 @@ <color name="red800">#ffc62828</color> <color name="orange500">#ffff9800</color> <color name="green500">#ff259b24</color> + <color name="bubble">#ff4b9b4a</color> </resources>
\ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 57599032..638b6bd6 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -364,6 +364,7 @@ <string name="message_options">Message options</string> <string name="copy_text">Copy text</string> <string name="select_text">Select text</string> + <string name="quote">Quote</string> <string name="copy_original_url">Copy original URL</string> <string name="send_again">Send again</string> <string name="file_url">File URL</string> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 69d4d39f..8ac3793b 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -50,6 +50,7 @@ <item name="attr/icon_new">@drawable/ic_action_new</item> <item name="attr/icon_new_attachment">@drawable/ic_action_new_attachment</item> <item name="attr/icon_not_secure">@drawable/ic_action_not_secure</item> + <item name="attr/icon_quote">@drawable/ic_action_reply</item> <item name="attr/icon_refresh">@drawable/ic_action_refresh</item> <item name="attr/icon_remove">@drawable/ic_action_remove</item> <item name="attr/icon_search">@drawable/ic_action_search</item> @@ -114,6 +115,7 @@ <item name="attr/icon_new">@drawable/ic_action_new</item> <item name="attr/icon_new_attachment">@drawable/ic_action_new_attachment</item> <item name="attr/icon_not_secure">@drawable/ic_action_not_secure</item> + <item name="attr/icon_quote">@drawable/ic_action_reply</item> <item name="attr/icon_refresh">@drawable/ic_action_refresh_white</item> <item name="attr/icon_remove">@drawable/ic_action_remove_white</item> <item name="attr/icon_search">@drawable/ic_action_search</item> |