From 18a08fb6116167f4d57322adab5aed7c40094064 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Fri, 11 Oct 2013 20:25:18 +0200
Subject: [PATCH] Lots of layout improvements

They are more consistent now. Transitioning to RTL languages will also be
easier since more of them can be mirrored now. Also fixes some spacing issues
with icons and others.
---
 res/layout/appdetails.xml    | 20 ++++++++--------
 res/layout/appinfo.xml       |  6 ++---
 res/layout/applistitem.xml   | 44 +++++++++++++++++++-----------------
 res/layout/fdroid.xml        |  2 ++
 res/layout/searchresults.xml |  7 +++++-
 res/values/dimen.xml         |  4 ++--
 6 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/res/layout/appdetails.xml b/res/layout/appdetails.xml
index 3d54832b4..3d3f4c312 100644
--- a/res/layout/appdetails.xml
+++ b/res/layout/appdetails.xml
@@ -3,8 +3,8 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:paddingTop="5dp"
-    android:paddingLeft="8dp"
-    android:paddingRight="8dp"
+    android:paddingLeft="6dp"
+    android:paddingRight="6dp"
     android:baselineAligned="false"
     android:orientation="vertical" >
 
@@ -20,11 +20,13 @@
             android:layout_height="50dp"
             android:cropToPadding="true"
             android:padding="4dp"
+			android:layout_marginRight="3dp"
             android:scaleType="fitCenter" />
 
         <RelativeLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:paddingTop="6dp"
             android:orientation="vertical" >
 
             <TextView
@@ -37,21 +39,21 @@
                 android:textStyle="bold" />
 
             <TextView
-                android:id="@+id/license"
+                android:id="@+id/status"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
+                android:layout_alignParentLeft="true"
                 android:layout_below="@id/title"
                 android:textSize="12sp" />
 
             <TextView
-                android:id="@+id/status"
-                android:layout_width="fill_parent"
+                android:id="@+id/license"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_below="@id/title"
-                android:layout_toLeftOf="@id/license"
+                android:layout_alignParentRight="true"
+                android:padding="3dp"
                 android:textSize="12sp" />
+
         </RelativeLayout>
     </LinearLayout>
 
diff --git a/res/layout/appinfo.xml b/res/layout/appinfo.xml
index 09c52745b..7253804a6 100644
--- a/res/layout/appinfo.xml
+++ b/res/layout/appinfo.xml
@@ -5,7 +5,7 @@
     android:paddingTop="3dp"
     android:paddingLeft="3dp"
     android:paddingRight="3dp"
-    android:paddingBottom="10dp"
+    android:paddingBottom="11dp"
     android:baselineAligned="false"
     android:orientation="vertical" >
 
@@ -38,7 +38,7 @@
         android:id="@+id/permissions"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="6sp"
+        android:layout_marginTop="8sp"
         android:singleLine="true"
         android:textSize="14sp"
         android:textStyle="bold" />
@@ -53,7 +53,7 @@
         android:id="@+id/antifeatures"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="6sp"
+        android:layout_marginTop="8sp"
         android:singleLine="true"
         android:textSize="14sp"
         android:textStyle="bold"
diff --git a/res/layout/applistitem.xml b/res/layout/applistitem.xml
index b50d11f10..19b374c4b 100644
--- a/res/layout/applistitem.xml
+++ b/res/layout/applistitem.xml
@@ -4,16 +4,20 @@
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
 		android:paddingTop="3dp"
-		android:paddingBottom="4dp"
-		android:paddingLeft="6dp"
-		android:paddingRight="10dp">
+		android:paddingBottom="5dp"
+		android:paddingLeft="3dp"
+		android:paddingRight="3dp"
+		android:baselineAligned="false" >
 
   <ImageView android:id="@+id/icon"
 	     android:scaleType="fitCenter"
 	     android:layout_width="50dp"
 	     android:layout_height="50dp"
-	     android:layout_marginRight="4dp"
-	     android:padding="4dp"/>
+		 android:paddingTop="4dp"
+		 android:paddingBottom="4dp"
+		 android:paddingRight="6dp"
+		 android:paddingLeft="2dp"
+		 />
 
   <LinearLayout android:id="@+id/status_icons"
         android:layout_width="wrap_content"
@@ -42,21 +46,11 @@
 	    android:textStyle="bold"
 	    android:singleLine="true"
 	    android:ellipsize="marquee"
-	    android:layout_width="fill_parent"
-	    android:layout_height="wrap_content"
-	    android:layout_toRightOf="@id/icon"
-	    android:layout_toLeftOf="@id/status_icons"
-	    android:paddingTop="4dp"
-	    android:paddingBottom="2dp" />
-
-  <TextView android:id="@+id/license"
-	    android:textSize="12sp"
-	    android:singleLine="true"
-	    android:ellipsize="end"
 	    android:layout_width="wrap_content"
 	    android:layout_height="wrap_content"
-	    android:layout_below="@id/name"
-		android:layout_alignParentRight="true" />
+	    android:layout_toRightOf="@id/icon"
+	    android:paddingTop="4dp"
+	    android:paddingBottom="2dp" />
 
   <TextView android:id="@+id/status"
 	    android:textSize="12sp"
@@ -64,9 +58,17 @@
 	    android:ellipsize="end"
 	    android:layout_width="wrap_content"
 	    android:layout_height="wrap_content"
-	    android:layout_alignBaseline="@id/license"
-	    android:layout_toLeftOf="@id/license"
-		android:layout_alignLeft="@id/name" />
+	    android:layout_toRightOf="@id/icon"
+	    android:layout_below="@id/name" />
+
+  <TextView android:id="@+id/license"
+	    android:textSize="12sp"
+	    android:singleLine="true"
+	    android:ellipsize="end"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+		android:padding="8dp"
+		android:layout_alignParentRight="true" />
 
   <TextView android:id="@+id/summary"
 	    android:singleLine="true"
diff --git a/res/layout/fdroid.xml b/res/layout/fdroid.xml
index 85674fa89..5dbd4c54e 100644
--- a/res/layout/fdroid.xml
+++ b/res/layout/fdroid.xml
@@ -3,6 +3,8 @@
 	android:id="@+id/fdroid_layout"
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
+	android:paddingLeft="2dp"
+	android:paddingRight="2dp"
 	android:baselineAligned="false"
 	android:orientation="vertical">
 
diff --git a/res/layout/searchresults.xml b/res/layout/searchresults.xml
index 242999361..1b4df828b 100644
--- a/res/layout/searchresults.xml
+++ b/res/layout/searchresults.xml
@@ -2,14 +2,19 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
+	android:paddingLeft="2dp"
+	android:paddingRight="2dp"
 	android:baselineAligned="false"
 	android:orientation="vertical">
 
 	<TextView android:id="@+id/description"
 		android:singleLine="false"
+	    android:textSize="14sp"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:padding="2dp" />
+		android:paddingTop="4dp"
+		android:paddingBottom="2dp"
+		android:gravity="center" />
 
 	<ListView android:id="@android:id/list"
 		android:layout_width="fill_parent"
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 8ab611650..6fe5117c7 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="applist_summary_padding">6dp</dimen>
-</resources>
\ No newline at end of file
+    <dimen name="applist_summary_padding">3dp</dimen>
+</resources>