From 5eebede6b3fe1c6ec5e18c734e620956f0d2a3a6 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Mon, 14 Aug 2017 21:38:05 -0700 Subject: [PATCH 1/3] Update README.md * fix markdown --- README.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 854b90c..c8491fe 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ -#Android-ActionItemBadge [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.mikepenz/actionitembadge/badge.svg?style=flat)](https://maven-badges.herokuapp.com/maven-central/com.mikepenz/actionitembadge) [![Android Arsenal](http://img.shields.io/badge/Android%20Arsenal-Android--ActionItemBadge-brightgreen.svg?style=flat)](http://android-arsenal.com/details/1/755) +# Android-ActionItemBadge [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.mikepenz/actionitembadge/badge.svg?style=flat)](https://maven-badges.herokuapp.com/maven-central/com.mikepenz/actionitembadge) [![Android Arsenal](http://img.shields.io/badge/Android%20Arsenal-Android--ActionItemBadge-brightgreen.svg?style=flat)](http://android-arsenal.com/details/1/755) [![Join the chat at https://gitter.im/mikepenz/Android-ActionItemBadge](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mikepenz/Android-ActionItemBadge?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ActionItemBadge is a library which offers a simple and easy to use method to add a badge to your action item! -##Screenshots +## Screenshots ![Image](https://raw.githubusercontent.com/mikepenz/Android-ActionItemBadge/develop/DEV/screenshot/screenshot1_small.png) ![Image](https://raw.githubusercontent.com/mikepenz/Android-ActionItemBadge/develop/DEV/screenshot/screenshot2_small.png) -##Include in your project -###Using Maven +## Include in your project +### Using Maven The ActionItemBadge Library is pushed to [Maven Central], so you just need to add the following dependency to your `build.gradle`. ```javascript @@ -25,16 +25,16 @@ dependencies { } ``` -###Additional dependency for the icon font +### 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 +## 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. -##Usage -###menu.xml +## Usage +### menu.xml Create your menu.xml as you would do normally and add the app:actionLayout param. It is also a good idea to set showAsAction="always" (The badge can only be shown in the actionbar) ```xml @@ -48,7 +48,7 @@ It is also a good idea to set showAsAction="always" (The badge can only be shown android:title="@string/sample_1"/> ``` -###Activity +### Activity Override the onCreateOptionsMenu method ```java @Override @@ -87,17 +87,17 @@ call invalidateOptionsMenu() afterwards. } ``` -#Dependencies +# Dependencies * Android-Iconics - https://github.com/mikepenz/Android-Iconics -#Developed By +# Developed By * Mike Penz * [mikepenz.com](http://mikepenz.com) - * [paypal.me/mikepenz](http://paypal.me/mikepenz) -#License +# License Copyright 2016 Mike Penz From 167ff8f41dbc1e42c007a37bdf43368b3538d919 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Sat, 28 Oct 2017 18:59:14 +0200 Subject: [PATCH 2/3] * update build tools to 27, * update compile sdk to 27 * update target sdk to 27 * update supportLibs to 27 * update gradle to 4.1 * update butterknife to 8.8.1 --- README.md | 8 ++++---- app/build.gradle | 20 ++++++++++---------- build.gradle | 16 +++++++--------- gradle/wrapper/gradle-wrapper.properties | 4 ++-- library/build.gradle | 8 ++++---- 5 files changed, 27 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index c8491fe..6dddb84 100644 --- a/README.md +++ b/README.md @@ -14,14 +14,14 @@ The ActionItemBadge Library is pushed to [Maven Central], so you just need to ad ```javascript dependencies { - compile 'com.mikepenz:actionitembadge:3.3.1@aar' + implementation 'com.mikepenz:actionitembadge:3.3.1@aar' //SUB-DEPENDENCIES //Android-Iconics - used to provide an easy API for icons - compile 'com.mikepenz:iconics-core:2.8.1@aar' + implementation 'com.mikepenz:iconics-core:{latestVersion}@aar' //appcompat - compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}" + implementation "com.android.support:appcompat-v7:${supportLibVersion}" } ``` @@ -99,7 +99,7 @@ call invalidateOptionsMenu() afterwards. # License - Copyright 2016 Mike Penz + Copyright 2017 Mike Penz Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/app/build.gradle b/app/build.gradle index 99ea777..f7f8bcf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ android { defaultConfig { minSdkVersion 14 - targetSdkVersion 25 + targetSdkVersion 27 versionCode 331 versionName "3.3.1" } @@ -20,8 +20,6 @@ android { lintOptions { abortOnError false } - - enforceUniquePackageName false } dependencies { @@ -35,29 +33,31 @@ dependencies { // contains util classes to support various android versions, and clean up code // comes with the awesome "Holder"-Pattern // https://github.com/mikepenz/Materialize - compile 'com.mikepenz:materialize:1.0.0@aar' + compile 'com.mikepenz:materialize:1.1.1@aar' // used to fill the RecyclerView with the DrawerItems // and provides single and multi selection, expandable items // https://github.com/mikepenz/FastAdapter - compile 'com.mikepenz:fastadapter:2.1.5@aar' + compile 'com.mikepenz:fastadapter:2.6.3@aar' // used to provide out of the box icon font support. simplifies development, // and provides scalable icons. the core is very very light // https://github.com/mikepenz/Android-Iconics - compile 'com.mikepenz:iconics-core:2.8.1@aar' + compile 'com.mikepenz:iconics-core:2.9.3@aar' //used to generate the drawer on the left //https://github.com/mikepenz/MaterialDrawer - compile 'com.mikepenz:materialdrawer:5.8.1@aar' + compile('com.mikepenz:materialdrawer:5.9.5@aar') { + exclude group: "com.android.support" + } //used to generate the Open Source section //https://github.com/mikepenz/AboutLibraries - compile 'com.mikepenz:aboutlibraries:5.9.1@aar' + compile 'com.mikepenz:aboutlibraries:5.9.8@aar' //used to display the icons in the drawer and in the menu //https://github.com/mikepenz/Android-Iconics - 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.mikepenz:crossfader:1.5.0@aar' } diff --git a/build.gradle b/build.gradle index 74c17b9..74cc6b2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,27 +1,25 @@ buildscript { repositories { + google() jcenter() maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0-beta1' - 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 = 25 - buildToolsVersion = "25.0.2" - supportLibVersion = "25.1.0" + compileSdkVersion = 27 + buildToolsVersion = "27.0.0" + supportLibVersion = "27.0.0" } allprojects { repositories { + google() jcenter() maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } } -} - -task wrapper(type: Wrapper) { - gradleVersion = '3.2' } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e0d8185..4f46c93 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Dec 27 09:05:09 CET 2016 +#Sat Oct 28 18:55:50 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index e6225db..9df23c4 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -7,7 +7,7 @@ android { defaultConfig { minSdkVersion 14 - targetSdkVersion 25 + targetSdkVersion 27 versionCode 331 versionName "3.3.1" } @@ -25,10 +25,10 @@ dependencies { // used to provide out of the box icon font support. simplifies development, // and provides scalable icons. the core is very very light // https://github.com/mikepenz/Android-Iconics - compile 'com.mikepenz:iconics-core:2.8.1@aar' + implementation 'com.mikepenz:iconics-core:2.9.3@aar' - compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}" + implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}" // used to provide useful AS warnings - compile "com.android.support:support-annotations:${rootProject.ext.supportLibVersion}" + implementation "com.android.support:support-annotations:${rootProject.ext.supportLibVersion}" } From 2fc002404a0206980f803e42e26f83bdfa479920 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Sat, 28 Oct 2017 19:00:51 +0200 Subject: [PATCH 3/3] * [release] v3.3.2 --- 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 6dddb84..1e2677f 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 { - implementation 'com.mikepenz:actionitembadge:3.3.1@aar' + implementation 'com.mikepenz:actionitembadge:3.3.2@aar' //SUB-DEPENDENCIES //Android-Iconics - used to provide an easy API for icons diff --git a/app/build.gradle b/app/build.gradle index f7f8bcf..b8320f8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 27 - versionCode 331 - versionName "3.3.1" + versionCode 332 + versionName "3.3.2" } buildTypes { release { diff --git a/gradle.properties b/gradle.properties index 06c1be2..3a3d381 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,8 +12,8 @@ # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -VERSION_NAME=3.3.1 -VERSION_CODE=331 +VERSION_NAME=3.3.2 +VERSION_CODE=332 GROUP=com.mikepenz POM_DESCRIPTION=Android-ActionItemBadge Library POM_URL=https://github.com/mikepenz/Android-ActionItemBadge diff --git a/library/build.gradle b/library/build.gradle index 9df23c4..6bc8189 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -8,8 +8,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 27 - versionCode 331 - versionName "3.3.1" + versionCode 332 + versionName "3.3.2" } buildTypes { release { diff --git a/library/src/main/res/values/aboutlibraries.xml b/library/src/main/res/values/aboutlibraries.xml index 37fd539..0ef1b1f 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.3.1 + 3.3.2 https://github.com/mikepenz/Android-ActionItemBadge apache_2_0 true