Released 3.5.2. Updated demo app Recycler Adapter to 2.4.0. Updated O…

…kHttp to 3.14.0

examples/app/demoapp/build.gradle

@@ -62,7 +62,7 @@ dependencies {
  annotationProcessor "com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
 
  implementation 'com.nononsenseapps:filepicker:4.0.0-beta1'
- implementation 'net.gotev:recycleradapter:2.0.1'
+ implementation 'net.gotev:recycleradapter:2.4.0'
 
  /*implementation "net.gotev:uploadservice:${libraryVersion}"
  implementation "net.gotev:uploadservice-okhttp:${libraryVersion}"

examples/app/demoapp/src/main/java/net/gotev/uploadservicedemo/adapteritems/EmptyItem.java

@@ -5,7 +5,6 @@
 import android.widget.TextView;
 
 import net.gotev.recycleradapter.AdapterItem;
-import net.gotev.recycleradapter.RecyclerAdapterNotifier;
 import net.gotev.uploadservicedemo.R;
 import net.gotev.uploadservicedemo.views.ButterKnifeViewHolder;
 
@@ -20,12 +19,19 @@
 
 public class EmptyItem extends AdapterItem<EmptyItem.Holder> {
 
- private @StringRes int text;
+ private @StringRes
+ int text;
 
  public EmptyItem(@StringRes int textResource) {
  text = textResource;
  }
 
+ @NotNull
+ @Override
+ public String diffingId() {
+ return EmptyItem.class.getName();
+ }
+
  @Override
  public int getLayoutId() {
  return R.layout.item_empty;
@@ -42,8 +48,8 @@ public static class Holder extends ButterKnifeViewHolder {
  @BindView(R.id.textView)
  TextView textView;
 
- public Holder(View itemView, RecyclerAdapterNotifier adapter) {
- super(itemView, adapter);
+ public Holder(View itemView) {
+ super(itemView);
  }
  }
 }

examples/app/demoapp/src/main/java/net/gotev/uploadservicedemo/adapteritems/UploadItem.java

@@ -1,12 +1,10 @@
 package net.gotev.uploadservicedemo.adapteritems;
 
-import android.os.Bundle;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import net.gotev.recycleradapter.AdapterItem;
-import net.gotev.recycleradapter.RecyclerAdapterNotifier;
 import net.gotev.uploadservicedemo.R;
 import net.gotev.uploadservicedemo.views.ButterKnifeViewHolder;
 
@@ -30,9 +28,6 @@ public interface Delegate {
  public static final int TYPE_PARAMETER = 1;
  public static final int TYPE_FILE = 2;
 
- private static final String KEY_EVENT = "event";
- private static final String EVENT_REMOVE = "remove";
-
  private int mType;
  private String mTitle;
  private String mSubtitle;
@@ -63,14 +58,6 @@ public void bind(@NotNull Holder holder) {
  holder.subtitle.setText(mSubtitle);
  }
 
- @Override
- public boolean onEvent(int position, Bundle data) {
- if (data != null && EVENT_REMOVE.equals(data.getString(KEY_EVENT)))
- mDelegate.onRemoveUploadItem(position);
-
- return false;
- }
-
  public static class Holder extends ButterKnifeViewHolder {
 
  @BindView(R.id.title)
@@ -82,16 +69,17 @@ public static class Holder extends ButterKnifeViewHolder {
  @BindView(R.id.image)
  ImageView image;
 
- public Holder(View itemView, RecyclerAdapterNotifier adapter) {
- super(itemView, adapter);
+ public Holder(View itemView) {
+ super(itemView);
  }
 
  @OnClick(R.id.remove)
  public void onRemoveItem() {
- Bundle data = new Bundle();
- data.putString(KEY_EVENT, EVENT_REMOVE);
+ UploadItem item = (UploadItem) getAdapterItem();
 
- sendEvent(data);
+ if (item != null) {
+ item.mDelegate.onRemoveUploadItem(getAdapterPosition());
+ }
  }
  }
 
@@ -111,22 +99,10 @@ public int compareTo(@NonNull AdapterItem otherItem) {
  return mTitle.compareTo(other.mTitle);
  }
 
+ @NotNull
  @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof UploadItem)) return false;
-
- UploadItem that = (UploadItem) o;
-
- return that.mTitle.equals(mTitle);
-
- }
-
- @Override
- public int hashCode() {
- int result = mTitle.hashCode();
- result = 31 * result + mSubtitle.hashCode();
- return result;
+ public String diffingId() {
+ return UploadItem.class.getName() + mTitle + mSubtitle;
  }
 
  public int getType() {

examples/app/demoapp/src/main/java/net/gotev/uploadservicedemo/views/ButterKnifeViewHolder.java

@@ -2,7 +2,6 @@
 
 import android.view.View;
 
-import net.gotev.recycleradapter.RecyclerAdapterNotifier;
 import net.gotev.recycleradapter.RecyclerAdapterViewHolder;
 
 import butterknife.ButterKnife;
@@ -12,8 +11,8 @@
  */
 
 public abstract class ButterKnifeViewHolder extends RecyclerAdapterViewHolder {
- public ButterKnifeViewHolder(View itemView, RecyclerAdapterNotifier adapter) {
- super(itemView, adapter);
+ public ButterKnifeViewHolder(View itemView) {
+ super(itemView);
  ButterKnife.bind(this, itemView);
  }
 }

manifest.gradle

@@ -9,8 +9,8 @@ ext {
  library_licenses = ["Apache-2.0"]
  library_licenses_url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
  library_project_group = 'net.gotev'
- library_version = '3.5.1'
- version_code = 31
+ library_version = '3.5.2'
+ version_code = 32
  min_sdk = 18
  target_sdk = 28
  demo_app_id = 'net.gotev.uploadservicedemo'

uploadservice-okhttp/build.gradle

@@ -65,7 +65,7 @@ dependencies {
  // Espresso dependencies
  androidTestImplementation "androidx.test.espresso:espresso-core:$androidx_test_espresso_version"
 
- api 'com.squareup.okhttp3:okhttp:3.12.1'
+ api 'com.squareup.okhttp3:okhttp:3.14.0'
  //api "net.gotev:uploadservice:${version}"
  //comment the previous line and uncomment the next line for development (it uses the local lib)
  api project(':uploadservice')