#3468 Switch from RvRenderer to AdapterDelegates - replace UploadCategoryDepictionsRenderer

Author: macgills

app/src/main/java/fr/free/nrw/commons/category/CategoriesRenderer.java

@@ -1,30 +1,19 @@
 package fr.free.nrw.commons.explore.depictions
 
 import androidx.recyclerview.widget.DiffUtil
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import fr.free.nrw.commons.upload.categories.BaseAdapter
 import fr.free.nrw.commons.upload.structure.depictions.DepictedItem
 
 
-class DepictionAdapter(clickListener: (DepictedItem) -> Unit) :
-    AsyncListDifferDelegationAdapter<DepictedItem>(
-        DiffUtil,
-        depictionDelegate(clickListener)
-    ) {
+class DepictionAdapter(clickListener: (DepictedItem) -> Unit) : BaseAdapter<DepictedItem>(
+    object : DiffUtil.ItemCallback<DepictedItem>() {
+        override fun areItemsTheSame(oldItem: DepictedItem, newItem: DepictedItem) =
+            oldItem.id == newItem.id
 
-    fun addAll(newResults: List<DepictedItem>) {
-        items = (items ?: emptyList<DepictedItem>()) + newResults
-    }
+        override fun areContentsTheSame(oldItem: DepictedItem, newItem: DepictedItem) =
+            oldItem == newItem
+    },
+    depictionDelegate(clickListener)
+)
 
-    fun clear() {
-        items = emptyList()
-    }
 
-}
-
-object DiffUtil : DiffUtil.ItemCallback<DepictedItem>() {
-    override fun areItemsTheSame(oldItem: DepictedItem, newItem: DepictedItem) =
-        oldItem.id == newItem.id
-
-    override fun areContentsTheSame(oldItem: DepictedItem, newItem: DepictedItem) =
-        oldItem == newItem
-}

app/src/main/java/fr/free/nrw/commons/explore/depictions/DepictionAdapter.kt

@@ -0,0 +1,20 @@
+package fr.free.nrw.commons.upload.categories
+
+import androidx.recyclerview.widget.DiffUtil
+import com.hannesdorfmann.adapterdelegates4.AdapterDelegate
+import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+
+
+abstract class BaseAdapter<T>(
+    itemCallback: DiffUtil.ItemCallback<T>,
+    vararg adapterDelegate: AdapterDelegate<List<T>>
+) : AsyncListDifferDelegationAdapter<T>(itemCallback, *adapterDelegate) {
+    fun addAll(newResults: List<T>) {
+        items = (items ?: emptyList<T>()) + newResults
+    }
+
+    fun clear() {
+        items = emptyList()
+    }
+}
+

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

@@ -17,23 +17,19 @@
 import com.google.android.material.textfield.TextInputLayout;
 import com.jakewharton.rxbinding2.view.RxView;
 import com.jakewharton.rxbinding2.widget.RxTextView;
-import com.pedrogomez.renderers.RVRendererAdapter;
 import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.category.CategoryClickedListener;
 import fr.free.nrw.commons.category.CategoryItem;
 import fr.free.nrw.commons.upload.UploadBaseFragment;
-import fr.free.nrw.commons.upload.UploadCategoriesAdapterFactory;
 import fr.free.nrw.commons.utils.DialogUtil;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import javax.inject.Inject;
+import kotlin.Unit;
 import timber.log.Timber;
 
-public class UploadCategoriesFragment extends UploadBaseFragment implements CategoriesContract.View,
-        CategoryClickedListener {
+public class UploadCategoriesFragment extends UploadBaseFragment implements CategoriesContract.View {
 
     @BindView(R.id.tv_title)
     TextView tvTitle;
@@ -48,16 +44,11 @@ public class UploadCategoriesFragment extends UploadBaseFragment implements Cate
 
     @Inject
     CategoriesContract.UserActionListener presenter;
-    private RVRendererAdapter<CategoryItem> adapter;
+    private UploadCategoryAdapter adapter;
     private Disposable subscribe;
     private List<CategoryItem> categories;
     private boolean isVisible;
 
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
@@ -103,8 +94,10 @@ private void searchForCategory(String query) {
     }
 
     private void initRecyclerView() {
-        adapter = new UploadCategoriesAdapterFactory(this)
-                .create(new ArrayList<>());
+        adapter = new UploadCategoryAdapter(categoryItem -> {
+            presenter.onCategoryItemClicked(categoryItem);
+            return Unit.INSTANCE;
+        });
         rvCategories.setLayoutManager(new LinearLayoutManager(getContext()));
         rvCategories.setAdapter(adapter);
     }
@@ -133,11 +126,12 @@ public void showError(int stringResourceId) {
 
     @Override
     public void setCategories(List<CategoryItem> categories) {
-        adapter.clear();
-        if (categories != null) {
+        if(categories==null) {
+            adapter.clear();
+        }
+        else{
             this.categories = categories;
-            adapter.addAll(categories);
-            adapter.notifyDataSetChanged();
+            adapter.setItems(categories);
         }
     }
 
@@ -168,11 +162,6 @@ public void onPreviousButtonClicked() {
         callback.onPreviousButtonClicked(callback.getIndexInViewFlipper(this));
     }
 
-    @Override
-    public void categoryClicked(CategoryItem item) {
-        presenter.onCategoryItemClicked(item);
-    }
-
     @Override
     public void setUserVisibleHint(boolean isVisibleToUser) {
         super.setUserVisibleHint(isVisibleToUser);

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

@@ -0,0 +1,18 @@
+package fr.free.nrw.commons.upload.categories
+
+import androidx.recyclerview.widget.DiffUtil
+import fr.free.nrw.commons.category.CategoryItem
+
+class UploadCategoryAdapter(onCategoryClicked: (CategoryItem) -> Unit) :
+    BaseAdapter<CategoryItem>(
+        object : DiffUtil.ItemCallback<CategoryItem>() {
+            override fun areItemsTheSame(oldItem: CategoryItem, newItem: CategoryItem) =
+                oldItem.name == newItem.name
+
+            override fun areContentsTheSame(oldItem: CategoryItem, newItem: CategoryItem) =
+                oldItem.name == newItem.name && oldItem.isSelected == newItem.isSelected
+        },
+        uploadCategoryDelegate(onCategoryClicked)
+    )
+
+

app/src/main/java/fr/free/nrw/commons/upload/categories/BaseAdapter.kt

@@ -0,0 +1,20 @@
+package fr.free.nrw.commons.upload.categories
+
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateLayoutContainer
+import fr.free.nrw.commons.R
+import fr.free.nrw.commons.category.CategoryItem
+import kotlinx.android.synthetic.main.layout_upload_categories_item.*
+
+
+fun uploadCategoryDelegate(onCategoryClicked: (CategoryItem) -> Unit) =
+    adapterDelegateLayoutContainer<CategoryItem, CategoryItem>(R.layout.layout_upload_categories_item) {
+        containerView.setOnClickListener {
+            item.isSelected = !item.isSelected
+            uploadCategoryCheckbox.isChecked = item.isSelected
+            onCategoryClicked(item)
+        }
+        bind {
+            uploadCategoryCheckbox.isChecked = item.isSelected
+            uploadCategoryCheckbox.text = item.name
+        }
+    }

app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.java

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/tvName"
+    android:id="@+id/uploadCategoryCheckbox"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:checkMark="?android:attr/textCheckMark"
     android:checked="false"
     android:gravity="center_vertical"
-    android:padding="@dimen/tiny_gap"/>
+    android:padding="@dimen/tiny_gap"/>