1 files changed, 18 insertions, 33 deletions

diff --git a/app/src/main/res/layout/gpodnetauth_device.xml b/app/src/main/res/layout/gpodnetauth_device.xml
index 1f38bf457..7837121e1 100644
--- a/app/src/main/res/layout/gpodnetauth_device.xml
+++ b/app/src/main/res/layout/gpodnetauth_device.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
+<RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="16dp">
 
     <TextView
         android:id="@+id/txtvTitle"
@@ -11,7 +12,7 @@
         android:layout_height="wrap_content"
         android:text="@string/gpodnetauth_device_title"
         android:layout_alignParentTop="true"
-        android:layout_margin="16dp"
+        android:layout_marginBottom="16dp"
         style="@style/AntennaPod.TextView.Heading"/>
 
     <TextView
@@ -21,8 +22,7 @@
         android:text="@string/gpodnetauth_device_descr"
         android:layout_below="@id/txtvTitle"
         android:textSize="@dimen/text_size_medium"
-        android:textColor="?android:attr/textColorSecondary"
-        android:layout_margin="16dp"/>
+        android:textColor="?android:attr/textColorPrimary"/>
 
     <EditText
         android:id="@+id/etxtCaption"
@@ -30,7 +30,6 @@
         android:layout_height="wrap_content"
         android:hint="@string/gpodnetauth_device_caption"
         android:layout_below="@id/txtvDescription"
-        android:layout_margin="8dp"
         android:imeOptions="flagNoFullscreen"/>
 
     <TextView
@@ -39,29 +38,21 @@
         android:layout_height="wrap_content"
         android:text="@string/gpodnetauth_device_deviceID"
         android:textSize="@dimen/text_size_medium"
-        android:textColor="?android:attr/textColorSecondary"
-        android:layout_margin="8dp"
-        android:layout_alignTop="@+id/etxtDeviceID"
-        android:layout_alignLeft="@+id/etxtCaption"
-        android:layout_alignStart="@+id/etxtCaption"/>
+        android:layout_below="@id/etxtCaption"/>
 
     <EditText
         android:id="@+id/etxtDeviceID"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/etxtCaption"
-        android:layout_toRightOf="@id/txtvDeviceID"
-        android:layout_toEndOf="@id/txtvDeviceID"
+        android:layout_below="@id/txtvDeviceID"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
-        android:layout_margin="8dp"
         android:imeOptions="flagNoFullscreen"/>
 
     <Button
         android:id="@+id/butCreateNewDevice"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
         android:layout_below="@id/etxtDeviceID"
@@ -77,7 +68,6 @@
         android:layout_toLeftOf="@id/butCreateNewDevice"
         android:layout_toStartOf="@id/butCreateNewDevice"
         android:textColor="@color/download_failed_red"
-        android:layout_margin="16dp"
         android:textSize="@dimen/text_size_small"
         tools:text="Error message"
         tools:background="@android:color/holo_green_dark" />
@@ -100,30 +90,25 @@
         android:layout_height="wrap_content"
         android:text="@string/gpodnetauth_device_chooseExistingDevice"
         android:layout_below="@id/butCreateNewDevice"
+        android:textColor="?android:attr/textColorPrimary"
         android:textSize="@dimen/text_size_medium"
-        android:textColor="?android:attr/textColorSecondary"
-        android:layout_margin="16dp"/>
+        android:layout_marginTop="32dp"/>
 
     <Button
         android:id="@+id/butChooseExistingDevice"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/gpodnetauth_device_butChoose"
         android:layout_below="@+id/spinnerChooseDevice"
-        android:layout_alignLeft="@+id/butCreateNewDevice"
-        android:layout_alignStart="@+id/butCreateNewDevice"
-        android:layout_alignRight="@+id/butCreateNewDevice"
-        android:layout_alignEnd="@+id/butCreateNewDevice"/>
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"/>
 
     <Spinner
         android:id="@+id/spinnerChooseDevice"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/txtvChooseExistingDevice"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_margin="8dp"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"/>
+        android:layout_alignParentStart="true"/>
 
 </RelativeLayout>
\ No newline at end of file