Merge branch 'develop'

Author: JoanZapata

android-iconify-sample/build.gradle

@@ -22,12 +22,14 @@ android {
         versionName VERSION_NAME
     }
 
+    def password = project.hasProperty('ICONIFY_SAMPLE_KEYSTORE_PASSWORD') ?
+            project.property('ICONIFY_SAMPLE_KEYSTORE_PASSWORD') : ''
     signingConfigs {
         release {
             storeFile file("keystore")
-            storePassword ICONIFY_SAMPLE_KEYSTORE_PASSWORD
+            storePassword password
             keyAlias "android-iconify"
-            keyPassword ICONIFY_SAMPLE_KEYSTORE_PASSWORD
+            keyPassword password
         }
     }
 

android-iconify/src/main/java/com/joanzapata/iconify/IconDrawable.java

@@ -61,7 +61,7 @@ private void init(Context context, Icon icon) {
         this.icon = icon;
         paint = new TextPaint();
         paint.setTypeface(Iconify.findTypefaceOf(icon).getTypeface(context));
-        paint.setStyle(Paint.Style.STROKE);
+        paint.setStyle(Paint.Style.FILL);
         paint.setTextAlign(Paint.Align.CENTER);
         paint.setUnderlineText(false);
         paint.setColor(Color.BLACK);

android-iconify/src/main/java/com/joanzapata/iconify/Iconify.java

@@ -42,7 +42,8 @@ private static void addIconFontDescriptor(IconFontDescriptor iconFontDescriptor)
         for (IconFontDescriptorWrapper wrapper : iconFontDescriptors) {
             if (wrapper.getIconFontDescriptor().ttfFileName().equals(iconFontDescriptor.ttfFileName())) {
                 throw new IllegalArgumentException("Can't add twice the same font \""
-                        + iconFontDescriptor.ttfFileName() + "\"");
+                        + iconFontDescriptor.ttfFileName() + "\", please initialize " +
+                        "Iconify in your Application and not in your Activity.");
             }
         }
 

gradle.properties

@@ -1,6 +1,6 @@
 GROUP=com.joanzapata.iconify
-VERSION_NAME=2.0.7
-VERSION_CODE=20007
+VERSION_NAME=2.0.8
+VERSION_CODE=20008
 POM_DESCRIPTION=Evolutive integration of popular icon fonts for Android
 
 POM_URL=https://github.com/JoanZapata/android-iconify/