Merge branch 'release/v2.5.2'

Author: mikepenz

MIGRATION.md

@@ -31,5 +31,10 @@ protected void attachBaseContext(Context newBase) {
 * provide the fonts you need. no additional steps required
 
 ### Font Addons
+#### Google Material font v2.1.0.1.original
+* is now the default Google Material icon set again with the "gmd" mapping
+#### Material Design Iconic v2.2.0.1
+* is now the standalone Material Design Iconic icon pack with the "gmi" mapping
+
 #### Google Material font 1.2.0.1 --> 2.1.2.1
 * the mapping of some icons changed

README.md

@@ -46,7 +46,7 @@ Provide additional fonts for you project, or even create your custom font with j
 ##1. Provide the gradle dependency
 ```gradle
 dependencies {
-	compile 'com.mikepenz:iconics-core:2.5.1@aar'
+	compile 'com.mikepenz:iconics-core:2.5.2@aar'
 }
 ```
 
@@ -294,8 +294,9 @@ https://play.google.com/store/apps/details?id=com.mikepenz.iconics.sample
 
 #Developed By
 
-* Mike Penz - http://mikepenz.com - <mikepenz@gmail.com>
-
+* Mike Penz 
+ * [mikepenz.com](http://mikepenz.com) - <mikepenz@gmail.com>
+ * [paypal.me/mikepenz](http://paypal.me/mikepenz)
 
 #License
 

app/build.gradle

@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 251
-        versionName "2.5.1"
+        versionCode 252
+        versionName "2.5.2"
         enforceUniquePackageName false
     }
 
@@ -58,8 +58,8 @@ dependencies {
     compile 'com.android.support:recyclerview-v7:23.1.1'
     compile 'com.android.support:cardview-v7:23.1.1'
 
-    compile('com.mikepenz:aboutlibraries:5.3.3@aar')
-    compile('com.mikepenz:materialdrawer:4.5.4@aar') {
+    compile('com.mikepenz:aboutlibraries:5.3.4@aar')
+    compile('com.mikepenz:materialdrawer:4.5.9@aar') {
         transitive = true
         exclude module: "iconics-core"
     }

library-core/build.gradle

@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 251
-        versionName "2.5.1"
+        versionCode 252
+        versionName "2.5.2"
     }
     buildTypes {
         release {

library-core/gradle.properties

@@ -32,8 +32,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=2.5.1
-VERSION_CODE=251
+VERSION_NAME=2.5.2
+VERSION_CODE=252
 
 POM_NAME=Android-Iconics Library
 POM_ARTIFACT_ID=iconics-core

library-core/src/main/java/com/mikepenz/iconics/typeface/GenericFont.java

@@ -30,8 +30,8 @@
  * Created by mikepenz on 01.11.14.
  */
 public class GenericFont implements ITypeface {
-    private String mFontName = "GenericFont";
-    private String mAuthor = "GenericAuthor";
+    private String mFontName;
+    private String mAuthor;
     private String mMappingPrefix;
     private String mFontFile;
 
@@ -42,11 +42,13 @@ protected GenericFont() {
     }
 
     public GenericFont(String mappingPrefix, String fontFile) {
-        this.mMappingPrefix = mappingPrefix;
-        this.mFontFile = fontFile;
+        this("GenericFont", "GenericAuthor", mappingPrefix, fontFile);
     }
 
     public GenericFont(String fontName, String author, String mappingPrefix, String fontFile) {
+        if (mappingPrefix.length() != 3) {
+            new IllegalArgumentException("MappingPrefix must be 3 char long");
+        }
         this.mFontName = fontName;
         this.mAuthor = author;
         this.mMappingPrefix = mappingPrefix;

library-core/src/main/res/values/library_androidiconics_strings.xml

@@ -25,7 +25,7 @@
         This library allows you to include vector icons everywhere in your project. No limits are given. Scale with no limit, use any Color at any time, provide a contour, and many additional customizations
         ]]>
     </string>
-    <string name="library_AndroidIconics_libraryVersion">2.5.1</string>
+    <string name="library_AndroidIconics_libraryVersion">2.5.2</string>
     <string name="library_AndroidIconics_libraryWebsite">https://github.com/mikepenz/Android-Iconics</string>
     <string name="library_AndroidIconics_licenseId">apache_2_0</string>
     <string name="library_AndroidIconics_isOpenSource">true</string>