diff --git a/README.md b/README.md index cbb979a..ff7fc4d 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.0.6@aar') { + compile('com.mikepenz:actionitembadge:3.1.0@aar') { transitive = true } } diff --git a/app/build.gradle b/app/build.gradle index 4426207..fd18170 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.mikepenz.actionitembadge.sample" minSdkVersion 14 targetSdkVersion 22 - versionCode 306 - versionName "3.0.6" + versionCode 310 + versionName "3.1.0" } buildTypes { release { @@ -22,11 +22,14 @@ android { dependencies { compile project(':library') - compile('com.mikepenz:materialdrawer:3.1.2@aar') { + compile('com.mikepenz:materialdrawer:4.0.0.rc7-SNAPSHOT@aar') { transitive = true + exclude module: "iconics-core" } - compile('com.mikepenz:aboutlibraries:5.0.9@aar') { + compile('com.mikepenz:aboutlibraries:5.1.1@aar') { transitive = true } - compile 'com.mikepenz:iconics:1.6.2@aar' + + compile 'com.mikepenz:google-material-typeface:1.2.0@aar' + compile 'com.mikepenz:fontawesome-typeface:4.4.0@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 4e6f56f..7921746 100644 --- a/app/src/main/java/com/mikepenz/actionitembadge/sample/MainActivity.java +++ b/app/src/main/java/com/mikepenz/actionitembadge/sample/MainActivity.java @@ -13,7 +13,7 @@ import com.mikepenz.actionitembadge.R; import com.mikepenz.actionitembadge.library.ActionItemBadge; import com.mikepenz.actionitembadge.library.ActionItemBadgeAdder; -import com.mikepenz.iconics.typeface.FontAwesome; +import com.mikepenz.fontawesome_typeface_library.FontAwesome; public class MainActivity extends AppCompatActivity { 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 d2c99ae..7b73c09 100644 --- a/app/src/main/java/com/mikepenz/actionitembadge/sample/ToolbarActivity.java +++ b/app/src/main/java/com/mikepenz/actionitembadge/sample/ToolbarActivity.java @@ -9,7 +9,6 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; -import android.widget.AdapterView; import android.widget.Toast; import com.mikepenz.aboutlibraries.LibsBuilder; @@ -20,7 +19,7 @@ import com.mikepenz.actionitembadge.library.utils.BadgeStyle; import com.mikepenz.actionitembadge.library.utils.NumberUtils; import com.mikepenz.actionitembadge.library.utils.UIUtil; -import com.mikepenz.iconics.typeface.FontAwesome; +import com.mikepenz.fontawesome_typeface_library.FontAwesome; import com.mikepenz.materialdrawer.Drawer; import com.mikepenz.materialdrawer.DrawerBuilder; import com.mikepenz.materialdrawer.model.DividerDrawerItem; @@ -49,7 +48,7 @@ protected void onCreate(Bundle savedInstanceState) { drawer = new DrawerBuilder(this) .withToolbar(toolbar) .addDrawerItems( - new PrimaryDrawerItem().withName("Activity").withIdentifier(1000).withCheckable(false), + new PrimaryDrawerItem().withName("Activity").withIdentifier(1000).withSelectable(false), new DividerDrawerItem(), new PrimaryDrawerItem().withName("Default (Dark Grey)").withIdentifier(1), new PrimaryDrawerItem().withName("Grey").withIdentifier(2), @@ -60,13 +59,13 @@ protected void onCreate(Bundle savedInstanceState) { new PrimaryDrawerItem().withName("Yellow").withIdentifier(7), new PrimaryDrawerItem().withName("Custom").withIdentifier(8), new DividerDrawerItem(), - new PrimaryDrawerItem().withName("SWITCH").withIdentifier(9).withCheckable(false), - new PrimaryDrawerItem().withName("RESET COUNT").withIdentifier(10).withCheckable(false), - new PrimaryDrawerItem().withName("HIDE BADGE").withIdentifier(11).withCheckable(false) + new PrimaryDrawerItem().withName("SWITCH").withIdentifier(9).withSelectable(false), + new PrimaryDrawerItem().withName("RESET COUNT").withIdentifier(10).withSelectable(false), + new PrimaryDrawerItem().withName("HIDE BADGE").withIdentifier(11).withSelectable(false) ) .withOnDrawerItemClickListener(new Drawer.OnDrawerItemClickListener() { @Override - public boolean onItemClick(AdapterView adapterView, View view, int i, long l, IDrawerItem iDrawerItem) { + public boolean onItemClick(View view, int i, IDrawerItem iDrawerItem) { if (iDrawerItem.getIdentifier() == 1000) { Intent intent = new Intent(ToolbarActivity.this, MainActivity.class); startActivity(intent); diff --git a/build.gradle b/build.gradle index 8a8169d..f0c8f86 100644 --- a/build.gradle +++ b/build.gradle @@ -19,3 +19,8 @@ allprojects { maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } } } + + +task wrapper(type: Wrapper) { + gradleVersion = '2.5' +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 135c465..7846212 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.0.6 -VERSION_CODE=306 +VERSION_NAME=3.1.0 +VERSION_CODE=310 GROUP=com.mikepenz POM_DESCRIPTION=Android-ActionItemBadge Library diff --git a/library/build.gradle b/library/build.gradle index bb55397..eeea05a 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -7,8 +7,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 22 - versionCode 306 - versionName "3.0.6" + versionCode 310 + versionName "3.1.0" } buildTypes { release { @@ -20,5 +20,5 @@ android { apply from: 'gradle-mvn-push.gradle' dependencies { - compile 'com.mikepenz:iconics-core:1.6.2@aar' + compile 'com.mikepenz:iconics-core:1.7.1@aar' } diff --git a/library/src/main/res/values/aboutlibraries.xml b/library/src/main/res/values/aboutlibraries.xml index b9e2ff5..c6b0ec8 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.0.6 + 3.1.0 https://github.com/mikepenz/Android-ActionItemBadge apache_2_0 true