refactor: renamed isNumRow to isNumbersRow

ismailnurudeen · ismailnurudeen · commit 7bb026b2786f · 2023-04-20T11:53:56.000+01:00
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
@@ -97,7 +97,7 @@ class MyKeyboard {
 
         var parent: MyKeyboard
 
-        var isNumRow: Boolean = false
+        var isNumbersRow: Boolean = false
 
         constructor(parent: MyKeyboard) {
             this.parent = parent
@@ -109,7 +109,7 @@ class MyKeyboard {
             defaultWidth = getDimensionOrFraction(a, R.styleable.MyKeyboard_keyWidth, parent.mDisplayWidth, parent.mDefaultWidth)
             defaultHeight = (res.getDimension(R.dimen.key_height) * this.parent.mKeyboardHeightMultiplier).roundToInt()
             defaultHorizontalGap = getDimensionOrFraction(a, R.styleable.MyKeyboard_horizontalGap, parent.mDisplayWidth, parent.mDefaultHorizontalGap)
-            isNumRow = a.getBoolean(R.styleable.MyKeyboard_isNumRow, false)
+            isNumbersRow = a.getBoolean(R.styleable.MyKeyboard_isNumbersRow, false)
             a.recycle()
         }
     }
@@ -346,7 +346,7 @@ class MyKeyboard {
                     when (parser.name) {
                         TAG_ROW -> {
                             currentRow = createRowFromXml(res, parser)
-                            if (currentRow.isNumRow && !context.config.showNumbersRow) {
+                            if (currentRow.isNumbersRow && !context.config.showNumbersRow) {
                                 continue
                             }
                             inRow = true
@@ -355,7 +355,7 @@ class MyKeyboard {
                         }
 
                         TAG_KEY -> {
-                            if (currentRow?.isNumRow == true && !context.config.showNumbersRow) {
+                            if (currentRow?.isNumbersRow == true && !context.config.showNumbersRow) {
                                 continue
                             }
                             inKey = true
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
@@ -11,7 +11,7 @@
     <declare-styleable name="MyKeyboard">
         <attr name="keyWidth" format="fraction" />
         <attr name="horizontalGap" format="fraction" />
-        <attr name="isNumRow" format="boolean" />
+        <attr name="isNumbersRow" format="boolean" />
     </declare-styleable>
 
     <declare-styleable name="MyKeyboard_Key">
diff --git a/app/src/main/res/xml/keys_letters_bengali.xml b/app/src/main/res/xml/keys_letters_bengali.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
-    <Row app:isNumRow="true">
+    <Row app:isNumbersRow="true">
         <Key
             app:keyEdgeFlags="left"
             app:keyLabel="1"
diff --git a/app/src/main/res/xml/keys_letters_bulgarian.xml b/app/src/main/res/xml/keys_letters_bulgarian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
-    <Row app:isNumRow="true">
+    <Row app:isNumbersRow="true">
         <Key
             app:keyEdgeFlags="left"
             app:keyLabel="1"
diff --git a/app/src/main/res/xml/keys_letters_english_dvorak.xml b/app/src/main/res/xml/keys_letters_english_dvorak.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
-    <Row app:isNumRow="true">
+    <Row app:isNumbersRow="true">
         <Key
             app:keyEdgeFlags="left"
             app:keyLabel="1"
diff --git a/app/src/main/res/xml/keys_letters_english_qwerty.xml b/app/src/main/res/xml/keys_letters_english_qwerty.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
-    <Row app:isNumRow="true">
+    <Row app:isNumbersRow="true">
         <Key
             app:keyEdgeFlags="left"
             app:keyLabel="1"
diff --git a/app/src/main/res/xml/keys_letters_english_qwertz.xml b/app/src/main/res/xml/keys_letters_english_qwertz.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
-    <Row app:isNumRow="true">
+    <Row app:isNumbersRow="true">
         <Key
             app:keyEdgeFlags="left"
             app:keyLabel="1"
diff --git a/app/src/main/res/xml/keys_letters_french.xml b/app/src/main/res/xml/keys_letters_french.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
-    <Row app:isNumRow="true">
+    <Row app:isNumbersRow="true">
         <Key
             app:keyEdgeFlags="left"
             app:keyLabel="1"
diff --git a/app/src/main/res/xml/keys_letters_german.xml b/app/src/main/res/xml/keys_letters_german.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
-    <Row app:isNumRow="true">
+    <Row app:isNumbersRow="true">
         <Key
             app:keyEdgeFlags="left"
             app:keyLabel="1"
diff --git a/app/src/main/res/xml/keys_letters_greek.xml b/app/src/main/res/xml/keys_letters_greek.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
-    <Row app:isNumRow="true">
+    <Row app:isNumbersRow="true">
         <Key
             app:keyEdgeFlags="left"
             app:keyLabel="1"
diff --git a/app/src/main/res/xml/keys_letters_lithuanian.xml b/app/src/main/res/xml/keys_letters_lithuanian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
-    <Row app:isNumRow="true">
+    <Row app:isNumbersRow="true">
         <Key
             app:keyEdgeFlags="left"
             app:keyLabel="1"
diff --git a/app/src/main/res/xml/keys_letters_romanian.xml b/app/src/main/res/xml/keys_letters_romanian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
-    <Row app:isNumRow="true">
+    <Row app:isNumbersRow="true">
         <Key
             app:keyEdgeFlags="left"
             app:keyLabel="1"
diff --git a/app/src/main/res/xml/keys_letters_russian.xml b/app/src/main/res/xml/keys_letters_russian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
-    <Row app:isNumRow="true">
+    <Row app:isNumbersRow="true">
         <Key
             app:keyEdgeFlags="left"
             app:keyLabel="1"
diff --git a/app/src/main/res/xml/keys_letters_slovenian.xml b/app/src/main/res/xml/keys_letters_slovenian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
-    <Row app:isNumRow="true">
+    <Row app:isNumbersRow="true">
         <Key
             app:keyEdgeFlags="left"
             app:keyLabel="1"
diff --git a/app/src/main/res/xml/keys_letters_spanish_qwerty.xml b/app/src/main/res/xml/keys_letters_spanish_qwerty.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
-    <Row app:isNumRow="true">
+    <Row app:isNumbersRow="true">
         <Key
             app:keyEdgeFlags="left"
             app:keyLabel="1"
diff --git a/app/src/main/res/xml/keys_letters_turkish_q.xml b/app/src/main/res/xml/keys_letters_turkish_q.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
-    <Row app:isNumRow="true">
+    <Row app:isNumbersRow="true">
         <Key
             app:keyEdgeFlags="left"
             app:keyLabel="1"

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ class MyKeyboard {`
`97`	`97`
`98`	`98`	`var parent: MyKeyboard`
`99`	`99`
`100`		`- var isNumRow: Boolean = false`
	`100`	`+ var isNumbersRow: Boolean = false`
`101`	`101`
`102`	`102`	`constructor(parent: MyKeyboard) {`
`103`	`103`	`this.parent = parent`
`@@ -109,7 +109,7 @@ class MyKeyboard {`
`109`	`109`	`defaultWidth = getDimensionOrFraction(a, R.styleable.MyKeyboard_keyWidth, parent.mDisplayWidth, parent.mDefaultWidth)`
`110`	`110`	`defaultHeight = (res.getDimension(R.dimen.key_height) * this.parent.mKeyboardHeightMultiplier).roundToInt()`
`111`	`111`	`defaultHorizontalGap = getDimensionOrFraction(a, R.styleable.MyKeyboard_horizontalGap, parent.mDisplayWidth, parent.mDefaultHorizontalGap)`
`112`		`- isNumRow = a.getBoolean(R.styleable.MyKeyboard_isNumRow, false)`
	`112`	`+ isNumbersRow = a.getBoolean(R.styleable.MyKeyboard_isNumbersRow, false)`
`113`	`113`	`a.recycle()`
`114`	`114`	`}`
`115`	`115`	`}`
`@@ -346,7 +346,7 @@ class MyKeyboard {`
`346`	`346`	`when (parser.name) {`
`347`	`347`	`TAG_ROW -> {`
`348`	`348`	`currentRow = createRowFromXml(res, parser)`
`349`		`- if (currentRow.isNumRow && !context.config.showNumbersRow) {`
	`349`	`+ if (currentRow.isNumbersRow && !context.config.showNumbersRow) {`
`350`	`350`	`continue`
`351`	`351`	`}`
`352`	`352`	`inRow = true`
`@@ -355,7 +355,7 @@ class MyKeyboard {`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`TAG_KEY -> {`
`358`		`- if (currentRow?.isNumRow == true && !context.config.showNumbersRow) {`
	`358`	`+ if (currentRow?.isNumbersRow == true && !context.config.showNumbersRow) {`
`359`	`359`	`continue`
`360`	`360`	`}`
`361`	`361`	`inKey = true`