Move getDimensionOrFraction to Utilities class

Author: yawnoc

app/src/main/java/io/github/yawnoc/Utilities.java

@@ -10,8 +10,10 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.res.TypedArray;
 import android.net.Uri;
 import android.provider.Settings;
+import android.util.TypedValue;
 import android.view.inputmethod.InputMethodManager;
 
 import java.util.HashMap;
@@ -41,6 +43,29 @@ public static <V, K> Map<V, K> invertMap(Map<K, V> forwardMap) {
     return inverseMap;
   }
 
+  public static int getDimensionOrFraction(
+    final TypedArray array,
+    final int attributeIndex,
+    final int baseValue,
+    final int defaultValue
+  )
+  {
+    final TypedValue value = array.peekValue(attributeIndex);
+    if (value == null) {
+      return defaultValue;
+    }
+    switch (value.type) {
+      case TypedValue.TYPE_DIMENSION:
+        return array.getDimensionPixelOffset(attributeIndex, defaultValue);
+      case TypedValue.TYPE_FRACTION:
+        return Math.round(
+          array.getFraction(attributeIndex, baseValue, baseValue, defaultValue)
+        );
+      default:
+        return defaultValue;
+    }
+  }
+  
   public static String loadPreferenceString(
     final Context context,
     final String preferenceFileName,

app/src/main/java/io/github/yawnoc/strokeinput/Key.java

@@ -25,6 +25,8 @@
 import android.content.res.XmlResourceParser;
 import android.util.Xml;
 
+import static io.github.yawnoc.Utilities.getDimensionOrFraction;
+
 /*
   An individual key.
 */
@@ -161,14 +163,14 @@ else if (valueTextShifted == null) {
       );
 
     width =
-      Keyboard.getDimensionOrFraction(
+      getDimensionOrFraction(
         attributesArray,
         R.styleable.Keyboard_keyWidth,
         grandparentKeyboard.screenWidth,
         parentRow.keyWidth
       );
     height =
-      Keyboard.getDimensionOrFraction(
+      getDimensionOrFraction(
         attributesArray,
         R.styleable.Keyboard_keyHeight,
         grandparentKeyboard.screenHeight,

app/src/main/java/io/github/yawnoc/strokeinput/Keyboard.java

@@ -27,12 +27,13 @@
 import android.graphics.Color;
 import android.util.DisplayMetrics;
 import android.util.Log;
-import android.util.TypedValue;
 import android.util.Xml;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static io.github.yawnoc.Utilities.getDimensionOrFraction;
+
 /*
   A container that holds rows of keys, to be declared in a layout XML.
 */
@@ -260,27 +261,4 @@ private void parseKeyboardAttributes(
     attributesArray.recycle();
   }
 
-  public static int getDimensionOrFraction(
-    final TypedArray array,
-    final int attributeIndex,
-    final int baseValue,
-    final int defaultValue
-  )
-  {
-    final TypedValue value = array.peekValue(attributeIndex);
-    if (value == null) {
-      return defaultValue;
-    }
-    switch (value.type) {
-      case TypedValue.TYPE_DIMENSION:
-        return array.getDimensionPixelOffset(attributeIndex, defaultValue);
-      case TypedValue.TYPE_FRACTION:
-        return Math.round(
-          array.getFraction(attributeIndex, baseValue, baseValue, defaultValue)
-        );
-      default:
-        return defaultValue;
-    }
-  }
-  
 }

app/src/main/java/io/github/yawnoc/strokeinput/Row.java

@@ -25,7 +25,7 @@
 import android.content.res.XmlResourceParser;
 import android.util.Xml;
 
-import static io.github.yawnoc.strokeinput.Keyboard.getDimensionOrFraction;
+import static io.github.yawnoc.Utilities.getDimensionOrFraction;
 
 /*
  A container that holds keys.