From 34c741f8359c5852ea12f2f940a38293a6b3841c Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Fri, 7 Apr 2017 14:59:54 +1000
Subject: [PATCH] Clear up confusion around "Tick" icon when updating app.

When navigating to Updates -> Show Apps and then downloading an item, it
shows the download progress inline for that item. After this is
complete, it then shows a tick icon next to the item. The long term goal
should be to remove the list item from under "Show Apps" so that it is
only shown at the top of the "Updates" view. However this will require
more work. In the meantime, we can alleviate some confusion by replacing
the "Tick" icon with a button that says "Update" (like the other buttons
in the Update view).
---
 .../views/apps/AppListItemController.java     |  6 ++--
 .../res/drawable/ic_download_complete.xml     | 33 -------------------
 .../res/layout/updateable_app_list_item.xml   | 16 ++++++++-
 3 files changed, 17 insertions(+), 38 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_download_complete.xml

diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java
index 08e349509..92b01e730 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java
@@ -329,9 +329,7 @@ public class AppListItemController extends RecyclerView.ViewHolder {
         }
 
         if (isReadyToInstall(app)) {
-            installButton.setImageDrawable(ContextCompat.getDrawable(activity, R.drawable.ic_download_complete));
-            installButton.setVisibility(View.VISIBLE);
-            // TODO: If in the downloading phase, then need to reflect that instead of this "download complete" icon.
+            installButton.setVisibility(View.GONE);
         } else {
             boolean installable = app.canAndWantToUpdate(activity) || !app.isInstalled();
             boolean shouldAllow = app.compatible && !app.isFiltered();
@@ -386,7 +384,7 @@ public class AppListItemController extends RecyclerView.ViewHolder {
 
     private void onDownloadComplete() {
         if (installButton != null) {
-            installButton.setImageDrawable(ContextCompat.getDrawable(activity, R.drawable.ic_download_complete));
+            installButton.setVisibility(View.GONE);
         }
 
         if (progressBar != null) {
diff --git a/app/src/main/res/drawable/ic_download_complete.xml b/app/src/main/res/drawable/ic_download_complete.xml
deleted file mode 100644
index 5074a5848..000000000
--- a/app/src/main/res/drawable/ic_download_complete.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="90dp"
-        android:height="90dp"
-        android:viewportWidth="90.0"
-        android:viewportHeight="90.0">
-    <path
-        android:pathData="m45,9.73c19.49,0 35.27,15.78 35.27,35.27 0,19.49 -15.78,35.27 -35.27,35.27 -19.49,0 -35.27,-15.78 -35.27,-35.27 0,-19.49 15.78,-35.27 35.27,-35.27z"
-        android:strokeLineCap="butt"
-        android:fillAlpha="1"
-        android:strokeColor="#00000000"
-        android:fillColor="#ffffff"
-        android:strokeWidth="2"
-        android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
-    <path
-        android:pathData="m45,7.73c-2.14,0 -4.24,0.19 -6.29,0.54l0.44,1.95c1.9,-0.32 3.86,-0.49 5.85,-0.49 19.49,0 35.27,15.78 35.27,35.27 0,19.49 -15.78,35.27 -35.27,35.27 -19.49,0 -35.27,-15.78 -35.27,-35.27 0,-1.94 0.16,-3.85 0.46,-5.7l-1.97,-0.35c-0.32,1.97 -0.5,3.99 -0.5,6.05 0,20.57 16.7,37.27 37.27,37.27 20.57,0 37.27,-16.7 37.27,-37.27 0,-20.57 -16.7,-37.27 -37.27,-37.27zM30.57,10.64c-3,1.26 -5.8,2.92 -8.34,4.88l1.26,1.53c2.41,-1.86 5.07,-3.42 7.92,-4.61l-0.85,-1.81zM16.08,21.52c-2.24,2.75 -4.09,5.82 -5.47,9.14l1.84,0.76c1.31,-3.15 3.07,-6.06 5.19,-8.67l-1.56,-1.23z"
-        android:strokeLineCap="butt"
-        android:fillAlpha="1"
-        android:strokeColor="#00000000"
-        android:fillColor="#0066cc"
-        android:strokeWidth="2"
-        android:strokeLineJoin="miter"
-        android:strokeAlpha="1"/>
-    <path
-        android:pathData="m59.21,32.08a2.5,2.5 0,0 0,-1.72 0.76l-18.12,18.12 -8.09,-8.09a2.5,2.5 0,1 0,-3.54 3.54l9.85,9.86a2.5,2.5 0,0 0,3.54 0l19.89,-19.89a2.5,2.5 0,0 0,-1.82 -4.29z"
-        android:strokeLineCap="round"
-        android:fillAlpha="1"
-        android:strokeColor="#00000000"
-        android:fillColor="#0066cc"
-        android:strokeWidth="5"
-        android:strokeLineJoin="round"
-        android:strokeAlpha="1"/>
-</vector>
diff --git a/app/src/main/res/layout/updateable_app_list_item.xml b/app/src/main/res/layout/updateable_app_list_item.xml
index 161116c87..1ee83c0e4 100644
--- a/app/src/main/res/layout/updateable_app_list_item.xml
+++ b/app/src/main/res/layout/updateable_app_list_item.xml
@@ -55,8 +55,22 @@
         android:layout_marginRight="16dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/action_button"
         app:layout_constraintTop_toTopOf="@+id/icon"
         app:layout_constraintBottom_toBottomOf="@+id/icon" />
 
+    <Button
+        android:id="@+id/action_button"
+        style="@style/DetailsPrimaryButtonStyleSmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Update" />
+
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file