Skip to content

Commit

Permalink
Merge branch 'release/v3.3.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
mikepenz committed Oct 28, 2017
2 parents 13bfb2d + 2fc0024 commit 2ea904c
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 49 deletions.
34 changes: 17 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
#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
dependencies {
compile '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
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}"
}
```

###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
Expand All @@ -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"/>
</menu>
```
###Activity
### Activity
Override the onCreateOptionsMenu method
```java
@Override
Expand Down Expand Up @@ -87,19 +87,19 @@ call invalidateOptionsMenu() afterwards.
}
```

#Dependencies
# Dependencies
* Android-Iconics - https://github.com/mikepenz/Android-Iconics


#Developed By
# Developed By

* Mike Penz
* [mikepenz.com](http://mikepenz.com) - <[email protected]>
* [paypal.me/mikepenz](http://paypal.me/mikepenz)

#License
# 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.
Expand Down
24 changes: 12 additions & 12 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ android {

defaultConfig {
minSdkVersion 14
targetSdkVersion 25
versionCode 331
versionName "3.3.1"
targetSdkVersion 27
versionCode 332
versionName "3.3.2"
}
buildTypes {
release {
Expand All @@ -20,8 +20,6 @@ android {
lintOptions {
abortOnError false
}

enforceUniquePackageName false
}

dependencies {
Expand All @@ -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'
}
16 changes: 7 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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'
}
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
12 changes: 6 additions & 6 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ android {

defaultConfig {
minSdkVersion 14
targetSdkVersion 25
versionCode 331
versionName "3.3.1"
targetSdkVersion 27
versionCode 332
versionName "3.3.2"
}
buildTypes {
release {
Expand All @@ -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}"
}
2 changes: 1 addition & 1 deletion library/src/main/res/values/aboutlibraries.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Android-<b>ActionItemBadge</b> is a library which offers a simple and easy to use method to add a badge to your action item!!
]]>
</string>
<string name="library_AndroidActionItemBadge_libraryVersion">3.3.1</string>
<string name="library_AndroidActionItemBadge_libraryVersion">3.3.2</string>
<string name="library_AndroidActionItemBadge_libraryWebsite">https://github.com/mikepenz/Android-ActionItemBadge</string>
<string name="library_AndroidActionItemBadge_licenseId">apache_2_0</string>
<string name="library_AndroidActionItemBadge_isOpenSource">true</string>
Expand Down

0 comments on commit 2ea904c

Please sign in to comment.