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

Ensure caption is shown on every review fragment

Browse source
This commit is contained in:
Yusuke Matsubara 2018-05-27 20:32:05 +09:00 • committed by maskara
parent 1183476bca
commit 83f4407ed3
6 changed files with 141 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java
View file

@ -618,7 +618,8 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi {
.get(); .get();
return new Revision( return new Revision(
res.getString("/api/query/pages/page/revisions/rev/@revid"), res.getString("/api/query/pages/page/revisions/rev/@revid"),
res.getString("/api/query/pages/page/revisions/rev/@user")); res.getString("/api/query/pages/page/revisions/rev/@user"),
filename);
}); });
} }

12
app/src/main/java/fr/free/nrw/commons/mwapi/Revision.java
View file

@ -1,11 +1,15 @@
package fr.free.nrw.commons.mwapi; package fr.free.nrw.commons.mwapi;
public class Revision { import fr.free.nrw.commons.PageTitle;
public String revisionId;
public String username;
public Revision(String revisionId, String username) { public class Revision {
public final String revisionId;
public final String username;
public final PageTitle pageTitle;
public Revision(String revisionId, String username, String pageTitle) {
this.revisionId = revisionId; this.revisionId = revisionId;
this.username = username; this.username = username;
this.pageTitle = new PageTitle(pageTitle);
} }
} }

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

@ -5,22 +5,16 @@ import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.widget.NavigationView; import android.support.design.widget.NavigationView;
import android.support.v4.view.ViewPager;
import android.support.v4.widget.DrawerLayout; import android.support.v4.widget.DrawerLayout;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.util.AttributeSet;
import android.util.Log;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import com.viewpagerindicator.CirclePageIndicator; import com.viewpagerindicator.CirclePageIndicator;
import org.mediawiki.api.MWApi;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
@ -140,7 +134,13 @@ public class ReviewActivity extends AuthenticatedActivity {
return; return;
} }
reviewController.onImageRefreshed(fileName); //file name is updated reviewController.onImageRefreshed(fileName); //file name is updated
reviewPagerAdapter.updateFilename(); mwApi.firstRevisionOfFile("File:" + fileName)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(revision -> {
reviewController.firstRevision = revision;
reviewPagerAdapter.updateFileInformation(fileName, revision);
});
reviewPager.setCurrentItem(0); reviewPager.setCurrentItem(0);
Observable.fromCallable(() -> { Observable.fromCallable(() -> {
MediaResult media = mwApi.fetchMediaByFilename("File:" + fileName); MediaResult media = mwApi.fetchMediaByFilename("File:" + fileName);
@ -150,12 +150,6 @@ public class ReviewActivity extends AuthenticatedActivity {
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(this::updateCategories, this::categoryFetchError); .subscribe(this::updateCategories, this::categoryFetchError);
mwApi.firstRevisionOfFile("File:" + fileName).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(revision -> {
ReviewController.firstRevision = revision;
((ReviewImageFragment)reviewPagerAdapter.getItem(reviewPager.getCurrentItem())).updateImageCaption();
});
} }

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

@ -1,6 +1,7 @@
package fr.free.nrw.commons.review; package fr.free.nrw.commons.review;
import android.content.Context; import android.content.Context;
import android.support.annotation.Nullable;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import java.util.ArrayList; import java.util.ArrayList;
@ -17,12 +18,14 @@ import io.reactivex.schedulers.Schedulers;
*/ */
public class ReviewController { public class ReviewController {
public static String fileName; private String fileName;
public static Revision firstRevision; // TODO: maybe we can expand this class to include fileName @Nullable
public Revision firstRevision; // TODO: maybe we can expand this class to include fileName
protected static ArrayList<String> categories; protected static ArrayList<String> categories;
ReviewPagerAdapter reviewPagerAdapter;
ViewPager viewPager; private ReviewPagerAdapter reviewPagerAdapter;
ReviewActivity reviewActivity; private ViewPager viewPager;
private ReviewActivity reviewActivity;
ReviewController(Context context) { ReviewController(Context context) {
reviewActivity = (ReviewActivity)context; reviewActivity = (ReviewActivity)context;
@ -31,7 +34,7 @@ public class ReviewController {
} }
public void onImageRefreshed(String fileName) { public void onImageRefreshed(String fileName) {
ReviewController.fileName = fileName; this.fileName = fileName;
ReviewController.categories = new ArrayList<>(); ReviewController.categories = new ArrayList<>();
} }

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

@ -15,6 +15,7 @@ import com.facebook.drawee.view.SimpleDraweeView;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import fr.free.nrw.commons.Utils; import fr.free.nrw.commons.Utils;
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
import fr.free.nrw.commons.mwapi.Revision;
/** /**
* Created by root on 19.05.2018. * Created by root on 19.05.2018.
@ -40,27 +41,31 @@ public class ReviewImageFragment extends CommonsDaggerSupportFragment {
private Button noButton; private Button noButton;
public ProgressBar progressBar; public ProgressBar progressBar;
private Revision revision;
public void update(int position, String fileName) { public void update(int position, String fileName, Revision revision) {
this.position = position; this.position = position;
this.fileName = fileName; this.fileName = fileName;
this.revision = revision;
if (simpleDraweeView!=null) { fillImageCaption();
if (simpleDraweeView != null) {
simpleDraweeView.setImageURI(Utils.makeThumbBaseUrl(fileName)); simpleDraweeView.setImageURI(Utils.makeThumbBaseUrl(fileName));
progressBar.setVisibility(View.GONE); progressBar.setVisibility(View.GONE);
} }
} }
public void updateCategories(Iterable<String> categories) { public void updateCategories(Iterable<String> categories) {
if (categories!=null && isAdded()) { if (categories != null && isAdded()) {
catString = TextUtils.join(", ", categories); catString = TextUtils.join(", ", categories);
if (catString != null && !catString.equals("") && textViewQuestionContext != null) { if (catString != null && !catString.equals("") && textViewQuestionContext != null) {
catString = "<b>"+catString+"</b>"; catString = "<b>" + catString + "</b>";
String stringToConvertHtml = String.format(getResources().getString(R.string.review_category_explanation), catString); String stringToConvertHtml = String.format(getResources().getString(R.string.review_category_explanation), catString);
((TextView) textViewQuestionContext).setText(Html.fromHtml(stringToConvertHtml)); ((TextView) textViewQuestionContext).setText(Html.fromHtml(stringToConvertHtml));
} else if (textViewQuestionContext != null) { } else if (textViewQuestionContext != null) {
((TextView)textViewQuestionContext).setText(getResources().getString(R.string.review_no_category)); ((TextView) textViewQuestionContext).setText(getResources().getString(R.string.review_no_category));
} }
} }
} }
@ -82,13 +87,16 @@ public class ReviewImageFragment extends CommonsDaggerSupportFragment {
imageCaption = layoutView.findViewById(R.id.imageCaption); imageCaption = layoutView.findViewById(R.id.imageCaption);
yesButton = layoutView.findViewById(R.id.yesButton); yesButton = layoutView.findViewById(R.id.yesButton);
noButton = layoutView.findViewById(R.id.noButton); noButton = layoutView.findViewById(R.id.noButton);
fillImageCaption();
String question, explanation; String question, explanation;
switch(position) { switch (position) {
case COPYRIGHT: case COPYRIGHT:
question = getString(R.string.review_copyright); question = getString(R.string.review_copyright);
explanation = getString(R.string.review_copyright_explanation); explanation = getString(R.string.review_copyright_explanation);
yesButton.setOnClickListener(view -> { yesButton.setOnClickListener(view -> {
((ReviewActivity)getActivity()).reviewController.reportPossibleCopyRightViolation(); ((ReviewActivity) getActivity()).reviewController.reportPossibleCopyRightViolation();
}); });
break; break;
case CATEGORY: case CATEGORY:
@ -96,21 +104,21 @@ public class ReviewImageFragment extends CommonsDaggerSupportFragment {
explanation = getString(R.string.review_no_category); explanation = getString(R.string.review_no_category);
updateCategories(ReviewController.categories); updateCategories(ReviewController.categories);
yesButton.setOnClickListener(view -> { yesButton.setOnClickListener(view -> {
((ReviewActivity)getActivity()).reviewController.reportWrongCategory(); ((ReviewActivity) getActivity()).reviewController.reportWrongCategory();
}); });
break; break;
case SPAM: case SPAM:
question = getString(R.string.review_spam); question = getString(R.string.review_spam);
explanation = getString(R.string.review_spam_explanation); explanation = getString(R.string.review_spam_explanation);
yesButton.setOnClickListener(view -> { yesButton.setOnClickListener(view -> {
((ReviewActivity)getActivity()).reviewController.reportSpam(); ((ReviewActivity) getActivity()).reviewController.reportSpam();
}); });
break; break;
case THANKS: case THANKS:
question = getString(R.string.review_thanks); question = getString(R.string.review_thanks);
explanation = getString(R.string.review_thanks_explanation); explanation = getString(R.string.review_thanks_explanation, ((ReviewActivity) getActivity()).reviewController.firstRevision.username);
yesButton.setOnClickListener(view -> { yesButton.setOnClickListener(view -> {
((ReviewActivity)getActivity()).reviewController.sendThanks(); ((ReviewActivity) getActivity()).reviewController.sendThanks();
}); });
break; break;
default: default:
@ -119,7 +127,7 @@ public class ReviewImageFragment extends CommonsDaggerSupportFragment {
} }
noButton.setOnClickListener(view -> { noButton.setOnClickListener(view -> {
((ReviewActivity)getActivity()).reviewController.swipeToNext(); ((ReviewActivity) getActivity()).reviewController.swipeToNext();
}); });
((TextView) textViewQuestion).setText(question); ((TextView) textViewQuestion).setText(question);
@ -134,7 +142,9 @@ public class ReviewImageFragment extends CommonsDaggerSupportFragment {
return layoutView; return layoutView;
} }
public void updateImageCaption() { private void fillImageCaption() {
((TextView)imageCaption).setText(fileName+" is uploaded by: "+ReviewController.firstRevision.username); if (imageCaption != null && fileName != null && revision != null) {
((TextView) imageCaption).setText(fileName + " is uploaded by: " + revision.username);
}
} }
} }

9
app/src/main/java/fr/free/nrw/commons/review/ReviewPagerAdapter.java
View file

@ -5,12 +5,13 @@ import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter; import android.support.v4.app.FragmentStatePagerAdapter;
import fr.free.nrw.commons.mwapi.Revision;
/** /**
* Created by nes on 19.05.2018. * Created by nes on 19.05.2018.
*/ */
public class ReviewPagerAdapter extends FragmentStatePagerAdapter { public class ReviewPagerAdapter extends FragmentStatePagerAdapter {
private int currentPosition;
ReviewImageFragment[] reviewImageFragments; ReviewImageFragment[] reviewImageFragments;
@ -26,13 +27,13 @@ public class ReviewPagerAdapter extends FragmentStatePagerAdapter {
@Override @Override
public int getCount() { public int getCount() {
return 4; return reviewImageFragments.length;
} }
public void updateFilename() { public void updateFileInformation(String fileName, Revision revision) {
for (int i = 0; i < getCount(); i++) { for (int i = 0; i < getCount(); i++) {
ReviewImageFragment fragment = reviewImageFragments[i]; ReviewImageFragment fragment = reviewImageFragments[i];
fragment.update(i, ReviewController.fileName); fragment.update(i, fileName, revision);
} }
} }