Merge pull request #3725 from nextcloud/ssoDialog

make SSO dialog nicer

src/main/res/layout/activity_sso_grant_permission.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   Nextcloud Android client application
 
   Copyright (C) 2018 Andy Scherzinger
@@ -16,59 +17,75 @@
   You should have received a copy of the GNU Affero General Public
   License along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_margin="@dimen/standard_margin"
-    tools:context="com.owncloud.android.ui.activity.SsoGrantPermissionActivity">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_margin="@dimen/standard_margin"
+              android:orientation="horizontal"
+              tools:context="com.owncloud.android.ui.activity.SsoGrantPermissionActivity">
 
     <ImageView
         android:id="@+id/appIcon"
         android:layout_width="@dimen/user_icon_size"
         android:layout_height="@dimen/user_icon_size"
         android:layout_gravity="top|start"
+        android:layout_marginEnd="@dimen/standard_margin"
+        android:layout_marginRight="@dimen/standard_margin"
         android:contentDescription="@null"
         android:src="@drawable/background"
-        app:layout_constraintTop_toTopOf="@+id/permissionText"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <TextView
-        android:id="@+id/permissionText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingEnd="@dimen/zero"
-        android:paddingStart="@dimen/zero"
-        android:paddingRight="@dimen/zero"
-        android:paddingLeft="@dimen/zero"
-        android:paddingBottom="@dimen/standard_padding"
-        android:textSize="@dimen/permission_dialog_text_size"
-        app:layout_constraintBottom_toTopOf="@+id/btnGrant"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="Grant Nextcloud News access to your Nextcloud account incrediblyLong_username_with_123456789_number@Nextcloud_dummy.com?" />
+        app:layout_constraintTop_toTopOf="@+id/permissionText"/>
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btnGrant"
-        style="@style/Button.Borderless"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/permission_allow"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        android:orientation="vertical">
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btnDecline"
-        style="@style/Button.Borderless"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/standard_half_margin"
-        android:layout_marginRight="@dimen/standard_half_margin"
-        android:text="@string/permission_deny"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/btnGrant" />
+        <TextView
+            android:id="@+id/permissionText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingStart="@dimen/zero"
+            android:paddingLeft="@dimen/zero"
+            android:paddingEnd="@dimen/zero"
+            android:paddingRight="@dimen/zero"
+            android:paddingBottom="@dimen/standard_padding"
+            android:textSize="@dimen/permission_dialog_text_size"
+            app:layout_constraintBottom_toTopOf="@+id/btnGrant"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="Grant Nextcloud News access to your Nextcloud account incrediblyLong_username_with_123456789_number@Nextcloud_dummy.com?"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="end"
+            android:orientation="horizontal">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btnDecline"
+                style="@style/Button.Borderless"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/standard_half_margin"
+                android:layout_marginRight="@dimen/standard_half_margin"
+                android:text="@string/permission_deny"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/btnGrant"/>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btnGrant"
+                style="@style/Button.Borderless"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/permission_allow"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"/>
+        </LinearLayout>
+    </LinearLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>