Key Text Size set to accept number not number with sp or dp

Karikari · Jul 2, 2021 · 34680d2 · 34680d2
1 parent 6026ec3
commit 34680d2
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 13 deletions.
diff --git a/app/src/main/java/com/karikari/goodpinkeypad/GoodPinKeyPad.kt b/app/src/main/java/com/karikari/goodpinkeypad/GoodPinKeyPad.kt
@@ -20,6 +20,7 @@ import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.ContextCompat
 import java.util.*
 
+
 class GoodPinKeyPad : LinearLayout {
     companion object {
         private val TAG = GoodPinKeyPad::class.java.simpleName
@@ -197,7 +198,7 @@ class GoodPinKeyPad : LinearLayout {
             errorIndicator = typedArray.getDrawable(R.styleable.GoodPinKeyPad_errorIndicator)
 
             keyTextSize =
-                typedArray.getDimension(R.styleable.GoodPinKeyPad_keyTextSize, dpToPx(0f).toFloat())
+                typedArray.getFloat(R.styleable.GoodPinKeyPad_keyTextSize, 0f)
 
             errorTextSize =
                 typedArray.getDimension(
@@ -225,7 +226,7 @@ class GoodPinKeyPad : LinearLayout {
             }
 
             if (keyTextSize != 0f) {
-                textView.textSize = keyTextSize
+                textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, keyTextSize)
             }
         }
         if (keypadBackPressIcon != null) {
@@ -475,4 +476,25 @@ class GoodPinKeyPad : LinearLayout {
         return TypedValue.applyDimension(1, valueInDp, this.resources.displayMetrics)
             .toInt()
     }
+
+    fun dpToSp(dp: Float, context: Context): Int {
+        return (dpToPxx(dp, context) / context.resources.displayMetrics.scaledDensity).toInt()
+    }
+    fun dpToPxx(dp: Float, context: Context): Int {
+        return TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_DIP,
+            dp,
+            context.resources.displayMetrics
+        )
+            .toInt()
+    }
+
+    fun spToPx(sp: Float, context: Context): Int {
+        return TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_SP,
+            sp,
+            context.resources.displayMetrics
+        )
+            .toInt()
+    }
 }
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/eeirie_black_transparent"
+    android:orientation="vertical"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
     tools:context=".MainActivity"
-    android:orientation="vertical"
-    android:background="@color/eeirie_black_transparent"
     tools:showIn="@layout/activity_main">
 
 
@@ -22,11 +21,11 @@
         app:keyBackground="@drawable/keys_white_theme_selector"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:marginTop="5dp"
+        app:marginTop="10dp"
         app:pinEntry="four"
+        app:keyTextSize="30"
         app:selectedIndicator="@drawable/black_solid_dot"
         app:textColor="#db3a34"
         tools:layout_editor_absoluteY="100dp" />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml
@@ -30,7 +30,7 @@
 
         <attr name="font" format="reference"/>
 
-        <attr name="keyTextSize" format="dimension"/>
+        <attr name="keyTextSize" format="float"/>
 
         <attr name="errorTextSize" format="dimension"/>
 

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -1,6 +1,6 @@
 <resources>
     <dimen name="fab_margin">16dp</dimen>
     <dimen name="key_size">60dp</dimen>
-    <dimen name="key_text_size">30sp</dimen>
+    <dimen name="key_text_size">35sp</dimen>
     <dimen name="key_margin">50dp</dimen>
 </resources>
diff --git a/goodpinkeypad/src/main/java/com/karikari/goodpinkeypad/GoodPinKeyPad.kt b/goodpinkeypad/src/main/java/com/karikari/goodpinkeypad/GoodPinKeyPad.kt
@@ -197,7 +197,7 @@ class GoodPinKeyPad : LinearLayout {
             errorIndicator = typedArray.getDrawable(R.styleable.GoodPinKeyPad_errorIndicator)
 
             keyTextSize =
-                typedArray.getDimension(R.styleable.GoodPinKeyPad_keyTextSize, dpToPx(0f).toFloat())
+                typedArray.getFloat(R.styleable.GoodPinKeyPad_keyTextSize, 0f)
 
             errorTextSize =
                 typedArray.getDimension(
@@ -225,7 +225,7 @@ class GoodPinKeyPad : LinearLayout {
             }
 
             if (keyTextSize != 0f) {
-                textView.textSize = keyTextSize
+                textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, keyTextSize)
             }
         }
         if (keypadBackPressIcon != null) {

diff --git a/goodpinkeypad/src/main/res/values/attr.xml b/goodpinkeypad/src/main/res/values/attr.xml
@@ -30,7 +30,7 @@
 
         <attr name="font" format="reference"/>
 
-        <attr name="keyTextSize" format="dimension"/>
+        <attr name="keyTextSize" format="float"/>
 
         <attr name="errorTextSize" format="dimension"/>