From ae95ef1b74cb49413f41ee7f333eed88a77902dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Fri, 11 Oct 2013 18:59:40 +0200
Subject: [PATCH] Spacings after html lists are fixed. Better paddings.

---
 res/layout/appinfo.xml                | 11 +++++++++--
 src/org/fdroid/fdroid/AppDetails.java | 21 +++++++++++++++------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/res/layout/appinfo.xml b/res/layout/appinfo.xml
index 57a695b3e..09c52745b 100644
--- a/res/layout/appinfo.xml
+++ b/res/layout/appinfo.xml
@@ -2,6 +2,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
+    android:paddingTop="3dp"
+    android:paddingLeft="3dp"
+    android:paddingRight="3dp"
+    android:paddingBottom="10dp"
+    android:baselineAligned="false"
     android:orientation="vertical" >
 
     <TextView
@@ -33,6 +38,7 @@
         android:id="@+id/permissions"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="6sp"
         android:singleLine="true"
         android:textSize="14sp"
         android:textStyle="bold" />
@@ -47,10 +53,11 @@
         android:id="@+id/antifeatures"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="6sp"
         android:singleLine="true"
         android:textSize="14sp"
-		android:textStyle="bold"
-		android:text="@string/antifeatures_list" />
+        android:textStyle="bold"
+        android:text="@string/antifeatures_list" />
 
     <TextView
         android:id="@+id/antifeatures_list"
diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java
index 1a863e7c5..d549fd2b3 100644
--- a/src/org/fdroid/fdroid/AppDetails.java
+++ b/src/org/fdroid/fdroid/AppDetails.java
@@ -474,10 +474,16 @@ public class AppDetails extends ListActivity {
             @Override
             public void handleTag(boolean opening, String tag, Editable output,
                     XMLReader reader) {
-                if (opening && tag.equals("ul")) {
-                    listNum = -1;
+                if (tag.equals("ul")) {
+                    if (opening)
+                        listNum = -1;
+                    else
+                        output.append('\n');
                 } else if (opening && tag.equals("ol")) {
-                    listNum = 1;
+                    if (opening)
+                        listNum = 1;
+                    else
+                        output.append('\n');
                 } else if (tag.equals("li")) {
                     if (opening) {
                         if (listNum == -1) {
@@ -495,7 +501,7 @@ public class AppDetails extends ListActivity {
         }
         Spanned desc = Html.fromHtml(
                 app.detail_description, null, new HtmlTagHandler());
-        tv.setText(desc.subSequence(0, desc.length() - 1));
+        tv.setText(desc.subSequence(0, desc.length() - 2));
 
         tv = (TextView) infoView.findViewById(R.id.appid);
         if (pref_expert)
@@ -511,7 +517,7 @@ public class AppDetails extends ListActivity {
 
             CommaSeparatedList permsList = app.apks.get(0).detail_permissions;
             if (permsList == null) {
-                tv.setText(getString(R.string.no_permissions) + '\n');
+                tv.setText(getString(R.string.no_permissions));
             } else {
                 Iterator<String> permissions = permsList.iterator();
                 StringBuilder sb = new StringBuilder();
@@ -525,6 +531,7 @@ public class AppDetails extends ListActivity {
                                 "Can't find permission '" + permissionName + "'");
                     }
                 }
+                sb.setLength(sb.length() - 1);
                 tv.setText(sb.toString());
             }
             tv = (TextView) infoView.findViewById(R.id.permissions);
@@ -540,9 +547,11 @@ public class AppDetails extends ListActivity {
             StringBuilder sb = new StringBuilder();
             for (String af : app.antiFeatures)
                 sb.append("<li>"+titleAntiFeature(af)+": "+descAntiFeature(af)+"</li>");
-            tv.setText(Html.fromHtml(sb.toString(), null, new HtmlTagHandler()));
+            Spanned afs = Html.fromHtml(sb.toString(), null, new HtmlTagHandler());
+            tv.setText(afs.subSequence(0, afs.length() - 2));
         } else {
             infoView.findViewById(R.id.antifeatures).setVisibility(View.GONE);
+            infoView.findViewById(R.id.antifeatures_list).setVisibility(View.GONE);
         }
     }