From 0901565c8addc3f24bdcf9b77cde19feef7a28c2 Mon Sep 17 00:00:00 2001
From: "Mr. Dragon" <whyorean@gmail.com>
Date: Tue, 26 Mar 2019 04:16:25 +0530
Subject: [PATCH] Downloads : Cleanup FetchListener & Adjust ItemView margin

---
 .../store/adapter/DownloadsAdapter.java       | 55 ++++++-------------
 .../store/fragment/details/ActionButton.java  | 26 +--------
 app/src/main/res/layout/item_downloads.xml    |  4 +-
 3 files changed, 21 insertions(+), 64 deletions(-)

diff --git a/app/src/main/java/com/aurora/store/adapter/DownloadsAdapter.java b/app/src/main/java/com/aurora/store/adapter/DownloadsAdapter.java
index fd1638dba..60188f528 100644
--- a/app/src/main/java/com/aurora/store/adapter/DownloadsAdapter.java
+++ b/app/src/main/java/com/aurora/store/adapter/DownloadsAdapter.java
@@ -41,12 +41,12 @@ import com.aurora.store.utility.Util;
 import com.aurora.store.utility.ViewUtil;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
+import com.tonyodev.fetch2.AbstractFetchListener;
 import com.tonyodev.fetch2.Download;
 import com.tonyodev.fetch2.Error;
 import com.tonyodev.fetch2.Fetch;
 import com.tonyodev.fetch2.FetchListener;
 import com.tonyodev.fetch2.Status;
-import com.tonyodev.fetch2core.DownloadBlock;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -118,7 +118,7 @@ public class DownloadsAdapter extends RecyclerView.Adapter<DownloadsAdapter.View
             viewHolder.txtETA.setText("");
             viewHolder.txtSpeed.setText("");
         } else if (download.getStatus() != Status.DOWNLOADING) {
-            viewHolder.txtETA.setText("Not available");
+            viewHolder.txtETA.setText("N/A");
             viewHolder.txtSpeed.setText("--/s");
         }
 
@@ -136,18 +136,7 @@ public class DownloadsAdapter extends RecyclerView.Adapter<DownloadsAdapter.View
     }
 
     private FetchListener getFetchListener(int currentId, ViewHolder viewHolder) {
-        return new FetchListener() {
-
-            @Override
-            public void onWaitingNetwork(@NotNull Download download) {
-
-            }
-
-            @Override
-            public void onStarted(@NotNull Download download, @NotNull List<? extends DownloadBlock> list, int i) {
-                if (currentId == download.getId())
-                    viewHolder.txtStatus.setText(Util.getStatus(download.getStatus()));
-            }
+        return new AbstractFetchListener() {
 
             @Override
             public void onResumed(@NotNull Download download) {
@@ -155,12 +144,6 @@ public class DownloadsAdapter extends RecyclerView.Adapter<DownloadsAdapter.View
                     viewHolder.txtStatus.setText(Util.getStatus(download.getStatus()));
             }
 
-            @Override
-            public void onRemoved(@NotNull Download download) {
-                if (currentId == download.getId())
-                    viewHolder.txtStatus.setText(Util.getStatus(download.getStatus()));
-            }
-
             @Override
             public void onQueued(@NotNull Download download, boolean waitingOnNetwork) {
                 if (currentId == download.getId())
@@ -190,19 +173,10 @@ public class DownloadsAdapter extends RecyclerView.Adapter<DownloadsAdapter.View
 
             @Override
             public void onError(@NotNull Download download, @NotNull Error error, @Nullable Throwable throwable) {
-                if (currentId == download.getId())
-                    viewHolder.txtStatus.setText(Util.getStatus(download.getStatus()));
-            }
-
-            @Override
-            public void onDownloadBlockUpdated(@NotNull Download download, @NotNull DownloadBlock downloadBlock, int i) {
-
-            }
-
-            @Override
-            public void onDeleted(@NotNull Download download) {
-                if (currentId == download.getId())
+                if (currentId == download.getId()) {
                     viewHolder.txtStatus.setText(Util.getStatus(download.getStatus()));
+                    viewHolder.clearStatus();
+                }
             }
 
             @Override
@@ -216,13 +190,10 @@ public class DownloadsAdapter extends RecyclerView.Adapter<DownloadsAdapter.View
 
             @Override
             public void onCancelled(@NotNull Download download) {
-                if (currentId == download.getId())
+                if (currentId == download.getId()) {
                     viewHolder.txtStatus.setText(Util.getStatus(download.getStatus()));
-            }
-
-            @Override
-            public void onAdded(@NotNull Download download) {
-
+                    viewHolder.clearStatus();
+                }
             }
         };
     }
@@ -249,5 +220,13 @@ public class DownloadsAdapter extends RecyclerView.Adapter<DownloadsAdapter.View
             super(itemView);
             ButterKnife.bind(this, itemView);
         }
+
+        void clearStatus() {
+            txtProgress.setText("");
+            progressBar.setProgress(0);
+            txtSpeed.setText("--/s");
+            txtETA.setText("N/A");
+            txtSize.setText("--");
+        }
     }
 }
diff --git a/app/src/main/java/com/aurora/store/fragment/details/ActionButton.java b/app/src/main/java/com/aurora/store/fragment/details/ActionButton.java
index 56398cb86..a0b3b7b0b 100644
--- a/app/src/main/java/com/aurora/store/fragment/details/ActionButton.java
+++ b/app/src/main/java/com/aurora/store/fragment/details/ActionButton.java
@@ -53,6 +53,7 @@ import com.aurora.store.utility.Util;
 import com.aurora.store.utility.ViewUtil;
 import com.dragons.aurora.playstoreapiv2.AndroidAppDeliveryData;
 import com.dragons.aurora.playstoreapiv2.Split;
+import com.tonyodev.fetch2.AbstractFetchListener;
 import com.tonyodev.fetch2.Download;
 import com.tonyodev.fetch2.Error;
 import com.tonyodev.fetch2.Fetch;
@@ -325,11 +326,7 @@ public class ActionButton extends AbstractHelper {
     }
 
     private FetchListener getFetchListener() {
-        return new FetchListener() {
-            @Override
-            public void onWaitingNetwork(@NotNull Download download) {
-
-            }
+        return new AbstractFetchListener() {
 
             @Override
             public void onStarted(@NotNull Download download,
@@ -353,10 +350,6 @@ public class ActionButton extends AbstractHelper {
                 }
             }
 
-            @Override
-            public void onRemoved(@NotNull Download download) {
-            }
-
             @Override
             public void onQueued(@NotNull Download download, boolean waitingOnNetwork) {
                 if (waitingOnNetwork)
@@ -402,16 +395,6 @@ public class ActionButton extends AbstractHelper {
                 notification.notifyFailed();
             }
 
-            @Override
-            public void onDownloadBlockUpdated(@NotNull Download download, @NotNull DownloadBlock downloadBlock, int i) {
-
-            }
-
-            @Override
-            public void onDeleted(@NotNull Download download) {
-
-            }
-
             @Override
             public void onCompleted(@NotNull Download download) {
                 if (download.getId() == request.getId()) {
@@ -444,11 +427,6 @@ public class ActionButton extends AbstractHelper {
                     switchViews(false);
                 }
             }
-
-            @Override
-            public void onAdded(@NotNull Download download) {
-
-            }
         };
     }
 }
diff --git a/app/src/main/res/layout/item_downloads.xml b/app/src/main/res/layout/item_downloads.xml
index 43e2b3587..57c8d9bd4 100644
--- a/app/src/main/res/layout/item_downloads.xml
+++ b/app/src/main/res/layout/item_downloads.xml
@@ -30,12 +30,13 @@
         android:id="@+id/img_download"
         android:layout_width="@dimen/icon_size_med"
         android:layout_height="@dimen/icon_size_med"
+        android:layout_margin="@dimen/margin_xxsmall"
         android:src="@drawable/ic_placeholder" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="5dp"
+        android:layout_marginStart="@dimen/margin_small"
         android:layout_toEndOf="@id/img_download"
         android:orientation="vertical">
 
@@ -88,7 +89,6 @@
                 android:id="@+id/txt_progress"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/app_version"
                 android:layout_alignParentEnd="true"
                 android:layout_marginStart="5dp"
                 android:ellipsize="end"