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

Improve text for receiving shared images (#2266)

Browse source
This commit is contained in:
Vivek Maskara 2019-01-03 19:35:00 +05:30 • committed by Josephine Lim
parent 465e232c67
commit be98a56ba0
6 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
View file

@ -98,6 +98,7 @@ public class UploadActivity extends AuthenticatedActivity implements UploadView,
@BindView(R.id.bottom_card_add_desc) Button bottomCardAddDescription;
@BindView(R.id.categories_subtitle) TextView categoriesSubtitle;
@BindView(R.id.license_subtitle) TextView licenseSubtitle;
@BindView(R.id.please_wait_text_view) TextView pleaseWaitTextView;
//Right Card
@BindView(R.id.right_card) CardView rightCard;
@ -312,7 +313,7 @@ public class UploadActivity extends AuthenticatedActivity implements UploadView,
}
@Override
public void setBottomCardVisibility(@UploadPage int page) {
public void setBottomCardVisibility(@UploadPage int page, int uploadCount) {
if (page == TITLE_CARD) {
viewFlipper.setDisplayedChild(0);
} else if (page == CATEGORIES) {
@ -322,6 +323,7 @@ public class UploadActivity extends AuthenticatedActivity implements UploadView,
dismissKeyboard();
} else if (page == PLEASE_WAIT) {
viewFlipper.setDisplayedChild(3);
pleaseWaitTextView.setText(getResources().getQuantityText(R.plurals.receiving_shared_content, uploadCount));
}
}

2
app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java
View file

@ -412,7 +412,7 @@ public class UploadPresenter {
view.setTopCardVisibility(false);
view.setRightCardVisibility(false);
}
view.setBottomCardVisibility(currentPage);
view.setBottomCardVisibility(currentPage, uploadCount);
}
//endregion

2
app/src/main/java/fr/free/nrw/commons/upload/UploadView.java
View file

@ -52,7 +52,7 @@ public interface UploadView {
void setBottomCardVisibility(boolean visible);
void setBottomCardVisibility(@UploadPage int page);
void setBottomCardVisibility(@UploadPage int page, int uploadCount);
void updateRightCardContent(boolean gpsPresent);