Merge branch 'release/v1.6.2'

mikepenz · Aug 4, 2015 · 1b2b00a · 1b2b00a
2 parents af148d6 + 88e9d02
commit 1b2b00a
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ The Android-Iconics Library is pushed to [Maven Central], so you just need to ad
 
 ```gradle
 dependencies {
-	compile 'com.mikepenz:iconics:1.6.1@aar'
+	compile 'com.mikepenz:iconics:1.6.2@aar'
 }
 ```
 
@@ -35,7 +35,7 @@ Provide your own font without the additional icons
 
 ```gradle
 dependencies {
-	compile 'com.mikepenz:iconics-core:1.6.1@aar'
+	compile 'com.mikepenz:iconics-core:1.6.2@aar'
 }
 ```
 
@@ -131,7 +131,7 @@ Just add the dependency of any and as many typface-library-addons in your build.
 
 ```javascript
 dependencies {
-	compile 'com.mikepenz:iconics:1.6.1@aar'
+	compile 'com.mikepenz:iconics:1.6.2@aar'
 	compile 'com.mikepenz:octicons-typeface:2.2.1@aar'
 	compile 'com.mikepenz:meteocons-typeface:1.1.2@aar'
 	compile 'com.mikepenz:community-material-typeface:1.1.71@aar'

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 161
-        versionName "1.6.1"
+        versionCode 162
+        versionName "1.6.2"
         enforceUniquePackageName false
     }
 

diff --git a/library-core/build.gradle b/library-core/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 161
-        versionName "1.6.1"
+        versionCode 162
+        versionName "1.6.2"
     }
     buildTypes {
         release {

diff --git a/library-core/gradle.properties b/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=1.6.1
-VERSION_CODE=161
+VERSION_NAME=1.6.2
+VERSION_CODE=162
 
 POM_NAME=Android-Iconics Library
 POM_ARTIFACT_ID=iconics-core

diff --git a/library-core/src/main/java/com/mikepenz/iconics/Iconics.java b/library-core/src/main/java/com/mikepenz/iconics/Iconics.java
@@ -81,7 +81,11 @@ public static Collection<ITypeface> getRegisteredFonts(Context ctx) {
         return FONTS.values();
     }
 
-    public static ITypeface findFont(String key) {
+    public static ITypeface findFont(Context ctx, String key) {
+        if (FONTS == null) {
+            init(ctx);
+        }
+
         return FONTS.get(key);
     }
 

diff --git a/library-core/src/main/java/com/mikepenz/iconics/IconicsDrawable.java b/library-core/src/main/java/com/mikepenz/iconics/IconicsDrawable.java
@@ -104,7 +104,7 @@ public IconicsDrawable(Context context, String icon) {
         mContext = context.getApplicationContext();
         prepare();
 
-        ITypeface font = Iconics.findFont(icon.substring(0, 3));
+        ITypeface font = Iconics.findFont(context, icon.substring(0, 3));
         icon = icon.replace("-", "_");
         icon(font.getIcon(icon));
     }

diff --git a/library-core/src/main/res/values/library_androidiconics_strings.xml b/library-core/src/main/res/values/library_androidiconics_strings.xml
@@ -27,7 +27,7 @@
         Android-Iconics is a library to use (almost) any alternative icon-font in your projects. It allows you to add any Android-Iconics compatible typeface-library-addon to your project and you are able to start using that font.
         ]]>
     </string>
-    <string name="library_AndroidIconics_libraryVersion">1.6.1</string>
+    <string name="library_AndroidIconics_libraryVersion">1.6.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>

diff --git a/library/build.gradle b/library/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 161
-        versionName "1.6.1"
+        versionCode 162
+        versionName "1.6.2"
     }
     buildTypes {
         release {
@@ -25,5 +25,5 @@ if (project.hasProperty('pushall') || project.hasProperty('libraryonly')) {
 }
 
 dependencies {
-    compile "com.mikepenz:iconics-core:1.6.1"
+    compile "com.mikepenz:iconics-core:1.6.2"
 }
diff --git a/library/gradle.properties b/library/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=1.6.1
-VERSION_CODE=161
+VERSION_NAME=1.6.2
+VERSION_CODE=162
 
 POM_NAME=Android-Iconics Library
 POM_ARTIFACT_ID=iconics