From 8ba9593ee48febe304a5ebd2ea8b2d02caf9d0bb Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Wed, 21 Oct 2015 23:03:35 +0200 Subject: [PATCH 1/7] * update android-iconics core to v1.7.9 --- library/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/build.gradle b/library/build.gradle index 0528187..1060512 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -20,5 +20,5 @@ android { apply from: 'gradle-mvn-push.gradle' dependencies { - compile 'com.mikepenz:iconics-core:1.7.8@aar' + compile 'com.mikepenz:iconics-core:1.7.9@aar' } From b9084410237c5d8116ddedc574f9080f31ba050f Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Wed, 21 Oct 2015 23:03:44 +0200 Subject: [PATCH 2/7] * update sample app dependencies --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 83d732b..24bc6fa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,11 +22,11 @@ android { dependencies { compile project(':library') - compile('com.mikepenz:materialdrawer:4.3.6@aar') { + compile('com.mikepenz:materialdrawer:4.3.7@aar') { transitive = true exclude module: "iconics-core" } - compile('com.mikepenz:aboutlibraries:5.2.4@aar') { + compile('com.mikepenz:aboutlibraries:5.2.5@aar') { transitive = true } From 4382a00fed83ba283101f28c1dd096af71ac30a8 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Thu, 29 Oct 2015 18:56:52 +0100 Subject: [PATCH 3/7] Update README.md * add android-iconics info FIX #35 --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index e4ec089..d580565 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,10 @@ dependencies { } ``` +###Additional dependency for the icon font +If you are going to use the icon font you will have to add additional dependency for the font. +You can find all available addons here: https://github.com/mikepenz/Android-Iconics#2-choose-your-desired-fonts + ##UPGRADE NOTES ####< 3.0.0 - If you come from a version prior 3.0.0 you will have to rename some classes, and the default styles also found a new place. Just check out the updated sample app for all the changes. From 85b54e556755301256139a648dd200a9f78d2042 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Tue, 3 Nov 2015 22:36:12 +0100 Subject: [PATCH 4/7] * update Android-Iconics core to v2.0.0 --- library/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/build.gradle b/library/build.gradle index 1060512..8ad4fcc 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -20,5 +20,5 @@ android { apply from: 'gradle-mvn-push.gradle' dependencies { - compile 'com.mikepenz:iconics-core:1.7.9@aar' + compile 'com.mikepenz:iconics-core:2.0.0@aar' } From 42b212355b2ee7abb5cce02431a9531321a41afd Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Tue, 3 Nov 2015 22:40:54 +0100 Subject: [PATCH 5/7] * update dependencies of sample app --- app/build.gradle | 8 ++++---- .../com/mikepenz/actionitembadge/sample/MainActivity.java | 4 ++-- .../mikepenz/actionitembadge/sample/ToolbarActivity.java | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 24bc6fa..32aca58 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,15 +22,15 @@ android { dependencies { compile project(':library') - compile('com.mikepenz:materialdrawer:4.3.7@aar') { + compile('com.mikepenz:materialdrawer:4.4.4@aar') { transitive = true exclude module: "iconics-core" } - compile('com.mikepenz:aboutlibraries:5.2.5@aar') { + compile('com.mikepenz:aboutlibraries:5.3.0@aar') { transitive = true } - compile 'com.mikepenz:google-material-typeface:1.2.0.1@aar' + compile 'com.mikepenz:google-material-typeface:2.1.2.1@aar' compile 'com.mikepenz:fontawesome-typeface:4.4.0.1@aar' - compile 'com.mikepenz:crossfader:1.1.2@aar' + compile 'com.mikepenz:crossfader:1.1.3@aar' } diff --git a/app/src/main/java/com/mikepenz/actionitembadge/sample/MainActivity.java b/app/src/main/java/com/mikepenz/actionitembadge/sample/MainActivity.java index 7921746..1583455 100644 --- a/app/src/main/java/com/mikepenz/actionitembadge/sample/MainActivity.java +++ b/app/src/main/java/com/mikepenz/actionitembadge/sample/MainActivity.java @@ -9,7 +9,7 @@ import android.widget.Toast; import com.mikepenz.aboutlibraries.LibsBuilder; -import com.mikepenz.aboutlibraries.ui.LibsFragment; +import com.mikepenz.aboutlibraries.ui.LibsSupportFragment; import com.mikepenz.actionitembadge.R; import com.mikepenz.actionitembadge.library.ActionItemBadge; import com.mikepenz.actionitembadge.library.ActionItemBadgeAdder; @@ -34,7 +34,7 @@ protected void onCreate(Bundle savedInstanceState) { } //init and show about libraries :D - LibsFragment fragment = new LibsBuilder().withFields(R.string.class.getFields()).withVersionShown(true).withLicenseShown(true).fragment(); + LibsSupportFragment fragment = new LibsBuilder().withFields(R.string.class.getFields()).withVersionShown(true).withLicenseShown(true).supportFragment(); FragmentManager fragmentManager = getSupportFragmentManager(); fragmentManager.beginTransaction().replace(R.id.frame_container, fragment).commit(); } diff --git a/app/src/main/java/com/mikepenz/actionitembadge/sample/ToolbarActivity.java b/app/src/main/java/com/mikepenz/actionitembadge/sample/ToolbarActivity.java index 7b73c09..de8c1fb 100644 --- a/app/src/main/java/com/mikepenz/actionitembadge/sample/ToolbarActivity.java +++ b/app/src/main/java/com/mikepenz/actionitembadge/sample/ToolbarActivity.java @@ -12,7 +12,7 @@ import android.widget.Toast; import com.mikepenz.aboutlibraries.LibsBuilder; -import com.mikepenz.aboutlibraries.ui.LibsFragment; +import com.mikepenz.aboutlibraries.ui.LibsSupportFragment; import com.mikepenz.actionitembadge.R; import com.mikepenz.actionitembadge.library.ActionItemBadge; import com.mikepenz.actionitembadge.library.ActionItemBadgeAdder; @@ -111,12 +111,12 @@ public boolean onItemClick(View view, int i, IDrawerItem iDrawerItem) { } }) .withFireOnInitialOnClick(true) - .withSelectedItem(2) + .withSelectedItem(3) .withSavedInstance(savedInstanceState) .build(); //init and show about libraries :D - LibsFragment fragment = new LibsBuilder().withFields(R.string.class.getFields()).withVersionShown(true).withLicenseShown(true).fragment(); + LibsSupportFragment fragment = new LibsBuilder().withFields(R.string.class.getFields()).withVersionShown(true).withLicenseShown(true).supportFragment(); FragmentManager fragmentManager = getSupportFragmentManager(); fragmentManager.beginTransaction().replace(R.id.frame_container, fragment).commit(); } From ac357a31d63473e8e20f68d5e6c8b02e4cda007b Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Tue, 3 Nov 2015 22:42:16 +0100 Subject: [PATCH 6/7] * update gradle to v2.8 --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 8e5942e..3eb3b6e 100644 --- a/build.gradle +++ b/build.gradle @@ -22,5 +22,5 @@ allprojects { task wrapper(type: Wrapper) { - gradleVersion = '2.6' + gradleVersion = '2.8' } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 45066f1..62d11e7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Sep 06 21:48:00 CEST 2015 +#Tue Nov 03 22:42:03 CET 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip From 095de1f58ca285fa6443fda5a2b06e9d165f8dcc Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Tue, 3 Nov 2015 22:42:34 +0100 Subject: [PATCH 7/7] * [release] v3.1.4 --- README.md | 2 +- app/build.gradle | 4 ++-- gradle.properties | 4 ++-- library/build.gradle | 4 ++-- library/src/main/res/values/aboutlibraries.xml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d580565..d55b972 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ The ActionItemBadge Library is pushed to [Maven Central], so you just need to ad ```javascript dependencies { - compile('com.mikepenz:actionitembadge:3.1.3@aar') { + compile('com.mikepenz:actionitembadge:3.1.4@aar') { transitive = true } } diff --git a/app/build.gradle b/app/build.gradle index 32aca58..01ad584 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.mikepenz.actionitembadge.sample" minSdkVersion 14 targetSdkVersion 23 - versionCode 313 - versionName "3.1.3" + versionCode 314 + versionName "3.1.4" } buildTypes { release { diff --git a/gradle.properties b/gradle.properties index 79bc962..97001bb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,8 +17,8 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -VERSION_NAME=3.1.3 -VERSION_CODE=313 +VERSION_NAME=3.1.4 +VERSION_CODE=314 GROUP=com.mikepenz POM_DESCRIPTION=Android-ActionItemBadge Library diff --git a/library/build.gradle b/library/build.gradle index 8ad4fcc..b969d53 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -7,8 +7,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 23 - versionCode 313 - versionName "3.1.3" + versionCode 314 + versionName "3.1.4" } buildTypes { release { diff --git a/library/src/main/res/values/aboutlibraries.xml b/library/src/main/res/values/aboutlibraries.xml index 77001df..3cbc4a6 100644 --- a/library/src/main/res/values/aboutlibraries.xml +++ b/library/src/main/res/values/aboutlibraries.xml @@ -9,7 +9,7 @@ Android-ActionItemBadge is a library which offers a simple and easy to use method to add a badge to your action item!! ]]> - 3.1.3 + 3.1.4 https://github.com/mikepenz/Android-ActionItemBadge apache_2_0 true