Added option to remove a language description

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

@@ -6,13 +6,14 @@
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.ImageView;
+import android.widget.Spinner;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.widget.AppCompatEditText;
-import androidx.appcompat.widget.AppCompatSpinner;
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.utils.AbstractTextWatcher;
@@ -76,29 +77,37 @@ public List<UploadMediaDetail> getUploadMediaDetails() {
         return uploadMediaDetails;
     }
 
-    public void addDescription(UploadMediaDetail uploadMediaDetail) {
+    public void addDescription(final UploadMediaDetail uploadMediaDetail) {
         this.uploadMediaDetails.add(uploadMediaDetail);
         notifyItemInserted(uploadMediaDetails.size());
     }
 
+    private void removeDescription(final UploadMediaDetail uploadMediaDetail, final int pos) {
+        this.uploadMediaDetails.remove(uploadMediaDetail);
+        notifyItemRemoved(pos);
+    }
+
     public class ViewHolder extends RecyclerView.ViewHolder {
 
         @Nullable
         @BindView(R.id.spinner_description_languages)
-        AppCompatSpinner spinnerDescriptionLanguages;
+        Spinner spinnerDescriptionLanguages;
 
         @BindView(R.id.description_item_edit_text)
-        AppCompatEditText descItemEditText;
+        TextInputEditText descItemEditText;
 
         @BindView(R.id.description_item_edit_text_input_layout)
         TextInputLayout descInputLayout;
 
         @BindView(R.id.caption_item_edit_text)
-        AppCompatEditText captionItemEditText;
+        TextInputEditText captionItemEditText;
 
         @BindView(R.id.caption_item_edit_text_input_layout)
         TextInputLayout captionInputLayout;
 
+        @BindView(R.id.btn_remove)
+        ImageView removeButton;
+
         public ViewHolder(View itemView) {
             super(itemView);
             ButterKnife.bind(this, itemView);
@@ -119,6 +128,7 @@ public void bind(int position) {
                 }));
 
             if (position == 0) {
+                removeButton.setVisibility(View.GONE);
                 captionInputLayout.setEndIconMode(TextInputLayout.END_ICON_CUSTOM);
                 captionInputLayout.setEndIconDrawable(R.drawable.mapbox_info_icon_default);
                 captionInputLayout.setEndIconOnClickListener(v ->
@@ -130,10 +140,13 @@ public void bind(int position) {
                     callback.showAlert(R.string.media_detail_description, R.string.description_info));
 
             } else {
+                removeButton.setVisibility(View.VISIBLE);
                 captionInputLayout.setEndIconDrawable(null);
                 descInputLayout.setEndIconDrawable(null);
             }
 
+            removeButton.setOnClickListener(v -> removeDescription(uploadMediaDetail, position));
+
             captionItemEditText.addTextChangedListener(new AbstractTextWatcher(
                     captionText -> uploadMediaDetails.get(position).setCaptionText(captionText)));
             initLanguageSpinner(position, uploadMediaDetail);
@@ -148,6 +161,7 @@ public void bind(int position) {
             } else {
                 captionItemEditText.clearFocus();
             }
+
         }
 
         /**

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

@@ -195,6 +195,7 @@ public void onButtonAddDescriptionClicked() {
         UploadMediaDetail uploadMediaDetail = new UploadMediaDetail();
         uploadMediaDetail.setManuallyAdded(true);//This was manually added by the user
         uploadMediaDetailAdapter.addDescription(uploadMediaDetail);
+        rvDescriptions.smoothScrollToPosition(uploadMediaDetailAdapter.getItemCount()-1);
     }
 
     @Override

app/src/main/res/drawable/ic_clear_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="?attr/editTextColor"
+  android:viewportHeight="24.0" android:viewportWidth="24.0"
+  android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:fillColor="#8F000000" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>

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

@@ -82,7 +82,7 @@
                     android:layout_marginTop="@dimen/standard_gap"
                     android:orientation="vertical">
 
-                    <fr.free.nrw.commons.widget.HeightLimitedRecyclerView
+                    <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rv_descriptions"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"

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

@@ -1,52 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:layout_marginHorizontal="8dp"
+  android:layout_marginVertical="8dp"
+  app:elevation="6dp">
+
+  <androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:weightSum="8">
-
-    <androidx.appcompat.widget.AppCompatSpinner
-        android:id="@+id/spinner_description_languages"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:minWidth="@dimen/tiny_height"
-        android:padding="@dimen/dimen_0"
-        android:spinnerMode="dialog" />
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_weight="8">
+    android:layout_height="match_parent"
+    android:layout_marginHorizontal="20dp"
+    android:layout_marginVertical="20dp">
+
+    <ImageView
+      android:id="@+id/btn_remove"
+      android:layout_width="24dp"
+      android:layout_height="wrap_content"
+      android:contentDescription="@string/remove"
+      android:visibility="visible"
+      app:layout_constraintBottom_toTopOf="@+id/caption_item_edit_text_input_layout"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:srcCompat="@drawable/ic_clear_24dp" />
+
+    <Spinner
+      android:id="@+id/spinner_description_languages"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:spinnerMode="dialog"
+      app:layout_constraintBottom_toTopOf="@+id/caption_item_edit_text_input_layout"
+      app:layout_constraintStart_toStartOf="parent" />
+
     <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/caption_item_edit_text_input_layout"
+      android:id="@+id/caption_item_edit_text_input_layout"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      app:layout_constraintBottom_toTopOf="@id/description_item_edit_text_input_layout"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent">
+
+      <com.google.android.material.textfield.TextInputEditText
+        android:id="@+id/caption_item_edit_text"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
-
-        <androidx.appcompat.widget.AppCompatEditText
-            android:id="@+id/caption_item_edit_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/share_caption_hint"
-            android:imeOptions="actionNext|flagNoExtractUi"
-            android:inputType="textMultiLine" />
+        android:layout_height="match_parent"
+        android:hint="@string/share_caption_hint"
+        android:imeOptions="actionNext|flagNoExtractUi"
+        android:inputType="textMultiLine" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/description_item_edit_text_input_layout"
+      android:id="@+id/description_item_edit_text_input_layout"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent">
+
+      <com.google.android.material.textfield.TextInputEditText
+        android:id="@+id/description_item_edit_text"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
-
-        <androidx.appcompat.widget.AppCompatEditText
-            android:id="@+id/description_item_edit_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/share_description_hint"
-            android:imeOptions="actionNext|flagNoExtractUi"
-            android:inputType="textMultiLine" />
+        android:layout_height="match_parent"
+        android:hint="@string/share_description_hint"
+        android:imeOptions="actionNext|flagNoExtractUi"
+        android:inputType="textMultiLine" />
     </com.google.android.material.textfield.TextInputLayout>
 
-    </LinearLayout>
-</LinearLayout>
+  </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.cardview.widget.CardView>

app/src/main/res/values/strings.xml

@@ -628,5 +628,6 @@ Upload your first media by tapping on the add button.</string>
   <string name="ask_to_turn_location_on">Turn on location?</string>
   <string name="nearby_needs_location">Nearby needs location enabled to work properly</string>
   <string name="use_location_from_similar_image">Did you shoot these two pictures at the same place? Do you want to use the latitude/longitude of the picture on the right?</string>
+  <string name="remove">Removes a caption and description</string>
 
 </resources>