Merge pull request #27 from bartoszwilk/refactor-sample-recyclerview

Refactor sample-recyclerview
mkoslacz · Dec 20, 2016 · 3878cb3 · 3878cb3
2 parents 0735fd2 + 57114ae
commit 3878cb3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/...java/com/mateuszkoslacz/moviper/recyclerviewsample/viper/view/adapter/ProductAdapter.java b/...java/com/mateuszkoslacz/moviper/recyclerviewsample/viper/view/adapter/ProductAdapter.java
@@ -7,7 +7,9 @@
 import com.hannesdorfmann.mosby.mvp.MvpView;
 import com.mateuszkoslacz.moviper.base.view.MvpRecyclerViewAdapter;
 import com.mateuszkoslacz.moviper.base.view.MvpBaseViewHolder;
+import com.mateuszkoslacz.moviper.recyclerviewsample.viper.view.adapter.agregate.HeaderListingItem;
 import com.mateuszkoslacz.moviper.recyclerviewsample.viper.view.adapter.agregate.ListingItem;
+import com.mateuszkoslacz.moviper.recyclerviewsample.viper.view.adapter.agregate.ProductListingItem;
 import com.mateuszkoslacz.moviper.recyclerviewsample.viper.view.adapter.delegate.HeaderAdapterDelegate;
 import com.mateuszkoslacz.moviper.recyclerviewsample.viper.view.adapter.delegate.ProductAdapterDelegate;
 
@@ -23,14 +25,14 @@ public class ProductAdapter
         MvpBaseViewHolder> {
 
     private List<ListingItem> mListingItems;
-    private AdapterDelegatesManager mDelegatesManager;
+    private AdapterDelegatesManager<List<ListingItem>> mDelegatesManager;
 
     public ProductAdapter() {
         mListingItems = new ArrayList<>();
-        mDelegatesManager = new AdapterDelegatesManager();
+        mDelegatesManager = new AdapterDelegatesManager<>();
         mDelegatesManager
-                .addDelegate(ListingItem.TYPE_HEADER, new HeaderAdapterDelegate())
-                .addDelegate(ListingItem.TYPE_PRODUCT, new ProductAdapterDelegate());
+                .addDelegate(HeaderListingItem.TYPE, new HeaderAdapterDelegate())
+                .addDelegate(ProductListingItem.TYPE, new ProductAdapterDelegate());
     }
 
     @Override

diff --git a/...euszkoslacz/moviper/recyclerviewsample/viper/view/adapter/agregate/HeaderListingItem.java b/...euszkoslacz/moviper/recyclerviewsample/viper/view/adapter/agregate/HeaderListingItem.java
@@ -8,6 +8,7 @@
 
 public class HeaderListingItem implements ListingItem {
 
+    public static final int TYPE = HeaderListingItem.class.hashCode();
     private Category mCategory;
 
     public HeaderListingItem(Category category) {
@@ -16,7 +17,7 @@ public HeaderListingItem(Category category) {
 
     @Override
     public int getType() {
-        return ListingItem.TYPE_HEADER;
+        return TYPE;
     }
 
     public Category getCategory() {

diff --git a/...om/mateuszkoslacz/moviper/recyclerviewsample/viper/view/adapter/agregate/ListingItem.java b/...om/mateuszkoslacz/moviper/recyclerviewsample/viper/view/adapter/agregate/ListingItem.java
@@ -6,8 +6,5 @@
 
 public interface ListingItem {
 
-    int TYPE_HEADER = 0;
-    int TYPE_PRODUCT = 1;
-
     int getType();
 }
diff --git a/...uszkoslacz/moviper/recyclerviewsample/viper/view/adapter/agregate/ProductListingItem.java b/...uszkoslacz/moviper/recyclerviewsample/viper/view/adapter/agregate/ProductListingItem.java
@@ -8,6 +8,7 @@
 
 public class ProductListingItem implements ListingItem {
 
+    public static final int TYPE = ProductListingItem.class.hashCode();
     private Product mProduct;
 
     public ProductListingItem(Product product) {
@@ -16,7 +17,7 @@ public ProductListingItem(Product product) {
 
     @Override
     public int getType() {
-        return ListingItem.TYPE_PRODUCT;
+        return TYPE;
     }
 
     public Product getProduct() {

diff --git a/...koslacz/moviper/recyclerviewsample/viper/view/adapter/delegate/HeaderAdapterDelegate.java b/...koslacz/moviper/recyclerviewsample/viper/view/adapter/delegate/HeaderAdapterDelegate.java
@@ -20,7 +20,7 @@ public class HeaderAdapterDelegate extends AdapterDelegate<List<ListingItem>> {
 
     @Override
     protected boolean isForViewType(@NonNull List<ListingItem> items, int position) {
-        return items.get(position).getType() == ListingItem.TYPE_HEADER;
+        return items.get(position).getType() == HeaderListingItem.TYPE;
     }
 
     @NonNull

diff --git a/...oslacz/moviper/recyclerviewsample/viper/view/adapter/delegate/ProductAdapterDelegate.java b/...oslacz/moviper/recyclerviewsample/viper/view/adapter/delegate/ProductAdapterDelegate.java
@@ -20,7 +20,7 @@ public class ProductAdapterDelegate extends AdapterDelegate<List<ListingItem>> {
 
     @Override
     protected boolean isForViewType(@NonNull List<ListingItem> items, int position) {
-        return items.get(position).getType() == ListingItem.TYPE_PRODUCT;
+        return items.get(position).getType() == ProductListingItem.TYPE;
     }
 
     @NonNull