aboutsummaryrefslogtreecommitdiffstats
path: root/res/layout/join_conference_dialog.xml
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-09-12 17:53:42 +0200
committeriNPUTmice <daniel@gultsch.de>2014-09-12 17:53:42 +0200
commit83c3b33f18429dc8788c2b58a31d150bee553d10 (patch)
treef4451e53a65dd25fd434dcb08bdaad53137e987a /res/layout/join_conference_dialog.xml
parentcee898084ee27592d774c8f62f5be7fd1edf821b (diff)
parent73cba91c9b08ff512104897b32837f9824f1cd3e (diff)
Merge branch 'development'0.7.1
Diffstat (limited to 'res/layout/join_conference_dialog.xml')
-rw-r--r--res/layout/join_conference_dialog.xml32
1 files changed, 16 insertions, 16 deletions
diff --git a/res/layout/join_conference_dialog.xml b/res/layout/join_conference_dialog.xml
index a36a5ef7..95c9d24c 100644
--- a/res/layout/join_conference_dialog.xml
+++ b/res/layout/join_conference_dialog.xml
@@ -3,45 +3,45 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:padding="8dp">
+ android:padding="8dp" >
- <TextView
+ <TextView
android:id="@+id/your_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="?attr/TextSizeBody"
+ android:text="@string/your_account"
android:textColor="@color/primarytext"
- android:text="@string/your_account" />
+ android:textSize="?attr/TextSizeBody" />
+
<Spinner
android:id="@+id/account"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
- <TextView
+ <TextView
android:id="@+id/jabber_id"
- android:layout_marginTop="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="?attr/TextSizeBody"
+ android:layout_marginTop="8dp"
+ android:text="@string/conference_address"
android:textColor="@color/primarytext"
- android:text="@string/conference_address" />
-
+ android:textSize="?attr/TextSizeBody" />
+
<AutoCompleteTextView
android:id="@+id/jid"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:inputType="textEmailAddress"
android:hint="@string/conference_address_example"
- android:textColorHint="@color/secondarytext"
+ android:inputType="textEmailAddress"
android:textColor="@color/primarytext"
- />
+ android:textColorHint="@color/secondarytext" />
<CheckBox
android:id="@+id/bookmark"
- android:layout_marginTop="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/save_as_bookmark"
- android:checked="true" />
+ android:layout_marginTop="8dp"
+ android:checked="true"
+ android:text="@string/save_as_bookmark" />
-</LinearLayout>
+</LinearLayout> \ No newline at end of file