rebranding

10 files changed, 13 insertions, 5 deletions

diff --git a/res/drawable-hdpi/ic_action_group.png b/res/drawable-hdpi/ic_action_group.png
new file mode 100644
index 000000000..271980b97
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_group.png
diff --git a/res/drawable-hdpi/ic_action_person.png b/res/drawable-hdpi/ic_action_person.png
new file mode 100644
index 000000000..9fd81097b
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_person.png
diff --git a/res/drawable-mdpi/ic_action_group.png b/res/drawable-mdpi/ic_action_group.png
new file mode 100644
index 000000000..06dbeecd9
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_group.png
diff --git a/res/drawable-mdpi/ic_action_person.png b/res/drawable-mdpi/ic_action_person.png
new file mode 100644
index 000000000..359da1c12
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_person.png
diff --git a/res/drawable-xhdpi/ic_action_group.png b/res/drawable-xhdpi/ic_action_group.png
new file mode 100644
index 000000000..ea3f24e73
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_group.png
diff --git a/res/drawable-xhdpi/ic_action_person.png b/res/drawable-xhdpi/ic_action_person.png
new file mode 100644
index 000000000..03eeb8d6a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_person.png
diff --git a/res/drawable-xxhdpi/ic_action_group.png b/res/drawable-xxhdpi/ic_action_group.png
new file mode 100644
index 000000000..6ef9b128a
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_group.png
diff --git a/res/drawable-xxhdpi/ic_action_person.png b/res/drawable-xxhdpi/ic_action_person.png
new file mode 100644
index 000000000..fd1bcdd45
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_person.png
diff --git a/res/menu/conversations.xml b/res/menu/conversations.xml
index a6cdd8857..bb2bd9ee2 100644
--- a/res/menu/conversations.xml
+++ b/res/menu/conversations.xml
@@ -15,10 +15,17 @@
         android:title="@string/action_secure" />
     
     <item
-        android:id="@+id/action_details"
+        android:id="@+id/action_contact_details"
         android:orderInCategory="40"
-        android:showAsAction="never"
-        android:title="@string/action_details" />
+        android:showAsAction="ifRoom"
+        android:icon="@drawable/ic_action_person"
+        android:title="@string/action_contact_details" />
+      <item
+        android:id="@+id/action_muc_details"
+        android:orderInCategory="40"
+        android:showAsAction="ifRoom"
+        android:icon="@drawable/ic_action_group"
+        android:title="@string/action_muc_details" />
     
     <item
         android:id="@+id/action_archive"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e4ccb8ba3..dd372df66 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Secure Conversations</string>
+    <string name="app_name">Conversations</string>
     <string name="action_settings">Settings</string>
     <string name="action_add">New conversation</string>
     <string name="action_accounts">Manage accounts</string>
     <string name="action_archive">Archive conversation</string>
-    <string name="action_details">Contact details</string>
+    <string name="action_contact_details">Contact details</string>
+    <string name="action_muc_details">Conferenece details</string>
     <string name="action_secure">Secure conversation</string>
     <string name="action_add_account">Add account</string>
     <string name="title_activity_new_conversation">New Conversation</string>