Merge branch 'siacs/master' into development

5 files changed, 47 insertions, 14 deletions

diff --git a/src/main/res/layout/enter_jid_dialog.xml b/src/main/res/layout/enter_jid_dialog.xml
index 6333e340a..d4af0dfcc 100644
--- a/src/main/res/layout/enter_jid_dialog.xml
+++ b/src/main/res/layout/enter_jid_dialog.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="8dp" >
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:paddingBottom="8dp"
+              android:paddingLeft="24dp"
+              android:paddingRight="24dp"
+              android:paddingTop="16dp">
 
     <TextView
         android:id="@+id/your_account"
@@ -11,12 +14,12 @@
         android:layout_height="wrap_content"
         android:text="@string/your_account"
         android:textColor="@color/black87"
-        android:textSize="?attr/TextSizeBody" />
+        android:textSize="?attr/TextSizeBody"/>
 
     <Spinner
         android:id="@+id/account"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"/>
 
     <TextView
         android:id="@+id/jabber_id"
@@ -25,7 +28,7 @@
         android:layout_marginTop="8dp"
         android:text="@string/account_settings_jabber_id"
         android:textColor="@color/black87"
-        android:textSize="?attr/TextSizeBody" />
+        android:textSize="?attr/TextSizeBody"/>
 
     <AutoCompleteTextView
         android:id="@+id/jid"
@@ -34,6 +37,7 @@
         android:hint="@string/account_settings_example_jabber_id"
         android:inputType="textEmailAddress"
         android:textColor="@color/black87"
-        android:textColorHint="@color/black54" />
+        android:textColorHint="@color/black54"
+        android:textSize="?attr/TextSizeBody" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/form_text.xml b/src/main/res/layout/form_text.xml
new file mode 100644
index 000000000..e36ac74e9
--- /dev/null
+++ b/src/main/res/layout/form_text.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+    <TextView
+        android:id="@+id/label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:textColor="@color/black87"
+        android:textSize="?attr/TextSizeBody"/>
+
+    <EditText
+        android:id="@+id/field"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/black87"
+        android:textColorHint="@color/black54"
+        android:textSize="?attr/TextSizeBody"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/join_conference_dialog.xml b/src/main/res/layout/join_conference_dialog.xml
index 7609dd0d5..f7aa3c467 100644
--- a/src/main/res/layout/join_conference_dialog.xml
+++ b/src/main/res/layout/join_conference_dialog.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="8dp" >
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:paddingBottom="8dp"
+              android:paddingLeft="24dp"
+              android:paddingRight="24dp"
+              android:paddingTop="16dp">
 
     <TextView
         android:id="@+id/your_account"
@@ -34,7 +37,8 @@
         android:hint="@string/conference_address_example"
         android:inputType="textEmailAddress"
         android:textColor="@color/black87"
-        android:textColorHint="@color/black54" />
+        android:textColorHint="@color/black54"
+        android:textSize="?attr/TextSizeBody"/>
 
     <CheckBox
         android:id="@+id/bookmark"
@@ -42,6 +46,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:checked="true"
-        android:text="@string/save_as_bookmark" />
+        android:text="@string/save_as_bookmark"
+        android:textColor="@color/black87"
+        android:textSize="?attr/TextSizeBody"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 8c01fb16f..1708f773f 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -574,4 +574,5 @@
   <string name="no">Nein</string>
   <string name="selection_too_large">Das ausgewählte Bild ist zu groß</string>
   <string name="yes">Ja</string>
+  <string name="selection_too_large">Der ausgewählte Bereich ist zu groß</string>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3156c585f..e4fbeff0e 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -602,4 +602,5 @@
 	<string name="cancel_update">Cancel update check?</string>
 	<string name="yes">Yes</string>
 	<string name="no">No</string>
+	<string name="no_accounts">(No activated accounts)</string>
 </resources>