yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Long click download button to download with default label

Browse Source
This commit is contained in:
seven332 committed 2016-03-15 01:24:25 +08:00
1 parent b6a6863f6c
commit 04ae2c1b4b
4 files changed
+21 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java
+2 -2
View File
@@ -216,10 +216,10 @@ public final class CommonOperations {
client.execute(request);
}
public static void startDownload(final Activity activity, final GalleryInfo galleryInfo) {
public static void startDownload(final Activity activity, final GalleryInfo galleryInfo, boolean forceDefault) {
final DownloadManager dm = EhApplication.getDownloadManager(activity);
boolean justStart = dm.containDownloadInfo(galleryInfo.gid);
boolean justStart = forceDefault || dm.containDownloadInfo(galleryInfo.gid);
String label = null;
// Get default download label
if (!justStart && Settings.getHasDefaultDownloadLabel()) {
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
+17 -9
View File
@@ -104,7 +104,8 @@ import java.util.List;
import java.util.Locale;
public class GalleryDetailScene extends BaseScene implements View.OnClickListener,
com.hippo.ehviewer.download.DownloadManager.DownloadInfoListener {
com.hippo.ehviewer.download.DownloadManager.DownloadInfoListener,
View.OnLongClickListener{
@IntDef({STATE_INIT, STATE_NORMAL, STATE_REFRESH, STATE_REFRESH_HEADER, STATE_FAILED})
@Retention(RetentionPolicy.SOURCE)
@@ -421,6 +422,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
mCategory.setOnClickListener(this);
mOtherActions.setOnClickListener(this);
mDownload.setOnClickListener(this);
mDownload.setOnLongClickListener(this);
mRead.setOnClickListener(this);
mBelowHeader = mainView.findViewById(R.id.below_header);
@@ -987,15 +989,9 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
lub.setCategory(category);
GalleryListScene.startScene(this, lub);
} else if (mDownload == v) {
// Add download
GalleryInfo galleryInfo = null;
if (mGalleryInfo != null) {
galleryInfo = mGalleryInfo;
} else if (mGalleryDetail != null) {
galleryInfo = mGalleryDetail;
}
GalleryInfo galleryInfo = getGalleryInfo();
if (galleryInfo != null) {
CommonOperations.startDownload(getActivity(), galleryInfo);
CommonOperations.startDownload(getActivity(), galleryInfo, false);
}
} else if (mRead == v) {
GalleryInfo galleryInfo = null;
@@ -1106,6 +1102,18 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
}
}
@Override
public boolean onLongClick(View v) {
if (mDownload == v) {
GalleryInfo galleryInfo = getGalleryInfo();
if (galleryInfo != null) {
CommonOperations.startDownload(getActivity(), galleryInfo, true);
}
return true;
}
return false;
}
@Override
public void onBackPressed() {
if (ApiHelper.SUPPORT_TRANSITION && mViewTransition != null && mThumb != null &&
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
+1 -1
View File
@@ -588,7 +588,7 @@ public final class GalleryListScene extends BaseScene
public void onClick(DialogInterface dialog, int which) {
switch (which) {
case 0: // Download
CommonOperations.startDownload(getActivity(), gi);
CommonOperations.startDownload(getActivity(), gi, false);
break;
case 1: // Favorites
CommonOperations.addToFavorites(getActivity(), gi,
app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java
+1 -1
View File
@@ -174,7 +174,7 @@ public class HistoryScene extends ToolbarScene
public void onClick(DialogInterface dialog, int which) {
switch (which) {
case 0: // Download
CommonOperations.startDownload(getActivity(), gi);
CommonOperations.startDownload(getActivity(), gi, false);
break;
case 1: // Favorites
CommonOperations.addToFavorites(getActivity(), gi,