muc creation

8 files changed, 19 insertions, 2 deletions

diff --git a/res/drawable-hdpi/ic_action_chat.png b/res/drawable-hdpi/ic_action_chat.png
new file mode 100644
index 000000000..0847ac466
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_chat.png
diff --git a/res/drawable-mdpi/ic_action_chat.png b/res/drawable-mdpi/ic_action_chat.png
new file mode 100644
index 000000000..8fdb5d752
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_chat.png
diff --git a/res/drawable-xhdpi/ic_action_chat.png b/res/drawable-xhdpi/ic_action_chat.png
new file mode 100644
index 000000000..8a9a43141
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_chat.png
diff --git a/res/drawable-xxhdpi/ic_action_chat.png b/res/drawable-xxhdpi/ic_action_chat.png
new file mode 100644
index 000000000..04000fd0f
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_chat.png
diff --git a/res/layout/activity_new_conversation.xml b/res/layout/activity_new_conversation.xml
index 88e1b802f..a2b00af12 100644
--- a/res/layout/activity_new_conversation.xml
+++ b/res/layout/activity_new_conversation.xml
@@ -49,7 +49,8 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentRight="true"
         android:layout_below="@+id/contacts_header"
-        tools:listitem="@layout/contact" >
+        tools:listitem="@layout/contact"
+        android:choiceMode="multipleChoice">
 
     </ListView>
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/contact.xml b/res/layout/contact.xml
index 82404d3f0..fcf8e8b97 100644
--- a/res/layout/contact.xml
+++ b/res/layout/contact.xml
@@ -3,7 +3,8 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:padding="8dp"
-    android:paddingBottom="8dp">
+    android:paddingBottom="8dp"
+    android:background="?android:attr/activatedBackgroundIndicator">
 
     <ImageView
         android:id="@+id/contact_photo"
diff --git a/res/menu/newconversation_context.xml b/res/menu/newconversation_context.xml
new file mode 100644
index 000000000..64c630f14
--- /dev/null
+++ b/res/menu/newconversation_context.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    
+    <item
+        android:id="@+id/action_contact_details"
+        android:showAsAction="ifRoom"
+        android:icon="@drawable/ic_action_person"
+        android:title="@string/action_contact_details" />
+ <item
+        android:id="@+id/action_start_conversation"
+        android:showAsAction="ifRoom"
+        android:icon="@drawable/ic_action_chat"
+        android:title="@string/start_conversation" />
+</menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 062b2b0d7..b3a3dcd96 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -29,4 +29,5 @@
     <string name="ask_again"><u>Click to ask again</u></string>
     <string name="show_otr_key">OTR fingerprint</string>
     <string name="no_otr_fingerprint">No OTR Fingerprint generated. Just go ahead an start an encrypted conversation</string>
+    <string name="start_conversation">Start Conversation</string>
 </resources>