[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: name callback s/getters consistently

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: name callback s/getters consistently
......................................................................


Hygiene: name callback s/getters consistently

Change-Id: Ic7043296b355ccef33dea73cd665fdfa357b5c2c
---
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
M app/src/main/java/org/wikipedia/feed/news/NewsListCardView.java
M app/src/main/java/org/wikipedia/feed/view/FeedView.java
M 
app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardItemView.java
M app/src/main/java/org/wikipedia/views/AutoFitRecyclerView.java
5 files changed, 8 insertions(+), 8 deletions(-)

Approvals:
  BearND: Looks good to me, but someone else must approve
  Dbrant: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java 
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index 57da467..dcd093c 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -95,7 +95,7 @@
 
         unbinder = ButterKnife.bind(this, view);
         feedView.setAdapter(new FeedAdapter<>(coordinator, feedCallback));
-        feedView.callback(feedCallback);
+        feedView.setCallback(feedCallback);
         feedView.addOnScrollListener(feedScrollListener);
 
         swipeRefreshLayout.setColorSchemeResources(R.color.foundation_blue);
@@ -134,7 +134,7 @@
         coordinator.setFeedUpdateListener(null);
         swipeRefreshLayout.setOnRefreshListener(null);
         feedView.removeOnScrollListener(feedScrollListener);
-        feedView.callback((FeedViewCallback) null);
+        feedView.setCallback((FeedViewCallback) null);
         unbinder.unbind();
         unbinder = null;
         super.onDestroyView();
diff --git a/app/src/main/java/org/wikipedia/feed/news/NewsListCardView.java 
b/app/src/main/java/org/wikipedia/feed/news/NewsListCardView.java
index 9787b65..6ae01e5 100644
--- a/app/src/main/java/org/wikipedia/feed/news/NewsListCardView.java
+++ b/app/src/main/java/org/wikipedia/feed/news/NewsListCardView.java
@@ -53,7 +53,7 @@
             final NewsItemCard card = item(i);
             holder.getView().setText(card.text());
             holder.getView().setImage(card.image());
-            holder.getView().callback(callback);
+            holder.getView().setCallback(callback);
             holder.getView().setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View view) {
diff --git a/app/src/main/java/org/wikipedia/feed/view/FeedView.java 
b/app/src/main/java/org/wikipedia/feed/view/FeedView.java
index a97716a..68a20c0 100644
--- a/app/src/main/java/org/wikipedia/feed/view/FeedView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/FeedView.java
@@ -35,7 +35,7 @@
         init();
     }
 
-    public void callback(@Nullable ItemTouchHelperSwipeAdapter.Callback 
callback) {
+    public void setCallback(@Nullable ItemTouchHelperSwipeAdapter.Callback 
callback) {
         if (itemTouchHelper != null) {
             itemTouchHelper.attachToRecyclerView(new DummyView(getContext()));
             itemTouchHelper = null;
@@ -65,7 +65,7 @@
                 R.dimen.view_list_card_margin_horizontal, 
R.dimen.view_list_card_margin_vertical));
         addItemDecoration(new HeaderMarginItemDecoration(getContext(),
                 R.dimen.view_list_first_card_margin_top));
-        callback(new RecyclerViewColumnCallback());
+        setCallback(new RecyclerViewColumnCallback());
     }
 
     /* Workaround for 
https://code.google.com/p/android/issues/detail?id=205947.
diff --git 
a/app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardItemView.java
 
b/app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardItemView.java
index ed412bb..893f6f3 100644
--- 
a/app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardItemView.java
+++ 
b/app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardItemView.java
@@ -25,12 +25,12 @@
         ButterKnife.bind(this);
     }
 
-    public void callback(@Nullable FeedViewCallback callback) {
+    public void setCallback(@Nullable FeedViewCallback callback) {
         this.callback = callback;
     }
 
     @Nullable
-    public FeedViewCallback callback() {
+    public FeedViewCallback getCallback() {
         return callback;
     }
 
diff --git a/app/src/main/java/org/wikipedia/views/AutoFitRecyclerView.java 
b/app/src/main/java/org/wikipedia/views/AutoFitRecyclerView.java
index b900c85..a0b88c9 100644
--- a/app/src/main/java/org/wikipedia/views/AutoFitRecyclerView.java
+++ b/app/src/main/java/org/wikipedia/views/AutoFitRecyclerView.java
@@ -50,7 +50,7 @@
         }
     }
 
-    public void callback(@Nullable Callback callback) {
+    public void setCallback(@Nullable Callback callback) {
         this.callback = callback == null ? new DefaultCallback() : callback;
     }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7043296b355ccef33dea73cd665fdfa357b5c2c
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: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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