support registration via pars tokens

2 files changed, 122 insertions, 114 deletions

diff --git a/src/main/res/layout/activity_magic_create.xml b/src/main/res/layout/activity_magic_create.xml
index e315a634b..11f2d8b00 100644
--- a/src/main/res/layout/activity_magic_create.xml
+++ b/src/main/res/layout/activity_magic_create.xml
@@ -1,128 +1,134 @@
 <?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">
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <include layout="@layout/toolbar" />
-
-    <ScrollView
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fillViewport="true">
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/toolbar"
+            layout="@layout/toolbar" />
 
-        <RelativeLayout
+        <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="?attr/color_background_secondary">
-
-            <LinearLayout
-                android:id="@+id/linearLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentBottom="true"
-                android:minHeight="256dp"
-                android:orientation="vertical"
-                android:paddingStart="16dp"
-                android:paddingEnd="16dp"
-                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:layout_marginTop="8dp"
-                    android:text="@string/magic_create_text"
-                    android:textAppearance="@style/TextAppearance.Conversations.Body1" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/pick_your_username"
-                    android:textAppearance="@style/TextAppearance.Conversations.Title" />
-
-                <EditText
-                    android:id="@+id/username"
-                    style="@style/Widget.Conversations.EditText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/username_hint"
-                    android:imeOptions="actionNext"
-                    android:inputType="text"
-                    android:textColor="?attr/text_Color_Main" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/choose_your_server"
-                    android:textAppearance="@style/TextAppearance.Conversations.Title" />
-
-                <Spinner
-                    android:id="@+id/server"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:hint="@string/server_hint"
-                    android:prompt="@string/server_hint"
-                    android:spinnerMode="dialog" />
-
-                <CheckBox
-                    android:id="@+id/use_own"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/use_own_provider" />
-
-                <TextView
-                    android:id="@+id/full_jid"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:text="@string/your_full_jid_will_be"
-                    android:textAppearance="@style/TextAppearance.Conversations.Caption"
-                    android:visibility="invisible" />
-
-                <TextView
-                    android:id="@+id/server_info"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:text="@string/welcome_server_info"
-                    android:textAppearance="@style/TextAppearance.Conversations.Caption" />
-
-                <Button
-                    android:id="@+id/create_account"
-                    style="@style/Widget.Conversations.Button.Borderless"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:text="@string/next"
-                    android:textColor="?attr/colorAccent" />
-
-            </LinearLayout>
+            android:fillViewport="true">
 
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_above="@+id/linearLayout"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true">
+                android:background="?attr/color_background_secondary">
 
-                <ImageView
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:id="@+id/linearLayout"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    android:layout_centerVertical="true"
-                    android:padding="8dp"
-                    android:src="@drawable/main_logo" />
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentBottom="true"
+                    android:minHeight="256dp"
+                    android:orientation="vertical"
+                    android:paddingStart="16dp"
+                    android:paddingLeft="16dp"
+                    android:paddingEnd="16dp"
+                    android:paddingRight="16dp"
+                    android:paddingBottom="8dp">
+
+                    <Space
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_weight="1" />
+
+                    <TextView
+                        android:id="@+id/instructions"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:text="@string/magic_create_text"
+                        android:textAppearance="@style/TextAppearance.Conversations.Body1" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/pick_your_username"
+                        android:textAppearance="@style/TextAppearance.Conversations.Title" />
+
+                    <EditText
+                        android:id="@+id/username"
+                        style="@style/Widget.Conversations.EditText"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/username_hint"
+                        android:imeOptions="actionNext"
+                        android:inputType="text"
+                        android:textColor="?attr/text_Color_Main" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/choose_your_server"
+                        android:textAppearance="@style/TextAppearance.Conversations.Title" />
+
+                    <Spinner
+                        android:id="@+id/server"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:hint="@string/server_hint"
+                        android:prompt="@string/server_hint"
+                        android:spinnerMode="dialog" />
+
+                    <CheckBox
+                        android:id="@+id/use_own"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/use_own_provider" />
+
+                    <TextView
+                        android:id="@+id/full_jid"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:text="@string/your_full_jid_will_be"
+                        android:textAppearance="@style/TextAppearance.Conversations.Caption"
+                        android:visibility="invisible" />
+
+                    <TextView
+                        android:id="@+id/server_info"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:text="@string/welcome_server_info"
+                        android:textAppearance="@style/TextAppearance.Conversations.Caption" />
+
+                    <Button
+                        android:id="@+id/create_account"
+                        style="@style/Widget.Conversations.Button.Borderless"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="end"
+                        android:text="@string/next"
+                        android:textColor="?attr/colorAccent" />
+
+                </LinearLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_above="@+id/linearLayout"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentLeft="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>
-    </ScrollView>
-</LinearLayout>
\ No newline at end of file
+        </ScrollView>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3c274366d..1c267eaf8 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -998,4 +998,6 @@
     <string name="pref_theme_color_options">Theme color</string>
     <string name="pref_enable_otr_summary">Enable OTR encryption for message encryption</string>
     <string name="pref_enable_otr">Enable OTR encryption</string>
+    <string name="magic_create_text_on_x">You have been invited to %1$s. We will guide you through the process of creating an account.\\nWhen picking %1$s as a provider you will be able to communicate with users of other providers by giving them your full XMPP address.</string>
+    <string name="account_status_regis_invalid_token">Invalid registration token</string>
 </resources>