Merge pull request #639 from nextcloud/sso

Proof of concept for SingSignOn

1 files changed, 13 insertions, 10 deletions

diff --git a/News-Android-App/src/main/res/layout/dialog_signin.xml b/News-Android-App/src/main/res/layout/dialog_signin.xml
index f061a621..e3d66280 100644
--- a/News-Android-App/src/main/res/layout/dialog_signin.xml
+++ b/News-Android-App/src/main/res/layout/dialog_signin.xml
@@ -1,11 +1,10 @@
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".LoginActivity"
     android:id="@+id/login_form"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -13,11 +12,20 @@
         android:paddingRight="@dimen/abc_dialog_padding_material"
         android:paddingTop="@dimen/abc_dialog_padding_material">
 
+        <Switch
+            android:id="@+id/swSingleSignOn"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:text="Use single sign on" />
+
+
         <android.support.design.widget.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:id="@+id/username_container">
+            android:id="@+id/username_container"
+            android:layout_marginTop="8dp"
+            android:layout_below="@id/swSingleSignOn">
 
             <EditText
                 android:id="@+id/username"
@@ -34,7 +42,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/username_container"
-            android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:id="@+id/password_container">
 
@@ -56,7 +63,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/password_container"
-            android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true">
 
             <EditText
@@ -84,7 +90,6 @@
             android:src="@drawable/ic_action_visibility"
             android:layout_alignTop="@+id/password_container"
             android:layout_alignBottom="@+id/password_container"
-            android:layout_alignRight="@+id/password_container"
             android:layout_alignEnd="@+id/password_container"
             android:contentDescription="@string/content_desc_show_password"/>
 
@@ -93,9 +98,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/pref_title_DisableHostnameVerification"
-            android:layout_below="@+id/url_container"
-            android:layout_alignRight="@+id/imgView_ShowPassword"
-            android:layout_alignEnd="@+id/imgView_ShowPassword" />
+            android:layout_below="@+id/url_container" />
 
     </RelativeLayout>