From 8d94bf9e67fbc6496074ec14236f4de35503013e Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Wed, 4 Sep 2013 17:26:07 +0200
Subject: Improved layout of login GUI

---
 res/layout/gpodnetauth_credentials.xml | 15 ++++++++-------
 res/layout/gpodnetauth_device.xml      | 19 ++++++++-----------
 2 files changed, 16 insertions(+), 18 deletions(-)

(limited to 'res')

diff --git a/res/layout/gpodnetauth_credentials.xml b/res/layout/gpodnetauth_credentials.xml
index 8d32a5e2b..b66fc9414 100644
--- a/res/layout/gpodnetauth_credentials.xml
+++ b/res/layout/gpodnetauth_credentials.xml
@@ -53,13 +53,15 @@
 
     <TextView
         android:id="@+id/txtvError"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_below="@id/etxtPassword"
         android:layout_alignParentLeft="true"
-        android:layout_alignBottom="@id/butLogin"
+        android:layout_toLeftOf="@id/butLogin"
         android:textColor="@color/download_failed_red"
-        android:textSize="@dimen/text_size_medium"
+        android:textSize="@dimen/text_size_small"
+        android:maxLines="2"
+        android:ellipsize="end"
         android:gravity="center"
         android:layout_margin="16dp"/>
 
@@ -67,10 +69,9 @@
         android:id="@+id/progBarLogin"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toLeftOf="@id/butLogin"
-        android:layout_below="@id/etxtPassword"
-        android:layout_alignBottom="@id/butLogin"
-        android:visibility="gone"/>
+        android:visibility="gone"
+        android:layout_alignTop="@+id/butLogin"
+        android:layout_toLeftOf="@+id/butLogin"/>
 
     <TextView
         android:layout_width="match_parent"
diff --git a/res/layout/gpodnetauth_device.xml b/res/layout/gpodnetauth_device.xml
index 21f2ef295..ac08cb5ad 100644
--- a/res/layout/gpodnetauth_device.xml
+++ b/res/layout/gpodnetauth_device.xml
@@ -66,11 +66,9 @@
         android:id="@+id/progbarCreateDevice"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_below="@id/etxtCaption"
-        android:layout_alignBottom="@id/butCreateNewDevice"
+        android:layout_alignTop="@id/butCreateNewDevice"
+        android:layout_toLeftOf="@id/butCreateNewDevice"
         android:textColor="@color/download_failed_red"
-        android:layout_margin="16dp"
         android:textSize="@dimen/text_size_medium"
         android:visibility="gone"
         />
@@ -87,12 +85,12 @@
 
     <Button
         android:id="@+id/butChooseExistingDevice"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_margin="16dp"
         android:text="@string/gpodnetauth_device_butChoose"
-        android:layout_alignTop="@+id/spinnerChooseDevice"
-        android:layout_alignRight="@+id/txtvChooseExistingDevice"/>
+        android:layout_below="@+id/spinnerChooseDevice"
+        android:layout_alignLeft="@+id/butCreateNewDevice"
+        android:layout_alignRight="@+id/butCreateNewDevice"/>
 
     <Spinner
         android:id="@+id/spinnerChooseDevice"
@@ -100,8 +98,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/txtvChooseExistingDevice"
         android:layout_alignParentLeft="true"
-        android:layout_toLeftOf="@id/butChooseExistingDevice"
-
-        android:layout_margin="16dp"/>
+        android:layout_margin="8dp"
+        android:layout_alignParentRight="true"/>
 
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3