diff --git a/README.md b/README.md index 7dda92c..e02ebf7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -#Crossfader [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.mikepenz/crossfader/badge.svg?style=flat)](https://maven-badges.herokuapp.com/maven-central/com.mikepenz/crossfader) +# Crossfader [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.mikepenz/crossfader/badge.svg?style=flat)](https://maven-badges.herokuapp.com/maven-central/com.mikepenz/crossfader) [![Join the chat at https://gitter.im/mikepenz/crossfader](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mikepenz/crossfader?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) **Crossfader** is a small library to provide an easy to use and fast helper class for the great CrossFadeSlidingPaneLayout by @chiuki. @@ -9,8 +9,8 @@ It comes with following features: * No additional dependencies * No need to modify your layouts -#Preview -##Screenshots +# Preview +## Screenshots ![Image](https://raw.githubusercontent.com/mikepenz/Crossfader/develop/DEV/screenshots/screenshot1_small.png) ![Image](https://raw.githubusercontent.com/mikepenz/Crossfader/develop/DEV/screenshots/screenshot2_small.png) @@ -22,11 +22,11 @@ It comes with following features: The Crossfader Library is pushed to [Maven Central](http://search.maven.org/#search|ga|1|g%3A%22com.mikepenz%22), so you just need to add the following dependency to your `build.gradle`. ```javascript -compile "com.mikepenz:crossfader:1.5.0@aar" -compile "com.android.support:appcompat-v7:${supportLibVersion}" +implementation "com.mikepenz:crossfader:1.5.1@aar" +implementation "com.android.support:appcompat-v7:${supportLibVersion}" ``` -##How to use +## How to use Initialize and create the Crossfader ```java @@ -63,13 +63,13 @@ protected void onSaveInstanceState(Bundle outState) { } ``` -#Developed By +# Developed By * Mike Penz * [mikepenz.com](http://mikepenz.com) - * [paypal.me/mikepenz](http://paypal.me/mikepenz) -#License +# License Copyright 2016 Mike Penz diff --git a/app/build.gradle b/app/build.gradle index 8ec6f76..9f7a6de 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,17 +12,9 @@ android { defaultConfig { applicationId "com.mikepenz.crossfader.app" minSdkVersion 14 - targetSdkVersion 24 - versionCode 150 - versionName '1.5.0' - - applicationVariants.all { variant -> - variant.outputs.each { output -> - def file = output.outputFile - def fileName = file.name.replace(".apk", "-v" + versionName + "-c" + versionCode + ".apk") - output.outputFile = new File(file.parentFile, fileName) - } - } + targetSdkVersion 27 + versionCode 151 + versionName '1.5.1' } buildTypes { debug { @@ -51,14 +43,19 @@ android { dependencies { compile project(':library') - compile('com.mikepenz:materialdrawer:5.5.0@aar') { + implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}" + implementation "com.android.support:cardview-v7:${rootProject.ext.supportLibVersion}" + implementation "com.android.support:recyclerview-v7:${rootProject.ext.supportLibVersion}" + + compile('com.mikepenz:materialdrawer:5.9.5@aar') { + exclude group: "com.android.support" transitive = true } - compile('com.mikepenz:aboutlibraries:5.8.0@aar') { + compile('com.mikepenz:aboutlibraries:5.9.8@aar') { transitive = true } - compile 'com.mikepenz:google-material-typeface:2.2.0.1@aar' - compile 'com.mikepenz:fontawesome-typeface:4.4.0.1@aar' + compile 'com.mikepenz:google-material-typeface:3.0.1.1.original@aar' + compile 'com.mikepenz:fontawesome-typeface:4.7.0.0@aar' compile 'com.squareup.picasso:picasso:2.5.2' } diff --git a/app/src/main/java/com/mikepenz/crossfader/app/SimpleActivity.java b/app/src/main/java/com/mikepenz/crossfader/app/SimpleActivity.java index 72d314f..1763714 100755 --- a/app/src/main/java/com/mikepenz/crossfader/app/SimpleActivity.java +++ b/app/src/main/java/com/mikepenz/crossfader/app/SimpleActivity.java @@ -92,7 +92,7 @@ public boolean onProfileChanged(View view, IProfile profile, boolean current) { new PrimaryDrawerItem().withName(R.string.drawer_item_third).withIcon(FontAwesome.Icon.faw_gamepad).withIdentifier(3), new PrimaryDrawerItem().withName(R.string.drawer_item_fourth).withIcon(FontAwesome.Icon.faw_eye).withIdentifier(4), new PrimaryDrawerItem().withDescription("A more complex sample").withName(R.string.drawer_item_fifth).withIcon(GoogleMaterial.Icon.gmd_adb).withIdentifier(5), - new PrimaryDrawerItem().withName(R.string.drawer_item_sixth).withIcon(GoogleMaterial.Icon.gmd_car).withIdentifier(6), + new PrimaryDrawerItem().withName(R.string.drawer_item_sixth).withIcon(GoogleMaterial.Icon.gmd_camera).withIdentifier(6), new DividerDrawerItem(), new SecondaryDrawerItem().withName(R.string.drawer_item_seventh).withIcon(FontAwesome.Icon.faw_github) ) // add the items we want to use with our Drawer diff --git a/build.gradle b/build.gradle index 609b1b4..9e92468 100644 --- a/build.gradle +++ b/build.gradle @@ -1,28 +1,26 @@ buildscript { repositories { + google() jcenter() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' - classpath 'com.novoda:bintray-release:0.3.4' + classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.novoda:bintray-release:0.5.0' } } ext { - compileSdkVersion = 24 - buildToolsVersion = "24.0.1" - supportLibVersion = "24.2.0" + compileSdkVersion = 27 + buildToolsVersion = "27.0.0" + supportLibVersion = "27.0.0" } allprojects { repositories { + google() jcenter() mavenCentral() maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } } -} - -task wrapper(type: Wrapper) { - gradleVersion = '2.14' } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index b30b8b7..400cbf1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Maven stuff -VERSION_NAME=1.5.0 -VERSION_CODE=150 +VERSION_NAME=1.5.1 +VERSION_CODE=151 GROUP=com.mikepenz POM_DESCRIPTION=Crossfader Library POM_URL=https://github.com/mikepenz/Crossfader diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d579e65..dac6743 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Aug 21 19:44:19 CEST 2016 +#Sat Oct 28 18:36:42 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index 303ccee..67d256c 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -7,9 +7,9 @@ android { defaultConfig { minSdkVersion 14 - targetSdkVersion 24 - versionCode 150 - versionName '1.5.0' + targetSdkVersion 27 + versionCode 151 + versionName '1.5.1' } buildTypes { release { @@ -28,5 +28,5 @@ apply from: 'gradle-mvn-push.gradle' apply from: 'gradle-jcenter-push.gradle' dependencies { - compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}" + implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}" } diff --git a/library/src/main/res/values/library_crossfader_strings.xml b/library/src/main/res/values/library_crossfader_strings.xml index d11d61f..dc3f69c 100755 --- a/library/src/main/res/values/library_crossfader_strings.xml +++ b/library/src/main/res/values/library_crossfader_strings.xml @@ -10,7 +10,7 @@ Crossfader ]]> - 1.5.0 + 1.5.1 https://github.com/mikepenz/Crossfader apache_2_0 true