Merge branch 'release/v2.5.4'

Author: mikepenz

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.3@aar'
+	compile 'com.mikepenz:iconics-core:2.5.4@aar'
 }
 ```
 
@@ -62,7 +62,7 @@ compile 'com.mikepenz:weather-icons-typeface:2.0.10.1@aar'
 compile 'com.mikepenz:typeicons-typeface:2.0.7.1@aar'
 compile 'com.mikepenz:entypo-typeface:1.0.0.1@aar'
 compile 'com.mikepenz:devicon-typeface:2.0.0.1@aar'
-compile 'com.mikepenz:foundation-icons-typeface-typeface:3.0.0.1@aar'
+compile 'com.mikepenz:foundation-icons-typeface:3.0.0.1@aar'
 compile 'com.mikepenz:ionicons-typeface:2.0.1.1@aar'
 ```
 
@@ -300,7 +300,7 @@ https://play.google.com/store/apps/details?id=com.mikepenz.iconics.sample
 
 #License
 
-    Copyright 2015 Mike Penz
+    Copyright 2016 Mike Penz
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

app/build.gradle

@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 253
-        versionName "2.5.3"
+        versionCode 254
+        versionName "2.5.4"
         enforceUniquePackageName false
     }
 

app/src/main/res/layout/activity_automatic.xml

@@ -50,6 +50,14 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
+                <EditText
+                    android:id="@+id/editText"
+                    android:layout_width="wrap_content"
+                    android:layout_height="56dp"
+                    android:text="efgh{faw-adjust}ijk"
+                    android:textColor="@android:color/black"
+                    android:textSize="16sp" />
+
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"

library-core/build.gradle

@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 253
-        versionName "2.5.3"
+        versionCode 254
+        versionName "2.5.4"
     }
     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.3
-VERSION_CODE=253
+VERSION_NAME=2.5.4
+VERSION_CODE=254
 
 POM_NAME=Android-Iconics Library
 POM_ARTIFACT_ID=iconics-core

library-core/src/main/java/com/mikepenz/iconics/Iconics.java

@@ -243,9 +243,13 @@ public void build() {
                 mappedFonts.put(font.getMappingPrefix(), font);
             }
 
+            //DO NOT STYLE EDITABLE (comes from EditText) as this causes bad issues with the cursor!
+            /*
             if (view.getText() instanceof Editable) {
                 Iconics.styleEditable(ctx, mappedFonts, (Editable) view.getText(), withStyles, withStylesFor);
-            } else if (view.getText() instanceof Spanned) {
+            } else
+            */
+            if (view.getText() instanceof Spanned) {
                 view.setText(Iconics.style(ctx, mappedFonts, (Spanned) view.getText(), withStyles, withStylesFor));
             } else {
                 view.setText(Iconics.style(ctx, mappedFonts, new SpannableString(view.getText()), withStyles, withStylesFor));

library-core/src/main/java/com/mikepenz/iconics/context/IconicsFactory.java

@@ -8,6 +8,7 @@
 import android.text.TextWatcher;
 import android.util.AttributeSet;
 import android.view.View;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -49,6 +50,11 @@ void onViewCreatedInternal(View view, final Context context, AttributeSet attrs)
             }
 
             a.recycle();
+        } else if (view instanceof EditText) {
+            //handle iconics
+            new Iconics.IconicsBuilder().ctx(context).on((TextView) view).build();
+
+            //for an editText we only style initial as styling the Editable causes problems!
         } else if (view instanceof TextView) {
             //handle iconics
             new Iconics.IconicsBuilder().ctx(context).on((TextView) view).build();

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.3</string>
+    <string name="library_AndroidIconics_libraryVersion">2.5.4</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>