Merge pull request #549 from rosenpin/fixed-dismiss-issues

Fixed dismiss fab issues
Haptic-Apps · Nov 16, 2015 · 85b52b2 · 85b52b2
2 parents d233a62 + f63426f
commit 85b52b2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/SubmissionAdapter.java b/app/src/main/java/me/ccrama/redditslide/Adapters/SubmissionAdapter.java
@@ -98,14 +98,14 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
 
     @Override
     public void onBindViewHolder(final RecyclerView.ViewHolder holder2, final int i) {
-
+        if (HasSeen.getSeen(dataSet.posts.get(i).getFullName())){
+            seen.add(dataSet.posts.get(i));
+        }
         if (holder2 instanceof SubmissionViewHolder) {
             final SubmissionViewHolder holder = (SubmissionViewHolder) holder2;
 
             final Submission submission = dataSet.posts.get(i);
-            if (HasSeen.getSeen(submission.getFullName())){
-                seen.add(submission);
-            }
+
             CreateCardView.resetColorCard(holder.itemView);
             CreateCardView.colorCard(submission.getSubredditName().toLowerCase(), holder.itemView, subreddit, custom);
             holder.itemView.setOnClickListener(new View.OnClickListener() {

diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/SubmissionsView.java b/app/src/main/java/me/ccrama/redditslide/Fragments/SubmissionsView.java
@@ -141,17 +141,9 @@ public void onClick(View v) {
                 fab.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-
-                        int i = 0;
-                        Iterator<?> it = adapter.dataSet.posts.iterator();
-                        while (it.hasNext()) {
-                            i++;
-                            if (adapter.seen.contains(it.next())) {
-                                it.remove();
-                                Hidden.setHidden(adapter.dataSet.posts.get(i));
-                                adapter.notifyItemRemoved(i);
-                            }
-                        }
+                        clearSeenPosts();
+                        //Rechecking arrays, I'm note sure why is it necessary but it is.
+                        clearSeenPosts();
                     }
                 });
             }
@@ -202,6 +194,16 @@ public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
         return v;
     }
 
+    private void clearSeenPosts() {
+        for (int i = 0; i < adapter.dataSet.posts.size(); i++) {
+            if (HasSeen.getSeen(adapter.dataSet.posts.get(i).getFullName())) {
+                Hidden.setHidden(adapter.dataSet.posts.get(i));
+                adapter.dataSet.posts.remove(adapter.dataSet.posts.get(i));
+                adapter.notifyItemRemoved(adapter.dataSet.posts.indexOf(adapter.dataSet.posts.get(i)));
+            }
+        }
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.4+'
+        classpath 'com.android.tools.build:gradle:1.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files