From 3f00b2a4fbf7aaf947dda034974eb8cfc2127dde Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Fri, 28 Sep 2018 09:31:33 +0900
Subject: [PATCH] standardize version properties

---
 .../fdroid/views/AppDetailsRecyclerViewAdapter.java       | 4 ++--
 app/src/main/res/layout/updates_header.xml                | 4 ++--
 app/src/main/res/values/strings.xml                       | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
index 5375ac403..a92bb8875 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
@@ -1093,7 +1093,7 @@ public class AppDetailsRecyclerViewAdapter
             Repo repo = RepoProvider.Helper.findById(context, apk.repoId);
             if (repo != null) {
                 repository.setVisibility(View.VISIBLE);
-                repository.setText(repo.getName());
+                repository.setText("Repository: " + repo.getName());
             } else {
                 repository.setVisibility(View.INVISIBLE);
             }
@@ -1170,7 +1170,7 @@ public class AppDetailsRecyclerViewAdapter
         }
 
         private String getApiText(final Apk apk) {
-            String apiText = "Android ";
+            String apiText = "Version: ";
             if (apk.minSdkVersion > 0 && apk.maxSdkVersion < Apk.SDK_VERSION_MAX_VALUE) {
                 apiText += context.getString(R.string.minsdk_up_to_maxsdk,
                         Utils.getAndroidVersionName(apk.minSdkVersion),
diff --git a/app/src/main/res/layout/updates_header.xml b/app/src/main/res/layout/updates_header.xml
index 88edde404..b7542efc8 100644
--- a/app/src/main/res/layout/updates_header.xml
+++ b/app/src/main/res/layout/updates_header.xml
@@ -52,10 +52,10 @@
 
     <Button
         android:id="@+id/button_toggle_apps_to_update"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_margin="8dp"
         android:background="?attr/selectableItemBackground"
-        android:padding="10dp"
         tools:text="Show apps"
         android:textColor="@color/fdroid_blue"
         android:textAllCaps="true"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1a1792c27..330a97126 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -90,13 +90,13 @@ This often occurs with apps installed via Google Play or other sources, if they
     <string name="app_suggested">Suggested</string>
     <string name="app_incompatible">Incompatible</string>
     <string name="app_installed">Installed</string>
+    <string name="app__newly_added">New</string>
     <string name="app_not_installed">Not Installed</string>
     <string name="app_inst_known_source">Installed (from %s)</string>
     <string name="app_inst_unknown_source">Installed (from unknown source)</string>
     <string name="app_version_x_available">Version %1$s available</string>
     <string name="app_version_x_installed">Version %1$s</string>
     <string name="app_recommended_version_installed">Version %1$s (Recommended)</string>
-    <string name="app__newly_added">New</string>
     <string name="added_on">Added on %s</string>
     <string name="app__tts__cancel_download">Cancel download</string>
     <string name="app__install_downloaded_update">Update</string>
@@ -355,9 +355,9 @@ This often occurs with apps installed via Google Play or other sources, if they
     <string name="repo_added">Saved package repository %1$s.</string>
     <string name="repo_searching_address">Looking for package repository at\n%1$s</string>
     <string name="share_repository">Share Repository</string>
-    <string name="minsdk_or_later">%s or later</string>
-    <string name="up_to_maxsdk">Up to %s</string>
-    <string name="minsdk_up_to_maxsdk">%1$s up to %2$s</string>
+    <string name="minsdk_or_later">%s+</string>
+    <string name="up_to_maxsdk">1.0-%s</string>
+    <string name="minsdk_up_to_maxsdk">%1$s-%2$s</string>
     <string name="not_on_same_wifi">Your device is not on the same Wi-Fi as the local repo you just added! Try joining
         this network: %s
     </string>