Merge pull request #369 from MGaetan89/abtract_table_adapter_default_…

…methods Add default get*ItemViewType implementations to AbstractTableAdapter
evrencoskun · Mar 15, 2021 · cd1c561 · cd1c561
2 parents 2a0783e + 2a603a3
commit cd1c561
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 16 deletions.
diff --git a/...eview/src/androidTest/java/com/evrencoskun/tableview/test/adapters/CornerTestAdapter.java b/...eview/src/androidTest/java/com/evrencoskun/tableview/test/adapters/CornerTestAdapter.java
@@ -54,7 +54,7 @@ static class TestCellViewHolder extends AbstractViewHolder {
     }
 
     @NonNull
-    public AbstractViewHolder onCreateCellViewHolder(ViewGroup parent, int viewType) {
+    public AbstractViewHolder onCreateCellViewHolder(@NonNull ViewGroup parent, int viewType) {
         View layout = LayoutInflater.from(parent.getContext())
                 .inflate(R.layout.cell_layout, parent, false);
         return new TestCellViewHolder(layout);
@@ -83,7 +83,8 @@ public TestColumnHeaderViewHolder(View itemView) {
     }
 
     @NonNull
-    public AbstractViewHolder onCreateColumnHeaderViewHolder(ViewGroup parent, int viewType) {
+    public AbstractViewHolder onCreateColumnHeaderViewHolder(@NonNull ViewGroup parent, int
+            viewType) {
         View layout = LayoutInflater.from(parent.getContext())
                 .inflate(R.layout.column_layout, parent, false);
         return new TestColumnHeaderViewHolder(layout);
@@ -112,7 +113,7 @@ public TestRowHeaderViewHolder(View itemView) {
     }
 
     @NonNull
-    public AbstractViewHolder onCreateRowHeaderViewHolder(ViewGroup parent, int viewType) {
+    public AbstractViewHolder onCreateRowHeaderViewHolder(@NonNull ViewGroup parent, int viewType) {
         View layout = LayoutInflater.from(parent.getContext())
                 .inflate(R.layout.row_layout, parent, false);
         return new TestRowHeaderViewHolder(layout);
@@ -128,12 +129,8 @@ public void onBindRowHeaderViewHolder(@NonNull AbstractViewHolder holder,
     }
 
     @NonNull
-    public View onCreateCornerView(ViewGroup parent) {
+    public View onCreateCornerView(@NonNull ViewGroup parent) {
         return LayoutInflater.from(parent.getContext())
                 .inflate(R.layout.corner_layout, parent, false);
     }
-
-    public int getColumnHeaderItemViewType(int position) { return 0; }
-    public int getRowHeaderItemViewType(int position) { return 0; }
-    public int getCellItemViewType(int position) { return 0; }
 }
diff --git a/...eview/src/androidTest/java/com/evrencoskun/tableview/test/adapters/SimpleTestAdapter.java b/...eview/src/androidTest/java/com/evrencoskun/tableview/test/adapters/SimpleTestAdapter.java
@@ -54,7 +54,7 @@ static class TestCellViewHolder extends AbstractViewHolder {
     }
 
     @NonNull
-    public AbstractViewHolder onCreateCellViewHolder(ViewGroup parent, int viewType) {
+    public AbstractViewHolder onCreateCellViewHolder(@NonNull ViewGroup parent, int viewType) {
         View layout = LayoutInflater.from(parent.getContext())
                 .inflate(R.layout.cell_layout, parent, false);
         return new TestCellViewHolder(layout);
@@ -71,7 +71,8 @@ public void onBindCellViewHolder(@NonNull AbstractViewHolder holder, Cell cell,
     }
 
     @NonNull
-    public AbstractViewHolder onCreateColumnHeaderViewHolder(ViewGroup parent, int viewType) {
+    public AbstractViewHolder onCreateColumnHeaderViewHolder(@NonNull ViewGroup parent, int
+            viewType) {
         View layout = LayoutInflater.from(parent.getContext())
                 .inflate(R.layout.cell_layout, parent, false);
         return new TestCellViewHolder(layout);
@@ -89,7 +90,7 @@ public void onBindColumnHeaderViewHolder(@NonNull AbstractViewHolder holder,
     }
 
     @NonNull
-    public AbstractViewHolder onCreateRowHeaderViewHolder(ViewGroup parent, int viewType) {
+    public AbstractViewHolder onCreateRowHeaderViewHolder(@NonNull ViewGroup parent, int viewType) {
         View layout = LayoutInflater.from(parent.getContext())
                 .inflate(R.layout.cell_layout, parent, false);
         return new TestCellViewHolder(layout);
@@ -104,12 +105,8 @@ public void onBindRowHeaderViewHolder(@NonNull AbstractViewHolder holder,
     }
 
     @NonNull
-    public View onCreateCornerView(ViewGroup parent) {
+    public View onCreateCornerView(@NonNull ViewGroup parent) {
         return LayoutInflater.from(parent.getContext())
                 .inflate(R.layout.cell_layout, parent, false);
     }
-
-    public int getColumnHeaderItemViewType(int position) { return 0; }
-    public int getRowHeaderItemViewType(int position) { return 0; }
-    public int getCellItemViewType(int position) { return 0; }
 }
diff --git a/tableview/src/main/java/com/evrencoskun/tableview/adapter/AbstractTableAdapter.java b/tableview/src/main/java/com/evrencoskun/tableview/adapter/AbstractTableAdapter.java
@@ -159,7 +159,23 @@ public void setAllItems(@Nullable List<CH> columnHeaderItems, @Nullable List<RH>
         }
     }
 
+    @Override
+    public int getColumnHeaderItemViewType(int position) {
+        return 0;
+    }
+
+    @Override
+    public int getRowHeaderItemViewType(int position) {
+        return 0;
+    }
+
+    @Override
+    public int getCellItemViewType(int position) {
+        return 0;
+    }
+
     @Nullable
+    @Override
     public View getCornerView() {
         return mCornerView;
     }
@@ -357,6 +373,7 @@ private void dispatchCellDataSetChangesToListeners(@NonNull List<List<C>> newCel
      *
      * @param listener The AdapterDataSetChangedListener listener.
      */
+    @Override
     public void addAdapterDataSetChangedListener(@NonNull AdapterDataSetChangedListener<CH, RH, C> listener) {
         if (dataSetChangedListeners == null) {
             dataSetChangedListeners = new ArrayList<>();