[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: use Butter Knife in ReadingListFragment

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/308653

Change subject: Hygiene: use Butter Knife in ReadingListFragment
......................................................................

Hygiene: use Butter Knife in ReadingListFragment

Change-Id: I0c5bebb4e63f00a59173f8d3a110593a06951765
---
M app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
1 file changed, 22 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/53/308653/1

diff --git 
a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java 
b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
index ea17e0a..8638cf0 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
@@ -32,6 +32,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnPageChange;
+import butterknife.Unbinder;
+
 public class ReadingListsFragment extends Fragment implements 
BackPressedHandler {
     public interface Callback {
         void onLoadPage(PageTitle title, HistoryEntry entry);
@@ -40,13 +45,14 @@
     private static final int PAGE_READING_LISTS = 0;
     private static final int PAGE_LIST_DETAIL = 1;
 
-    private RecyclerView readingListView;
-    private View emptyContainer;
-    private ViewPager pager;
+    private Unbinder unbinder;
+    @BindView(R.id.reading_list_list) RecyclerView readingListView;
+    @BindView(R.id.empty_container) View emptyContainer;
+    @BindView(R.id.pager) ViewPager pager;
     private List<ReadingList> readingLists = new ArrayList<>();
     private ReadingListsFunnel funnel = new ReadingListsFunnel();
 
-    private ReadingListDetailView listDetailView;
+    @BindView(R.id.list_detail_view) ReadingListDetailView listDetailView;
     private ReadingListAdapter adapter = new ReadingListAdapter();
     private ReadingListPagerAdapter pagerAdapter = new 
ReadingListPagerAdapter();
 
@@ -70,30 +76,19 @@
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, 
Bundle savedInstanceState) {
-        View rootView = inflater.inflate(R.layout.fragment_reading_lists, 
container, false);
-        readingListView = (RecyclerView) 
rootView.findViewById(R.id.reading_list_list);
-        emptyContainer = rootView.findViewById(R.id.empty_container);
+        View view = inflater.inflate(R.layout.fragment_reading_lists, 
container, false);
+        unbinder = ButterKnife.bind(this, view);
 
-        // todo: use butter knife.
-        pager = (ViewPager) rootView.findViewById(R.id.pager);
-        listDetailView = (ReadingListDetailView) 
rootView.findViewById(R.id.list_detail_view);
         listDetailView.setActionListener(actionListener);
         listDetailView.setOnItemActionListener(itemActionListener);
 
         readingListView.setLayoutManager(new 
LinearLayoutManager(getContext()));
         readingListView.setAdapter(adapter);
 
-        pager = (ViewPager) rootView.findViewById(R.id.pager);
         pager.setAdapter(pagerAdapter);
-        pager.addOnPageChangeListener(new 
ViewPager.SimpleOnPageChangeListener() {
-            @Override
-            public void onPageSelected(int position) {
-                getActivity().supportInvalidateOptionsMenu();
-            }
-        });
 
         updateLists();
-        return rootView;
+        return view;
     }
 
     @Override
@@ -104,7 +99,12 @@
 
     @Override
     public void onDestroyView() {
+        listDetailView.setOnItemActionListener(null);
+        listDetailView.setActionListener(null);
         readingListView.setAdapter(null);
+        pager.setAdapter(null);
+        unbinder.unbind();
+        unbinder = null;
         super.onDestroyView();
     }
 
@@ -151,6 +151,10 @@
         }
     }
 
+    @OnPageChange(R.id.pager) void onListChanged() {
+        getActivity().supportInvalidateOptionsMenu();
+    }
+
     private void updateLists() {
         ReadingList.DAO.queryMruLists(new 
CallbackTask.Callback<List<ReadingList>>() {
             @Override

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c5bebb4e63f00a59173f8d3a110593a06951765
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org>

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