v1.0.0-beta.3

Author: aMarCruz

android/build.gradle

@@ -5,19 +5,19 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 26
+    buildToolsVersion "27.0.3"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
     }

android/gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,6 @@
+#Wed Mar 28 10:38:41 CST 2018
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

android/gradle/wrapper/gradle-wrapper.properties

@@ -22,11 +22,11 @@
 
 public class RNMeasureTextModule extends ReactContextBaseJavaModule {
 
-  public static void setAssetManager(AssetManager assetManager) {
+  static void setAssetManager(AssetManager assetManager) {
     sAssetManager = assetManager;
   }
 
-  public RNMeasureTextModule(ReactApplicationContext reactContext) {
+  RNMeasureTextModule(ReactApplicationContext reactContext) {
     super(reactContext);
     setAssetManager(reactContext.getAssets());
   }
@@ -50,7 +50,7 @@ public void measure(ReadableMap options, Promise promise) {
     TextPaint textPaint = sTextPaintInstance;
     @Nullable Layout layout = null;
 
-    final boolean allowFontScaling = true;
+    //final boolean allowFontScaling = true;
     final int style = 0;
 
     // width (optional)
@@ -72,7 +72,7 @@ public void measure(ReadableMap options, Promise promise) {
     if (options.hasKey("fontFamily")) {
       fontFamily = options.getString("fontFamily");
     }
-    if (fontFamily != null && fontFamily != "") {
+    if (fontFamily != null && !fontFamily.isEmpty()) {
       Typeface typeface = getTypeface(fontFamily, style);
       textPaint.setTypeface(typeface);
     } else {
@@ -88,8 +88,6 @@ public void measure(ReadableMap options, Promise promise) {
     final boolean unconstrainedWidth = width <= 0;
     final float spacingMultiplier = 1;
     final float spacingAddition = 0;
-    final int textBreakStrategy =
-      (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) ? 0 : Layout.BREAK_STRATEGY_HIGH_QUALITY;
 
     int hintWidth = 0;
 
@@ -134,13 +132,16 @@ public void measure(ReadableMap options, Promise promise) {
             includeFontPadding
           );
         } else {
-          layout = StaticLayout.Builder.obtain(text, 0, text.length(), textPaint, hintWidth)
+          StaticLayout.Builder builder = StaticLayout.Builder.obtain(text, 0, text.length(), textPaint, hintWidth)
             .setAlignment(Layout.Alignment.ALIGN_NORMAL)
             .setLineSpacing(spacingAddition, spacingMultiplier)
             .setIncludePad(includeFontPadding)
-            .setBreakStrategy(textBreakStrategy)
-            .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)
-            .build();
+            .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL);
+
+          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            builder.setBreakStrategy(Layout.BREAK_STRATEGY_HIGH_QUALITY);
+          }
+          layout = builder.build();
         }
       }
 

android/gradlew

@@ -19,6 +19,10 @@ public List<NativeModule> createNativeModules(ReactApplicationContext reactConte
       return modules;
     }
 
+    public List<Class<? extends JavaScriptModule>> createJSModules() {
+        return null;
+    }
+
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
       return Collections.emptyList();

android/gradlew.bat

@@ -13,10 +13,10 @@ declare module "react-native-text-size" {
     height: number,
     lineCount: number,
     lastLineWidth: number,
-  }
+  };
 
   interface TextSizeStatic {
-    measure: (params: TextSizeParams) => Promise<TextSizeResult>;
+    measure(params: TextSizeParams): Promise<TextSizeResult>;
   }
 
   const TextSize: TextSizeStatic;

android/src/main/java/io/amarcruz/rnmeasuretext/RNMeasureTextModule.java

@@ -2,6 +2,8 @@ import { Dimensions, NativeModules } from 'react-native';
 
 const RNMeasureText = NativeModules.RNMeasureText;
 
+const windowDims = Dimensions.get('window')
+
 /**
  * Get width, height, lineCount, and lastLineWidth values for text.
  *
@@ -15,7 +17,7 @@ function measure (params) {
     return Promise.reject(new Error('missing required \'fontSize\' property'));
   }
 
-  const fontScale = Dimensions.get('window').fontScale || 1;
+  const fontScale = windowDims.fontScale || 1;
 
   if (fontScale !== 1) {
     params = Object.assign(

android/src/main/java/io/amarcruz/rnmeasuretext/RNMeasureTextPackage.java

@@ -1,6 +1,6 @@
 {
   "name": "react-native-text-size",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "description": "Measure text height and width without laying it out.",
   "main": "index.js",
   "types": "./index.d.ts",