Skip to content

Commit 83eefd1

Browse files
committed
Refactor pixel conversions to utility functions
1 parent c2b8f58 commit 83eefd1

2 files changed

Lines changed: 21 additions & 4 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ public Keyboard(final Context context, final int layoutResourceId) {
9797
screenHeight = displayMetrics.heightPixels;
9898

9999
defaultKeyHeightPx =
100-
(int) (DEFAULT_KEY_HEIGHT_DP * displayMetrics.density);
100+
(int) Valuey.pxFromDp(DEFAULT_KEY_HEIGHT_DP, displayMetrics);
101101
defaultKeyBorderThicknessPx =
102-
(int) (DEFAULT_KEY_BORDER_THICKNESS_DP * displayMetrics.density);
102+
(int) Valuey.pxFromDp(DEFAULT_KEY_BORDER_THICKNESS_DP, displayMetrics);
103103
defaultKeyTextSizePx =
104-
(int) (DEFAULT_KEY_TEXT_SIZE_SP * displayMetrics.scaledDensity);
104+
(int) Valuey.pxFromSp(DEFAULT_KEY_TEXT_SIZE_SP, displayMetrics);
105105
defaultKeyPreviewMarginYPx =
106-
(int) (DEFAULT_KEY_PREVIEW_MARGIN_Y_DP * displayMetrics.density);
106+
(int) Valuey.pxFromDp(DEFAULT_KEY_PREVIEW_MARGIN_Y_DP, displayMetrics);
107107

108108
keyList = new ArrayList<>();
109109

app/src/main/java/io/github/yawnoc/utilities/Valuey.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
package io.github.yawnoc.utilities;
2222

2323
import android.content.res.TypedArray;
24+
import android.util.DisplayMetrics;
2425
import android.util.TypedValue;
2526

2627
public class Valuey {
@@ -38,6 +39,22 @@ public static float clipValueToRange(
3839
return Math.max(rangeMin, Math.min(rangeMax, value));
3940
}
4041

42+
public static float pxFromDp(
43+
final float dp,
44+
final DisplayMetrics displayMetrics
45+
)
46+
{
47+
return dp * displayMetrics.density;
48+
}
49+
50+
public static float pxFromSp(
51+
final float sp,
52+
final DisplayMetrics displayMetrics
53+
)
54+
{
55+
return sp * displayMetrics.scaledDensity;
56+
}
57+
4158
public static int getDimensionOrFraction(
4259
final TypedArray array,
4360
final int attributeIndex,

0 commit comments

Comments
 (0)