Skip to content

Disabled review buttons while an image is being loaded #3185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 6, 2019
Merged

Disabled review buttons while an image is being loaded #3185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5560a73
Disabled review buttons while an image is being loaded
yashk2000 Oct 26, 2019
1829b3e
Merge branch 'master' of https://github.com/commons-app/apps-android-…
yashk2000 Oct 30, 2019
c1d04fd
Added javadocs for the new methods
yashk2000 Nov 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,10 @@ protected void onCreate(Bundle savedInstanceState) {
runRandomizer(); //Run randomizer whenever everything is ready so that a first random image will be added
}

btnSkipImage.setOnClickListener(view -> runRandomizer());
btnSkipImage.setOnClickListener(view -> {
reviewPagerAdapter.disableButtons();
runRandomizer();
});

btnSkipImage.setOnTouchListener((view, event) -> {
if (event.getAction() == MotionEvent.ACTION_UP && event.getRawX() >= (
Expand All @@ -154,6 +157,7 @@ public boolean runRandomizer() {
.observeOn(AndroidSchedulers.mainThread())
.subscribe(media -> {
if (media != null) {
reviewPagerAdapter.disableButtons();
updateImage(media);
}
}));
Expand Down Expand Up @@ -181,6 +185,7 @@ private void updateImage(Media media) {
String caption = String.format(getString(R.string.review_is_uploaded_by), fileName, revision.getUser());
imageCaption.setText(caption);
progressBar.setVisibility(View.GONE);
reviewPagerAdapter.enableButtons();
}));
reviewPager.setCurrentItem(0);
}
Expand Down
26 changes: 26 additions & 0 deletions app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
.reviewController.reportSpam(requireActivity(), getReviewCallback()));
break;
case COPYRIGHT:
enableButtons();
question = getString(R.string.review_copyright);
explanation = getString(R.string.review_copyright_explanation);
yesButtonText = getString(R.string.review_copyright_yes_button_text);
Expand All @@ -90,6 +91,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
.reportPossibleCopyRightViolation(requireActivity(), getReviewCallback()));
break;
case CATEGORY:
enableButtons();
question = getString(R.string.review_category);
explanation = updateCategoriesQuestion();
yesButtonText = getString(R.string.review_category_yes_button_text);
Expand All @@ -102,6 +104,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
});
break;
case THANKS:
enableButtons();
question = getString(R.string.review_thanks);
explanation = getString(R.string.review_thanks_explanation, getReviewActivity().reviewController.firstRevision.getUser());
yesButtonText = getString(R.string.review_thanks_yes_button_text);
Expand All @@ -114,6 +117,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
});
break;
default:
enableButtons();
question = "How did we get here?";
explanation = "No idea.";
yesButtonText = "yes";
Expand Down Expand Up @@ -142,6 +146,28 @@ public void onFailure() {
};
}

/**
* This function is called when an image has
* been loaded to enable the review buttons.
*/
public void enableButtons() {
yesButton.setEnabled(true);
yesButton.setAlpha(1);
noButton.setEnabled(true);
noButton.setAlpha(1);
}

/**
* This function is called when an image is being loaded
* to disable the review buttons
*/
public void disableButtons() {
yesButton.setEnabled(false);
yesButton.setAlpha(0.5f);
noButton.setEnabled(false);
noButton.setAlpha(0.5f);
}

@OnClick(R.id.button_no)
void onNoButtonClicked() {
getReviewActivity().swipeToNext();
Expand Down
20 changes: 20 additions & 0 deletions app/src/main/java/fr/free/nrw/commons/review/ReviewPagerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,26 @@ void updateFileInformation() {
}
}

/**
* This function is called when an image has
* been loaded to enable the review buttons.
*/
public void enableButtons() {
if (reviewImageFragments != null){
reviewImageFragments[0].enableButtons();
}
}

/**
* This function is called when an image is being loaded
* to disable the review buttons
*/
public void disableButtons() {
if (reviewImageFragments != null){
reviewImageFragments[0].disableButtons();
}
}

@Override
public Fragment getItem(int position) {
Bundle bundle = new Bundle();
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/layout/fragment_review_image.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@
android:layout_margin="@dimen/activity_margin_horizontal"
android:background="@android:color/transparent"
android:text="@string/yes"
android:enabled="false"
android:alpha="0.5"
android:textAllCaps="true"
android:textAlignment="center"
android:textColor="@color/yes_button_color"/>
Expand All @@ -68,6 +70,8 @@
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="1"
android:enabled="false"
android:alpha="0.5"
android:layout_margin="@dimen/activity_margin_horizontal"
android:background="@android:color/transparent"
android:text="@string/no"
Expand Down