aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-06-29 23:29:21 +0200
committerChristian Schneppe <christian@pix-art.de>2018-06-29 23:29:21 +0200
commit5a148ad244705d4d7238903b37c3a46206df2521 (patch)
tree743760b7427574b95e640d862f808cd77c2ba12c /src/main/res/values
parent127981e3cbfca4b2bda85c93a0ad4877df0728a7 (diff)
non functional muc edit button
Diffstat (limited to 'src/main/res/values')
-rw-r--r--src/main/res/values/attrs.xml1
-rw-r--r--src/main/res/values/strings.xml3
-rw-r--r--src/main/res/values/themes.xml44
3 files changed, 33 insertions, 15 deletions
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index f72834b9f..10690b682 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -47,6 +47,7 @@
<attr name="icon_download" format="reference" />
<attr name="icon_edit" format="reference" />
<attr name="icon_edit_body" format="reference" />
+ <attr name="icon_save" format="reference" />
<attr name="icon_done" format="reference" />
<attr name="icon_group" format="reference" />
<attr name="icon_new" format="reference" />
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 14feee019..57edf9ba6 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -229,7 +229,7 @@
<string name="delete_bookmark">Delete bookmark</string>
<string name="bookmark_already_exists">This bookmark already exists</string>
<string name="action_edit_subject">Edit group chat subject</string>
- <string name="edit_subject_hint">The subject of this group chat</string>
+ <string name="topic">Topic</string>
<string name="joining_conference">Joining group chat…</string>
<string name="leave">Leave</string>
<string name="contact_added_you">Contact added you to contact list</string>
@@ -801,4 +801,5 @@
<string name="only_the_owner_can_change_group_chat_avatar">Only the owner can change group chat avatar</string>
<string name="contact_name">Contact name</string>
<string name="nickname">Nickname for this group chat</string>
+ <string name="group_chat_name">Name</string>
</resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 8c68c25f1..aa844dce1 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -50,13 +50,16 @@
<!--<item type="reference" name="infocard_border">@drawable/infocard_border</item>-->
<item name="divider">@color/black12</item>
- <item type="reference" name="ic_send_cancel_offline">@drawable/ic_send_cancel_offline</item>
- <item type="reference" name="ic_send_location_offline">@drawable/ic_send_location_offline</item>
- <item type="reference" name="ic_send_photo_offline">@drawable/ic_send_photo_offline</item>
- <item type="reference" name="ic_send_picture_offline">@drawable/ic_send_picture_offline</item>
- <item type="reference" name="ic_send_text_offline">@drawable/ic_send_text_offline</item>
- <item type="reference" name="ic_send_videocam_offline">@drawable/ic_send_videocam_offline</item>
- <item type="reference" name="ic_send_voice_offline">@drawable/ic_send_voice_offline</item>
+ <item name="ic_send_cancel_offline" type="reference">@drawable/ic_send_cancel_offline</item>
+ <item name="ic_send_location_offline" type="reference">@drawable/ic_send_location_offline
+ </item>
+ <item name="ic_send_photo_offline" type="reference">@drawable/ic_send_photo_offline</item>
+ <item name="ic_send_picture_offline" type="reference">@drawable/ic_send_picture_offline
+ </item>
+ <item name="ic_send_text_offline" type="reference">@drawable/ic_send_text_offline</item>
+ <item name="ic_send_videocam_offline" type="reference">@drawable/ic_send_videocam_offline
+ </item>
+ <item name="ic_send_voice_offline" type="reference">@drawable/ic_send_voice_offline</item>
<item name="icon_add_group" type="reference">@drawable/ic_group_add_white_24dp</item>
<item name="icon_add_person" type="reference">@drawable/ic_person_add_white_24dp</item>
@@ -67,6 +70,7 @@
<item name="icon_download" type="reference">@drawable/ic_file_download_white_24dp</item>
<item name="icon_edit" type="reference">@drawable/ic_edit_white_24dp</item>
<item name="icon_edit_body" type="reference">@drawable/ic_edit_black_24dp</item>
+ <item name="icon_save" type="reference">@drawable/ic_save_black_24dp</item>
<item name="icon_done" type="reference">@drawable/ic_done_black_24dp</item>
<item name="icon_group" type="reference">@drawable/ic_group_white_24dp</item>
<item name="icon_new" type="reference">@drawable/ic_contacts_white_24dp</item>
@@ -176,13 +180,24 @@
<item name="divider">@color/white12</item>
- <item name="ic_send_cancel_offline" type="reference">@drawable/ic_send_cancel_offline_white</item>
- <item name="ic_send_location_offline" type="reference">@drawable/ic_send_location_offline_white</item>
- <item name="ic_send_photo_offline" type="reference">@drawable/ic_send_photo_offline_white</item>
- <item name="ic_send_picture_offline" type="reference">@drawable/ic_send_picture_offline_white</item>
- <item name="ic_send_text_offline" type="reference">@drawable/ic_send_text_offline_white</item>
- <item name="ic_send_videocam_offline" type="reference">@drawable/ic_send_videocam_offline_white</item>
- <item name="ic_send_voice_offline" type="reference">@drawable/ic_send_voice_offline_white</item>
+ <item name="ic_send_cancel_offline" type="reference">
+ @drawable/ic_send_cancel_offline_white
+ </item>
+ <item name="ic_send_location_offline" type="reference">
+ @drawable/ic_send_location_offline_white
+ </item>
+ <item name="ic_send_photo_offline" type="reference">@drawable/ic_send_photo_offline_white
+ </item>
+ <item name="ic_send_picture_offline" type="reference">
+ @drawable/ic_send_picture_offline_white
+ </item>
+ <item name="ic_send_text_offline" type="reference">@drawable/ic_send_text_offline_white
+ </item>
+ <item name="ic_send_videocam_offline" type="reference">
+ @drawable/ic_send_videocam_offline_white
+ </item>
+ <item name="ic_send_voice_offline" type="reference">@drawable/ic_send_voice_offline_white
+ </item>
<item name="ic_attach_camera" type="reference">@drawable/ic_attach_camera_white</item>
<item name="ic_attach_video" type="reference">@drawable/ic_attach_videocam_white</item>
@@ -206,6 +221,7 @@
<item name="icon_download" type="reference">@drawable/ic_file_download_white_24dp</item>
<item name="icon_edit" type="reference">@drawable/ic_edit_white_24dp</item>
<item name="icon_edit_body" type="reference">@drawable/ic_edit_white_24dp</item>
+ <item name="icon_save" type="reference">@drawable/ic_save_white_24dp</item>
<item name="icon_done" type="reference">@drawable/ic_done_black_24dp</item>
<item name="icon_group" type="reference">@drawable/ic_group_white_24dp</item>
<item name="icon_new" type="reference">@drawable/ic_add_white_24dp</item>