Add an option to download all media in a gallery in ViewRedditGalleryActivity.

Docile-Alligator · Docile-Alligator · commit 3552a9a490c6 · 2024-09-18T13:01:23.000-04:00
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewRedditGalleryActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewRedditGalleryActivity.java
@@ -5,6 +5,9 @@
 import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO;
 import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES;
 
+import android.app.job.JobInfo;
+import android.app.job.JobScheduler;
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.graphics.Typeface;
@@ -49,14 +52,13 @@
 import ml.docilealligator.infinityforreddit.fragments.ViewRedditGalleryImageOrGifFragment;
 import ml.docilealligator.infinityforreddit.fragments.ViewRedditGalleryVideoFragment;
 import ml.docilealligator.infinityforreddit.post.Post;
+import ml.docilealligator.infinityforreddit.services.DownloadMediaService;
 import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
 import ml.docilealligator.infinityforreddit.utils.Utils;
 
 public class ViewRedditGalleryActivity extends AppCompatActivity implements SetAsWallpaperCallback, CustomFontReceiver {
 
-    public static final String EXTRA_REDDIT_GALLERY = "ERG";
-    public static final String EXTRA_SUBREDDIT_NAME = "ESN";
-    public static final String EXTRA_IS_NSFW = "EIN";
+    public static final String EXTRA_POST = "EP";
     public static final String EXTRA_GALLERY_ITEM_INDEX = "EGII";
 
     @Inject
@@ -66,6 +68,7 @@ public class ViewRedditGalleryActivity extends AppCompatActivity implements SetA
     Executor executor;
     public Typeface typeface;
     private SectionsPagerAdapter sectionsPagerAdapter;
+    private Post post;
     private ArrayList<Post.Gallery> gallery;
     private String subredditName;
     private boolean isNsfw;
@@ -144,13 +147,18 @@ protected void onCreate(Bundle savedInstanceState) {
             getSupportActionBar().hide();
         }
 
-        gallery = getIntent().getParcelableArrayListExtra(EXTRA_REDDIT_GALLERY);
+        post = getIntent().getParcelableExtra(EXTRA_POST);
+        if (post == null) {
+            finish();
+            return;
+        }
+        gallery = post.getGallery();
         if (gallery == null || gallery.isEmpty()) {
             finish();
             return;
         }
-        subredditName = getIntent().getStringExtra(EXTRA_SUBREDDIT_NAME);
-        isNsfw = getIntent().getBooleanExtra(EXTRA_IS_NSFW, false);
+        subredditName = post.getSubredditName();
+        isNsfw = post.isNSFW();
 
         if (sharedPreferences.getBoolean(SharedPreferencesUtils.SWIPE_VERTICALLY_TO_GO_BACK_FROM_MEDIA, true)) {
             binding.getRoot().setOnDragDismissedListener(dragDirection -> {
@@ -201,6 +209,10 @@ private void setToolbarTitle(int position) {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.view_reddit_gallery_activity, menu);
+        for (int i = 0; i < menu.size(); i++) {
+            Utils.setTitleWithCustomFontToMenuItem(typeface, menu.getItem(i), null);
+        }
         return true;
     }
 
@@ -209,6 +221,13 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
             finish();
             return true;
+        } else if (item.getItemId() == R.id.action_download_all_gallery_media_view_reddit_gallery_activity) {
+            //TODO: contentEstimatedBytes
+            JobInfo jobInfo = DownloadMediaService.constructGalleryDownloadAllImagesJobInfo(this, 5000000, post);
+            ((JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE)).schedule(jobInfo);
+
+            Toast.makeText(this, R.string.download_started, Toast.LENGTH_SHORT).show();
+            return true;
         }
 
         return false;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/HistoryPostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/HistoryPostRecyclerViewAdapter.java
@@ -2537,9 +2537,7 @@ private void openMedia(Post post, int galleryItemIndex, long videoProgress) {
                 mActivity.startActivity(intent);
             } else if (post.getPostType() == Post.GALLERY_TYPE) {
                 Intent intent = new Intent(mActivity, ViewRedditGalleryActivity.class);
-                intent.putParcelableArrayListExtra(ViewRedditGalleryActivity.EXTRA_REDDIT_GALLERY, post.getGallery());
-                intent.putExtra(ViewRedditGalleryActivity.EXTRA_SUBREDDIT_NAME, post.getSubredditName());
-                intent.putExtra(ViewRedditGalleryActivity.EXTRA_IS_NSFW, post.isNSFW());
+                intent.putExtra(ViewRedditGalleryActivity.EXTRA_POST, post);
                 intent.putExtra(ViewRedditGalleryActivity.EXTRA_GALLERY_ITEM_INDEX, galleryItemIndex);
                 mActivity.startActivity(intent);
             }
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostDetailRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostDetailRecyclerViewAdapter.java
@@ -1112,9 +1112,7 @@ private void openMedia(Post post, int galleryItemIndex, long videoProgress) {
                 mActivity.startActivity(intent);
             } else if (post.getPostType() == Post.GALLERY_TYPE) {
                 Intent intent = new Intent(mActivity, ViewRedditGalleryActivity.class);
-                intent.putParcelableArrayListExtra(ViewRedditGalleryActivity.EXTRA_REDDIT_GALLERY, post.getGallery());
-                intent.putExtra(ViewRedditGalleryActivity.EXTRA_SUBREDDIT_NAME, post.getSubredditName());
-                intent.putExtra(ViewRedditGalleryActivity.EXTRA_IS_NSFW, post.isNSFW());
+                intent.putExtra(ViewRedditGalleryActivity.EXTRA_POST, post);
                 intent.putExtra(ViewRedditGalleryActivity.EXTRA_GALLERY_ITEM_INDEX, galleryItemIndex);
                 mActivity.startActivity(intent);
             }
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java
@@ -2665,9 +2665,7 @@ private void openMedia(Post post, int galleryItemIndex, long videoProgress) {
                 mActivity.startActivity(intent);
             } else if (post.getPostType() == Post.GALLERY_TYPE) {
                 Intent intent = new Intent(mActivity, ViewRedditGalleryActivity.class);
-                intent.putParcelableArrayListExtra(ViewRedditGalleryActivity.EXTRA_REDDIT_GALLERY, post.getGallery());
-                intent.putExtra(ViewRedditGalleryActivity.EXTRA_SUBREDDIT_NAME, post.getSubredditName());
-                intent.putExtra(ViewRedditGalleryActivity.EXTRA_IS_NSFW, post.isNSFW());
+                intent.putExtra(ViewRedditGalleryActivity.EXTRA_POST, post);
                 intent.putExtra(ViewRedditGalleryActivity.EXTRA_GALLERY_ITEM_INDEX, galleryItemIndex);
                 mActivity.startActivity(intent);
             }
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewRedditGalleryVideoFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewRedditGalleryVideoFragment.java
@@ -214,7 +214,7 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
             requestPermissionAndDownload();
             return true;
         } else if (item.getItemId() == R.id.action_playback_speed_view_reddit_gallery_video_fragment) {
-
+            changePlaybackSpeed();
             return true;
         }
         return false;
diff --git a/app/src/main/res/layout/fragment_post_options_bottom_sheet.xml b/app/src/main/res/layout/fragment_post_options_bottom_sheet.xml
@@ -126,7 +126,7 @@
             android:paddingTop="16dp"
             android:paddingEnd="32dp"
             android:paddingBottom="16dp"
-            android:text="@string/action_download_gallery"
+            android:text="@string/action_download_all_gallery_media"
             android:textColor="?attr/primaryTextColor"
             android:textSize="?attr/font_default"
             android:visibility="gone"
diff --git a/app/src/main/res/menu/view_reddit_gallery_activity.xml b/app/src/main/res/menu/view_reddit_gallery_activity.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_download_all_gallery_media_view_reddit_gallery_activity"
+        android:orderInCategory="10"
+        android:title="@string/action_download_all_gallery_media"
+        app:showAsAction="never" />
+</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -99,7 +99,7 @@
     <string name="action_more_options">More Options</string>
     <string name="action_add_to_home_screen">Add to Home screen</string>
     <string name="action_reset_fab_position">Reset FAB position</string>
-    <string name="action_download_gallery">Download gallery</string>
+    <string name="action_download_all_gallery_media">Download All Gallery Media</string>
 
     <string name="parse_json_response_error">Error occurred when parsing the JSON response</string>
     <string name="retrieve_token_error">Error Retrieving the token</string>

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {`
`214`	`214`	`requestPermissionAndDownload();`
`215`	`215`	`return true;`
`216`	`216`	`} else if (item.getItemId() == R.id.action_playback_speed_view_reddit_gallery_video_fragment) {`
`217`		`-`
	`217`	`+ changePlaybackSpeed();`
`218`	`218`	`return true;`
`219`	`219`	`}`
`220`	`220`	`return false;`