From fe3a739fe3e330c621c2413a1c48ddb448f0bc11 Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Thu, 24 Sep 2015 14:10:41 +0300
Subject: [PATCH 01/10] Fix up indentation in repodetails.xml

---
 F-Droid/res/layout/repodetails.xml | 242 ++++++++++++++---------------
 1 file changed, 121 insertions(+), 121 deletions(-)

diff --git a/F-Droid/res/layout/repodetails.xml b/F-Droid/res/layout/repodetails.xml
index 921612d11..ec787f2cb 100644
--- a/F-Droid/res/layout/repodetails.xml
+++ b/F-Droid/res/layout/repodetails.xml
@@ -14,136 +14,136 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-    <RelativeLayout
-        android:id="@+id/repoView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        <RelativeLayout
+            android:id="@+id/repoView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/input_repo_url"
-        android:textStyle="bold"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true" />
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/input_repo_url"
+            android:textStyle="bold"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true" />
 
-    <!-- Name of this repo -->
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/label_repo_name"
-        android:text="@string/repo_name"
-        android:layout_below="@id/input_repo_url"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:paddingTop="@dimen/form_label_top"/>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:singleLine="false"
-        android:id="@+id/text_repo_name"
-        android:layout_below="@id/label_repo_name" android:textStyle="bold"/>
+        <!-- Name of this repo -->
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/label_repo_name"
+            android:text="@string/repo_name"
+            android:layout_below="@id/input_repo_url"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:paddingTop="@dimen/form_label_top"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="false"
+            android:id="@+id/text_repo_name"
+            android:layout_below="@id/label_repo_name" android:textStyle="bold"/>
 
-    <!-- Description - as pulled from the index file during last update... -->
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/label_description"
-        android:text="@string/repo_description"
-        android:layout_below="@id/text_repo_name"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:paddingTop="@dimen/form_label_top"/>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:singleLine="false"
-        android:scrollHorizontally="false"
-        android:id="@+id/text_description"
-        android:layout_below="@id/label_description" android:textStyle="bold"/>
+        <!-- Description - as pulled from the index file during last update... -->
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/label_description"
+            android:text="@string/repo_description"
+            android:layout_below="@id/text_repo_name"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:paddingTop="@dimen/form_label_top"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="false"
+            android:scrollHorizontally="false"
+            android:id="@+id/text_description"
+            android:layout_below="@id/label_description" android:textStyle="bold"/>
 
-    <!-- Number of apps belonging to this repo -->
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/label_num_apps"
-        android:text="@string/repo_num_apps"
-        android:layout_below="@id/text_description"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:paddingTop="@dimen/form_label_top" />
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/text_num_apps"
-        android:layout_below="@id/label_num_apps" android:textStyle="bold"/>
+        <!-- Number of apps belonging to this repo -->
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/label_num_apps"
+            android:text="@string/repo_num_apps"
+            android:layout_below="@id/text_description"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:paddingTop="@dimen/form_label_top" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/text_num_apps"
+            android:layout_below="@id/label_num_apps" android:textStyle="bold"/>
 
-    <!-- The last time this repo was updated -->
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/label_last_update"
-        android:text="@string/repo_last_update"
-        android:layout_below="@id/text_num_apps"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:paddingTop="@dimen/form_label_top" />
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/text_last_update"
-        android:layout_below="@id/label_last_update" android:textStyle="bold"/>
+        <!-- The last time this repo was updated -->
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/label_last_update"
+            android:text="@string/repo_last_update"
+            android:layout_below="@id/text_num_apps"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:paddingTop="@dimen/form_label_top" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/text_last_update"
+            android:layout_below="@id/label_last_update" android:textStyle="bold"/>
 
-    <!-- Signature (or "unsigned" if none) -->
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/label_repo_fingerprint"
-        android:text="@string/repo_fingerprint"
-        android:layout_below="@id/text_last_update"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:paddingTop="@dimen/form_label_top" />
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:singleLine="false"
-        android:scrollHorizontally="false"
-        android:id="@+id/text_repo_fingerprint"
-        android:layout_below="@id/label_repo_fingerprint" android:textStyle="bold"/>
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:singleLine="false"
-        android:scrollHorizontally="false"
-        android:id="@+id/text_repo_fingerprint_description"
-        android:layout_below="@id/text_repo_fingerprint"/>
+        <!-- Signature (or "unsigned" if none) -->
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/label_repo_fingerprint"
+            android:text="@string/repo_fingerprint"
+            android:layout_below="@id/text_last_update"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:paddingTop="@dimen/form_label_top" />
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="false"
+            android:scrollHorizontally="false"
+            android:id="@+id/text_repo_fingerprint"
+            android:layout_below="@id/label_repo_fingerprint" android:textStyle="bold"/>
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="false"
+            android:scrollHorizontally="false"
+            android:id="@+id/text_repo_fingerprint_description"
+            android:layout_below="@id/text_repo_fingerprint"/>
 
-    <!-- The last time this repo was updated -->
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/text_not_yet_updated"
-        android:layout_below="@id/input_repo_url"
-        android:text="@string/repo_not_yet_updated"
-        android:textStyle="bold"
-        android:paddingTop="@dimen/form_label_top"/>
+        <!-- The last time this repo was updated -->
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/text_not_yet_updated"
+            android:layout_below="@id/input_repo_url"
+            android:text="@string/repo_not_yet_updated"
+            android:textStyle="bold"
+            android:paddingTop="@dimen/form_label_top"/>
 
-    <Button
-        android:id="@+id/btn_update"
-        android:layout_centerHorizontal="true"
-        android:text="@string/repo_update"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/text_not_yet_updated"/>
+        <Button
+            android:id="@+id/btn_update"
+            android:layout_centerHorizontal="true"
+            android:text="@string/repo_update"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/text_not_yet_updated"/>
 
-    </RelativeLayout>
+        </RelativeLayout>
 
-    <ImageView
-        android:id="@+id/qr_code"
-        android:src="@drawable/swap_qr_example"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        <ImageView
+            android:id="@+id/qr_code"
+            android:src="@drawable/swap_qr_example"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
     </LinearLayout>
 </ScrollView>

From 4ecb253c80c4942302357fae670abe63041731e7 Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Thu, 24 Sep 2015 14:24:27 +0300
Subject: [PATCH 02/10] Remove useless RelativeLayout

---
 F-Droid/res/layout/repodetails.xml | 48 +++++++-----------------------
 1 file changed, 11 insertions(+), 37 deletions(-)

diff --git a/F-Droid/res/layout/repodetails.xml b/F-Droid/res/layout/repodetails.xml
index ec787f2cb..74665c4c2 100644
--- a/F-Droid/res/layout/repodetails.xml
+++ b/F-Droid/res/layout/repodetails.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -10,23 +9,16 @@
     android:paddingEnd="@dimen/padding_side">
 
     <LinearLayout
+        android:id="@+id/repoView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <RelativeLayout
-            android:id="@+id/repoView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
         <TextView
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:id="@+id/input_repo_url"
-            android:textStyle="bold"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentTop="true" />
+            android:textStyle="bold"/>
 
         <!-- Name of this repo -->
         <TextView
@@ -34,16 +26,13 @@
             android:layout_height="wrap_content"
             android:id="@+id/label_repo_name"
             android:text="@string/repo_name"
-            android:layout_below="@id/input_repo_url"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
             android:paddingTop="@dimen/form_label_top"/>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="false"
             android:id="@+id/text_repo_name"
-            android:layout_below="@id/label_repo_name" android:textStyle="bold"/>
+            android:textStyle="bold"/>
 
         <!-- Description - as pulled from the index file during last update... -->
         <TextView
@@ -51,9 +40,6 @@
             android:layout_height="wrap_content"
             android:id="@+id/label_description"
             android:text="@string/repo_description"
-            android:layout_below="@id/text_repo_name"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
             android:paddingTop="@dimen/form_label_top"/>
         <TextView
             android:layout_width="wrap_content"
@@ -61,7 +47,7 @@
             android:singleLine="false"
             android:scrollHorizontally="false"
             android:id="@+id/text_description"
-            android:layout_below="@id/label_description" android:textStyle="bold"/>
+            android:textStyle="bold"/>
 
         <!-- Number of apps belonging to this repo -->
         <TextView
@@ -69,15 +55,12 @@
             android:layout_height="wrap_content"
             android:id="@+id/label_num_apps"
             android:text="@string/repo_num_apps"
-            android:layout_below="@id/text_description"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
             android:paddingTop="@dimen/form_label_top" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/text_num_apps"
-            android:layout_below="@id/label_num_apps" android:textStyle="bold"/>
+            android:textStyle="bold"/>
 
         <!-- The last time this repo was updated -->
         <TextView
@@ -85,15 +68,12 @@
             android:layout_height="wrap_content"
             android:id="@+id/label_last_update"
             android:text="@string/repo_last_update"
-            android:layout_below="@id/text_num_apps"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
             android:paddingTop="@dimen/form_label_top" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/text_last_update"
-            android:layout_below="@id/label_last_update" android:textStyle="bold"/>
+            android:textStyle="bold"/>
 
         <!-- Signature (or "unsigned" if none) -->
         <TextView
@@ -101,9 +81,6 @@
             android:layout_height="wrap_content"
             android:id="@+id/label_repo_fingerprint"
             android:text="@string/repo_fingerprint"
-            android:layout_below="@id/text_last_update"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
             android:paddingTop="@dimen/form_label_top" />
         <TextView
             android:layout_width="fill_parent"
@@ -111,21 +88,19 @@
             android:singleLine="false"
             android:scrollHorizontally="false"
             android:id="@+id/text_repo_fingerprint"
-            android:layout_below="@id/label_repo_fingerprint" android:textStyle="bold"/>
+            android:textStyle="bold"/>
         <TextView
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:singleLine="false"
             android:scrollHorizontally="false"
-            android:id="@+id/text_repo_fingerprint_description"
-            android:layout_below="@id/text_repo_fingerprint"/>
+            android:id="@+id/text_repo_fingerprint_description"/>
 
         <!-- The last time this repo was updated -->
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/text_not_yet_updated"
-            android:layout_below="@id/input_repo_url"
             android:text="@string/repo_not_yet_updated"
             android:textStyle="bold"
             android:paddingTop="@dimen/form_label_top"/>
@@ -135,15 +110,14 @@
             android:layout_centerHorizontal="true"
             android:text="@string/repo_update"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/text_not_yet_updated"/>
-
-        </RelativeLayout>
+            android:layout_height="wrap_content"/>
 
         <ImageView
             android:id="@+id/qr_code"
             android:src="@drawable/swap_qr_example"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
+
     </LinearLayout>
+
 </ScrollView>

From dbd69444f1195b40b4a8079bd451ee8e3520cf38 Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Sun, 27 Sep 2015 10:07:35 +0300
Subject: [PATCH 03/10] Set side paddings in LinearLayout, not in ScrollView

This fixes scrollbar position.
---
 F-Droid/res/layout/repodetails.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/F-Droid/res/layout/repodetails.xml b/F-Droid/res/layout/repodetails.xml
index 74665c4c2..55b0d8d30 100644
--- a/F-Droid/res/layout/repodetails.xml
+++ b/F-Droid/res/layout/repodetails.xml
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingTop="@dimen/padding_top"
-    android:paddingLeft="@dimen/padding_side"
-    android:paddingStart="@dimen/padding_side"
-    android:paddingRight="@dimen/padding_side"
-    android:paddingEnd="@dimen/padding_side">
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:id="@+id/repoView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:paddingLeft="?attr/listPreferredItemPaddingLeft"
+        android:paddingRight="?attr/listPreferredItemPaddingRight"
         android:orientation="vertical">
 
         <TextView

From f5906f320f6a37820149299f4c59d627d86094ad Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Sun, 27 Sep 2015 10:19:36 +0300
Subject: [PATCH 04/10] Remove update button

It's confusing because it does not update the repo details view.
---
 F-Droid/res/layout/repodetails.xml            |  7 -----
 F-Droid/res/menu/repo_details_activity.xml    |  7 +----
 .../fdroid/views/RepoDetailsActivity.java     | 27 -------------------
 3 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/F-Droid/res/layout/repodetails.xml b/F-Droid/res/layout/repodetails.xml
index 55b0d8d30..52d5d4f90 100644
--- a/F-Droid/res/layout/repodetails.xml
+++ b/F-Droid/res/layout/repodetails.xml
@@ -102,13 +102,6 @@
             android:textStyle="bold"
             android:paddingTop="@dimen/form_label_top"/>
 
-        <Button
-            android:id="@+id/btn_update"
-            android:layout_centerHorizontal="true"
-            android:text="@string/repo_update"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-
         <ImageView
             android:id="@+id/qr_code"
             android:src="@drawable/swap_qr_example"
diff --git a/F-Droid/res/menu/repo_details_activity.xml b/F-Droid/res/menu/repo_details_activity.xml
index 82a38938c..a98ec8310 100644
--- a/F-Droid/res/menu/repo_details_activity.xml
+++ b/F-Droid/res/menu/repo_details_activity.xml
@@ -2,11 +2,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item
-        android:id="@+id/menu_update"
-        android:icon="@drawable/ic_refresh_white"
-        android:title="@string/repo_update"
-        app:showAsAction="always|withText" />
     <item
         android:id="@+id/menu_delete"
         android:icon="@drawable/ic_delete_white"
@@ -18,4 +13,4 @@
         android:title="@string/enable_nfc_send"
         app:showAsAction="ifRoom|withText" />
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java b/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
index 44d3b754e..2872daddb 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
@@ -2,7 +2,6 @@ package org.fdroid.fdroid.views;
 
 import android.annotation.TargetApi;
 import android.content.BroadcastReceiver;
-import android.content.ContentValues;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -21,7 +20,6 @@ import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -66,7 +64,6 @@ public class RepoDetailsActivity extends ActionBarActivity {
      */
     private static final int[] HIDE_IF_EXISTS = {
             R.id.text_not_yet_updated,
-            R.id.btn_update
     };
     private Repo repo;
     private long repoId;
@@ -109,14 +106,6 @@ public class RepoDetailsActivity extends ActionBarActivity {
         TextView inputUrl = (TextView) findViewById(R.id.input_repo_url);
         inputUrl.setText(repo.address);
 
-        Button update = (Button) repoView.findViewById(R.id.btn_update);
-        update.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                performUpdate();
-            }
-        });
-
         Uri uri = Uri.parse(repo.address);
         uri = uri.buildUpon().appendQueryParameter("fingerprint", repo.fingerprint).build();
         String qrUriString = uri.toString().toUpperCase(Locale.ENGLISH);
@@ -207,9 +196,6 @@ public class RepoDetailsActivity extends ActionBarActivity {
             case android.R.id.home:
                 NavUtils.navigateUpFromSameTask(this);
                 return true;
-            case R.id.menu_update:
-                performUpdate();
-                return true;
             case R.id.menu_delete:
                 promptForDelete();
                 return true;
@@ -328,19 +314,6 @@ public class RepoDetailsActivity extends ActionBarActivity {
         lastUpdated.setText(lastUpdate);
     }
 
-    /**
-     * When an update is performed, notify the listener so that the repo
-     * list can be updated. We will perform the update ourselves though.
-     */
-    private void performUpdate() {
-        // Ensure repo is enabled before updating...
-        ContentValues values = new ContentValues(1);
-        values.put(RepoProvider.DataColumns.IN_USE, 1);
-        RepoProvider.Helper.update(this, repo, values);
-
-        UpdateService.updateRepoNow(repo.address, this);
-    }
-
     private void promptForDelete() {
         new AlertDialog.Builder(this)
                 .setTitle(R.string.repo_confirm_delete_title)

From 77f0dbb65a9c10c77f2bcc64841364b74135014c Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Mon, 28 Sep 2015 08:43:52 +0300
Subject: [PATCH 05/10] Correct the message about disabled repo

Explain that repository should be enabled.
---
 F-Droid/res/values/strings.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/F-Droid/res/values/strings.xml b/F-Droid/res/values/strings.xml
index 7e76a5302..c32b538f7 100644
--- a/F-Droid/res/values/strings.xml
+++ b/F-Droid/res/values/strings.xml
@@ -198,9 +198,7 @@
         applications could not be verified. You should be careful
         with applications downloaded from unsigned indexes.</string>
     <string name="repo_not_yet_updated">This repository has not been used yet.
-        In order to view the apps it provides, you will need to update
-        it.\n\nOnce updated, the description and other details will
-        become available here.</string>
+        You need to enable it to view the apps it provides.</string>
     <string name="unknown">Unknown</string>
     <string name="repo_confirm_delete_title">Delete Repository?</string>
     <string name="repo_confirm_delete_body">Deleting a repository means

From 6f6bd44a38a3fa0b68e0592bc3115812e472910c Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Mon, 28 Sep 2015 08:55:02 +0300
Subject: [PATCH 06/10] Use static title for repository details activity

Repository name is usually too long to fit into the title. Besides, it's
also shown in the activity, no need to duplicate it.
---
 F-Droid/AndroidManifest.xml                                  | 2 +-
 F-Droid/res/values/strings.xml                               | 1 +
 F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/F-Droid/AndroidManifest.xml b/F-Droid/AndroidManifest.xml
index 86a6d8f46..7ad08688f 100644
--- a/F-Droid/AndroidManifest.xml
+++ b/F-Droid/AndroidManifest.xml
@@ -347,7 +347,7 @@
         </activity>-->
         <activity
             android:name=".views.RepoDetailsActivity"
-            android:label="@string/menu_manage"
+            android:label="@string/repo_details"
             android:parentActivityName=".views.ManageReposActivity"
             android:windowSoftInputMode="stateHidden">
             <meta-data
diff --git a/F-Droid/res/values/strings.xml b/F-Droid/res/values/strings.xml
index c32b538f7..329ce8e21 100644
--- a/F-Droid/res/values/strings.xml
+++ b/F-Droid/res/values/strings.xml
@@ -188,6 +188,7 @@
     <string name="theme">Theme</string>
     <string name="unsigned">Unsigned</string>
     <string name="unverified">Unverified</string>
+    <string name="repo_details">Repository</string>
     <string name="repo_num_apps">Number of apps</string>
     <string name="repo_fingerprint">Fingerprint of Repo Signing Key (SHA-256)</string>
     <string name="repo_description">Description</string>
diff --git a/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java b/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
index 2872daddb..6531b30de 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
@@ -101,8 +101,6 @@ public class RepoDetailsActivity extends ActionBarActivity {
         };
         repo = RepoProvider.Helper.findById(this, repoId, projection);
 
-        setTitle(repo.name);
-
         TextView inputUrl = (TextView) findViewById(R.id.input_repo_url);
         inputUrl.setText(repo.address);
 

From 4b2089b7906e81a264e42662f474b318c6051c22 Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Mon, 28 Sep 2015 09:00:03 +0300
Subject: [PATCH 07/10] Use primary text color for key fingerprint

No need to grey it out.
---
 F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java b/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
index 6531b30de..16279e75f 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
@@ -255,23 +255,20 @@ public class RepoDetailsActivity extends ActionBarActivity {
         TextView repoFingerprintDescView = (TextView) parent.findViewById(R.id.text_repo_fingerprint_description);
 
         String repoFingerprint;
-        int repoFingerprintColor;
 
         // TODO show the current state of the signature check, not just whether there is a key or not
         if (TextUtils.isEmpty(repo.fingerprint) && TextUtils.isEmpty(repo.pubkey)) {
             repoFingerprint = getResources().getString(R.string.unsigned);
-            repoFingerprintColor = getResources().getColor(R.color.unsigned);
+            repoFingerprintView.setTextColor(getResources().getColor(R.color.unsigned));
             repoFingerprintDescView.setVisibility(View.VISIBLE);
             repoFingerprintDescView.setText(getResources().getString(R.string.unsigned_description));
         } else {
             // this is based on repo.fingerprint always existing, which it should
             repoFingerprint = Utils.formatFingerprint(this, repo.fingerprint);
-            repoFingerprintColor = getResources().getColor(R.color.signed);
             repoFingerprintDescView.setVisibility(View.GONE);
         }
 
         repoFingerprintView.setText(repoFingerprint);
-        repoFingerprintView.setTextColor(repoFingerprintColor);
     }
 
     private void updateRepoView() {

From 2cc66619794bd3c9822a18f2f28b6d91492689ec Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Mon, 28 Sep 2015 09:06:33 +0300
Subject: [PATCH 08/10] Make repository details look more Material

See http://www.google.com/design/spec/style/typography.html

Remove useless attributes; add styles with proper paddings, size and color
for caption and body text. Unfortunately, line spacing attributes are
supported only since Jelly Bean.
---
 F-Droid/res/layout/repodetails.xml            | 103 +++++++++---------
 F-Droid/res/values-v16/styles.xml             |   8 ++
 F-Droid/res/values/dimens.xml                 |   3 -
 F-Droid/res/values/strings.xml                |   1 +
 F-Droid/res/values/styles.xml                 |  12 +-
 .../fdroid/views/RepoDetailsActivity.java     |   1 -
 6 files changed, 71 insertions(+), 57 deletions(-)
 create mode 100644 F-Droid/res/values-v16/styles.xml

diff --git a/F-Droid/res/layout/repodetails.xml b/F-Droid/res/layout/repodetails.xml
index 52d5d4f90..5b48380af 100644
--- a/F-Droid/res/layout/repodetails.xml
+++ b/F-Droid/res/layout/repodetails.xml
@@ -11,102 +11,101 @@
         android:paddingRight="?attr/listPreferredItemPaddingRight"
         android:orientation="vertical">
 
+        <!-- URL of this repo -->
         <TextView
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:text="@string/repo_url"
+            style="@style/RepoDetailsCaption"/>
+        <TextView
             android:id="@+id/input_repo_url"
-            android:textStyle="bold"/>
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/RepoDetailsBody"/>
 
         <!-- Name of this repo -->
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:id="@+id/label_repo_name"
-            android:text="@string/repo_name"
-            android:paddingTop="@dimen/form_label_top"/>
-        <TextView
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:singleLine="false"
+            android:text="@string/repo_name"
+            style="@style/RepoDetailsCaption"/>
+        <TextView
             android:id="@+id/text_repo_name"
-            android:textStyle="bold"/>
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/RepoDetailsBody"/>
 
         <!-- Description - as pulled from the index file during last update... -->
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:id="@+id/label_description"
-            android:text="@string/repo_description"
-            android:paddingTop="@dimen/form_label_top"/>
-        <TextView
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:singleLine="false"
-            android:scrollHorizontally="false"
+            android:text="@string/repo_description"
+            style="@style/RepoDetailsCaption"/>
+        <TextView
             android:id="@+id/text_description"
-            android:textStyle="bold"/>
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/RepoDetailsBody"/>
 
         <!-- Number of apps belonging to this repo -->
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:id="@+id/label_num_apps"
-            android:text="@string/repo_num_apps"
-            android:paddingTop="@dimen/form_label_top" />
-        <TextView
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:text="@string/repo_num_apps"
+            style="@style/RepoDetailsCaption"/>
+        <TextView
             android:id="@+id/text_num_apps"
-            android:textStyle="bold"/>
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/RepoDetailsBody"/>
 
         <!-- The last time this repo was updated -->
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:id="@+id/label_last_update"
-            android:text="@string/repo_last_update"
-            android:paddingTop="@dimen/form_label_top" />
-        <TextView
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:text="@string/repo_last_update"
+            style="@style/RepoDetailsCaption"/>
+        <TextView
             android:id="@+id/text_last_update"
-            android:textStyle="bold"/>
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/RepoDetailsBody"/>
 
         <!-- Signature (or "unsigned" if none) -->
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:id="@+id/label_repo_fingerprint"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:text="@string/repo_fingerprint"
-            android:paddingTop="@dimen/form_label_top" />
+            style="@style/RepoDetailsCaption"/>
         <TextView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:singleLine="false"
-            android:scrollHorizontally="false"
             android:id="@+id/text_repo_fingerprint"
-            android:textStyle="bold"/>
-        <TextView
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:singleLine="false"
-            android:scrollHorizontally="false"
-            android:id="@+id/text_repo_fingerprint_description"/>
+            style="@style/RepoDetailsBody"/>
+        <TextView
+            android:id="@+id/text_repo_fingerprint_description"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/RepoDetailsBody"/>
 
-        <!-- The last time this repo was updated -->
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:id="@+id/text_not_yet_updated"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:text="@string/repo_not_yet_updated"
-            android:textStyle="bold"
-            android:paddingTop="@dimen/form_label_top"/>
+            style="@style/RepoDetailsBody"/>
 
         <ImageView
             android:id="@+id/qr_code"
             android:src="@drawable/swap_qr_example"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:paddingTop="16dp"/>
 
     </LinearLayout>
 
diff --git a/F-Droid/res/values-v16/styles.xml b/F-Droid/res/values-v16/styles.xml
new file mode 100644
index 000000000..89f9ee467
--- /dev/null
+++ b/F-Droid/res/values-v16/styles.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <style name="RepoDetailsBody">
+        <item name="android:lineSpacingMultiplier">1.25</item>
+    </style>
+
+</resources>
diff --git a/F-Droid/res/values/dimens.xml b/F-Droid/res/values/dimens.xml
index f823de15f..f1113aab1 100644
--- a/F-Droid/res/values/dimens.xml
+++ b/F-Droid/res/values/dimens.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <dimen name="padding_side">8dp</dimen>
-    <dimen name="padding_top">5dp</dimen>
-    <dimen name="form_label_top">5dp</dimen>
     <dimen name="applist_icon_normal_size">48dp</dimen>
     <dimen name="applist_icon_compact_size">32dp</dimen>
 
diff --git a/F-Droid/res/values/strings.xml b/F-Droid/res/values/strings.xml
index 329ce8e21..c488e3d93 100644
--- a/F-Droid/res/values/strings.xml
+++ b/F-Droid/res/values/strings.xml
@@ -189,6 +189,7 @@
     <string name="unsigned">Unsigned</string>
     <string name="unverified">Unverified</string>
     <string name="repo_details">Repository</string>
+    <string name="repo_url">Address</string>
     <string name="repo_num_apps">Number of apps</string>
     <string name="repo_fingerprint">Fingerprint of Repo Signing Key (SHA-256)</string>
     <string name="repo_description">Description</string>
diff --git a/F-Droid/res/values/styles.xml b/F-Droid/res/values/styles.xml
index 0d3af88a3..b81034df8 100644
--- a/F-Droid/res/values/styles.xml
+++ b/F-Droid/res/values/styles.xml
@@ -1,3 +1,4 @@
+<?xml version='1.0' encoding='utf-8'?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="AppBaseThemeDark" parent="Theme.AppCompat">
@@ -38,6 +39,15 @@
         <item name="colorAccent">@color/fdroid_green</item>
     </style>
 
+    <style name="RepoDetailsCaption">
+        <item name="android:paddingTop">16dp</item>
+        <item name="android:paddingBottom">4dp</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
+    </style>
+
+    <style name="RepoDetailsBody" />
+
     <style name="SwapTheme.Wizard" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorButtonNormal">@color/swap_bright_blue</item>
         <item name="android:actionBarStyle">@style/Widget.AppCompat.ActionBar.Solid</item>
@@ -168,4 +178,4 @@
         <item name="android:textStyle">italic</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java b/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
index 16279e75f..70b56a2f5 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
@@ -48,7 +48,6 @@ public class RepoDetailsActivity extends ActionBarActivity {
     private static final int[] SHOW_IF_EXISTS = {
             R.id.label_repo_name,
             R.id.text_repo_name,
-            R.id.label_description,
             R.id.text_description,
             R.id.label_num_apps,
             R.id.text_num_apps,

From f9feab57cc9d8bb35092f8a148d62aa11b8ab8ac Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Thu, 1 Oct 2015 17:47:05 +0300
Subject: [PATCH 09/10] Use monospace font for repository fingerprint

Bytes look better when they are properly aligned.
---
 F-Droid/res/layout/repodetails.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/F-Droid/res/layout/repodetails.xml b/F-Droid/res/layout/repodetails.xml
index 5b48380af..ce8bf3eab 100644
--- a/F-Droid/res/layout/repodetails.xml
+++ b/F-Droid/res/layout/repodetails.xml
@@ -86,6 +86,7 @@
             android:id="@+id/text_repo_fingerprint"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:typeface="monospace"
             style="@style/RepoDetailsBody"/>
         <TextView
             android:id="@+id/text_repo_fingerprint_description"

From b3ae79e5c2853747c3086eb21b8ee895aebc093d Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Thu, 1 Oct 2015 17:49:31 +0300
Subject: [PATCH 10/10] Correct the fingerprint caption

Do not use the word "repo" in captions because all the info in the
activity is about a repository.
---
 F-Droid/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/F-Droid/res/values/strings.xml b/F-Droid/res/values/strings.xml
index c488e3d93..16c41b048 100644
--- a/F-Droid/res/values/strings.xml
+++ b/F-Droid/res/values/strings.xml
@@ -191,7 +191,7 @@
     <string name="repo_details">Repository</string>
     <string name="repo_url">Address</string>
     <string name="repo_num_apps">Number of apps</string>
-    <string name="repo_fingerprint">Fingerprint of Repo Signing Key (SHA-256)</string>
+    <string name="repo_fingerprint">Fingerprint of the signing key (SHA-256)</string>
     <string name="repo_description">Description</string>
     <string name="repo_last_update">Last update</string>
     <string name="repo_update">Update</string>