From d39ce2bb910a5a75ac1a26043c92906b5486a766 Mon Sep 17 00:00:00 2001
From: Jacob Kapitein <jacob.kapitein@protonmail.com>
Date: Wed, 3 Aug 2022 18:24:40 +0200
Subject: [PATCH] Remove duplicate code

---
 .../keyboard/helpers/MyKeyboard.kt            | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
index 4379a7e..39fc55f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
@@ -248,12 +248,7 @@ class MyKeyboard {
         mDefaultHorizontalGap = 0
         mDefaultWidth = mDisplayWidth / 10
         mDefaultHeight = mDefaultWidth
-        mKeyboardHeightMultiplier = when (context.config.keyboardHeightMultiplier) {
-            KEYBOARD_HEIGHT_MULTIPLIER_SMALL -> 1F
-            KEYBOARD_HEIGHT_MULTIPLIER_MEDIUM -> 1.2F
-            KEYBOARD_HEIGHT_MULTIPLIER_BIG -> 1.4F
-            else -> 1F
-        }
+        mKeyboardHeightMultiplier = getKeyboardHeightMultiplier(context.config.keyboardHeightMultiplier);
         mKeys = ArrayList()
         mEnterKeyType = enterKeyType
         loadKeyboard(context, context.resources.getXml(xmlLayoutResId))
@@ -277,12 +272,7 @@ class MyKeyboard {
         row.defaultHeight = mDefaultHeight
         row.defaultWidth = keyWidth
         row.defaultHorizontalGap = mDefaultHorizontalGap
-        mKeyboardHeightMultiplier = when (context.config.keyboardHeightMultiplier) {
-            KEYBOARD_HEIGHT_MULTIPLIER_SMALL -> 1F
-            KEYBOARD_HEIGHT_MULTIPLIER_MEDIUM -> 1.2F
-            KEYBOARD_HEIGHT_MULTIPLIER_BIG -> 1.4F
-            else -> 1F
-        }
+        mKeyboardHeightMultiplier = getKeyboardHeightMultiplier(context.config.keyboardHeightMultiplier);
 
         characters.forEachIndexed { index, character ->
             val key = Key(row)
@@ -393,4 +383,13 @@ class MyKeyboard {
         mDefaultHorizontalGap = getDimensionOrFraction(a, R.styleable.MyKeyboard_horizontalGap, mDisplayWidth, 0)
         a.recycle()
     }
+
+    private fun getKeyboardHeightMultiplier(multiplierType: Int): Float {
+        return when(multiplierType) {
+            KEYBOARD_HEIGHT_MULTIPLIER_SMALL -> 1.0F
+            KEYBOARD_HEIGHT_MULTIPLIER_MEDIUM -> 1.2F
+            KEYBOARD_HEIGHT_MULTIPLIER_BIG -> 1.4F
+            else -> 1.0F
+        }
+    }
 }