Hide subtitle message when uploading a single image (commons-app#2163)

Author: zhao-gang

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

@@ -309,19 +309,29 @@ public void setRightCardVisibility(boolean visible) {
     }
 
     @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) {
             viewFlipper.setDisplayedChild(1);
+            TextView categoriesSubtitle = viewFlipper.findViewById(R.id.categories_subtitle);
+            setSubtitleVisibility(categoriesSubtitle, uploadCount);
         } else if (page == LICENSE) {
             viewFlipper.setDisplayedChild(2);
             dismissKeyboard();
+            TextView licenseSubtitle = viewFlipper.findViewById(R.id.license_subtitle);
+            setSubtitleVisibility(licenseSubtitle, uploadCount);
         } else if (page == PLEASE_WAIT) {
             viewFlipper.setDisplayedChild(3);
         }
     }
 
+    private void setSubtitleVisibility(TextView subtitle, int uploadCount) {
+        if (subtitle != null && uploadCount > 1) {
+                subtitle.setVisibility(View.VISIBLE);
+        }
+    }
+
     @Override
     public void setBottomCardState(boolean state) {
         updateCardState(state, bottomCardExpandButton, rvDescriptions, previous, next, bottomCardAddDescription);

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

@@ -406,7 +406,7 @@ private void showCorrectCards(int currentStep, int uploadCount) {
             view.setTopCardVisibility(false);
             view.setRightCardVisibility(false);
         }
-        view.setBottomCardVisibility(currentPage);
+        view.setBottomCardVisibility(currentPage, uploadCount);
     }
 
     //endregion

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);
 

app/src/main/res/layout/activity_upload_categories.xml

@@ -38,7 +38,9 @@
         android:textSize="@dimen/subtitle_text"
         android:text="@string/upload_flow_all_images_in_set"
         android:layout_below="@+id/categories_title"
-        tools:text="(For all images in set)" />
+        android:visibility="gone"
+        tools:text="(For all images in set)"
+        tools:visibility="gone"/>
 
     <FrameLayout
         android:layout_width="match_parent"

app/src/main/res/layout/activity_upload_license.xml

@@ -38,7 +38,9 @@
         android:textSize="@dimen/subtitle_text"
         android:text="@string/upload_flow_all_images_in_set"
         android:layout_below="@+id/license_title"
-        tools:text="(For all images in set)" />
+        android:visibility="gone"
+        tools:text="(For all images in set)"
+        tools:visibility="gone"/>
 
     <Spinner
         android:id="@+id/license_list"