aboutsummaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-07-17 00:03:37 +0200
committeriNPUTmice <daniel@gultsch.de>2014-07-17 00:03:37 +0200
commit38a9242955704232039272fd8b6011d47622495d (patch)
tree16665564834041b3c1218531d548449e64285f8d /res/layout
parent670dead69502884d178ab60ec10e8e0e7b7a7915 (diff)
brought muc invites back. + couple of bug fixes + refactoring
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/activity_choose_contact.xml13
-rw-r--r--res/layout/activity_muc_details.xml4
2 files changed, 14 insertions, 3 deletions
diff --git a/res/layout/activity_choose_contact.xml b/res/layout/activity_choose_contact.xml
new file mode 100644
index 00000000..248a7822
--- /dev/null
+++ b/res/layout/activity_choose_contact.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <ListView
+ android:id="@+id/choose_contact_list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:listitem="@layout/contact" />
+
+</LinearLayout> \ No newline at end of file
diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml
index d47c6b6e..49b4cef3 100644
--- a/res/layout/activity_muc_details.xml
+++ b/res/layout/activity_muc_details.xml
@@ -63,7 +63,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:text="hallo hallo"
android:textColor="@color/primarytext"
android:textSize="18sp" />
@@ -72,7 +71,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:text="Participant"
android:textColor="@color/primarytext"
android:textSize="14sp" />
</LinearLayout>
@@ -123,7 +121,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="24dp"
- android:text="@string/invite_contacts" />
+ android:text="@string/invite_contact" />
</LinearLayout>
</ScrollView> \ No newline at end of file