@nativescript-community/text 1.6.7 → 1.6.8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/text",
-    "version": "1.6.7",
+    "version": "1.6.8",
     "description": "Expands the capabilities of NativeScript's text property.",
     "main": "./index",
     "sideEffects": false,
@@ -37,5 +37,5 @@
     },
     "license": "Apache-2.0",
     "readmeFilename": "README.md",
-    "gitHead": "a387827976e3e65f981d26b12b6123d3d7d27cf1"
+    "gitHead": "0810f355bfb768beb536456d570fc36531807fcc"
 }

package/platforms/android/java/com/nativescript/text/Font.java

@@ -362,7 +362,7 @@ public class Font {
                     
         }
         if (!Double.isNaN(fontSize)) {
-            ssb.setSpan(new FontSizeSpan(context, fontSize.floatValue(), true), start, end,
+            ssb.setSpan(new FontSizeSpan(context, fontSize.floatValue(), false), start, end,
                     android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
         }
         Double relativeSize = span.optDouble("relativeSize");

package/platforms/android/java/com/nativescript/text/FontSizeSpan.java

@@ -20,6 +20,7 @@ public class FontSizeSpan extends MetricAffectingSpan {
     public FontSizeSpan(Context context, float size) {
         mContext = context;
         mSize = size;
+        mDip = false;
     }
 
     /**
@@ -43,19 +44,23 @@ public class FontSizeSpan extends MetricAffectingSpan {
     static float FONT_SIZE_FACTOR = -1.0f;
     static float SCREEN_DENSITY = -1.0f;
     private void setTextPaintSize(TextPaint ds) {
-        int flags = ds.getFlags();
-        // dont think we can cache this as it would change when display change on the phone
-        if (FONT_SIZE_FACTOR == -1) {
-            android.util.DisplayMetrics metrics = mContext.getResources().getDisplayMetrics();
-            SCREEN_DENSITY = metrics.density;
-            FONT_SIZE_FACTOR = android.util.TypedValue.applyDimension(android.util.TypedValue.COMPLEX_UNIT_SP, 1, metrics);
-        }
-        if (mDip && (flags & 2048) != 2048) {
-            // this case is for use with TextView
-            ds.setTextSize(mSize * FONT_SIZE_FACTOR);
+        if (mDip) {
+            int flags = ds.getFlags();
+            // dont think we can cache this as it would change when display change on the phone
+            if (FONT_SIZE_FACTOR == -1) {
+                android.util.DisplayMetrics metrics = mContext.getResources().getDisplayMetrics();
+                SCREEN_DENSITY = metrics.density;
+                FONT_SIZE_FACTOR = android.util.TypedValue.applyDimension(android.util.TypedValue.COMPLEX_UNIT_SP, 1, metrics);
+            }
+            if (mDip && (flags & 2048) != 2048) {
+                // this case is for use with TextView
+                ds.setTextSize(mSize * FONT_SIZE_FACTOR);
+            } else {
+                // this case is for StaticLayout drawing in canvas
+                ds.setTextSize(mSize * FONT_SIZE_FACTOR / SCREEN_DENSITY);
+            }
         } else {
-            // this case is for StaticLayout drawing in canvas
-            ds.setTextSize(mSize * FONT_SIZE_FACTOR / SCREEN_DENSITY);
+            ds.setTextSize(mSize);
         }
     }