mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 21:03:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Pass context and adapters as parameters to controller

Browse source
This commit is contained in:
neslihanturan 2018-05-20 11:16:03 +03:00 • committed by maskara
parent 029d742e58
commit 5b63fc60cd
3 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
View file

@ -57,7 +57,7 @@ public class ReviewActivity extends AuthenticatedActivity {
@Inject MediaWikiApi mwApi; @Inject MediaWikiApi mwApi;
private ReviewPagerAdapter reviewPagerAdapter; public ReviewPagerAdapter reviewPagerAdapter;
//private ReviewCallback reviewCallback; //private ReviewCallback reviewCallback;
private ReviewController reviewController; private ReviewController reviewController;
@ -81,7 +81,7 @@ public class ReviewActivity extends AuthenticatedActivity {
ButterKnife.bind(this); ButterKnife.bind(this);
initDrawer(); initDrawer();
reviewController = new ReviewController(); reviewController = new ReviewController(this);
reviewPagerAdapter = new ReviewPagerAdapter(getSupportFragmentManager()); reviewPagerAdapter = new ReviewPagerAdapter(getSupportFragmentManager());
pager.setAdapter(reviewPagerAdapter); pager.setAdapter(reviewPagerAdapter);

10
app/src/main/java/fr/free/nrw/commons/review/ReviewController.java
View file

@ -1,5 +1,8 @@
package fr.free.nrw.commons.review; package fr.free.nrw.commons.review;
import android.content.Context;
import android.support.v4.view.ViewPager;
import java.util.ArrayList; import java.util.ArrayList;
/** /**
@ -9,6 +12,13 @@ import java.util.ArrayList;
public class ReviewController implements ReviewActivity.ReviewCallback { public class ReviewController implements ReviewActivity.ReviewCallback {
public static String fileName; public static String fileName;
protected static ArrayList<String> categories; protected static ArrayList<String> categories;
ReviewPagerAdapter reviewPagerAdapter;
ViewPager viewPager;
ReviewController(Context context) {
reviewPagerAdapter = ((ReviewActivity)context).reviewPagerAdapter;
viewPager = ((ReviewActivity)context).pager;
}
@Override @Override
public void onImageRefreshed(String fileName) { public void onImageRefreshed(String fileName) {

11
app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.java
View file

@ -34,7 +34,7 @@ public class ReviewImageFragment extends CommonsDaggerSupportFragment {
private int position; private int position;
private String fileName; private String fileName;
private String catString; private String catString;
//private View catsView;
private View textViewQuestionContext; private View textViewQuestionContext;
private SimpleDraweeView simpleDraweeView; private SimpleDraweeView simpleDraweeView;
public ProgressBar progressBar; public ProgressBar progressBar;
@ -75,20 +75,15 @@ public class ReviewImageFragment extends CommonsDaggerSupportFragment {
false); false);
progressBar = layoutView.findViewById(R.id.progressBar); progressBar = layoutView.findViewById(R.id.progressBar);
View textView = layoutView.findViewById(R.id.reviewQuestion); View textView = layoutView.findViewById(R.id.reviewQuestion);
//View textViewQuestion = layoutView.findViewById(R.id.reviewQuestion);
textViewQuestionContext = layoutView.findViewById(R.id.reviewQuestionContext); textViewQuestionContext = layoutView.findViewById(R.id.reviewQuestionContext);
//catsView = layoutView.findViewById(R.id.reviewCategories);
String question; String question;
switch(position) { switch(position) {
case COPYRIGHT: case COPYRIGHT:
question = getString(R.string.review_copyright); question = getString(R.string.review_copyright);
break; break;
case CATEGORY: 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); question = getString(R.string.review_category);
updateCategories(ReviewController.categories); updateCategories(ReviewController.categories);
//catsView.setVisibility(View.VISIBLE);
break; break;
case SPAM: case SPAM:
question = getString(R.string.review_spam); question = getString(R.string.review_spam);
@ -103,10 +98,6 @@ public class ReviewImageFragment extends CommonsDaggerSupportFragment {
simpleDraweeView.setImageURI(Utils.makeThumbBaseUrl(fileName)); simpleDraweeView.setImageURI(Utils.makeThumbBaseUrl(fileName));
progressBar.setVisibility(View.GONE); progressBar.setVisibility(View.GONE);
} }
/*if (catString != null) {
((TextView) catsView).setText(catString);
}*/
return layoutView; return layoutView;
} }
} }