Enrich gallery list item menu

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java

@@ -76,8 +76,10 @@ import com.hippo.ehviewer.client.exception.EhException;
 import com.hippo.ehviewer.client.parser.GalleryDetailUrlParser;
 import com.hippo.ehviewer.client.parser.GalleryListParser;
 import com.hippo.ehviewer.client.parser.GalleryPageUrlParser;
+import com.hippo.ehviewer.dao.DownloadInfo;
 import com.hippo.ehviewer.dao.QuickSearch;
 import com.hippo.ehviewer.ui.CommonOperations;
+import com.hippo.ehviewer.ui.GalleryActivity;
 import com.hippo.ehviewer.ui.MainActivity;
 import com.hippo.ehviewer.widget.SearchBar;
 import com.hippo.ehviewer.widget.SearchLayout;
@@ -981,21 +983,60 @@ public final class GalleryListScene extends BaseScene
             return true;
         }
 
+        boolean download;
+        switch (EhApplication.getDownloadManager(context).getDownloadState(gi.gid)) {
+            default:
+            case DownloadInfo.STATE_INVALID:
+                download = true;
+                break;
+            case DownloadInfo.STATE_NONE:
+                download = true;
+                break;
+            case DownloadInfo.STATE_WAIT:
+                download = false;
+                break;
+            case DownloadInfo.STATE_DOWNLOAD:
+                download = false;
+                break;
+            case DownloadInfo.STATE_FINISH:
+                download = true;
+                break;
+            case DownloadInfo.STATE_FAILED:
+                download = true;
+                break;
+        }
+        boolean favourite = gi.favoriteSlot == -2;
+
+        CharSequence[] items = new CharSequence[] {
+            context.getString(R.string.read),
+            context.getString(download ? R.string.download : R.string.stop_downloading),
+            context.getString(favourite ? R.string.add_to_favourites : R.string.remove_from_favourites),
+        };
+
         new AlertDialog.Builder(context)
                 .setTitle(EhUtils.getSuitableTitle(gi))
-                .setItems(R.array.gallery_list_menu_entries, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        switch (which) {
-                            case 0: // Download
+                .setItems(items, (dialog, which) -> {
+                    switch (which) {
+                        case 0: // Read
+                            Intent intent = new Intent(activity, GalleryActivity.class);
+                            intent.setAction(GalleryActivity.ACTION_EH);
+                            intent.putExtra(GalleryActivity.KEY_GALLERY_INFO, gi);
+                            startActivity(intent);
+                            break;
+                        case 1: // Download
+                            if (download) {
                                 CommonOperations.startDownload(activity, gi, false);
-                                break;
-                            case 1: // Favorites
-                                CommonOperations.addToFavorites(activity, gi,
-                                        new addToFavoriteListener(context,
-                                                activity.getStageId(), getTag()));
-                                break;
-                        }
+                            } else {
+                                EhApplication.getDownloadManager().stopDownload(gi.gid);
+                            }
+                            break;
+                        case 2: // Favorites
+                            if (favourite) {
+                                CommonOperations.addToFavorites(activity, gi, new AddToFavoriteListener(context, activity.getStageId(), getTag()));
+                            } else {
+                                CommonOperations.removeFromFavorites(activity, gi, new RemoveFromFavoriteListener(context, activity.getStageId(), getTag()));
+                            }
+                            break;
                     }
                 }).show();
         return true;
@@ -1518,9 +1559,9 @@ public final class GalleryListScene extends BaseScene
         }
     }
 
-    private static class addToFavoriteListener extends EhCallback<GalleryListScene, Void> {
+    private static class AddToFavoriteListener extends EhCallback<GalleryListScene, Void> {
 
-        public addToFavoriteListener(Context context, int stageId, String sceneTag) {
+        public AddToFavoriteListener(Context context, int stageId, String sceneTag) {
             super(context, stageId, sceneTag);
         }
 
@@ -1542,4 +1583,29 @@ public final class GalleryListScene extends BaseScene
             return scene instanceof GalleryListScene;
         }
     }
+
+    private static class RemoveFromFavoriteListener extends EhCallback<GalleryListScene, Void> {
+
+        public RemoveFromFavoriteListener(Context context, int stageId, String sceneTag) {
+            super(context, stageId, sceneTag);
+        }
+
+        @Override
+        public void onSuccess(Void result) {
+            showTip(R.string.remove_from_favorite_success, LENGTH_SHORT);
+        }
+
+        @Override
+        public void onFailure(Exception e) {
+            showTip(R.string.remove_from_favorite_failure, LENGTH_LONG);
+        }
+
+        @Override
+        public void onCancel() {}
+
+        @Override
+        public boolean isInstance(SceneFragment scene) {
+            return scene instanceof GalleryListScene;
+        }
+    }
 }

app/src/main/res/values-zh-rCN/strings.xml

@@ -166,6 +166,9 @@
     <string name="select_image_first">请先选择图片</string>
 
     <string name="add_to_favourites">收藏</string>
+    <string name="remove_from_favourites">移除收藏</string>
+
+    <string name="stop_downloading">停止下载</string>
 
     <string name="quick_search">快速搜索</string>
     <string name="quick_search_tip">点击“+”来添加快速搜索</string>

app/src/main/res/values-zh-rHK/strings.xml

@@ -166,6 +166,9 @@
     <string name="select_image_first">請先選擇圖片</string>
 
     <string name="add_to_favourites">收藏</string>
+    <string name="remove_from_favourites">移除收藏</string>
+
+    <string name="stop_downloading">停止下載</string>
 
     <string name="quick_search">快速搜索</string>
     <string name="quick_search_tip">點擊“+”來添加快速搜索</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -166,6 +166,9 @@
     <string name="select_image_first">請先選擇圖片</string>
 
     <string name="add_to_favourites">收藏</string>
+    <string name="remove_from_favourites">移除收藏</string>
+
+    <string name="stop_downloading">停止下載</string>
 
     <string name="quick_search">快速搜尋</string>
     <string name="quick_search_tip">點擊“+”以新增快速搜尋</string>

app/src/main/res/values/strings.xml

@@ -208,6 +208,9 @@
     <string name="select_image_first">Please select image first</string>
 
     <string name="add_to_favourites">Add to favourites</string>
+    <string name="remove_from_favourites">Remove from favourites</string>
+
+    <string name="stop_downloading">Stop downloading</string>
 
     <string name="quick_search">Quick search</string>
     <string name="quick_search_tip">Tap \"+\" to add Quick Search</string>