Merge branch 'develop'

Author: Ingo Schwarz

README.md

@@ -4,7 +4,7 @@ An Android library providing a TableView and a SortableTableView.
 
 ![SortableTableView Example](https://raw.githubusercontent.com/ISchwarz23/SortableTableView/develop/README/SortableTableView-Example.gif)
 
-**Minimum SDK-Version:** 11  |  **Compile SDK-Version:** 23  |  **Latest Library Version:** 1.1.1  
+**Minimum SDK-Version:** 11  |  **Compile SDK-Version:** 23  |  **Latest Library Version:** 2.0.0  
 
 ## Repository Content
 **tableview** - contains the android library sources and resources  
@@ -17,7 +17,7 @@ To use the this library in your project simply add the following dependency to y
 ```
     dependencies {
         ...
-        compile 'de.codecrafters.tableview:tableview:1.1.1'
+        compile 'de.codecrafters.tableview:tableview:2.0.0'
         ...
     }
 ```
@@ -32,7 +32,7 @@ The provided TableView is very easy to adapt to your needs. To set the column co
         android:id="@+id/tableView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        table:columnCount="4" />
+        table:tableView_columnCount="4" />
 ```
 A second possibility to define the column count of your TableView is to set it directly in the code.
 ```java
@@ -183,7 +183,7 @@ The table view provides several possibilities to style its header. One possibili
         android:id="@+id/tableView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        table:headerColor="@color/primary" />
+        table:tableView_headerColor="@color/primary" />
 ```
 ```java
     tableView.setHeaderBackgroundColor(getResources().getColor(R.color.primary));
@@ -199,7 +199,7 @@ In addition you can set an **elevation** of the table header. To achieve this yo
         android:id="@+id/tableView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        table:headerElevation="10" />
+        table:tableView_headerElevation="10" />
 ```
 ```java
     tableView.setHeaderElevation(10);
@@ -213,7 +213,7 @@ For SortableTableViews it is also possible to replace the default **sortable ind
     	super.onCreate(savedInstanceState);
     	setContentView(R.layout.activity_main);
         // ...
-        sortbaleTableView.setHeaderSortStateViewProvider(new MySortStateViewProvider());
+        sortableTableView.setHeaderSortStateViewProvider(new MySortStateViewProvider());
     }
 
 	private static class MySortStateViewProvider implements SortStateViewProvider {
@@ -248,7 +248,7 @@ This Factory contains for example an alternating-table-data-row colorizer that w
         // ...
     	int colorEvenRows = getResources().getColor(R.color.white);
     	int colorOddRows = getResources().getColor(R.color.gray);
-    	tableView.setDataRowColoriser(TableDataRowColorizers.alternatingRows(colorEvenRows, colorOddRows));
+    	tableView.setDataRowColorizer(TableDataRowColorizers.alternatingRows(colorEvenRows, colorOddRows));
     }
 ```
 If the implementations of `TableDataRowColorizer` contained in the `TableDataRowColorizers` factory don't fulfil you needs you can create your own implementation of `TableDataRowColorizer`. Here is a small example of how to do so.
@@ -258,7 +258,7 @@ If the implementations of `TableDataRowColorizer` contained in the `TableDataRow
     	super.onCreate(savedInstanceState);
     	setContentView(R.layout.activity_main);
         // ...
-        tableView.setDataRowColoriser(new CarPriceRowColorizer());
+        tableView.setDataRowColorizer(new CarPriceRowColorizer());
     }
 
     private static class CarPriceRowColorizer implements TableDataRowColorizer<Car> {

app/src/main/java/de/codecrafters/tableviewexample/SortableCarTableView.java

@@ -2,12 +2,8 @@
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.widget.Toast;
-
-import java.util.Comparator;
 
 import de.codecrafters.tableview.SortableTableView;
-import de.codecrafters.tableview.listeners.TableDataClickListener;
 import de.codecrafters.tableview.toolkit.SimpleTableHeaderAdapter;
 import de.codecrafters.tableview.toolkit.SortStateViewProviders;
 import de.codecrafters.tableview.toolkit.TableDataRowColorizers;
@@ -35,7 +31,7 @@ public SortableCarTableView(Context context, AttributeSet attributes, int styleA
 
         int rowColorEven = context.getResources().getColor(R.color.table_data_row_even);
         int rowColorOdd = context.getResources().getColor(R.color.table_data_row_odd);
-        setDataRowColoriser(TableDataRowColorizers.alternatingRows(rowColorEven, rowColorOdd));
+        setDataRowColorizer(TableDataRowColorizers.alternatingRows(rowColorEven, rowColorOdd));
         setHeaderSortStateViewProvider(SortStateViewProviders.brightArrows());
 
         setColumnWeight(0, 2);

app/src/main/res/layout/activity_main.xml

@@ -18,8 +18,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/toolbar"
-        custom:columnCount="4"
-        custom:headerElevation="10"
-        custom:headerColor="@color/primary" />
+        custom:tableView_columnCount="4"
+        custom:tableView_headerElevation="10"
+        custom:tableView_headerColor="@color/primary" />
 
 </RelativeLayout>

tableview/build.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'com.android.library'
 
-def final tableViewLibraryVersion = '1.1.1'
+def final tableViewLibraryVersion = '2.0.0'
 
 ext {
     bintrayRepo = 'maven'
@@ -34,7 +34,7 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 23
-        versionCode 9
+        versionCode 10
         versionName tableViewLibraryVersion
     }
     buildTypes {

tableview/src/main/java/de/codecrafters/tableview/TableDataAdapter.java

@@ -32,7 +32,7 @@ public abstract class TableDataAdapter<T> extends ArrayAdapter<T> {
 
     private TableColumnModel columnModel;
     private final List<T> data;
-    private TableDataRowColorizer<? super T> rowColoriser;
+    private TableDataRowColorizer<? super T> rowColorizer;
 
 
     /**
@@ -159,7 +159,7 @@ public final View getView(final int rowIndex, final View convertView, final View
             Log.w(LOG_TAG, "No row date available for row with index " + rowIndex + ". " +
                     "Caught Exception: " + e.getMessage());
         }
-        rowView.setBackgroundColor(rowColoriser.getRowColor(rowIndex, rowData));
+        rowView.setBackgroundColor(rowColorizer.getRowColor(rowIndex, rowData));
 
         final int widthUnit = (parent.getWidth() / columnModel.getColumnWeightSum());
 
@@ -181,13 +181,13 @@ public final View getView(final int rowIndex, final View convertView, final View
     }
 
     /**
-     * Sets the {@link TableDataRowColorizer} that will be used to colorise the table data rows.
+     * Sets the {@link TableDataRowColorizer} that will be used to colorize the table data rows.
      *
      * @param rowColorizer
      *         The {@link TableDataRowColorizer} that shall be used.
      */
-    protected void setRowColoriser(final TableDataRowColorizer<? super T> rowColorizer) {
-        this.rowColoriser = rowColorizer;
+    protected void setRowColorizer(final TableDataRowColorizer<? super T> rowColorizer) {
+        this.rowColorizer = rowColorizer;
     }
 
     /**

tableview/src/main/java/de/codecrafters/tableview/TableView.java

@@ -45,7 +45,7 @@ public class TableView<T> extends LinearLayout {
     private TableHeaderView tableHeaderView;
     private ListView tableDataView;
     private TableHeaderAdapter tableHeaderAdapter;
-    private TableDataRowColorizer<? super T> dataRowColoriser = TableDataRowColorizers.similarRowColor(0x00000000);
+    private TableDataRowColorizer<? super T> dataRowColorizer = TableDataRowColorizers.similarRowColor(0x00000000);
 
     private int headerElevation;
     private int headerColor;
@@ -151,12 +151,12 @@ public void setHeaderElevation(final int elevation) {
      * Sets the given {@link TableDataRowColorizer} that will be used to define the background color for
      * every table data row.
      *
-     * @param coloriser
+     * @param colorizer
      *         The {@link TableDataRowColorizer} that shall be used.
      */
-    public void setDataRowColoriser(final TableDataRowColorizer<? super T> coloriser) {
-        dataRowColoriser = coloriser;
-        tableDataAdapter.setRowColoriser(coloriser);
+    public void setDataRowColorizer(final TableDataRowColorizer<? super T> colorizer) {
+        dataRowColorizer = colorizer;
+        tableDataAdapter.setRowColorizer(colorizer);
     }
 
     /**
@@ -239,7 +239,7 @@ public TableDataAdapter<T> getDataAdapter() {
     public void setDataAdapter(final TableDataAdapter<T> dataAdapter) {
         tableDataAdapter = dataAdapter;
         tableDataAdapter.setColumnModel(columnModel);
-        tableDataAdapter.setRowColoriser(dataRowColoriser);
+        tableDataAdapter.setRowColorizer(dataRowColorizer);
         tableDataView.setAdapter(tableDataAdapter);
         forceRefresh();
     }
@@ -307,9 +307,9 @@ private void forceRefresh() {
     private void setAttributes(final AttributeSet attributes) {
         final TypedArray styledAttributes = getContext().obtainStyledAttributes(attributes, R.styleable.TableView);
 
-        headerColor = styledAttributes.getInt(R.styleable.TableView_headerColor, DEFAULT_HEADER_COLOR);
-        headerElevation = styledAttributes.getInt(R.styleable.TableView_headerElevation, DEFAULT_HEADER_ELEVATION);
-        final int columnCount = styledAttributes.getInt(R.styleable.TableView_columnCount, DEFAULT_COLUMN_COUNT);
+        headerColor = styledAttributes.getInt(R.styleable.TableView_tableView_headerColor, DEFAULT_HEADER_COLOR);
+        headerElevation = styledAttributes.getInt(R.styleable.TableView_tableView_headerElevation, DEFAULT_HEADER_ELEVATION);
+        final int columnCount = styledAttributes.getInt(R.styleable.TableView_tableView_columnCount, DEFAULT_COLUMN_COUNT);
         columnModel = new TableColumnModel(columnCount);
 
         styledAttributes.recycle();
@@ -334,7 +334,7 @@ private void setupTableDataView(final AttributeSet attributes, final int styleAt
         } else {
             tableDataAdapter = new DefaultTableDataAdapter(getContext());
         }
-        tableDataAdapter.setRowColoriser(dataRowColoriser);
+        tableDataAdapter.setRowColorizer(dataRowColorizer);
 
         tableDataView = new ListView(getContext(), attributes, styleAttributes);
         tableDataView.setOnItemClickListener(new InternalDataClickListener());

tableview/src/main/java/de/codecrafters/tableview/toolkit/TableDataRowColorizers.java

@@ -11,34 +11,34 @@
 public final class TableDataRowColorizers {
 
     /**
-     * Gives an implementation of {link TableDataRowColoriser} that will return the given color
+     * Gives an implementation of {@link TableDataRowColorizer} that will return the given color
      * for every row.
      *
      * @param color
      *         The color that shall be applied to every table data row.
-     * @return The described {link TableDataRowColoriser}.
+     * @return The described {@link TableDataRowColorizer}.
      */
     public static TableDataRowColorizer<Object> similarRowColor(final int color) {
         return new SimpleTableDataRowColorizer(color);
     }
 
     /**
-     * Gives an implementation of {link TableDataRowColoriser} that will return alternately the two
+     * Gives an implementation of {@link TableDataRowColorizer} that will return alternately the two
      * given colors.
      *
      * @param colorEvenRows
      *         The color that will be returned for rows with an even index.
      * @param colorOddRows
      *         The color that will be returned for rows with an odd index.
-     * @return The described {link TableDataRowColoriser}.
+     * @return The described {@link TableDataRowColorizer}.
      */
     public static TableDataRowColorizer<Object> alternatingRows(final int colorEvenRows, final int colorOddRows) {
         return new AlternatingTableDataRowColorizer(colorEvenRows, colorOddRows);
     }
 
 
     /**
-     * An implementation of {link TableDataRowColoriser} that will return the given color
+     * An implementation of {@link TableDataRowColorizer} that will return the given color
      * for every row.
      *
      * @author ISchwarz
@@ -58,7 +58,7 @@ public int getRowColor(final int rowIndex, final Object rowData) {
     }
 
     /**
-     * An implementation of {link TableDataRowColoriser} that will return alternately the two
+     * An implementation of {@link TableDataRowColorizer} that will return alternately the two
      * given colors.
      *
      * @author ISchwarz

tableview/src/main/res/values/attributes.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <declare-styleable name="TableView">
-        <attr name="columnCount" format="integer"/>
-        <attr name="headerElevation" format="integer"/>
-        <attr name="headerColor" format="color"/>
+        <attr name="tableView_columnCount" format="integer"/>
+        <attr name="tableView_headerElevation" format="integer"/>
+        <attr name="tableView_headerColor" format="color"/>
     </declare-styleable>
 </resources>