Skip to content
Snippets Groups Projects
Commit 4e69ab46 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Fine-Tuned UI

parent f0f58fc8
No related branches found
No related tags found
No related merge requests found
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
android:id="@+id/next_button" android:id="@+id/next_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end|bottom" android:layout_gravity="right|bottom"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:layout_marginEnd="80dp" android:layout_marginEnd="80dp"
android:layout_marginRight="80dp" android:layout_marginRight="80dp"
......
...@@ -20,22 +20,21 @@ ...@@ -20,22 +20,21 @@
--> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <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" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:paddingLeft="64dp"
android:paddingRight="64dp">
<TextView xmlns:android="http://schemas.android.com/apk/res/android" <TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/title" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_above="@+id/view" android:layout_above="@+id/view"
android:layout_marginEnd="?attr/actionBarSize"
android:layout_marginStart="?attr/actionBarSize"
android:layout_toLeftOf="@+id/scrollView" android:layout_toLeftOf="@+id/scrollView"
android:layout_toStartOf="@+id/scrollView" android:layout_toStartOf="@+id/scrollView"
android:gravity="end" android:gravity="end"
android:paddingEnd="64dp"
android:paddingRight="64dp"
android:textSize="28sp" android:textSize="28sp"
android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse" android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse"
tools:text="Connection" /> tools:text="Connection" />
...@@ -53,11 +52,11 @@ ...@@ -53,11 +52,11 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/view" android:layout_below="@+id/view"
android:layout_marginEnd="?attr/actionBarSize"
android:layout_marginStart="?attr/actionBarSize"
android:layout_toLeftOf="@+id/scrollView" android:layout_toLeftOf="@+id/scrollView"
android:layout_toStartOf="@+id/scrollView" android:layout_toStartOf="@+id/scrollView"
android:gravity="end" android:gravity="end"
android:paddingEnd="64dp"
android:paddingRight="64dp"
android:textSize="16sp" android:textSize="16sp"
android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse" android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse"
tools:text="First, please choose which server your core is hosted on." /> tools:text="First, please choose which server your core is hosted on." />
...@@ -68,13 +67,17 @@ ...@@ -68,13 +67,17 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentEnd="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.support.v7.widget.CardView
android:id="@+id/content_host" android:id="@+id/content_host"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="400dp" /> android:layout_marginTop="?attr/actionBarSize"
android:minHeight="400dp"
app:cardElevation="4dp" />
</ScrollView> </ScrollView>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
android:id="@+id/next_button" android:id="@+id/next_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end|bottom" android:layout_gravity="right|bottom"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
......
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <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" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
...@@ -7,14 +8,16 @@ ...@@ -7,14 +8,16 @@
android:layout_width="400dp" android:layout_width="400dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom" android:layout_gravity="center_horizontal|bottom"
android:layout_marginLeft="?attr/actionBarSize"
android:layout_marginRight="?attr/actionBarSize"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="64dp" android:layout_marginTop="?attr/actionBarSize"
android:orientation="vertical" android:orientation="vertical"
android:padding="32dp"> android:paddingBottom="32dp">
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
...@@ -39,7 +42,8 @@ ...@@ -39,7 +42,8 @@
android:id="@+id/content_host" android:id="@+id/content_host"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="400dp" /> android:minHeight="400dp"
app:cardElevation="4dp" />
</LinearLayout> </LinearLayout>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
android:id="@+id/next_button" android:id="@+id/next_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end|bottom" android:layout_gravity="right|bottom"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
android:id="@+id/title" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="32dp" android:layout_marginBottom="8dp"
android:textSize="28sp" android:textSize="28sp"
android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse" android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse"
tools:text="Connection" /> tools:text="Connection" />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment