Merge remote-tracking branch 'refs/remotes/siacs/master' into development

3 files changed, 77 insertions, 64 deletions

diff --git a/src/main/res/layout/welcome.xml b/src/main/res/layout/welcome.xml
index 3af3f6e63..813570759 100644
--- a/src/main/res/layout/welcome.xml
+++ b/src/main/res/layout/welcome.xml
@@ -1,69 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-android:background="@color/grey50">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
 
-    <LinearLayout
-        android:id="@+id/linearLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:orientation="vertical"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:paddingBottom="8dp"
-        android:minHeight="256dp">
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"/>
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/welcome_header"
-            android:textColor="@color/black87"
-            android:textSize="?attr/TextSizeHeadline"
-            android:textStyle="bold"/>
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:text="@string/welcome_text"
-            android:textColor="@color/black87"
-            android:textSize="?attr/TextSizeBody"/>
-        <Button
-            android:id="@+id/create_account"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="right"
-            android:text="@string/create_account"
-            android:textColor="@color/accent"/>
-        <Button
-            android:id="@+id/use_existing_account"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="right"
-            android:text="@string/use_existing_accout"
-            android:textColor="@color/black54"/>
-    </LinearLayout>
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_above="@+id/linearLayout"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true">
-        <ImageView
-            android:padding="8dp"
-            android:layout_width="wrap_content"
+        android:background="@color/grey50">
+
+        <LinearLayout
+            android:id="@+id/linearLayout"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:src="@drawable/main_logo"/>
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:minHeight="256dp"
+            android:orientation="vertical"
+            android:paddingBottom="8dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp">
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/welcome_header"
+                android:textColor="@color/black87"
+                android:textSize="?attr/TextSizeHeadline"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="@string/welcome_text"
+                android:textColor="@color/black87"
+                android:textSize="?attr/TextSizeBody" />
+
+            <Button
+                android:id="@+id/create_account"
+                style="?android:attr/borderlessButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:text="@string/create_account"
+                android:textColor="@color/accent" />
+
+            <Button
+                android:id="@+id/use_existing_account"
+                style="?android:attr/borderlessButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:text="@string/use_existing_accout"
+                android:textColor="@color/black54" />
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@+id/linearLayout"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:padding="8dp"
+                android:src="@drawable/main_logo" />
+        </RelativeLayout>
     </RelativeLayout>
-</RelativeLayout>
\ No newline at end of file
+</ScrollView>
\ 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 36326e411..9ce1b49c1 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -617,7 +617,7 @@
   <string name="pref_return_to_previous">Schnell-Teilen</string>
   <string name="pref_return_to_previous_summary">Nach dem teilen sofort wieder zur letzten App zurückkehren anstatt die Unterhalt zu öffnen</string>
   <string name="shared_text_with_x">Text mit %s geteilt</string>
-  <string name="create_account">Konto erstellen</string>
+  <string name="create_account">Neues Konto erstellen</string>
   <string name="magic_create_text">Wir erstellen nun mit dir gemeinsam ein Konto auf pix-art.de mit einem zufällig generierten Passwort, welches du benutzen oder auf der nächsten Seite ändern kannst\nDanach kannst du mit Kontakten auf diesem und anderen Servern in Kontakt treten, indem du ihnen deine Jabber-ID gibst.</string>
   <string name="pick_your_username">Wähle deinen Benutzernamen</string>
   <string name="use_existing_accout">Nutze ein bestehendes Konto</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 027a8a4c1..a8cad9769 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -651,7 +651,7 @@
 	<string name="welcome_text">...is a free and secure XMPP/Jabber client for the use with pix-art.de</string>
 	<string name="magic_create_text">We will guide you through the process of creating an account on pix-art.de with a random password, which you can use or change to your own password on the next page. \nThan you will be able to communicate with users of this and other providers by giving them your full Jabber-ID.</string>
 	<string name="your_full_jid_will_be">Your Jabber-ID will be: %s</string>
-	<string name="create_account">Create account</string>
+	<string name="create_account">Create new account</string>
 	<string name="use_existing_accout">Use an existing account</string>
 	<string name="pick_your_username">Choose your username</string>
 </resources>