[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update: fix card enter / exit animations when added / remove...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Update: fix card enter / exit animations when added / removed 
by button tap
......................................................................


Update: fix card enter / exit animations when added / removed by button tap

Change-Id: Iae02e654f17c7e751f4a8bacd03809e5de259d31
---
M app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
2 files changed, 25 insertions(+), 4 deletions(-)

Approvals:
  Dbrant: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java 
b/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
index 417711e..a1acd39 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
@@ -21,7 +21,10 @@
     private static final int MAX_HIDDEN_CARDS = 100;
 
     public interface FeedUpdateListener {
+        // todo: should we remove update?
         void update(List<Card> cards);
+        void insert(Card card, int pos);
+        void remove(Card card, int pos);
     }
 
     @NonNull private Context context;
@@ -88,7 +91,7 @@
         cards.remove(card);
         addHiddenCard(card);
         if (updateListener != null) {
-            updateListener.update(cards);
+            updateListener.remove(card, position);
         }
         return position;
     }
@@ -97,7 +100,7 @@
         cards.add(position, card);
         unHideCard(card);
         if (updateListener != null) {
-            updateListener.update(cards);
+            updateListener.insert(card, position);
         }
     }
 
@@ -138,6 +141,7 @@
     }
 
     private void appendProgressCard(List<Card> cards) {
+        // todo: can we consolidate remove / add operations on list?
         cards.remove(progressCard);
         cards.add(progressCard);
     }
diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java 
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index e21720e..4078712 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -111,8 +111,7 @@
         });
 
         coordinator.setFeedUpdateListener(new 
FeedCoordinator.FeedUpdateListener() {
-            @Override
-            public void update(List<Card> cards) {
+            @Override public void update(List<Card> cards) {
                 if (isAdded()) {
                     swipeRefreshLayout.setRefreshing(false);
                     if (feedView != null && feedAdapter != null) {
@@ -120,6 +119,24 @@
                     }
                 }
             }
+
+            @Override public void insert(Card card, int pos) {
+                if (isAdded()) {
+                    swipeRefreshLayout.setRefreshing(false);
+                    if (feedView != null && feedAdapter != null) {
+                        feedAdapter.notifyItemInserted(pos);
+                    }
+                }
+            }
+
+            @Override public void remove(Card card, int pos) {
+                if (isAdded()) {
+                    swipeRefreshLayout.setRefreshing(false);
+                    if (feedView != null && feedAdapter != null) {
+                        feedAdapter.notifyItemRemoved(pos);
+                    }
+                }
+            }
         });
 
         return view;

-- 
To view, visit https://gerrit.wikimedia.org/r/325355
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae02e654f17c7e751f4a8bacd03809e5de259d31
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits