mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20: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);

1
app/src/main/res/layout/activity_upload.xml
View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">

8
app/src/main/res/layout/activity_upload_please_wait.xml
View file

@ -1,13 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/standard_gap"
android:layout_marginBottom="8dp"
android:gravity="center"
android:orientation="vertical"
tools:showIn="@layout/activity_upload">
android:orientation="vertical">
<ProgressBar
android:id="@+id/shareInProgress"
@ -18,6 +16,7 @@
android:indeterminateOnly="true" />
<TextView
android:id="@+id/please_wait_text_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/standard_gap"
@ -25,7 +24,6 @@
android:layout_marginTop="@dimen/standard_gap"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:gravity="center"
android:text="Receiving shared content,\nthis may take a moment or two." />
android:gravity="center" />
</LinearLayout>

5
app/src/main/res/values/strings.xml
View file

@ -451,4 +451,9 @@ Upload your first media by touching the camera or gallery icon above.</string>
<string name="this_function_needs_network_connection">This function requires network connection, please check your connection settings.</string>
<string name="bad_token_error_proposed_solution">Upload failed due to issues with edit token. Please try logging out and in again. </string>
<plurals name="receiving_shared_content">
<item quantity="one">Receiving shared content. Processing the image might take some time depending on the size of the image and your device</item>
<item quantity="other">Receiving shared content. Processing the images might take some time depending on the size of the images and your device</item>
</plurals>
</resources>