Merge commit 'refs/merge-requests/46' of gitorious.org:f-droid/fdroidclient

res/layout-land/appdetails.xml

@@ -14,6 +14,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
+            android:paddingRight="6dp"
             android:orientation="vertical" >
 
             <RelativeLayout

res/layout/about.xml

@@ -1,52 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent" android:layout_height="fill_parent"
+    android:layout_width="fill_parent"
-	android:orientation="vertical" android:paddingLeft="5px">
+    android:layout_height="fill_parent"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp"
+    android:paddingTop="6dp"
+    android:paddingBottom="6dp"
+    android:orientation="vertical">
 
 	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="fill_parent" android:layout_height="fill_parent"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
 		android:orientation="horizontal">
 
 		<TextView android:text="@string/about_version"
-			android:layout_width="wrap_content" android:layout_height="wrap_content"
+            android:textStyle="bold"
-			android:textSize="16px" android:textColor="#ffffff" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
 
-		<TextView android:id="@+id/version" android:layout_width="wrap_content"
+        <TextView android:id="@+id/version"
+            android:paddingLeft="5dp"
+            android:layout_width="wrap_content"
 			android:layout_height="wrap_content" />
 
 	</LinearLayout>
 
 	<LinearLayout android:layout_width="fill_parent"
-		android:layout_height="fill_parent" android:orientation="horizontal">
+        android:layout_height="fill_parent"
-
-		<TextView android:id="@+id/site" android:text="@string/about_site"
-			android:layout_width="wrap_content" android:layout_height="wrap_content"
-			android:textSize="16px" android:textColor="#ffffff" />
-
-		<TextView android:id="@+id/sitec" android:text="@string/about_sitec"
-			android:layout_width="wrap_content" android:layout_height="wrap_content" />
-
-	</LinearLayout>
-
-	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="fill_parent" android:layout_height="fill_parent"
         android:orientation="horizontal">
 
-		<TextView android:id="@+id/mail" android:text="@string/about_mail"
+        <TextView android:id="@+id/site"
-			android:layout_width="wrap_content" android:layout_height="wrap_content"
+            android:text="@string/about_site"
-			android:textSize="16px" android:textColor="#ffffff" />
+            android:textStyle="bold"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
 
-		<TextView android:id="@+id/mailc" android:text="@string/about_mailc"
+        <TextView android:id="@+id/sitec"
-			android:autoLink="email" android:layout_width="wrap_content"
+            android:text="@string/about_sitec"
+            android:paddingLeft="5dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
 	</LinearLayout>
 
-	<TextView android:id="@+id/not" android:text="@string/about_not"
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+		android:orientation="horizontal">
+
+        <TextView android:id="@+id/mail"
+            android:text="@string/about_mail"
+            android:textStyle="bold"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <TextView android:id="@+id/mailc"
+            android:text="@string/about_mailc"
+            android:paddingLeft="5dp"
+            android:autoLink="email"
+            android:layout_width="wrap_content"
+			android:layout_height="wrap_content" />
+
+	</LinearLayout>
 
 	<TextView android:text="@string/about_desc"
-		android:layout_width="fill_parent" android:layout_height="fill_parent"
+        android:paddingTop="5dp"
-		android:textSize="16px" />
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent" />
 
 </LinearLayout>

res/layout/apklistitem.xml

@@ -5,8 +5,8 @@
 		android:orientation="vertical"
 		android:paddingTop="5dp"
 		android:paddingBottom="5dp"
-		android:paddingLeft="10dp"
+		android:paddingLeft="2dp"
-		android:paddingRight="10dp">
+		android:paddingRight="2dp">
 
   <TextView android:id="@+id/buildtype"
 	    android:textSize="12sp"

res/layout/appdetails.xml

@@ -2,6 +2,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:paddingTop="5dp"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp"
     android:orientation="vertical" >
 
     <LinearLayout

res/layout/applistitem.xml

@@ -3,7 +3,7 @@
 		android:orientation="vertical"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:paddingTop="0dp"
+		android:paddingTop="3dp"
 		android:paddingBottom="4dp"
 		android:paddingLeft="6dp"
 		android:paddingRight="10dp">
@@ -43,6 +43,7 @@
 	    android:layout_height="wrap_content"
 	    android:layout_toRightOf="@id/icon"
 	    android:layout_toLeftOf="@id/status_icons"
+	    android:paddingTop="4dp"
 	    android:paddingBottom="2dp"
 	    android:paddingLeft="1dp"/>
 
@@ -72,6 +73,6 @@
 	    android:layout_width="fill_parent"
 	    android:layout_height="wrap_content"
 	    android:layout_below="@id/icon"
-	    android:paddingLeft="4dp"/>
+	    android:paddingLeft="6dp"/>
 
 </RelativeLayout>

res/values/strings.xml

@@ -36,7 +36,6 @@
 	<string name="about_mailc">admin@f-droid.org</string>
 	<string name="about_version">Version: </string>
 	<string name="about_website">Website</string>
-	<string name="about_not"> </string>
 
 	<string name="no_repo">You don\'t have any repositories configured!\n\nA
 		repository is a source of applications. To add one, press the MENU

src/org/fdroid/fdroid/AppDetails.java

@@ -115,7 +115,7 @@ public class AppDetails extends ListActivity {
             TextView version = (TextView) v.findViewById(R.id.version);
             boolean iscurrent = apk.vercode == app_currentvercode;
             version.setText(getString(R.string.version) + " " + apk.version
-                    + (iscurrent ? "*" : ""));
+                    + (iscurrent ? " *" : ""));
 
             TextView status = (TextView) v.findViewById(R.id.status);
             if (apk.vercode == app.installedVerCode