Automatically hide read posts on Reddit

.editorconfig

@@ -0,0 +1,9 @@
+# editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true

README.md

@@ -23,6 +23,17 @@ There is an active community for Slide on the
 [/r/slideforreddit](https://www.reddit.com/r/slideforreddit/) subreddit,
 which anybody is welcome to join.
 
+## Sponsors
+
+Thank you to our awesome Github Sponsors, who help keep the Slide project going
+
+|  | GitHub profile |
+| --------- | ------------- |
+| **KevinNThomas** | https://github.com/KevinNThomas |
+| **andrewkdinh** | https://github.com/andrewkdinh |
+
+If you're interested in sponsoring our work, check out the sponsor slots for Slide contributors on the right-hand **Sponsorship** menu
+
 ## Contributing
 
 ### Issues

app/build.gradle

@@ -1,18 +1,19 @@
 plugins {
     id 'com.gladed.androidgitversion' version '0.4.13'
-    id 'com.github.ben-manes.versions' version '0.28.0'
+    id 'com.github.ben-manes.versions' version '0.33.0'
     id 'com.android.application'
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     buildToolsVersion '29.0.3'
 
     defaultConfig {
-        applicationId "me.ccrama.redditslide"
+        applicationId "bobobo.redditslide"
         minSdkVersion 16
-        targetSdkVersion 28
-        versionCode 326
+        //Change to 28 for F-Droid, need to add this to the scheme
+        targetSdkVersion 29
+        versionCode 334
         versionName androidGitVersion.name()
 
         multiDexEnabled true
@@ -78,65 +79,71 @@ dependencies {
 /** Custom **/
     implementation 'com.github.ccrama:JRAW:9a2494892d'
     implementation 'com.github.ccrama:TedBottomPicker:496623c9b6'
-    implementation 'com.github.ccrama:commonmark-java:07b304b575'
-    implementation 'com.github.ccrama:PeekAndPop:09adee29f1'
+    implementation 'com.github.ccrama.commonmark-java:commonmark:07b304b575'
+    implementation 'com.github.ccrama.commonmark-java:commonmark-ext-gfm-strikethrough:07b304b575'
+    implementation 'com.github.ccrama.commonmark-java:commonmark-ext-gfm-tables:07b304b575'
     implementation 'com.github.ccrama:JReadability:bb291880a5'
-    implementation 'com.github.Alexendoo:Android-RobotoTextView:f6d0eb5ac7'
+    implementation 'com.github.Alexendoo.Android-RobotoTextView:robototextview:f6d0eb5ac7'
 
 /** AndroidX **/
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.browser:browser:1.2.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.interpolator:interpolator:1.0.0'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'com.google.android.material:material:1.1.0'
+    implementation 'com.google.android.material:material:1.2.1'
 
 /** Third-party (Other) **/
-    def exoPlayerVersion = '2.11.7'
-    implementation "com.google.android.exoplayer:exoplayer-core:${exoPlayerVersion}"
-    implementation "com.google.android.exoplayer:exoplayer-dash:${exoPlayerVersion}"
-    implementation "com.google.android.exoplayer:extension-okhttp:${exoPlayerVersion}"
-    implementation "com.google.android.exoplayer:exoplayer-ui:${exoPlayerVersion}"
+    def exoPlayerVersion = '2.12.1'
+    implementation "com.google.android.exoplayer:exoplayer-core:$exoPlayerVersion"
+    implementation "com.google.android.exoplayer:exoplayer-dash:$exoPlayerVersion"
+    implementation "com.google.android.exoplayer:exoplayer-ui:$exoPlayerVersion"
+    implementation "com.google.android.exoplayer:extension-okhttp:$exoPlayerVersion"
 
-    implementation 'com.google.guava:guava:29.0-android'
+    implementation 'com.google.guava:guava:30.0-android'
     //Updating material-dialogs to any newer version will break all AlertDialogWrapper
     //noinspection GradleDependency
     implementation 'com.afollestad.material-dialogs:commons:0.8.6.2' //0.9.6.0
     implementation 'com.jakewharton:process-phoenix:2.0.0'
-    implementation 'com.github.ligi.snackengage:snackengage-core:0.25'
-    implementation 'com.github.ligi.snackengage:snackengage-playrate:0.25'
-    implementation 'com.github.rey5137:material:1.3.0'
+    implementation 'com.github.ligi.snackengage:snackengage-core:0.26'
+    implementation 'com.github.ligi.snackengage:snackengage-playrate:0.26'
+    implementation 'com.github.rey5137:material:1.3.1'
     implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
-    implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
+    implementation 'com.github.davemorrissey:subsampling-scale-image-view:ebce8e0'
     implementation 'com.cocosw:bottomsheet:1.5.0@aar'
     implementation 'com.lusfold.androidkeyvaluestore:library:0.1.0@aar'
-    implementation 'org.apache.commons:commons-lang3:3.10'
-    implementation 'org.apache.commons:commons-text:1.8'
-    implementation 'commons-io:commons-io:2.7'
+    implementation 'org.apache.commons:commons-lang3:3.11'
+    implementation 'org.apache.commons:commons-text:1.9'
+    implementation 'commons-io:commons-io:2.8.0'
     implementation 'jp.wasabeef:blurry:3.0.0'
     implementation 'com.makeramen:roundedimageview:2.3.0'
     implementation 'com.getbase:floatingactionbutton:1.10.1'
     implementation 'com.sothree.slidinguppanel:library:3.4.0'
     implementation 'com.github.suckgamony.RapidDecoder:library:7cdfca47fa'
-    implementation 'com.github.dasar:shiftcolorpicker:v0.5'
     implementation 'com.squareup.okhttp3:okhttp:3.12.12'
     implementation 'com.google.code.gson:gson:2.8.6'
-
-    implementation 'com.github.ozodrukh:CircularReveal:2.1.0'
-    compileOnly 'org.jetbrains:annotations:19.0.0'
+    implementation 'com.github.ozodrukh.CircularReveal:circualreveal:2.1.0'
+    compileOnly 'org.jetbrains:annotations:20.1.0'
     implementation 'com.mikepenz:itemanimators:1.1.0@aar'
-    implementation 'com.neovisionaries:nv-websocket-client:2.9'
+    implementation 'com.neovisionaries:nv-websocket-client:2.10'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
     implementation 'me.everything:overscroll-decor-android:1.1.0'
-    implementation('com.mikepenz:aboutlibraries:8.3.0', {
-        exclude group: 'org.jetbrains', module: 'annotations'
-    })
-    implementation 'com.googlecode.mp4parser:isoparser:1.1.22'
+    implementation 'com.mikepenz:aboutlibraries:6.2.3'
+    implementation 'org.mp4parser:isoparser:1.9.41'
+    implementation 'org.mp4parser:muxer:1.9.41'
 
 /** Testing **/
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.1'
     testImplementation 'org.hamcrest:hamcrest:2.2'
-    testImplementation 'org.robolectric:robolectric:4.3.1'
+    testImplementation 'org.robolectric:robolectric:4.4'
     testImplementation 'org.powermock:powermock-module-junit4:2.0.7'
 }
+
+/*testImplementation 'junit:junit:4.12'
+    testImplementation 'org.hamcrest:hamcrest-all:1.3'
+    testImplementation 'org.mockito:mockito-core:2.23.0'
+    testImplementation "org.robolectric:robolectric:${robolectricVersion}"
+    testImplementation "org.robolectric:shadows-multidex:${robolectricVersion}"
+    testImplementation "org.powermock:powermock-api-mockito2:${powerMockitoVersion}"
+    testImplementation "org.powermock:powermock-module-junit4:${powerMockitoVersion}" */

app/src/main/AndroidManifest.xml

@@ -18,7 +18,7 @@
             android:installLocation="auto"
             android:label="@string/app_name"
             android:resizeableActivity="true"
-            android:roundIcon="@mipmap/icon_round"
+            android:roundIcon="@mipmap/ic_launcher_round"
             android:usesCleartextTraffic="true"
             android:theme="@style/yellow_dark">
         <provider
@@ -37,7 +37,7 @@
                 android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|uiMode"
                 android:icon="@mipmap/ic_launcher"
                 android:label="@string/app_name"
-                android:roundIcon="@mipmap/icon_round">
+                android:roundIcon="@mipmap/ic_launcher_round">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
@@ -322,6 +322,14 @@
                 android:name=".Activities.Album"
                 android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|uiMode"
                 android:theme="@style/swipeable"/>
+        <activity
+                android:name=".Activities.RedditGallery"
+                android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|uiMode"
+                android:theme="@style/swipeable"/>
+        <activity
+                android:name=".Activities.RedditGalleryPager"
+                android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|uiMode"
+                android:theme="@style/swipeable"/>
         <activity
                 android:name=".Activities.Tumblr"
                 android:colorMode="wideColorGamut"

app/src/main/java/me/ccrama/redditslide/Activities/Album.java

@@ -49,6 +49,8 @@
 import me.ccrama.redditslide.Views.ToolbarColorizeHelper;
 import me.ccrama.redditslide.util.LinkUtil;
 
+import static me.ccrama.redditslide.Notifications.ImageDownloadNotificationService.*;
+
 /**
  * Created by ccrama on 3/5/2015. <p/> This class is responsible for accessing the Imgur api to get
  * the album json data from a URL or Imgur hash. It extends FullScreenActivity and supports swipe
@@ -58,7 +60,7 @@ public class Album extends FullScreenActivity implements FolderChooserDialogCrea
     public static final String EXTRA_URL = "url";
     public static final String SUBREDDIT = "subreddit";
     private List<Image> images;
-    private int         adapterPosition;
+    private int adapterPosition;
 
     @Override
     public void onFolderSelection(FolderChooserDialogCreate dialog, File folder, boolean isSaveToLocation) {
@@ -87,6 +89,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 i.putExtra(MediaView.SUBMISSION_URL,
                         getIntent().getStringExtra(MediaView.SUBMISSION_URL));
             }
+            if (submissionTitle != null) {
+                i.putExtra(EXTRA_SUBMISSION_TITLE, submissionTitle);
+            }
             i.putExtra("url", url);
             startActivity(i);
             finish();
@@ -120,6 +125,9 @@ public void doImageSave(boolean isGif, String contentUrl) {
                 Intent i = new Intent(this, ImageDownloadNotificationService.class);
                 i.putExtra("actuallyLoaded", contentUrl);
                 if (subreddit != null && !subreddit.isEmpty()) i.putExtra("subreddit", subreddit);
+                if (submissionTitle != null) {
+                    i.putExtra(EXTRA_SUBMISSION_TITLE, submissionTitle);
+                }
                 startService(i);
             }
         } else {
@@ -201,6 +209,7 @@ private void saveImageGallery(final Bitmap bitmap, String URL) {
 
     public String url;
     public String subreddit;
+    public String submissionTitle;
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
@@ -226,9 +235,12 @@ public void onCreate(Bundle savedInstanceState) {
         //Keep the screen on
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
-        if(getIntent().hasExtra(SUBREDDIT)){
+        if (getIntent().hasExtra(SUBREDDIT)) {
             this.subreddit = getIntent().getExtras().getString(SUBREDDIT);
         }
+        if (getIntent().hasExtra(EXTRA_SUBMISSION_TITLE)) {
+            this.submissionTitle = getIntent().getExtras().getString(EXTRA_SUBMISSION_TITLE);
+        }
 
         final ViewPager pager = (ViewPager) findViewById(R.id.images);
 
@@ -238,7 +250,7 @@ public void onCreate(Bundle savedInstanceState) {
         pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
                                           @Override
                                           public void onPageScrolled(int position, float positionOffset,
-                                                  int positionOffsetPixels) {
+                                                                     int positionOffsetPixels) {
                                               if (position == 0 && positionOffsetPixels == 0) {
                                                   finish();
                                               }
@@ -282,7 +294,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
     public static class OverviewPagerAdapter extends FragmentStatePagerAdapter {
         public BlankFragment blankPage;
-        public AlbumFrag     album;
+        public AlbumFrag album;
 
         public OverviewPagerAdapter(FragmentManager fm) {
             super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
@@ -322,11 +334,10 @@ public static class AlbumFrag extends Fragment {
 
         @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
+                                 Bundle savedInstanceState) {
             rootView = inflater.inflate(R.layout.fragment_verticalalbum, container, false);
 
-            final PreCachingLayoutManager mLayoutManager;
-            mLayoutManager = new PreCachingLayoutManager(getActivity());
+            final PreCachingLayoutManager mLayoutManager = new PreCachingLayoutManager(getActivity());
             recyclerView = rootView.findViewById(R.id.images);
             recyclerView.setLayoutManager(mLayoutManager);
             ((Album) getActivity()).url =
@@ -372,7 +383,7 @@ public void run() {
                                                 new DialogInterface.OnClickListener() {
                                                     @Override
                                                     public void onClick(DialogInterface dialog,
-                                                            int which) {
+                                                                        int which) {
                                                         getActivity().finish();
                                                     }
                                                 })
@@ -381,7 +392,7 @@ public void onClick(DialogInterface dialog,
                                                 new DialogInterface.OnClickListener() {
                                                     @Override
                                                     public void onClick(DialogInterface dialog,
-                                                            int which) {
+                                                                        int which) {
                                                         Intent i = new Intent(getActivity(),
                                                                 Website.class);
                                                         i.putExtra(LinkUtil.EXTRA_URL, url);
@@ -404,13 +415,15 @@ public void doWithData(final List<Image> jsonElements) {
                 super.doWithData(jsonElements);
                 if (getActivity() != null) {
                     getActivity().findViewById(R.id.progress).setVisibility(View.GONE);
-                    ((Album) getActivity()).images = new ArrayList<>(jsonElements);
-                    AlbumView adapter = new AlbumView(baseActivity, ((Album) getActivity()).images,
-                            getActivity().findViewById(R.id.toolbar).getHeight(), ((Album) getActivity()).subreddit);
+                    Album albumActivity = (Album) getActivity();
+                    albumActivity.images = new ArrayList<>(jsonElements);
+                    AlbumView adapter = new AlbumView(baseActivity, albumActivity.images,
+                            getActivity().findViewById(R.id.toolbar).getHeight(),
+                            albumActivity.subreddit, albumActivity.submissionTitle);
                     recyclerView.setAdapter(adapter);
                 }
             }
         }
     }
 
-}
+}