Skip to content

Commit c0efce4

Browse files
keyboardsurferkeyboardsurfer
committed
Merge branch 'develop'
2 parents 6607d91 + ed7da31 commit c0efce4

26 files changed

+130
-101
lines changed

‎NOTICE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Crouton
2-
Copyright 2012 - 2013 Benjamin Weiss
2+
Copyright 2012 - 2014 Benjamin Weiss
33

44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

‎README.markdown‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ You can check some features in the Crouton Demo.
2121
If you're already using Crouton and just want to download the latest version of the library, follow [this link](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22de.keyboardsurfer.android.widget%22).
2222

2323
## [Changelog](https://github.com/keyboardsurfer/Crouton/wiki/Changelog)
24-
### Current version: 1.8.2
24+
### Current version: 1.8.3
2525

2626
## Usage
2727

@@ -101,7 +101,7 @@ Then declare Crouton within your dependencies:
101101
```groovy
102102
dependencies {
103103
...
104-
compile('de.keyboardsurfer.android.widget:crouton:1.8.1') {
104+
compile('de.keyboardsurfer.android.widget:crouton:1.8.3') {
105105
// exclusion is not neccessary, but generally a good idea.
106106
exclude group: 'com.google.android', module: 'support-v4'
107107
}
@@ -166,7 +166,7 @@ The build requires Gradle. Operations are very simple:
166166
After putting Crouton in a repository you can add it as dependency.
167167

168168
```gradle
169-
compile('de.keyboardsurfer.android.widget:crouton:1.8.1') {
169+
compile('de.keyboardsurfer.android.widget:crouton:1.8.3') {
170170
exclude group: 'com.google.android', module: 'support-v4'
171171
}
172172
```

‎build.gradle‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
/*
2-
* Copyright 2012 - 2013 Benjamin Weiss
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
2+
* Copyright 2012 - 2014 Benjamin Weiss
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
1515
*/
1616

1717

@@ -25,7 +25,7 @@ subprojects {
2525
}
2626

2727
dependencies {
28-
classpath 'com.android.tools.build:gradle:0.7+'
28+
classpath 'com.android.tools.build:gradle:0.8+'
2929
classpath 'com.github.dcendents:android-maven-plugin:1.0'
3030
}
3131
}

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,6 @@
1-
#
2-
# Copyright 2012 - 2013 Benjamin Weiss
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
15-
#
16-
17-
#Fri Jan 10 13:11:21 CET 2014
1+
#Mon Feb 03 17:16:48 CET 2014
182
distributionBase=GRADLE_USER_HOME
193
distributionPath=wrapper/dists
204
zipStoreBase=GRADLE_USER_HOME
215
zipStorePath=wrapper/dists
22-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-all.zip
6+
distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

‎library/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013 Benjamin Weiss
2+
* Copyright 2012 - 2014 Benjamin Weiss
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -25,21 +25,21 @@ android {
2525
buildToolsVersion '19'
2626
compileSdkVersion 19
2727
defaultConfig {
28-
versionCode 6
29-
versionName "1.8.2"
28+
versionCode 7
29+
versionName "1.8.3"
3030
minSdkVersion 8
3131
targetSdkVersion 19
3232
}
3333

3434
compileOptions {
35-
sourceCompatibility JavaVersion.VERSION_1_7
36-
targetCompatibility JavaVersion.VERSION_1_7
35+
sourceCompatibility JavaVersion.VERSION_1_6
36+
targetCompatibility JavaVersion.VERSION_1_6
3737
}
3838
}
3939

4040
group = "de.keyboardsurfer.android.widget"
4141
artifactId = "crouton"
42-
version = "1.8.2"
42+
version = "1.8.3"
4343

4444
android.libraryVariants.all { variant ->
4545
def name = variant.buildType.name
@@ -84,7 +84,7 @@ artifacts {
8484

8585
task wrapper(type: Wrapper) {
8686
description "Generates the gradle wrapper"
87-
gradleVersion = "1.9"
87+
gradleVersion = "1.10"
8888
}
8989

9090

‎library/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Jan 06 11:20:11 CET 2014
1+
#Mon Feb 03 17:16:48 CET 2014
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-bin.zip
6+
distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

‎library/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!--
3-
~ Copyright 2012 - 2013 Benjamin Weiss
3+
~ Copyright 2012 - 2014 Benjamin Weiss
44
~
55
~ Licensed under the Apache License, Version 2.0 (the "License");
66
~ you may not use this file except in compliance with the License.

‎library/src/main/java/de/keyboardsurfer/android/widget/crouton/Configuration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013 Benjamin Weiss
2+
* Copyright 2012 - 2014 Benjamin Weiss
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎library/src/main/java/de/keyboardsurfer/android/widget/crouton/Crouton.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012 - 2013 Benjamin Weiss
2+
* Copyright 2012 - 2014 Benjamin Weiss
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -830,7 +830,7 @@ private FrameLayout initializeCroutonViewGroup(Resources resources) {
830830
new FrameLayout.LayoutParams(width != 0 ? width : FrameLayout.LayoutParams.MATCH_PARENT, height));
831831

832832
// set background
833-
if (this.style.backgroundColorValue != -1) {
833+
if (this.style.backgroundColorValue != Style.NOT_SET) {
834834
croutonView.setBackgroundColor(this.style.backgroundColorValue);
835835
} else {
836836
croutonView.setBackgroundColor(resources.getColor(this.style.backgroundColorResourceId));
@@ -879,11 +879,11 @@ private RelativeLayout initializeContentView(final Resources resources) {
879879
textParams.addRule(RelativeLayout.RIGHT_OF, image.getId());
880880
}
881881

882-
if (this.style.gravity == Gravity.CENTER) {
882+
if ((this.style.gravity & Gravity.CENTER) != 0) {
883883
textParams.addRule(RelativeLayout.CENTER_IN_PARENT);
884-
} else if (this.style.gravity == Gravity.CENTER_VERTICAL) {
884+
} else if ((this.style.gravity & Gravity.CENTER_VERTICAL) != 0) {
885885
textParams.addRule(RelativeLayout.CENTER_VERTICAL);
886-
} else if (this.style.gravity == Gravity.CENTER_HORIZONTAL) {
886+
} else if ((this.style.gravity & Gravity.CENTER_HORIZONTAL) != 0) {
887887
textParams.addRule(RelativeLayout.CENTER_HORIZONTAL);
888888
}
889889

@@ -899,7 +899,9 @@ private TextView initializeTextView(final Resources resources) {
899899
text.setGravity(this.style.gravity);
900900

901901
// set the text color if set
902-
if (this.style.textColorResourceId != 0) {
902+
if (this.style.textColorValue != Style.NOT_SET) {
903+
text.setTextColor(this.style.textColorValue);
904+
} else if (this.style.textColorResourceId != 0) {
903905
text.setTextColor(resources.getColor(this.style.textColorResourceId));
904906
}
905907

‎library/src/main/java/de/keyboardsurfer/android/widget/crouton/DefaultAnimationsBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012 - 2013 Benjamin Weiss
2+
* Copyright 2012 - 2014 Benjamin Weiss
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)