#3503 Remove Title/Caption From MediaUploadDetail and only use Caption/Description pairs - restore button disabling

Author: macgills

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

@@ -109,7 +109,11 @@ public void bind(int position) {
             descItemEditText.setText(uploadMediaDetail.getDescriptionText());
 
             captionItemEditText.addTextChangedListener(new AbstractTextWatcher(
-                value -> eventListener.onEvent(value.length() != 0)) );
+                value -> {
+                    if (position == 0) {
+                        eventListener.onPrimaryCaptionTextChange(value.length() != 0);
+                    }
+                }));
 
             if (position == 0) {
                 captionItemEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, getInfoIcon(),
@@ -231,7 +235,7 @@ public interface Callback {
     }
 
     public interface EventListener {
-        void onEvent(Boolean data);
+        void onPrimaryCaptionTextChange(boolean isNotEmpty);
     }
 
     /**

app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java

@@ -167,7 +167,7 @@ private void initPresenter() {
     private void initRecyclerView() {
         uploadMediaDetailAdapter = new UploadMediaDetailAdapter(defaultKvStore.getString(Prefs.KEY_LANGUAGE_VALUE, ""));
         uploadMediaDetailAdapter.setCallback(this::showInfoAlert);
-        uploadMediaDetailAdapter.setEventListener(this::onEvent);
+        uploadMediaDetailAdapter.setEventListener(this);
         rvDescriptions.setLayoutManager(new LinearLayoutManager(getContext()));
         rvDescriptions.setAdapter(uploadMediaDetailAdapter);
     }
@@ -346,10 +346,10 @@ private void expandCollapseLlMediaDetail(boolean shouldExpand){
     }
 
     @Override
-    public void onEvent(Boolean data) {
-        btnNext.setEnabled(data);
-        btnNext.setClickable(data);
-        btnNext.setAlpha(data ? 1.0f: 0.5f);
+    public void onPrimaryCaptionTextChange(boolean isNotEmpty) {
+        btnNext.setEnabled(isNotEmpty);
+        btnNext.setClickable(isNotEmpty);
+        btnNext.setAlpha(isNotEmpty ? 1.0f: 0.5f);
     }
 
 

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

@@ -120,6 +120,8 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_alignParentRight="true"
+                            android:enabled="false"
+                            android:alpha=".5"
                             android:text="@string/next"
                             android:textColor="@android:color/white" />