From 2a603a3ec9b47e2c4facd582ddadc60794b4cbb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gae=CC=88tan=20Muller?= Date: Mon, 15 Mar 2021 08:18:13 +0100 Subject: [PATCH] Add default get*ItemViewType implementations to AbstractTableAdapter --- .../test/adapters/CornerTestAdapter.java | 13 +++++-------- .../test/adapters/SimpleTestAdapter.java | 13 +++++-------- .../tableview/adapter/AbstractTableAdapter.java | 17 +++++++++++++++++ 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/tableview/src/androidTest/java/com/evrencoskun/tableview/test/adapters/CornerTestAdapter.java b/tableview/src/androidTest/java/com/evrencoskun/tableview/test/adapters/CornerTestAdapter.java index 9246af69..3a2400ad 100644 --- a/tableview/src/androidTest/java/com/evrencoskun/tableview/test/adapters/CornerTestAdapter.java +++ b/tableview/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/tableview/src/androidTest/java/com/evrencoskun/tableview/test/adapters/SimpleTestAdapter.java b/tableview/src/androidTest/java/com/evrencoskun/tableview/test/adapters/SimpleTestAdapter.java index 37516f31..8aeb68e3 100644 --- a/tableview/src/androidTest/java/com/evrencoskun/tableview/test/adapters/SimpleTestAdapter.java +++ b/tableview/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 index 32be2fdf..fc9daa24 100644 --- 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 columnHeaderItems, @Nullable List } } + @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> newCel * * @param listener The AdapterDataSetChangedListener listener. */ + @Override public void addAdapterDataSetChangedListener(@NonNull AdapterDataSetChangedListener listener) { if (dataSetChangedListeners == null) { dataSetChangedListeners = new ArrayList<>();