From d078a097aff9fc945fcd7931456db70f6673ab8d Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sat, 30 Sep 2017 17:38:50 +0200
Subject: [PATCH] Simplifies the landscape layout for sw600dp setup slides

---
 .../res/layout-sw600dp-land/setup_slide.xml   | 87 ++++++++++---------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/app/src/main/res/layout-sw600dp-land/setup_slide.xml b/app/src/main/res/layout-sw600dp-land/setup_slide.xml
index 6e956bb4b..8038497cb 100644
--- a/app/src/main/res/layout-sw600dp-land/setup_slide.xml
+++ b/app/src/main/res/layout-sw600dp-land/setup_slide.xml
@@ -1,65 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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="match_parent"
-  android:layout_height="match_parent">
+  android:layout_height="match_parent"
+  android:paddingLeft="?attr/actionBarSize"
+  android:paddingRight="?attr/actionBarSize">
 
-  <TextView
-    android:id="@+id/title"
-    android:layout_width="match_parent"
+  <LinearLayout
+    android:layout_width="0dip"
     android:layout_height="wrap_content"
-    android:layout_above="@+id/view"
-    android:layout_marginEnd="?attr/actionBarSize"
-    android:layout_marginStart="?attr/actionBarSize"
-    android:layout_toLeftOf="@+id/scrollView"
-    android:layout_toStartOf="@+id/scrollView"
-    android:gravity="end"
-    android:textSize="28sp"
-    android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse"
-    tools:text="Connection" />
+    android:layout_gravity="center_vertical|end"
+    android:layout_weight="1"
+    android:orientation="vertical">
 
-  <android.support.v4.widget.Space
-    android:id="@+id/view"
-    android:layout_width="match_parent"
-    android:layout_height="8dp"
-    android:layout_centerVertical="true"
-    android:layout_toLeftOf="@+id/scrollView"
-    android:layout_toStartOf="@+id/scrollView" />
+    <TextView
+      android:id="@+id/title"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_gravity="end"
+      android:gravity="end"
+      android:textSize="28sp"
+      android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse"
+      tools:text="Connection" />
 
-  <TextView
-    android:id="@+id/description"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_below="@+id/view"
-    android:layout_marginEnd="?attr/actionBarSize"
-    android:layout_marginStart="?attr/actionBarSize"
-    android:layout_toLeftOf="@+id/scrollView"
-    android:layout_toStartOf="@+id/scrollView"
-    android:gravity="end"
-    android:textSize="16sp"
-    android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse"
-    tools:text="First, please choose which server your core is hosted on." />
+    <android.support.v4.widget.Space
+      android:layout_width="match_parent"
+      android:layout_height="8dp"
+      android:layout_gravity="end" />
+
+    <TextView
+      android:id="@+id/description"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_gravity="end"
+      android:gravity="end"
+      android:textSize="16sp"
+      android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse"
+      tools:text="First, please choose which server your core is hosted on." />
+
+  </LinearLayout>
+
+  <android.support.v4.widget.Space
+    android:layout_width="?attr/actionBarSize"
+    android:layout_height="match_parent" />
 
   <android.support.v4.widget.NestedScrollView
     android:id="@+id/scrollView"
-    android:layout_width="400dp"
-    android:layout_height="wrap_content"
-    android:layout_alignParentBottom="true"
-    android:layout_alignParentEnd="true"
-    android:layout_alignParentRight="true"
-    android:layout_marginEnd="?attr/actionBarSize"
-    android:layout_marginRight="?attr/actionBarSize">
+    android:layout_width="0dip"
+    android:layout_height="match_parent"
+    android:layout_weight="1">
 
     <android.support.v7.widget.CardView
       android:id="@+id/content_host"
-      android:layout_width="match_parent"
+      android:layout_width="400dp"
       android:layout_height="wrap_content"
+      android:layout_gravity="bottom|start"
       android:layout_marginTop="?attr/actionBarSize"
       android:minHeight="400dp"
       app:cardElevation="4dp" />
 
   </android.support.v4.widget.NestedScrollView>
 
-</RelativeLayout>
+</LinearLayout>
-- 
GitLab