Merge branch 'release/v3.1.4'

mikepenz · Nov 3, 2015 · d40e112 · d40e112
2 parents d2a69a9 + 095de1f
commit d40e112
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -14,12 +14,16 @@ 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
 	}
 }
 ```
 
+###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.

diff --git 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 {
@@ -22,15 +22,15 @@ android {
 
 dependencies {
     compile project(':library')
-    compile('com.mikepenz:materialdrawer:4.3.6@aar') {
+    compile('com.mikepenz:materialdrawer:4.4.4@aar') {
         transitive = true
         exclude module: "iconics-core"
     }
-    compile('com.mikepenz:aboutlibraries:5.2.4@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
@@ -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
@@ -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();
     }

diff --git a/build.gradle b/build.gradle
@@ -22,5 +22,5 @@ allprojects {
 
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.6'
+    gradleVersion = '2.8'
 }
diff --git 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/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
diff --git 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 {
@@ -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:2.0.0@aar'
 }
diff --git a/library/src/main/res/values/aboutlibraries.xml b/library/src/main/res/values/aboutlibraries.xml
@@ -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.1.3</string>
+    <string name="library_AndroidActionItemBadge_libraryVersion">3.1.4</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>