Merge branch 'develop'

Conflicts:
	build.gradle

Author: Ingo Schwarz

.build.gradle.un~

@@ -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:** 2.0.0  
+**Minimum SDK-Version:** 11  |  **Compile SDK-Version:** 23  |  **Latest Library Version:** 2.0.1  
 
 ## 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:2.0.0'
+        compile 'de.codecrafters.tableview:tableview:2.0.1'
         ...
     }
 ```

README.md

@@ -25,7 +25,7 @@ protected void onCreate(final Bundle savedInstanceState) {
             setSupportActionBar(toolbar);
         }
 
-        final SortableCarTableView carTableView = (SortableCarTableView) findViewById(R.id.tableView);
+        final SortableCarTableView carTableView = (SortableCarTableView) findViewById(R.id.tableView1);
         carTableView.setDataAdapter(new CarTableDataAdapter(this, createAndGiveCarList()));
         carTableView.addDataClickListener(new CarClickListener());
     }

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

@@ -1,6 +1,6 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
                 xmlns:custom="http://schemas.android.com/apk/res-auto"
+                xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 tools:context="de.codecrafters.tableviewexample.MainActivity">
@@ -10,16 +10,47 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/primary"
-        custom:title="@string/title_activity_main"
-        custom:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+        custom:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+        custom:title="@string/title_activity_main"/>
 
-    <de.codecrafters.tableviewexample.SortableCarTableView
-        android:id="@+id/tableView"
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@id/toolbar"
-        custom:tableView_columnCount="4"
-        custom:tableView_headerElevation="10"
-        custom:tableView_headerColor="@color/primary" />
+        android:layout_below="@id/toolbar">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <de.codecrafters.tableviewexample.SortableCarTableView
+                android:id="@+id/tableView1"
+                android:layout_width="match_parent"
+                android:layout_height="250dp"
+                custom:tableView_columnCount="4"
+                custom:tableView_headerColor="@color/primary"
+                custom:tableView_headerElevation="10"/>
+
+            <de.codecrafters.tableviewexample.SortableCarTableView
+                android:id="@+id/tableView2"
+                android:layout_width="match_parent"
+                android:layout_height="250dp"
+                custom:tableView_columnCount="4"
+                custom:tableView_headerColor="@color/primary"
+                custom:tableView_headerElevation="10"/>
+
+            <de.codecrafters.tableviewexample.SortableCarTableView
+                android:id="@+id/tableView3"
+                android:layout_width="match_parent"
+                android:layout_height="250dp"
+                custom:tableView_columnCount="4"
+                custom:tableView_headerColor="@color/primary"
+                custom:tableView_headerElevation="10"/>
+
+        </LinearLayout>
+
+    </ScrollView>
 
 </RelativeLayout>
+
+

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

@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'com.android.tools.build:gradle:2.1.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
     }

build.gradle

@@ -0,0 +1,21 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+<<<<<<< HEAD
+        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+=======
+        classpath 'com.android.tools.build:gradle:2.1.0'
+>>>>>>> develop
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}

build.gradle~

@@ -1,6 +1,6 @@
 apply plugin: 'com.android.library'
 
-def final tableViewLibraryVersion = '2.0.0'
+def final tableViewLibraryVersion = '2.0.1'
 
 ext {
     bintrayRepo = 'maven'