Skip to content

Commit 9effbfc

Browse files
author
Ingo Schwarz
committed
Merge branch 'develop' -> Version 0.9.5 - RC2
Conflicts: app/app.iml
2 parents 02f7c16 + 20bcae5 commit 9effbfc

File tree

6 files changed

+54
-67
lines changed

6 files changed

+54
-67
lines changed

‎app/app.iml

+1-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3939
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
40-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
4141
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4242
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4343
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -97,6 +97,5 @@
9797
<orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
9898
<orderEntry type="library" exported="" name="tableview-0.9.5" level="project" />
9999
<orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
100-
<orderEntry type="library" exported="" scope="TEST" name="mockable-android-22" level="project" />
101100
</component>
102101
</module>

‎app/src/main/res/values-v21/styles.xml

-12
This file was deleted.

‎app/src/main/res/values/styles.xml

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<resources>
3-
4-
<style name="AppTheme" parent="android:Theme.Holo.Light.NoActionBar">
5-
<item name="colorPrimaryDark">@color/primaryDark</item>
6-
<item name="colorPrimary">@color/primary</item>
7-
<item name="android:textColorHighlight">@color/primary</item>
8-
<item name="android:textColorHighlightInverse">@color/primary</item>
9-
<item name="toolbarStyle">@style/MyActionBar</item>
10-
</style>
11-
12-
<style name="MyActionBar" parent="@style/Widget.AppCompat.Toolbar">
13-
<item name="android:background">@color/primary</item>
14-
<!-- Support library compatibility -->
15-
<item name="background">@color/primary</item>
16-
<item name="android:textColor">#FFFFFF</item>
17-
<item name="android:textColorPrimary">#FFFFFF</item>
18-
<item name="android:textColorHighlight">#FFFFFF</item>
19-
</style>
20-
21-
</resources>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
4+
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
5+
<item name="colorPrimaryDark">@color/primaryDark</item>
6+
<item name="colorPrimary">@color/primary</item>
7+
<item name="android:textColorHighlight">@color/primary</item>
8+
<item name="android:textColorHighlightInverse">@color/primary</item>
9+
<item name="toolbarStyle">@style/MyActionBar</item>
10+
</style>
11+
12+
<style name="MyActionBar" parent="@style/Widget.AppCompat.Toolbar">
13+
<item name="android:background">@color/primary</item>
14+
<!-- Support library compatibility -->
15+
<item name="background">@color/primary</item>
16+
<item name="android:textColor">#FFFFFF</item>
17+
<item name="android:textColorPrimary">#FFFFFF</item>
18+
<item name="android:textColorHighlight">#FFFFFF</item>
19+
</style>
20+
21+
</resources>

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:1.2.3'
7+
classpath 'com.android.tools.build:gradle:1.3.0'
88
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
99
classpath 'com.github.dcendents:android-maven-plugin:1.2'
1010

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import android.view.LayoutInflater;
1010
import android.view.View;
1111
import android.view.ViewGroup;
12+
import android.widget.AbsListView;
1213
import android.widget.ArrayAdapter;
1314
import android.widget.LinearLayout;
1415
import android.widget.TextView;
@@ -147,7 +148,7 @@ public Resources getResources() {
147148
public View getView(final int rowIndex, final View convertView, final ViewGroup parent) {
148149
final LinearLayout rowView = new LinearLayout(getContext());
149150

150-
final LayoutParams rowLayoutParams = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
151+
final AbsListView.LayoutParams rowLayoutParams = new AbsListView.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
151152
rowView.setLayoutParams(rowLayoutParams);
152153
rowView.setGravity(Gravity.CENTER_VERTICAL);
153154

‎tableview/tableview.iml

+29-30
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
</facet>
99
<facet type="android" name="Android">
1010
<configuration>
11-
<option name="SELECTED_BUILD_VARIANT" value="debug" />
11+
<option name="SELECTED_BUILD_VARIANT" value="release" />
1212
<option name="SELECTED_TEST_ARTIFACT" value="_unit_test_" />
13-
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
14-
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugUnitTest" />
16-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugUnitTestSources" />
13+
<option name="ASSEMBLE_TASK_NAME" value="assembleRelease" />
14+
<option name="COMPILE_JAVA_TASK_NAME" value="compileReleaseSources" />
15+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleReleaseUnitTest" />
16+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileReleaseUnitTestSources" />
1717
<afterSyncTasks>
18-
<task>generateDebugSources</task>
18+
<task>generateReleaseSources</task>
1919
<task>mockableAndroidJar</task>
20-
<task>prepareDebugUnitTestDependencies</task>
20+
<task>prepareReleaseUnitTestDependencies</task>
2121
</afterSyncTasks>
2222
<option name="ALLOW_USER_CONFIGURATION" value="false" />
2323
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -29,30 +29,30 @@
2929
</facet>
3030
</component>
3131
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
32-
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
33-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
32+
<output url="file://$MODULE_DIR$/build/intermediates/classes/release" />
33+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/release" />
3434
<exclude-output />
3535
<content url="file://$MODULE_DIR$">
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
38-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
40-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
41-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
42-
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
43-
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
44-
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
45-
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
46-
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
47-
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
48-
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
49-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
50-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
51-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
52-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
53-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
54-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
55-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/release" isTestSource="false" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/release" isTestSource="false" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/release" isTestSource="false" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/release" isTestSource="false" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/release" type="java-resource" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/release" type="java-resource" />
42+
<sourceFolder url="file://$MODULE_DIR$/src/release/res" type="java-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/src/release/resources" type="java-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/src/release/assets" type="java-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/src/release/aidl" isTestSource="false" />
46+
<sourceFolder url="file://$MODULE_DIR$/src/release/java" isTestSource="false" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/release/jni" isTestSource="false" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/release/rs" isTestSource="false" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/res" type="java-test-resource" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/resources" type="java-test-resource" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/assets" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/aidl" isTestSource="true" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/java" isTestSource="true" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/jni" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/rs" isTestSource="true" />
5656
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5757
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5858
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -100,7 +100,6 @@
100100
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
101101
<orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
102102
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
103-
<orderEntry type="library" exported="" scope="TEST" name="mockable-android-22" level="project" />
104103
<orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.9.5" level="project" />
105104
</component>
106105
</module>

0 commit comments

Comments
 (0)