aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-03-15 06:20:59 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-03-15 06:20:59 +0100
commit841c6e04a9da5f8eaf00b5140da7b7934ad3cbe3 (patch)
treeb1516e736b2ccb87814f2b50b458be60428366e0 /res
parentafe12447098424254366f5714645420973b37f36 (diff)
muc invites in conference details
Diffstat (limited to 'res')
-rw-r--r--res/layout/activity_muc_details.xml9
-rw-r--r--res/menu/newconversation_context.xml4
-rw-r--r--res/values/strings.xml1
3 files changed, 13 insertions, 1 deletions
diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml
index 65bce365..74e3169a 100644
--- a/res/layout/activity_muc_details.xml
+++ b/res/layout/activity_muc_details.xml
@@ -8,7 +8,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical" >
-
<TextView
style="@style/sectionHeader"
android:layout_width="wrap_content"
@@ -134,5 +133,13 @@
</LinearLayout>
</LinearLayout>
+ <Button
+ android:layout_marginTop="24dp"
+ android:id="@+id/invite"
+ style="?android:attr/buttonStyleSmall"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/invite_contacts"
+ android:layout_gravity="center_horizontal"/>
</LinearLayout>
</ScrollView> \ No newline at end of file
diff --git a/res/menu/newconversation_context.xml b/res/menu/newconversation_context.xml
index 64c630f1..c28d839d 100644
--- a/res/menu/newconversation_context.xml
+++ b/res/menu/newconversation_context.xml
@@ -11,4 +11,8 @@
android:showAsAction="ifRoom"
android:icon="@drawable/ic_action_chat"
android:title="@string/start_conversation" />
+ <item
+ android:id="@+id/action_invite"
+ android:showAsAction="ifRoom"
+ android:title="@string/invite_contacts" />
</menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b3a3dcd9..f04fca96 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -30,4 +30,5 @@
<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>
+ <string name="invite_contacts">Invite Contacts</string>
</resources>