Migrate Upload Package To View Binding from Butterknife (commons-app#5590)

* Butterknife to ViewBinding
* Butterknife to ViewBinding
* code cleanup and tests fixed
* code cleanup and optimised imports

Author: shashankiitbhu

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

@@ -8,16 +8,12 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
-import android.widget.Button;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.DialogFragment;
 import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
 import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
-import com.facebook.drawee.view.SimpleDraweeView;
 import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.databinding.FragmentSimilarImageDialogBinding;
 import java.io.File;
 
 /**
@@ -26,17 +22,11 @@
 
 public class SimilarImageDialogFragment extends DialogFragment {
 
-    @BindView(R.id.orginalImage)
-    SimpleDraweeView originalImage;
-    @BindView(R.id.possibleImage)
-    SimpleDraweeView possibleImage;
-    @BindView(R.id.postive_button)
-    Button positiveButton;
-    @BindView(R.id.negative_button)
-    Button negativeButton;
     Callback callback;//Implemented interface from shareActivity
     Boolean gotResponse = false;
 
+    private FragmentSimilarImageDialogBinding binding;
+
     public SimilarImageDialogFragment() {
     }
     public interface Callback {
@@ -51,28 +41,31 @@ public void setCallback(Callback callback) {
 
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view =  inflater.inflate(R.layout.fragment_similar_image_dialog, container, false);
-        ButterKnife.bind(this,view);
+        binding = FragmentSimilarImageDialogBinding.inflate(inflater, container, false);
+
 
-        originalImage.setHierarchy(GenericDraweeHierarchyBuilder
+        binding.orginalImage.setHierarchy(GenericDraweeHierarchyBuilder
                 .newInstance(getResources())
                 .setPlaceholderImage(VectorDrawableCompat.create(getResources(),
                         R.drawable.ic_image_black_24dp,getContext().getTheme()))
                 .setFailureImage(VectorDrawableCompat.create(getResources(),
                         R.drawable.ic_error_outline_black_24dp, getContext().getTheme()))
                 .build());
-        possibleImage.setHierarchy(GenericDraweeHierarchyBuilder
+        binding.possibleImage.setHierarchy(GenericDraweeHierarchyBuilder
                 .newInstance(getResources())
                 .setPlaceholderImage(VectorDrawableCompat.create(getResources(),
                         R.drawable.ic_image_black_24dp,getContext().getTheme()))
                 .setFailureImage(VectorDrawableCompat.create(getResources(),
                         R.drawable.ic_error_outline_black_24dp, getContext().getTheme()))
                 .build());
 
-        originalImage.setImageURI(Uri.fromFile(new File(getArguments().getString("originalImagePath"))));
-        possibleImage.setImageURI(Uri.fromFile(new File(getArguments().getString("possibleImagePath"))));
+        binding.orginalImage.setImageURI(Uri.fromFile(new File(getArguments().getString("originalImagePath"))));
+        binding.possibleImage.setImageURI(Uri.fromFile(new File(getArguments().getString("possibleImagePath"))));
+
+        binding.postiveButton.setOnClickListener(v -> onPositiveButtonClicked());
+        binding.negativeButton.setOnClickListener(v -> onNegativeButtonClicked());
 
-        return view;
+        return binding.getRoot();
     }
 
     @Override
@@ -96,17 +89,21 @@ public void onDismiss(DialogInterface dialog) {
         super.onDismiss(dialog);
     }
 
-    @OnClick(R.id.negative_button)
     public void onNegativeButtonClicked() {
         callback.onNegativeResponse();
         gotResponse = true;
         dismiss();
     }
 
-    @OnClick(R.id.postive_button)
     public void onPositiveButtonClicked() {
         callback.onPositiveResponse();
         gotResponse = true;
         dismiss();
     }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        binding = null;
+    }
 }

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

@@ -10,21 +10,16 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
-
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
-
 import com.facebook.drawee.view.SimpleDraweeView;
-
+import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.databinding.ItemUploadThumbnailBinding;
+import fr.free.nrw.commons.filepicker.UploadableFile;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.filepicker.UploadableFile;
-
 /**
  * The adapter class for image thumbnails to be shown while uploading.
  */
@@ -33,6 +28,8 @@ class ThumbnailsAdapter extends RecyclerView.Adapter<ThumbnailsAdapter.ViewHolde
     List<UploadableFile> uploadableFiles;
     private Callback callback;
 
+    private ItemUploadThumbnailBinding binding;
+
     public ThumbnailsAdapter(Callback callback) {
         this.uploadableFiles = new ArrayList<>();
         this.callback = callback;
@@ -51,8 +48,8 @@ public void setUploadableFiles(
     @NonNull
     @Override
     public ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
-        return new ViewHolder(LayoutInflater.from(viewGroup.getContext())
-                .inflate(R.layout.item_upload_thumbnail, viewGroup, false));
+        binding = ItemUploadThumbnailBinding.inflate(LayoutInflater.from(viewGroup.getContext()), viewGroup, false);
+        return new ViewHolder(binding.getRoot());
     }
 
     @Override
@@ -67,16 +64,16 @@ public int getItemCount() {
 
     public class ViewHolder extends RecyclerView.ViewHolder {
 
-        @BindView(R.id.rl_container)
+
         RelativeLayout rlContainer;
-        @BindView(R.id.iv_thumbnail)
         SimpleDraweeView background;
-        @BindView(R.id.iv_error)
         ImageView ivError;
 
         public ViewHolder(@NonNull View itemView) {
             super(itemView);
-            ButterKnife.bind(this, itemView);
+            rlContainer = binding.rlContainer;
+            background = binding.ivThumbnail;
+            ivError = binding.ivError;
         }
 
         /**