From 44a39ff23065ebba9673e5199f6d63ca5fc1bff2 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Wed, 16 Mar 2016 13:29:58 +0800
Subject: [PATCH] Combine start and stop button in DownloadsScene

---
 .../ehviewer/ui/scene/DownloadsScene.java     | 28 +++++++++++++-----
 app/src/main/res/layout/item_download.xml     | 29 +++++++++++--------
 2 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
index 9a95c86df..86dba97af 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
@@ -657,22 +657,36 @@ public class DownloadsScene extends ToolbarScene
         holder.rating.setVisibility(View.VISIBLE);
         holder.category.setVisibility(View.VISIBLE);
         holder.state.setVisibility(View.VISIBLE);
-        holder.progressBar.setVisibility(View.INVISIBLE);
-        holder.percent.setVisibility(View.INVISIBLE);
-        holder.speed.setVisibility(View.INVISIBLE);
+        holder.progressBar.setVisibility(View.GONE);
+        holder.percent.setVisibility(View.GONE);
+        holder.speed.setVisibility(View.GONE);
+        if (info.state == DownloadInfo.STATE_WAIT || info.state == DownloadInfo.STATE_DOWNLOAD) {
+            holder.start.setVisibility(View.GONE);
+            holder.stop.setVisibility(View.VISIBLE);
+        } else {
+            holder.start.setVisibility(View.VISIBLE);
+            holder.stop.setVisibility(View.GONE);
+        }
 
         holder.state.setText(state);
     }
 
     @SuppressLint("SetTextI18n")
     private void bindProgress(DownloadHolder holder, DownloadInfo info) {
-        holder.uploader.setVisibility(View.INVISIBLE);
-        holder.rating.setVisibility(View.INVISIBLE);
-        holder.category.setVisibility(View.INVISIBLE);
-        holder.state.setVisibility(View.INVISIBLE);
+        holder.uploader.setVisibility(View.GONE);
+        holder.rating.setVisibility(View.GONE);
+        holder.category.setVisibility(View.GONE);
+        holder.state.setVisibility(View.GONE);
         holder.progressBar.setVisibility(View.VISIBLE);
         holder.percent.setVisibility(View.VISIBLE);
         holder.speed.setVisibility(View.VISIBLE);
+        if (info.state == DownloadInfo.STATE_WAIT || info.state == DownloadInfo.STATE_DOWNLOAD) {
+            holder.start.setVisibility(View.GONE);
+            holder.stop.setVisibility(View.VISIBLE);
+        } else {
+            holder.start.setVisibility(View.VISIBLE);
+            holder.stop.setVisibility(View.GONE);
+        }
 
         if (info.total <= 0 || info.finished < 0) {
             holder.percent.setText(null);
diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml
index 58720b416..a6fbfc36b 100644
--- a/app/src/main/res/layout/item_download.xml
+++ b/app/src/main/res/layout/item_download.xml
@@ -79,21 +79,26 @@
         android:paddingRight="8dp"
         android:orientation="horizontal">
 
-        <ImageView
-            android:id="@+id/start"
+        <FrameLayout
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:padding="8dp"
-            app:srcCompat="@drawable/v_play_x24"/>
+            android:layout_marginRight="8dp">
 
-        <ImageView
-            android:id="@+id/stop"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
-            android:padding="8dp"
-            app:srcCompat="@drawable/v_pause_x24"/>
+            <ImageView
+                android:id="@+id/start"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:padding="8dp"
+                app:srcCompat="@drawable/v_play_x24"/>
+
+            <ImageView
+                android:id="@+id/stop"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:padding="8dp"
+                app:srcCompat="@drawable/v_pause_x24"/>
+
+        </FrameLayout>
 
         <ImageView
             android:id="@+id/delete"