From 5b63fc60cd9f035e8a04180796f81c1646f77ba7 Mon Sep 17 00:00:00 2001
From: neslihanturan <tur.neslihan@gmail.com>
Date: Sun, 20 May 2018 11:16:03 +0300
Subject: [PATCH] Pass context and adapters as parameters to controller

---
 .../fr/free/nrw/commons/review/ReviewActivity.java    |  4 ++--
 .../fr/free/nrw/commons/review/ReviewController.java  | 10 ++++++++++
 .../free/nrw/commons/review/ReviewImageFragment.java  | 11 +----------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
index 2934a2fcc..bb6ddfff1 100644
--- a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
@@ -57,7 +57,7 @@ public class ReviewActivity extends AuthenticatedActivity {
 
     @Inject MediaWikiApi mwApi;
 
-    private ReviewPagerAdapter reviewPagerAdapter;
+    public ReviewPagerAdapter reviewPagerAdapter;
 
     //private ReviewCallback reviewCallback;
     private ReviewController reviewController;
@@ -81,7 +81,7 @@ public class ReviewActivity extends AuthenticatedActivity {
         ButterKnife.bind(this);
         initDrawer();
 
-        reviewController = new ReviewController();
+        reviewController = new ReviewController(this);
 
         reviewPagerAdapter = new ReviewPagerAdapter(getSupportFragmentManager());
         pager.setAdapter(reviewPagerAdapter);
diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewController.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewController.java
index 2bde33ecd..48080291c 100644
--- a/app/src/main/java/fr/free/nrw/commons/review/ReviewController.java
+++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewController.java
@@ -1,5 +1,8 @@
 package fr.free.nrw.commons.review;
 
+import android.content.Context;
+import android.support.v4.view.ViewPager;
+
 import java.util.ArrayList;
 
 /**
@@ -9,6 +12,13 @@ import java.util.ArrayList;
 public class ReviewController implements ReviewActivity.ReviewCallback {
     public static String fileName;
     protected static ArrayList<String> categories;
+    ReviewPagerAdapter reviewPagerAdapter;
+    ViewPager viewPager;
+
+    ReviewController(Context context) {
+        reviewPagerAdapter = ((ReviewActivity)context).reviewPagerAdapter;
+        viewPager = ((ReviewActivity)context).pager;
+    }
 
     @Override
     public void onImageRefreshed(String fileName) {
diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.java
index 3b80f70d0..8cca96ae3 100644
--- a/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.java
@@ -34,7 +34,7 @@ public class ReviewImageFragment extends CommonsDaggerSupportFragment {
         private int position;
         private String fileName;
         private String catString;
-        //private View catsView;
+
         private View textViewQuestionContext;
         private SimpleDraweeView simpleDraweeView;
         public ProgressBar progressBar;
@@ -75,20 +75,15 @@ public class ReviewImageFragment extends CommonsDaggerSupportFragment {
                     false);
             progressBar = layoutView.findViewById(R.id.progressBar);
             View textView = layoutView.findViewById(R.id.reviewQuestion);
-            //View textViewQuestion = layoutView.findViewById(R.id.reviewQuestion);
             textViewQuestionContext = layoutView.findViewById(R.id.reviewQuestionContext);
-            //catsView = layoutView.findViewById(R.id.reviewCategories);
             String question;
             switch(position) {
                 case COPYRIGHT:
                     question = getString(R.string.review_copyright);
                     break;
                 case CATEGORY:
-                    //textViewQuestion.setLayoutParams(new TableLayout.LayoutParams(TableLayout.LayoutParams.WRAP_CONTENT, TableLayout.LayoutParams.WRAP_CONTENT, 0.35f));
-                    //textViewQuestionContext.setLayoutParams(new TableLayout.LayoutParams(TableLayout.LayoutParams.WRAP_CONTENT, TableLayout.LayoutParams.WRAP_CONTENT, 0.35f));
                     question = getString(R.string.review_category);
                     updateCategories(ReviewController.categories);
-                    //catsView.setVisibility(View.VISIBLE);
                     break;
                 case SPAM:
                     question = getString(R.string.review_spam);
@@ -103,10 +98,6 @@ public class ReviewImageFragment extends CommonsDaggerSupportFragment {
                 simpleDraweeView.setImageURI(Utils.makeThumbBaseUrl(fileName));
                 progressBar.setVisibility(View.GONE);
             }
-
-            /*if (catString != null) {
-                ((TextView) catsView).setText(catString);
-            }*/
             return layoutView;
         }
 }