From 771947536eb8b57f36e87fc4bdc1fe7e13ccb7ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 1 Jan 2014 21:08:41 +0100
Subject: [PATCH] Add categories to AppDetails, layout tweaks

---
 res/layout/appdetails.xml             | 62 +++++++++++++++++----------
 res/layout/applistitem.xml            | 11 ++---
 src/org/fdroid/fdroid/AppDetails.java |  3 ++
 3 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/res/layout/appdetails.xml b/res/layout/appdetails.xml
index 0441cd54f..ac8c5e846 100644
--- a/res/layout/appdetails.xml
+++ b/res/layout/appdetails.xml
@@ -15,42 +15,58 @@
 
 		<ImageView
 			android:id="@+id/icon"
-			android:layout_width="48dp"
-			android:layout_height="48dp"
-			android:layout_marginRight="6dp"
+			android:layout_width="56dp"
+			android:layout_height="56dp"
+			android:padding="4dp"
 			android:scaleType="fitCenter" />
 
 		<RelativeLayout
 			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:paddingTop="6dp"
+			android:layout_height="fill_parent"
+			android:padding="6dp"
+			android:layout_centerVertical="true"
 			android:orientation="vertical" >
 
-			<TextView
-				android:id="@+id/title"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:ellipsize="marquee"
-				android:singleLine="true"
-				android:textSize="18sp"
-				android:textStyle="bold" />
-
-			<TextView
-				android:id="@+id/status"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentLeft="true"
-				android:layout_below="@id/title"
-				android:textSize="13sp" />
-
 			<TextView
 				android:id="@+id/license"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
+				android:layout_alignParentTop="true"
 				android:layout_alignParentRight="true"
-				android:padding="3dp"
+				android:paddingTop="2sp"
+				android:paddingBottom="2sp"
+				android:layout_marginLeft="8dp"
 				android:textSize="13sp" />
 
+			<TextView
+				android:id="@+id/categories"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_alignParentBottom="true"
+				android:layout_alignParentRight="true"
+				android:layout_marginLeft="8dp"
+				android:textSize="13sp" />
+
+			<TextView
+				android:id="@+id/title"
+				android:textSize="18sp"
+				android:textStyle="bold"
+				android:singleLine="true"
+				android:ellipsize="end"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_alignParentLeft="true"
+				android:layout_toLeftOf="@id/license" />
+
+			<TextView
+				android:id="@+id/status"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textSize="13sp"
+				android:layout_alignParentLeft="true"
+				android:layout_alignParentBottom="true"
+				android:layout_toLeftOf="@id/categories" />
+
 		</RelativeLayout>
 	</LinearLayout>
 
diff --git a/res/layout/applistitem.xml b/res/layout/applistitem.xml
index 025e2348f..5f5dcd350 100644
--- a/res/layout/applistitem.xml
+++ b/res/layout/applistitem.xml
@@ -20,7 +20,6 @@
 		android:layout_height="fill_parent"
 		android:paddingLeft="3dp"
 		android:paddingRight="8dp"
-		android:paddingBottom="3dp"
 		android:layout_toRightOf="@id/icon"
 		android:layout_centerVertical="true"
 		android:baselineAligned="false" >
@@ -50,8 +49,8 @@
 		<TextView android:id="@+id/status"
 			android:singleLine="true"
 			android:ellipsize="end"
-			android:paddingTop="2dp"
-			android:paddingBottom="2dp"
+			android:paddingTop="2sp"
+			android:paddingBottom="2sp"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="8dp"
@@ -71,6 +70,7 @@
 		<TextView android:id="@+id/name"
 			android:textSize="17sp"
 			android:textStyle="bold"
+			android:paddingBottom="3sp"
 			android:singleLine="true"
 			android:ellipsize="end"
 			android:layout_width="wrap_content"
@@ -79,13 +79,14 @@
 			android:layout_toLeftOf="@id/status" />
 
 		<TextView android:id="@+id/summary"
-
 			android:singleLine="true"
 			android:ellipsize="end"
-			android:layout_below="@id/name"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:layout_below="@id/name"
+			android:gravity="center_vertical"
 			android:layout_alignParentLeft="true"
+			android:layout_alignParentBottom="true"
 			android:layout_toLeftOf="@id/license" />
 
 	</RelativeLayout>
diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java
index af9b88d8b..4e2361257 100644
--- a/src/org/fdroid/fdroid/AppDetails.java
+++ b/src/org/fdroid/fdroid/AppDetails.java
@@ -448,6 +448,9 @@ public class AppDetails extends ListActivity {
         tv = (TextView) findViewById(R.id.license);
         tv.setText(app.license);
 
+        tv = (TextView) findViewById(R.id.categories);
+        tv.setText(app.categories.toString().replaceAll(",",", "));
+
         tv = (TextView) infoView.findViewById(R.id.description);
 
         /*