Skip to content

Commit cb11225

Browse files
Merge branch 'release/1.8.4'
2 parents 4e7cb71 + 535e504 commit cb11225

File tree

6 files changed

+55
-43
lines changed

6 files changed

+55
-43
lines changed

README.markdown

Lines changed: 8 additions & 31 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.3
24+
### Current version: 1.8.4
2525

2626
## Usage
2727

@@ -66,7 +66,7 @@ Currently you can use the three different Style attributes displayed below out o
6666

6767
## Extension and Modification
6868

69-
The whole design of a Crouton is defined by [Style](https://github.com/keyboardsurfer/Crouton/blob/master/library/src/de/keyboardsurfer/android/widget/crouton/Style.java).
69+
The whole design of a Crouton is defined by [Style](https://github.com/keyboardsurfer/Crouton/blob/master/library/src/main/java/de/keyboardsurfer/android/widget/crouton/Style.java).
7070

7171
You can use one of the styles Crouton ships with: **Style.ALERT**, **Style.CONFIRM** and **Style.INFO**. Or you can create your own Style.
7272

@@ -105,7 +105,7 @@ Then declare Crouton within your dependencies:
105105
```groovy
106106
dependencies {
107107
...
108-
compile('de.keyboardsurfer.android.widget:crouton:1.8.3') {
108+
compile('de.keyboardsurfer.android.widget:crouton:1.8.4') {
109109
// exclusion is not neccessary, but generally a good idea.
110110
exclude group: 'com.google.android', module: 'support-v4'
111111
}
@@ -152,7 +152,7 @@ If you are referencing a newer version of the Android Support Library in your ap
152152
<groupId>de.keyboardsurfer.android.widget</groupId>
153153
<exclusions>
154154
<exclusion>
155-
<groupId>com.google.android</groupId>
155+
<groupId>com.android.support</groupId>
156156
<artifactId>support-v4</artifactId>
157157
</exclusion>
158158
</exclusions>
@@ -169,38 +169,15 @@ The build requires Gradle. Operations are very simple:
169169

170170
After putting Crouton in a repository you can add it as dependency.
171171

172-
```gradle
173-
compile('de.keyboardsurfer.android.widget:crouton:1.8.3') {
172+
```groovy
173+
compile('de.keyboardsurfer.android.widget:crouton:1.8.4') {
174174
exclude group: 'com.google.android', module: 'support-v4'
175175
}
176176
```
177177

178-
###Signing
179-
180-
To sign your artifacts, create a file at the repository root, called `gradle.properties` that contains:
181-
182-
183-
```
184-
# makes building faster
185-
org.gradle.daemon true
186-
187-
# only requried for the demo
188-
keyStore=theKeyStoreFileName
189-
storePassword=theStorePassword
190-
keyAlias=theKeyAlias
191-
keyPassword=theKeyPassword
192-
193-
# for uploading to a repository
194-
repositoryUrl=yourRepositoryUrl
195-
sonatypeUser=yourSonatypeUser
196-
sonatypePass=yourSonatypePassword
197-
198-
# if you want to sign the built artifacts
199-
signing.keyId=yourKeyId
200-
signing.password=yourGPGPassword
201-
signing.secretKeyRingFile=/path/to/your/secring
202-
```
178+
###Building and Signing
203179

180+
In order to build and sign Crouton locally you'll need to rename `gradle.properties.sample` to `gradle.properties`.
204181

205182
## Contribution
206183

gradle.properties.sample

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#
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.
15+
#
16+
17+
org.gradle.daemon true
18+
19+
#android keystore data
20+
keyStore=keystore.keystore
21+
storePassword=storePass
22+
keyAlias=keyAlias
23+
keyPassword=somePass
24+
25+
#user data for sonatype
26+
sonatypeUser=someUser
27+
sonatypePass=somePassword
28+
repositoryUrl=someRepo
29+
30+
#info from your pgp key
31+
signing.keyId=foobar
32+
signing.password=barfoo
33+
signing.secretKeyRingFile=foobarbarfoo

library/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ apply plugin: 'android-maven'
1818
apply plugin: 'signing'
1919

2020
dependencies {
21-
compile 'com.android.support:support-v4:18.0.+'
21+
compile 'com.android.support:support-v4:19.0.1'
2222
}
2323

2424
android {
25-
buildToolsVersion '19'
25+
buildToolsVersion '19.0.1'
2626
compileSdkVersion 19
2727
defaultConfig {
2828
versionCode 7
29-
versionName "1.8.3"
29+
versionName "1.8.4"
3030
minSdkVersion 8
3131
targetSdkVersion 19
3232
}
@@ -39,7 +39,7 @@ android {
3939

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

4444
android.libraryVariants.all { variant ->
4545
def name = variant.buildType.name

library/src/main/java/de/keyboardsurfer/android/widget/crouton/Manager.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -411,9 +411,11 @@ private void removeAllMessagesForCrouton(Crouton crouton) {
411411
*/
412412
public static void announceForAccessibilityCompat(Context context, CharSequence text) {
413413
if (Build.VERSION.SDK_INT >= 4) {
414-
AccessibilityManager accessibilityManager = (AccessibilityManager) context.getSystemService(
415-
Context.ACCESSIBILITY_SERVICE);
416-
if (!accessibilityManager.isEnabled()) {
414+
AccessibilityManager accessibilityManager = null;
415+
if (null != context) {
416+
accessibilityManager = (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE);
417+
}
418+
if (null == accessibilityManager || !accessibilityManager.isEnabled()) {
417419
return;
418420
}
419421

sample/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
apply plugin: 'android'
18-
version = '1.8.3'
18+
version = '1.8.4'
1919

2020
buildscript {
2121
repositories {
@@ -41,12 +41,12 @@ dependencies {
4141
}
4242

4343
android {
44-
buildToolsVersion '19'
44+
buildToolsVersion '19.0.1'
4545
compileSdkVersion 19
4646

4747
defaultConfig {
4848
versionCode 13
49-
versionName "1.8.3"
49+
versionName "1.8.4"
5050
minSdkVersion 8
5151
targetSdkVersion 19
5252
}

sample/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
1919
package="de.keyboardsurfer.app.demo.crouton"
20-
android:versionCode="12"
21-
android:versionName="1.8.2" >
20+
android:versionCode="13"
21+
android:versionName="1.8.4" >
2222

2323
<uses-sdk
2424
android:minSdkVersion="7"

0 commit comments

Comments
 (0)