From 4e69ab46ddd331edd3effb0545f967ddc9a440a0 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Wed, 27 Sep 2017 15:46:13 +0200
Subject: [PATCH] Fine-Tuned UI
---
.../layout-sw600dp-land/activity_setup.xml | 2 +-
.../res/layout-sw600dp-land/setup_slide.xml | 21 +++++++++++--------
.../res/layout-sw600dp/activity_setup.xml | 2 +-
.../main/res/layout-sw600dp/setup_slide.xml | 10 ++++++---
app/src/main/res/layout/activity_setup.xml | 2 +-
app/src/main/res/layout/setup_slide.xml | 2 +-
6 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/app/src/main/res/layout-sw600dp-land/activity_setup.xml b/app/src/main/res/layout-sw600dp-land/activity_setup.xml
index c97d7bc4e..fce04add8 100644
--- a/app/src/main/res/layout-sw600dp-land/activity_setup.xml
+++ b/app/src/main/res/layout-sw600dp-land/activity_setup.xml
@@ -12,7 +12,7 @@
android:id="@+id/next_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="end|bottom"
+ android:layout_gravity="right|bottom"
android:layout_marginBottom="16dp"
android:layout_marginEnd="80dp"
android:layout_marginRight="80dp"
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 ed8ebc7b2..5bd5f30a8 100644
--- a/app/src/main/res/layout-sw600dp-land/setup_slide.xml
+++ b/app/src/main/res/layout-sw600dp-land/setup_slide.xml
@@ -20,22 +20,21 @@
-->
<RelativeLayout 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:paddingLeft="64dp"
- android:paddingRight="64dp">
+ android:layout_height="match_parent">
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/title"
android:layout_width="match_parent"
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:paddingEnd="64dp"
- android:paddingRight="64dp"
android:textSize="28sp"
android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse"
tools:text="Connection" />
@@ -53,11 +52,11 @@
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:paddingEnd="64dp"
- android:paddingRight="64dp"
android:textSize="16sp"
android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse"
tools:text="First, please choose which server your core is hosted on." />
@@ -68,13 +67,17 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true">
+ android:layout_alignParentRight="true"
+ android:layout_marginEnd="?attr/actionBarSize"
+ android:layout_marginRight="?attr/actionBarSize">
<android.support.v7.widget.CardView
android:id="@+id/content_host"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:minHeight="400dp" />
+ android:layout_marginTop="?attr/actionBarSize"
+ android:minHeight="400dp"
+ app:cardElevation="4dp" />
</ScrollView>
diff --git a/app/src/main/res/layout-sw600dp/activity_setup.xml b/app/src/main/res/layout-sw600dp/activity_setup.xml
index dd0d8803e..a8eaa1551 100644
--- a/app/src/main/res/layout-sw600dp/activity_setup.xml
+++ b/app/src/main/res/layout-sw600dp/activity_setup.xml
@@ -17,7 +17,7 @@
android:id="@+id/next_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="end|bottom"
+ android:layout_gravity="right|bottom"
android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
diff --git a/app/src/main/res/layout-sw600dp/setup_slide.xml b/app/src/main/res/layout-sw600dp/setup_slide.xml
index 7f40113c1..c14e2b3a5 100644
--- a/app/src/main/res/layout-sw600dp/setup_slide.xml
+++ b/app/src/main/res/layout-sw600dp/setup_slide.xml
@@ -1,4 +1,5 @@
<ScrollView 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">
@@ -7,14 +8,16 @@
android:layout_width="400dp"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"
+ android:layout_marginLeft="?attr/actionBarSize"
+ android:layout_marginRight="?attr/actionBarSize"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="64dp"
+ android:layout_marginTop="?attr/actionBarSize"
android:orientation="vertical"
- android:padding="32dp">
+ android:paddingBottom="32dp">
<TextView
android:id="@+id/title"
@@ -39,7 +42,8 @@
android:id="@+id/content_host"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:minHeight="400dp" />
+ android:minHeight="400dp"
+ app:cardElevation="4dp" />
</LinearLayout>
diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml
index 6778c9ebc..68d7f734f 100644
--- a/app/src/main/res/layout/activity_setup.xml
+++ b/app/src/main/res/layout/activity_setup.xml
@@ -12,7 +12,7 @@
android:id="@+id/next_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="end|bottom"
+ android:layout_gravity="right|bottom"
android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
diff --git a/app/src/main/res/layout/setup_slide.xml b/app/src/main/res/layout/setup_slide.xml
index 3cc29475b..7c7c5ad96 100644
--- a/app/src/main/res/layout/setup_slide.xml
+++ b/app/src/main/res/layout/setup_slide.xml
@@ -19,7 +19,7 @@
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="32dp"
+ android:layout_marginBottom="8dp"
android:textSize="28sp"
android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse"
tools:text="Connection" />
--
GitLab