Merge branch 'develop'

Author: Ingo Schwarz

.travis.yml

@@ -28,4 +28,7 @@ env:
 
 before_script:
   - chmod +x gradlew
-  # - android-wait-for-emulator
+  # - android-wait-for-emulator
+  
+script:
+  - ./gradlew build

app/app.iml

@@ -85,6 +85,8 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
+      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />

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

@@ -10,7 +10,7 @@
 import de.codecrafters.tableview.listeners.TableDataClickListener;
 import de.codecrafters.tableview.toolkit.SimpleTableHeaderAdapter;
 import de.codecrafters.tableview.toolkit.SortStateViewProviders;
-import de.codecrafters.tableview.toolkit.TableDataRowColorisers;
+import de.codecrafters.tableview.toolkit.TableDataRowColorizers;
 import de.codecrafters.tableviewexample.data.Car;
 
 
@@ -34,7 +34,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(TableDataRowColorisers.alternatingRows(rowColorEven, rowColorOdd));
+        setDataRowColoriser(TableDataRowColorizers.alternatingRows(rowColorEven, rowColorOdd));
         setHeaderSortStateViewProvider(SortStateViewProviders.brightArrows());
 
         setColumnWeight(0, 2);

tableview/build.gradle

@@ -49,6 +49,3 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:22.2.1'
 }
-
-apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
-apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'

tableview/tableview.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":tableview" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="de.codecrafters.tableview" external.system.module.version="0.9.3" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":tableview" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="SortableTableView" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -77,6 +77,8 @@
       <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/poms" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
+      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />