From ec3649147bfd407b8dc323db766df8ff4296945b Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Thu, 17 Mar 2016 19:23:09 +0100 Subject: [PATCH 1/5] * update gradle to v2.12 --- 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 95f44c2..1536372 100644 --- a/build.gradle +++ b/build.gradle @@ -23,5 +23,5 @@ allprojects { } task wrapper(type: Wrapper) { - gradleVersion = '2.11' + gradleVersion = '2.12' } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b2c99ae..37367a1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 11 16:39:35 CET 2016 +#Thu Mar 17 19:22:52 CET 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip From 9844db65a12319ca8c4fada6b832b04ba6f5c475 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Thu, 17 Mar 2016 19:23:19 +0100 Subject: [PATCH 2/5] * update to latest android iconics-core v2.5.10 --- library/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/build.gradle b/library/build.gradle index e48c9c6..e310bfa 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -25,5 +25,5 @@ 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.5.9@aar' + compile 'com.mikepenz:iconics-core:2.5.10@aar' } From 6d7c1c3134aa86fbdf6026e29e401b4d9fd842c7 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Thu, 17 Mar 2016 19:29:35 +0100 Subject: [PATCH 3/5] * rename the badge.xml and the layouts to `action_item_*` to prevent overwriting from other libs * could fix #43 --- .../sample/ToolbarActivity.java | 4 +-- app/src/main/res/menu/main.xml | 4 +-- .../library/ActionItemBadge.java | 28 +++++++++---------- .../library/utils/BadgeDrawableBuilder.java | 2 +- .../{badge.xml => action_item_badge.xml} | 0 ...u_badge.xml => menu_action_item_badge.xml} | 0 ...e.xml => menu_action_item_badge_large.xml} | 0 7 files changed, 19 insertions(+), 19 deletions(-) rename library/src/main/res/drawable/{badge.xml => action_item_badge.xml} (100%) rename library/src/main/res/layout/{menu_badge.xml => menu_action_item_badge.xml} (100%) rename library/src/main/res/layout/{menu_badge_large.xml => menu_action_item_badge_large.xml} (100%) 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 de8c1fb..f87c2f7 100644 --- a/app/src/main/java/com/mikepenz/actionitembadge/sample/ToolbarActivity.java +++ b/app/src/main/java/com/mikepenz/actionitembadge/sample/ToolbarActivity.java @@ -92,8 +92,8 @@ public boolean onItemClick(View view, int i, IDrawerItem iDrawerItem) { style = ActionItemBadge.BadgeStyles.YELLOW.getStyle(); bigStyle = ActionItemBadge.BadgeStyles.YELLOW_LARGE.getStyle(); } else if (iDrawerItem.getIdentifier() == 8) { - style = new BadgeStyle(BadgeStyle.Style.DEFAULT, R.layout.menu_badge, Color.parseColor("#FE0665"), Color.parseColor("#CC0548"), Color.parseColor("#EEEEEE")); - bigStyle = new BadgeStyle(BadgeStyle.Style.LARGE, R.layout.menu_badge_large, Color.parseColor("#FE0665"), Color.parseColor("#CC0548"), Color.parseColor("#EEEEEE")); + style = new BadgeStyle(BadgeStyle.Style.DEFAULT, R.layout.menu_action_item_badge, Color.parseColor("#FE0665"), Color.parseColor("#CC0548"), Color.parseColor("#EEEEEE")); + bigStyle = new BadgeStyle(BadgeStyle.Style.LARGE, R.layout.menu_action_item_badge_large, Color.parseColor("#FE0665"), Color.parseColor("#CC0548"), Color.parseColor("#EEEEEE")); } else if (iDrawerItem.getIdentifier() == 9) { BadgeStyle temp = style; style = bigStyle; diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml index 11fbcf8..827669d 100644 --- a/app/src/main/res/menu/main.xml +++ b/app/src/main/res/menu/main.xml @@ -5,14 +5,14 @@ \ No newline at end of file diff --git a/library/src/main/java/com/mikepenz/actionitembadge/library/ActionItemBadge.java b/library/src/main/java/com/mikepenz/actionitembadge/library/ActionItemBadge.java index 9b40726..f4bf720 100644 --- a/library/src/main/java/com/mikepenz/actionitembadge/library/ActionItemBadge.java +++ b/library/src/main/java/com/mikepenz/actionitembadge/library/ActionItemBadge.java @@ -25,20 +25,20 @@ */ public class ActionItemBadge { public enum BadgeStyles { - GREY(new BadgeStyle(BadgeStyle.Style.DEFAULT, R.layout.menu_badge, Color.parseColor("#e0e0e0"), Color.parseColor("#c7c7c7"), Color.BLACK)), - DARK_GREY(new BadgeStyle(BadgeStyle.Style.DEFAULT, R.layout.menu_badge, Color.parseColor("#606060"), Color.parseColor("#3e3e3e"), Color.WHITE)), - RED(new BadgeStyle(BadgeStyle.Style.DEFAULT, R.layout.menu_badge, Color.parseColor("#FF4444"), Color.parseColor("#CC0000"), Color.WHITE)), - BLUE(new BadgeStyle(BadgeStyle.Style.DEFAULT, R.layout.menu_badge, Color.parseColor("#33B5E5"), Color.parseColor("#0099CC"), Color.WHITE)), - GREEN(new BadgeStyle(BadgeStyle.Style.DEFAULT, R.layout.menu_badge, Color.parseColor("#99CC00"), Color.parseColor("#669900"), Color.WHITE)), - PURPLE(new BadgeStyle(BadgeStyle.Style.DEFAULT, R.layout.menu_badge, Color.parseColor("#AA66CC"), Color.parseColor("#9933CC"), Color.WHITE)), - YELLOW(new BadgeStyle(BadgeStyle.Style.DEFAULT, R.layout.menu_badge, Color.parseColor("#FFBB33"), Color.parseColor("#FF8800"), Color.WHITE)), - GREY_LARGE(new BadgeStyle(BadgeStyle.Style.LARGE, R.layout.menu_badge_large, Color.parseColor("#e0e0e0"), Color.parseColor("#c7c7c7"), Color.BLACK)), - DARK_GREY_LARGE(new BadgeStyle(BadgeStyle.Style.LARGE, R.layout.menu_badge_large, Color.parseColor("#606060"), Color.parseColor("#3e3e3e"), Color.WHITE)), - RED_LARGE(new BadgeStyle(BadgeStyle.Style.LARGE, R.layout.menu_badge_large, Color.parseColor("#FF4444"), Color.parseColor("#CC0000"), Color.WHITE)), - BLUE_LARGE(new BadgeStyle(BadgeStyle.Style.LARGE, R.layout.menu_badge_large, Color.parseColor("#33B5E5"), Color.parseColor("#0099CC"), Color.WHITE)), - GREEN_LARGE(new BadgeStyle(BadgeStyle.Style.LARGE, R.layout.menu_badge_large, Color.parseColor("#99CC00"), Color.parseColor("#669900"), Color.WHITE)), - PURPLE_LARGE(new BadgeStyle(BadgeStyle.Style.LARGE, R.layout.menu_badge_large, Color.parseColor("#AA66CC"), Color.parseColor("#9933CC"), Color.WHITE)), - YELLOW_LARGE(new BadgeStyle(BadgeStyle.Style.LARGE, R.layout.menu_badge_large, Color.parseColor("#FFBB33"), Color.parseColor("#FF8800"), Color.WHITE)),; + GREY(new BadgeStyle(BadgeStyle.Style.DEFAULT, R.layout.menu_action_item_badge, Color.parseColor("#e0e0e0"), Color.parseColor("#c7c7c7"), Color.BLACK)), + DARK_GREY(new BadgeStyle(BadgeStyle.Style.DEFAULT, R.layout.menu_action_item_badge, Color.parseColor("#606060"), Color.parseColor("#3e3e3e"), Color.WHITE)), + RED(new BadgeStyle(BadgeStyle.Style.DEFAULT, R.layout.menu_action_item_badge, Color.parseColor("#FF4444"), Color.parseColor("#CC0000"), Color.WHITE)), + BLUE(new BadgeStyle(BadgeStyle.Style.DEFAULT, R.layout.menu_action_item_badge, Color.parseColor("#33B5E5"), Color.parseColor("#0099CC"), Color.WHITE)), + GREEN(new BadgeStyle(BadgeStyle.Style.DEFAULT, R.layout.menu_action_item_badge, Color.parseColor("#99CC00"), Color.parseColor("#669900"), Color.WHITE)), + PURPLE(new BadgeStyle(BadgeStyle.Style.DEFAULT, R.layout.menu_action_item_badge, Color.parseColor("#AA66CC"), Color.parseColor("#9933CC"), Color.WHITE)), + YELLOW(new BadgeStyle(BadgeStyle.Style.DEFAULT, R.layout.menu_action_item_badge, Color.parseColor("#FFBB33"), Color.parseColor("#FF8800"), Color.WHITE)), + GREY_LARGE(new BadgeStyle(BadgeStyle.Style.LARGE, R.layout.menu_action_item_badge_large, Color.parseColor("#e0e0e0"), Color.parseColor("#c7c7c7"), Color.BLACK)), + DARK_GREY_LARGE(new BadgeStyle(BadgeStyle.Style.LARGE, R.layout.menu_action_item_badge_large, Color.parseColor("#606060"), Color.parseColor("#3e3e3e"), Color.WHITE)), + RED_LARGE(new BadgeStyle(BadgeStyle.Style.LARGE, R.layout.menu_action_item_badge_large, Color.parseColor("#FF4444"), Color.parseColor("#CC0000"), Color.WHITE)), + BLUE_LARGE(new BadgeStyle(BadgeStyle.Style.LARGE, R.layout.menu_action_item_badge_large, Color.parseColor("#33B5E5"), Color.parseColor("#0099CC"), Color.WHITE)), + GREEN_LARGE(new BadgeStyle(BadgeStyle.Style.LARGE, R.layout.menu_action_item_badge_large, Color.parseColor("#99CC00"), Color.parseColor("#669900"), Color.WHITE)), + PURPLE_LARGE(new BadgeStyle(BadgeStyle.Style.LARGE, R.layout.menu_action_item_badge_large, Color.parseColor("#AA66CC"), Color.parseColor("#9933CC"), Color.WHITE)), + YELLOW_LARGE(new BadgeStyle(BadgeStyle.Style.LARGE, R.layout.menu_action_item_badge_large, Color.parseColor("#FFBB33"), Color.parseColor("#FF8800"), Color.WHITE)),; private BadgeStyle style; diff --git a/library/src/main/java/com/mikepenz/actionitembadge/library/utils/BadgeDrawableBuilder.java b/library/src/main/java/com/mikepenz/actionitembadge/library/utils/BadgeDrawableBuilder.java index 3b1211b..cf23c49 100644 --- a/library/src/main/java/com/mikepenz/actionitembadge/library/utils/BadgeDrawableBuilder.java +++ b/library/src/main/java/com/mikepenz/actionitembadge/library/utils/BadgeDrawableBuilder.java @@ -36,7 +36,7 @@ public BadgeDrawableBuilder corners(int corners) { public StateListDrawable build(Context ctx) { StateListDrawable stateListDrawable = new StateListDrawable(); - GradientDrawable normal = (GradientDrawable) UIUtil.getCompatDrawable(ctx, R.drawable.badge); + GradientDrawable normal = (GradientDrawable) UIUtil.getCompatDrawable(ctx, R.drawable.action_item_badge); GradientDrawable selected = (GradientDrawable) normal.getConstantState().newDrawable().mutate(); normal.setColor(mColor); diff --git a/library/src/main/res/drawable/badge.xml b/library/src/main/res/drawable/action_item_badge.xml similarity index 100% rename from library/src/main/res/drawable/badge.xml rename to library/src/main/res/drawable/action_item_badge.xml diff --git a/library/src/main/res/layout/menu_badge.xml b/library/src/main/res/layout/menu_action_item_badge.xml similarity index 100% rename from library/src/main/res/layout/menu_badge.xml rename to library/src/main/res/layout/menu_action_item_badge.xml diff --git a/library/src/main/res/layout/menu_badge_large.xml b/library/src/main/res/layout/menu_action_item_badge_large.xml similarity index 100% rename from library/src/main/res/layout/menu_badge_large.xml rename to library/src/main/res/layout/menu_action_item_badge_large.xml From 6d9fd9c14368d1fd43b0768b6a465767a586aa8b Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Thu, 17 Mar 2016 19:32:38 +0100 Subject: [PATCH 4/5] * update sample app dependencies --- app/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b589d83..aba9713 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,20 +35,20 @@ dependencies { // 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:1.2.4@aar' + compile 'com.mikepenz:fastadapter:1.2.5@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.5.9@aar' + compile 'com.mikepenz:iconics-core:2.5.10@aar' //used to generate the drawer on the left //https://github.com/mikepenz/MaterialDrawer - compile 'com.mikepenz:materialdrawer:5.1.2@aar' + compile 'com.mikepenz:materialdrawer:5.1.4@aar' //used to generate the Open Source section //https://github.com/mikepenz/AboutLibraries - compile 'com.mikepenz:aboutlibraries:5.5.8@aar' + compile 'com.mikepenz:aboutlibraries:5.5.9@aar' //used to display the icons in the drawer and in the menu //https://github.com/mikepenz/Android-Iconics From 48d18dcd6b0f3e1a23a215c85aec5a5488aaef92 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Thu, 17 Mar 2016 19:32:55 +0100 Subject: [PATCH 5/5] * [release] v3.2.4 --- README.md | 4 ++-- app/build.gradle | 4 ++-- gradle.properties | 4 ++-- library/build.gradle | 4 ++-- library/src/main/res/values/aboutlibraries.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 9c69f85..245ef73 100644 --- a/README.md +++ b/README.md @@ -14,11 +14,11 @@ The ActionItemBadge Library is pushed to [Maven Central], so you just need to ad ```javascript dependencies { - compile 'com.mikepenz:actionitembadge:3.2.3@aar' + compile 'com.mikepenz:actionitembadge:3.2.4@aar' //SUB-DEPENDENCIES //Android-Iconics - used to provide an easy API for icons - compile 'com.mikepenz:iconics-core:2.5.8@aar' + compile 'com.mikepenz:iconics-core:2.5.10@aar' } ``` diff --git a/app/build.gradle b/app/build.gradle index aba9713..3bbeabb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 23 - versionCode 323 - versionName "3.2.3" + versionCode 324 + versionName "3.2.4" } buildTypes { release { diff --git a/gradle.properties b/gradle.properties index 1a5d3b6..bbf8e22 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.2.3 -VERSION_CODE=323 +VERSION_NAME=3.2.4 +VERSION_CODE=324 GROUP=com.mikepenz POM_DESCRIPTION=Android-ActionItemBadge Library diff --git a/library/build.gradle b/library/build.gradle index e310bfa..19fa2cf 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -8,8 +8,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 23 - versionCode 323 - versionName "3.2.3" + versionCode 324 + versionName "3.2.4" } buildTypes { release { diff --git a/library/src/main/res/values/aboutlibraries.xml b/library/src/main/res/values/aboutlibraries.xml index a0157a4..7bec664 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.2.3 + 3.2.4 https://github.com/mikepenz/Android-ActionItemBadge apache_2_0 true