commons-app#3468 Switch from RvRenderer to AdapterDelegates (commons-app#3750)

* commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace SearchDepictionsRenderer

* commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace UploadCategoryDepictionsRenderer

* commons-app#3468 Switch from RvRenderer to AdapterDelegates - update BaseAdapter to be easier to use

* commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace SearchImagesRenderer

* commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace SearchCategoriesRenderer

* commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace NotificationRenderer

* commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace UploadDepictsRenderer

* commons-app#3468 Switch from RvRenderer to AdapterDelegates - replace PlaceRenderer

* commons-app#3468 fix constant import

* commons-app#3468 Switch from RvRenderer to AdapterDelegates - resolve id conflict

Author: macgills

app/build.gradle

@@ -11,7 +11,7 @@ apply from: 'quality.gradle'
 
 def isRunningOnTravisAndIsNotPRBuild = System.getenv("CI") == "true" && file('../play.p12').exists()
 
-if(isRunningOnTravisAndIsNotPRBuild) {
+if (isRunningOnTravisAndIsNotPRBuild) {
     apply plugin: 'com.github.triplet.play'
 }
 
@@ -35,16 +35,16 @@ dependencies {
     // UI
     implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar'
     implementation 'com.github.chrisbanes:PhotoView:2.0.0'
-    implementation 'com.github.pedrovgs:renderers:3.3.3'
     implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:8.6.2'
     implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v8:0.11.0'
     implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-scalebar-v9:0.4.0'
     implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0'
     implementation 'com.dinuscxj:circleprogressbar:1.1.1'
     implementation 'com.karumi:dexter:5.0.0'
     implementation "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION"
-
     kapt "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION"
+    implementation "com.hannesdorfmann:adapterdelegates4-kotlin-dsl-layoutcontainer:$ADAPTER_DELEGATES_VERSION"
+    implementation "com.hannesdorfmann:adapterdelegates4-pagination:$ADAPTER_DELEGATES_VERSION"
 
     // Logging
     implementation 'ch.acra:acra-dialog:5.3.0'
@@ -104,6 +104,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation "androidx.exifinterface:exifinterface:1.0.0"
     implementation "androidx.core:core-ktx:$CORE_KTX_VERSION"
+    implementation "androidx.multidex:multidex:2.0.1"
 
     //swipe_layout
     implementation 'com.daimajia.swipelayout:library:1.2.0@aar'
@@ -112,7 +113,8 @@ dependencies {
     implementation "androidx.room:room-runtime:$ROOM_VERSION"
     implementation "androidx.room:room-ktx:$ROOM_VERSION"
     implementation "androidx.room:room-rxjava2:$ROOM_VERSION"
-    kapt "androidx.room:room-compiler:$ROOM_VERSION" // For Kotlin use kapt instead of annotationProcessor
+    kapt "androidx.room:room-compiler:$ROOM_VERSION"
+    // For Kotlin use kapt instead of annotationProcessor
     implementation 'com.squareup.retrofit2:retrofit:2.8.1'
     testImplementation "androidx.arch.core:core-testing:2.1.0"
 
@@ -145,7 +147,7 @@ android {
         testOptions {
             execution 'ANDROIDX_TEST_ORCHESTRATOR'
         }
-
+        multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
     }
 
@@ -172,7 +174,7 @@ android {
         test.resources.srcDirs += 'src/main/resoures'
     }
 
-	signingConfigs {
+    signingConfigs {
         release
     }
 
@@ -181,7 +183,7 @@ android {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
             testProguardFile 'test-proguard-rules.txt'
-            if(isRunningOnTravisAndIsNotPRBuild) {
+            if (isRunningOnTravisAndIsNotPRBuild) {
                 signingConfig signingConfigs.release
             }
         }
@@ -210,7 +212,7 @@ android {
     productFlavors {
         prod {
 
-			applicationId 'fr.free.nrw.commons'
+            applicationId 'fr.free.nrw.commons'
 
             buildConfigField "String", "WIKIMEDIA_API_POTD", "\"https://commons.wikimedia.org/w/api.php?action=featuredfeed&feed=potd&feedformat=rss&language=en\""
             buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.org/w/api.php\""
@@ -291,7 +293,7 @@ android {
     buildToolsVersion buildToolsVersion
 }
 
-if(isRunningOnTravisAndIsNotPRBuild) {
+if (isRunningOnTravisAndIsNotPRBuild) {
     play {
         track = "alpha"
         userFraction = 1

app/src/main/java/fr/free/nrw/commons/CommonsApplication.java

@@ -9,7 +9,6 @@
 import static org.acra.ReportField.USER_COMMENT;
 
 import android.annotation.SuppressLint;
-import android.app.Application;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Context;
@@ -25,7 +24,6 @@
 import com.mapbox.mapboxsdk.Mapbox;
 import com.squareup.leakcanary.LeakCanary;
 import com.squareup.leakcanary.RefWatcher;
-
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao;
 import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao;

app/src/main/java/fr/free/nrw/commons/category/CategoryClient.kt

@@ -5,6 +5,7 @@ import org.wikipedia.dataclient.mwapi.MwQueryResponse
 import javax.inject.Inject
 import javax.inject.Singleton
 
+const val CATEGORY_PREFIX = "Category:"
 /**
  * Category Client to handle custom calls to Commons MediaWiki APIs
  */
@@ -72,7 +73,7 @@ class CategoryClient @Inject constructor(private val categoryInterface: Category
         return responseObservable
             .map { it.query()?.pages() ?: emptyList() }
             .map {
-                it.map { page -> page.title().replace("Category:", "") }
+                it.map { page -> page.title().replace(CATEGORY_PREFIX, "") }
             }
     }
 

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

@@ -3,6 +3,7 @@
 
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
+import static fr.free.nrw.commons.category.CategoryClientKt.CATEGORY_PREFIX;
 
 import android.content.Intent;
 import android.content.res.Configuration;
@@ -17,17 +18,16 @@
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import com.pedrogomez.renderers.RVRendererAdapter;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
-import fr.free.nrw.commons.explore.categories.SearchCategoriesAdapterFactory;
+import fr.free.nrw.commons.explore.categories.SearchCategoriesAdapter;
 import fr.free.nrw.commons.utils.NetworkUtils;
 import fr.free.nrw.commons.utils.ViewUtil;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
-import java.util.ArrayList;
 import java.util.List;
 import javax.inject.Inject;
+import kotlin.Unit;
 import timber.log.Timber;
 
 /**
@@ -46,16 +46,9 @@ public class SubCategoryListFragment extends CommonsDaggerSupportFragment {
     private String categoryName = null;
     @Inject CategoryClient categoryClient;
 
-    private RVRendererAdapter<String> categoriesAdapter;
+    private SearchCategoriesAdapter categoriesAdapter;
     private boolean isParentCategory = true;
 
-    private final SearchCategoriesAdapterFactory adapterFactory = new SearchCategoriesAdapterFactory(item -> {
-        // Open SubCategory Details page
-        Intent intent = new Intent(getContext(), CategoryDetailsActivity.class);
-        intent.putExtra("categoryName", item);
-        getContext().startActivity(intent);
-
-    });
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) {
@@ -70,8 +63,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle sav
         else{
             categoriesRecyclerView.setLayoutManager(new GridLayoutManager(getContext(), 2));
         }
-        ArrayList<String> items = new ArrayList<>();
-        categoriesAdapter = adapterFactory.create(items);
+        categoriesAdapter = new SearchCategoriesAdapter(item->{
+            Intent intent = new Intent(getContext(), CategoryDetailsActivity.class);
+            intent.putExtra("categoryName", item);
+            getContext().startActivity(intent);
+            return Unit.INSTANCE;
+        });
         categoriesRecyclerView.setAdapter(categoriesAdapter);
         return rootView;
     }
@@ -88,12 +85,14 @@ public void initSubCategoryList() {
         }
         progressBar.setVisibility(View.VISIBLE);
         if (isParentCategory) {
-            compositeDisposable.add(categoryClient.getParentCategoryList("Category:"+categoryName)
+            compositeDisposable.add(categoryClient.getParentCategoryList(
+                CATEGORY_PREFIX +categoryName)
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(this::handleSuccess, this::handleError));
         } else {
-            compositeDisposable.add(categoryClient.getSubCategoryList("Category:"+categoryName)
+            compositeDisposable.add(categoryClient.getSubCategoryList(
+                CATEGORY_PREFIX +categoryName)
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(this::handleSuccess, this::handleError));

app/src/main/java/fr/free/nrw/commons/depictions/Media/DepictedImagesPresenter.java

@@ -40,6 +40,7 @@ public class DepictedImagesPresenter implements DepictedImagesContract.UserActio
      * Ex: Q9394
      */
     private List<Media> queryList = new ArrayList<>();
+    private String entityId;
 
     @Inject
     public DepictedImagesPresenter(@Named("default_preferences") JsonKvStore depictionKvStore, DepictsClient depictsClient, MediaClient mediaClient,  @Named(IO_THREAD) Scheduler ioScheduler,
@@ -67,6 +68,7 @@ public void onDetachView() {
     @SuppressLint("CheckResult")
     @Override
     public void initList(String entityId) {
+        this.entityId = entityId;
         view.setLoadingStatus(true);
         view.progressBarVisible(true);
         view.setIsLastPage(false);

app/src/main/java/fr/free/nrw/commons/depictions/subClass/SubDepictionListFragment.java

@@ -17,19 +17,18 @@
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import com.pedrogomez.renderers.RVRendererAdapter;
 import dagger.android.support.DaggerFragment;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.depictions.WikidataItemDetailsActivity;
-import fr.free.nrw.commons.explore.depictions.SearchDepictionsAdapterFactory;
-import fr.free.nrw.commons.explore.depictions.SearchDepictionsRenderer;
+import fr.free.nrw.commons.explore.depictions.DepictionAdapter;
 import fr.free.nrw.commons.upload.structure.depictions.DepictedItem;
 import fr.free.nrw.commons.utils.NetworkUtils;
 import fr.free.nrw.commons.utils.ViewUtil;
 import java.io.IOException;
 import java.util.List;
 import java.util.Locale;
 import javax.inject.Inject;
+import kotlin.Unit;
 
 /**
  * Fragment for parent classes and child classes of Depicted items in Explore
@@ -48,7 +47,7 @@ public class SubDepictionListFragment extends DaggerFragment implements SubDepic
      * Keeps a record of whether current instance of the fragment if of SubClass or ParentClass
      */
     private boolean isParentClass = false;
-    private RVRendererAdapter<DepictedItem> depictionsAdapter;
+    private DepictionAdapter depictionsAdapter;
     RecyclerView.LayoutManager layoutManager;
     /**
      * Stores entityId for the depiction
@@ -61,20 +60,6 @@ public class SubDepictionListFragment extends DaggerFragment implements SubDepic
 
     @Inject SubDepictionListPresenter presenter;
 
-    private final SearchDepictionsAdapterFactory adapterFactory = new SearchDepictionsAdapterFactory(new SearchDepictionsRenderer.DepictCallback() {
-        @Override
-        public void depictsClicked(DepictedItem item) {
-            // Open SubDepiction Details page
-            getActivity().finish();
-            WikidataItemDetailsActivity.startYourself(getContext(), item);
-        }
-    });
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-    }
-
     private void initViews() {
         if (getArguments() != null) {
             depictsName = getArguments().getString("wikidataItemName");
@@ -115,7 +100,12 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         }
         initViews();
         depictionsRecyclerView.setLayoutManager(layoutManager);
-        depictionsAdapter = adapterFactory.create();
+        depictionsAdapter = new DepictionAdapter(depictedItem -> {
+            // Open SubDepiction Details page
+            getActivity().finish();
+            WikidataItemDetailsActivity.startYourself(getContext(), depictedItem);
+            return Unit.INSTANCE;
+        });
         depictionsRecyclerView.setAdapter(depictionsAdapter);
         return v;
     }
@@ -130,14 +120,7 @@ public void onSuccess(List<DepictedItem> mediaList) {
         progressBar.setVisibility(View.GONE);
         depictionNotFound.setVisibility(GONE);
         bottomProgressBar.setVisibility(GONE);
-        int itemCount=layoutManager.getItemCount();
         depictionsAdapter.addAll(mediaList);
-        depictionsRecyclerView.getRecycledViewPool().clear();
-        if(itemCount!=0) {
-            depictionsAdapter.notifyItemRangeInserted(itemCount, mediaList.size()-1);
-        }else{
-            depictionsAdapter.notifyDataSetChanged();
-        }
     }
 
     @Override

app/src/main/java/fr/free/nrw/commons/depictions/subClass/models/SparqlResponses.kt

@@ -9,7 +9,8 @@ data class Binding(
     val itemLabel: SparqInfo,
     val itemDescription: SparqInfo? = null
 ) {
-    val id: String by lazy { item.value.substringAfterLast("/") }
+    val id: String
+        get() = item.value.substringAfterLast("/")
 }
 
 data class SparqInfo(val type: String, val value: String)

app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java

@@ -10,11 +10,9 @@
 import dagger.android.support.AndroidSupportInjectionModule;
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.auth.LoginActivity;
-import fr.free.nrw.commons.contributions.ContributionViewHolder;
 import fr.free.nrw.commons.contributions.ContributionsModule;
 import fr.free.nrw.commons.depictions.DepictionModule;
 import fr.free.nrw.commons.explore.SearchModule;
-import fr.free.nrw.commons.nearby.PlaceRenderer;
 import fr.free.nrw.commons.review.ReviewController;
 import fr.free.nrw.commons.settings.SettingsFragment;
 import fr.free.nrw.commons.upload.FileProcessor;
@@ -49,8 +47,6 @@ public interface CommonsApplicationComponent extends AndroidInjector<Application
     @Override
     void inject(ApplicationlessInjection instance);
 
-    void inject(PlaceRenderer placeRenderer);
-
     void inject(FileProcessor fileProcessor);
 
     void inject(PicOfDayAppWidget picOfDayAppWidget);

app/src/main/java/fr/free/nrw/commons/di/FragmentBuilderModule.java

@@ -72,13 +72,13 @@ public abstract class FragmentBuilderModule {
     @ContributesAndroidInjector
     abstract ContributionsFragment bindContributionsFragment();
 
-    @ContributesAndroidInjector
+    @ContributesAndroidInjector(modules = NearbyParentFragmentModule.class)
     abstract NearbyParentFragment bindNearbyParentFragment();
 
     @ContributesAndroidInjector
     abstract BookmarkPicturesFragment bindBookmarkPictureListFragment();
 
-    @ContributesAndroidInjector
+    @ContributesAndroidInjector(modules = BookmarkLocationsFragmentModule.class)
     abstract BookmarkLocationsFragment bindBookmarkLocationListFragment();
 
     @ContributesAndroidInjector