From ab6f41ec6884822c9720b926fda465ed2287656a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Fri, 3 Jan 2014 02:17:32 +0100
Subject: [PATCH] More layout tweaks, fix landscape

---
 res/layout-land/appdetails.xml | 71 ++++++++++++++++++++--------------
 res/layout/apklistitem.xml     | 18 ++++++---
 res/layout/appdetails.xml      | 11 +++---
 res/layout/applistitem.xml     |  8 ++--
 4 files changed, 65 insertions(+), 43 deletions(-)

diff --git a/res/layout-land/appdetails.xml b/res/layout-land/appdetails.xml
index 592971970..53c06af43 100644
--- a/res/layout-land/appdetails.xml
+++ b/res/layout-land/appdetails.xml
@@ -18,6 +18,14 @@
             android:layout_marginRight="4dp"
             android:orientation="vertical" >
 
+			<TextView
+				android:id="@+id/title"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:singleLine="false"
+				android:textSize="18sp"
+				android:textStyle="bold" />
+
             <RelativeLayout
                 android:id="@+id/header"
                 android:layout_width="fill_parent"
@@ -25,41 +33,48 @@
                 android:layout_marginBottom="4dp"
                 android:orientation="horizontal" >
 
-                <TextView
-                    android:id="@+id/title"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_marginBottom="4dp"
-                    android:singleLine="false"
-                    android:textSize="18sp"
-                    android:textStyle="bold" />
-
                 <ImageView
                     android:id="@+id/icon"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:layout_below="@id/title"
-                    android:layout_marginRight="6dp"
+                    android:layout_width="56dp"
+                    android:layout_height="56dp"
+                    android:padding="4dp"
                     android:scaleType="fitCenter" />
 
-                <TextView
-                    android:id="@+id/license"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/title"
-                    android:layout_toRightOf="@id/icon"
-                    android:textSize="13sp" />
+				<RelativeLayout
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"
+					android:padding="4dp"
+					android:layout_toRightOf="@id/icon"
+					android:orientation="vertical" >
+
+					<TextView
+						android:id="@+id/license"
+						android:layout_width="fill_parent"
+						android:layout_height="wrap_content"
+						android:layout_alignParentTop="true"
+						android:textSize="13sp" />
+
+					<TextView
+						android:id="@+id/categories"
+						android:layout_width="fill_parent"
+						android:layout_height="wrap_content"
+						android:layout_below="@id/license"
+						android:layout_above="@id/status"
+						android:layout_centerVertical="true"
+						android:textSize="13sp" />
+
+					<TextView
+						android:id="@+id/status"
+						android:layout_width="fill_parent"
+						android:layout_height="wrap_content"
+						android:layout_alignParentBottom="true"
+						android:textSize="13sp" />
+
+				</RelativeLayout>
 
-                <TextView
-                    android:id="@+id/status"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/license"
-                    android:layout_toRightOf="@id/icon"
-                    android:textSize="13sp" />
             </RelativeLayout>
         </LinearLayout>
+
     </ScrollView>
 
     <ListView
diff --git a/res/layout/apklistitem.xml b/res/layout/apklistitem.xml
index e7411fdd3..d92e92bb7 100644
--- a/res/layout/apklistitem.xml
+++ b/res/layout/apklistitem.xml
@@ -15,7 +15,7 @@
 		android:textSize="18sp" />
 
   <TextView android:id="@+id/status"
-		android:textSize="12sp"
+		android:textSize="13sp"
 		android:maxLines="2"
 		android:ellipsize="end"
 		android:layout_below="@id/version"
@@ -23,28 +23,36 @@
 		android:layout_width="wrap_content" />
 
   <TextView android:id="@+id/added"
-		android:textSize="12sp"
+		android:textSize="13sp"
 		android:layout_below="@id/status"
 		android:layout_height="wrap_content"
 		android:layout_width="wrap_content" />
 
   <TextView android:id="@+id/buildtype"
-		android:textSize="12sp"
+		android:textSize="13sp"
 		android:layout_alignParentRight="true"
 		android:layout_height="wrap_content"
 		android:layout_width="wrap_content"
 		android:layout_marginBottom="4sp" />
 
   <TextView android:id="@+id/size"
-		android:textSize="12sp"
+		android:textSize="13sp"
 		android:layout_below="@id/buildtype"
 		android:layout_alignParentRight="true"
 		android:layout_height="wrap_content"
 		android:layout_width="wrap_content"
 		android:layout_marginBottom="4sp" />
 
+  <TextView android:id="@+id/api"
+		android:textSize="13sp"
+		android:layout_below="@id/buildtype"
+		android:layout_toLeftOf="@id/size"
+		android:layout_alignParentRight="true"
+		android:layout_height="wrap_content"
+		android:layout_width="wrap_content" />
+
   <TextView android:id="@+id/nativecode"
-		android:textSize="12sp"
+		android:textSize="13sp"
 		android:layout_below="@id/size"
 		android:layout_alignParentRight="true"
 		android:layout_height="wrap_content"
diff --git a/res/layout/appdetails.xml b/res/layout/appdetails.xml
index ac8c5e846..455466134 100644
--- a/res/layout/appdetails.xml
+++ b/res/layout/appdetails.xml
@@ -22,9 +22,8 @@
 
 		<RelativeLayout
 			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
+			android:layout_height="56dp"
 			android:padding="6dp"
-			android:layout_centerVertical="true"
 			android:orientation="vertical" >
 
 			<TextView
@@ -33,9 +32,9 @@
 				android:layout_height="wrap_content"
 				android:layout_alignParentTop="true"
 				android:layout_alignParentRight="true"
-				android:paddingTop="2sp"
-				android:paddingBottom="2sp"
-				android:layout_marginLeft="8dp"
+				android:paddingTop="3sp"
+				android:paddingBottom="3sp"
+				android:layout_marginLeft="8sp"
 				android:textSize="13sp" />
 
 			<TextView
@@ -44,7 +43,7 @@
 				android:layout_height="wrap_content"
 				android:layout_alignParentBottom="true"
 				android:layout_alignParentRight="true"
-				android:layout_marginLeft="8dp"
+				android:layout_marginLeft="8sp"
 				android:textSize="13sp" />
 
 			<TextView
diff --git a/res/layout/applistitem.xml b/res/layout/applistitem.xml
index 12973157b..58d95cd6c 100644
--- a/res/layout/applistitem.xml
+++ b/res/layout/applistitem.xml
@@ -27,11 +27,11 @@
 		<TextView android:id="@+id/status"
 			android:singleLine="true"
 			android:ellipsize="end"
-			android:paddingTop="2sp"
-			android:paddingBottom="2sp"
+			android:paddingTop="3sp"
+			android:paddingBottom="3sp"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="8dp"
+			android:layout_marginLeft="8sp"
 			android:layout_alignParentTop="true"
 			android:layout_alignParentRight="true" />
 
@@ -41,7 +41,7 @@
 			android:ellipsize="end"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="8dp"
+			android:layout_marginLeft="8sp"
 			android:layout_alignParentBottom="true"
 			android:layout_alignParentRight="true" />