From 46978e1086d33bb7fb45e8260171a996cf0d940e Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 18 Jun 2015 14:35:13 -0400 Subject: [PATCH] make RepoDetails scrollable and add a QR code to the bottom Having a QR Code of the repo makes it easy for people to share the repo to someone else. --- F-Droid/res/layout/repodetails.xml | 30 ++++++++++++++----- .../fdroid/views/RepoDetailsActivity.java | 8 +++++ 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/F-Droid/res/layout/repodetails.xml b/F-Droid/res/layout/repodetails.xml index 7a7f1f9ef..921612d11 100644 --- a/F-Droid/res/layout/repodetails.xml +++ b/F-Droid/res/layout/repodetails.xml @@ -1,18 +1,24 @@ - + + + + - + + + + + diff --git a/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java b/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java index 4c87a4ff5..8f7cd4216 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java +++ b/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java @@ -26,12 +26,15 @@ import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.NfcHelper; import org.fdroid.fdroid.NfcNotEnabledActivity; import org.fdroid.fdroid.ProgressListener; +import org.fdroid.fdroid.QrGenAsyncTask; import org.fdroid.fdroid.R; import org.fdroid.fdroid.UpdateService; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.Repo; import org.fdroid.fdroid.data.RepoProvider; +import java.util.Locale; + public class RepoDetailsActivity extends ActionBarActivity { private static final String TAG = "RepoDetailsActivity"; @@ -111,6 +114,11 @@ public class RepoDetailsActivity extends ActionBarActivity { performUpdate(); } }); + + Uri uri = Uri.parse(repo.address); + uri = uri.buildUpon().appendQueryParameter("fingerprint", repo.fingerprint).build(); + String qrUriString = uri.toString().toUpperCase(Locale.ENGLISH); + new QrGenAsyncTask(this, R.id.qr_code).execute(uri.toString()); } @TargetApi(14)