From be98a56ba0256e4654d75719ff2a68c7cefb3bf1 Mon Sep 17 00:00:00 2001
From: Vivek Maskara <maskaravivek@gmail.com>
Date: Thu, 3 Jan 2019 19:35:00 +0530
Subject: [PATCH] Improve text for receiving shared images (#2266)

---
 .../java/fr/free/nrw/commons/upload/UploadActivity.java   | 4 +++-
 .../java/fr/free/nrw/commons/upload/UploadPresenter.java  | 2 +-
 .../main/java/fr/free/nrw/commons/upload/UploadView.java  | 2 +-
 app/src/main/res/layout/activity_upload.xml               | 1 -
 app/src/main/res/layout/activity_upload_please_wait.xml   | 8 +++-----
 app/src/main/res/values/strings.xml                       | 5 +++++
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
index 26aa6b806..6ef528470 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
@@ -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));
         }
     }
 
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java
index 257eec8ef..0281c97f6 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java
@@ -412,7 +412,7 @@ public class UploadPresenter {
             view.setTopCardVisibility(false);
             view.setRightCardVisibility(false);
         }
-        view.setBottomCardVisibility(currentPage);
+        view.setBottomCardVisibility(currentPage, uploadCount);
     }
 
     //endregion
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java
index 5f8707c2c..0dddaf788 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java
@@ -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);
 
diff --git a/app/src/main/res/layout/activity_upload.xml b/app/src/main/res/layout/activity_upload.xml
index 51fbdc425..5853dcc49 100644
--- a/app/src/main/res/layout/activity_upload.xml
+++ b/app/src/main/res/layout/activity_upload.xml
@@ -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">
diff --git a/app/src/main/res/layout/activity_upload_please_wait.xml b/app/src/main/res/layout/activity_upload_please_wait.xml
index e74d576e4..008f37c83 100644
--- a/app/src/main/res/layout/activity_upload_please_wait.xml
+++ b/app/src/main/res/layout/activity_upload_please_wait.xml
@@ -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>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 73871f63e..118c0f0f3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -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>