Merge pull request #138 from Omega-R/feature/base_list_adapter_improve

removed provideViewHolder from BaseListAdapter, updated deps

Author: anton-knyazev

app/src/main/java/com/omega_r/omegarecyclerview/ListAdapterExample/ListAdapter.java

@@ -3,6 +3,7 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import com.omega_r.libs.omegarecyclerview.BaseListAdapter;
 import com.omega_r.omegarecyclerview.R;
 
@@ -13,8 +14,9 @@ public ListAdapter(BaseListAdapter.OnItemClickListener<String> clickListener,
         super(clickListener, longClickListener);
     }
 
+    @NonNull
     @Override
-    protected ViewHolder provideViewHolder(ViewGroup parent) {
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         return new SampleViewHolder(parent);
     }
 

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Mar 06 12:09:01 MSK 2019
+#Mon Aug 19 10:05:28 MSK 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

omegarecyclerviewlibs/build.gradle

@@ -25,7 +25,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
-    implementation 'com.google.android.material:material:1.1.0-alpha02'
-
+    implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
+    implementation 'com.google.android.material:material:1.1.0-alpha09'
 }

omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/BaseListAdapter.java

@@ -10,18 +10,13 @@
 
 public abstract class BaseListAdapter<T> extends OmegaRecyclerView.Adapter<BaseListAdapter<T>.ViewHolder> {
 
-    private static final int INDEX_NOT_FOUND = -1;
-
     private List<T> items;
 
     @Nullable
-    private OnItemClickListener<T> clickListener = null;
+    private OnItemClickListener<T> clickListener;
 
     @Nullable
-    private OnItemLongClickListener<T> longClickListener = null;
-
-
-    protected abstract BaseListAdapter<T>.ViewHolder provideViewHolder(ViewGroup parent);
+    private OnItemLongClickListener<T> longClickListener;
 
     public BaseListAdapter(@NonNull List<T> items,
                            @Nullable OnItemClickListener<T> clickListener,
@@ -99,13 +94,6 @@ private void onLongItemClick(T item) {
         }
     }
 
-    @NonNull
-    @Override
-    public BaseListAdapter<T>.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        return provideViewHolder(parent);
-    }
-
-    @SuppressWarnings("unchecked")
     @Override
     public void onBindViewHolder(@NonNull BaseListAdapter<T>.ViewHolder holder, int position) {
         holder.bind(getItem(position));
@@ -116,7 +104,9 @@ public int getItemCount() {
         return items.size();
     }
 
-    public abstract class ViewHolder extends OmegaRecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
+    public abstract class ViewHolder extends OmegaRecyclerView.ViewHolder implements
+            View.OnClickListener,
+            View.OnLongClickListener {
 
         private T item;
 
@@ -134,6 +124,7 @@ private void bind(T item) {
             if (clickListener != null) {
                 itemView.setOnClickListener(this);
             }
+
             if (longClickListener != null) {
                 itemView.setOnLongClickListener(this);
             }