#352 fix expand conditional, code formatting, remove number keys fix

Author: andrewtavis

Keyboards/KeyboardsBase/InterfaceVariables.swift

@@ -12,8 +12,8 @@ var proxy: UITextDocumentProxy!
 // MARK: Display Variables
 
 // Variables for the keyboard and its appearance.
-public var usingExpandedKeyboard = false;
 var keyboard = [[String]]()
+var usingExpandedKeyboard = false
 var allKeys = [String]()
 let specialKeys = [
   "shift", "delete", "ABC", "АБВ", "123", "#+=", "selectKeyboard", "space", "return", ".?123", "hideKeyboard",

Keyboards/KeyboardsBase/KeyboardViewController.swift

@@ -18,25 +18,32 @@ class KeyboardViewController: UIInputViewController {
   @IBOutlet var stackView2: UIStackView!
   @IBOutlet var stackView3: UIStackView!
 
-
   private var tipView: ToolTipView?
 
   /// Changes the height of `stackViewNum` depending on device type and size.
   func conditionallyShowTopNumbersRow() {
     if DeviceType.isPhone {
       view.addConstraint(
         NSLayoutConstraint(
-          item: stackViewNum!, attribute: .height, relatedBy: .equal, toItem: nil, attribute: .height, multiplier: 0, constant: 0
+          item: stackViewNum!, attribute: .height, relatedBy: .equal, toItem: nil, attribute: .height, multiplier: 1, constant: 0
         )
       )
     } else if DeviceType.isPad {
       // Update the size of the numbers row to add it to the view.
-      // let numbersRowHeight = self.scribeKey.frame.height
-      view.addConstraint(
-        NSLayoutConstraint(
-          item: stackViewNum!, attribute: .height, relatedBy: .equal, toItem: nil, attribute: .height, multiplier: 0, constant: 0
+      if usingExpandedKeyboard {
+        let numbersRowHeight = scribeKey.frame.height
+        view.addConstraint(
+          NSLayoutConstraint(
+            item: stackViewNum!, attribute: .height, relatedBy: .equal, toItem: nil, attribute: .height, multiplier: 1, constant: numbersRowHeight
+          )
         )
-      )
+      } else {
+        view.addConstraint(
+          NSLayoutConstraint(
+            item: stackViewNum!, attribute: .height, relatedBy: .equal, toItem: nil, attribute: .height, multiplier: 1, constant: 0
+          )
+        )
+      }
     }
   }
 
@@ -1545,6 +1552,15 @@ class KeyboardViewController: UIInputViewController {
       keyboardView.backgroundColor? = keyboardBgColor
       allNonSpecialKeys = allKeys.filter { !specialKeys.contains($0) }
 
+      // Check if the device has a home button and is large enough so we should use an expanded keyboard.
+      if DeviceType.isPad {
+        if UIScreen.main.bounds.width > 768 {
+          usingExpandedKeyboard = true
+        } else {
+          usingExpandedKeyboard = false
+        }
+      }
+
       linkShadowBlendElements()
       setAutoActionPartitions()
       conditionallyShowTopNumbersRow()
@@ -1592,18 +1608,6 @@ class KeyboardViewController: UIInputViewController {
       } catch {}
     }
 
-    //Check if ipad device meets the criteria for expanded keyboard
-    if DeviceType.isPad {
-      //Check if device has home button, this will be used later to determine if we should use expanded keypad or not.
-      if #available(iOS 13.0, *), (keyboardView.safeAreaInsets.bottom <= 0 && UIScreen.main.bounds.width > 768)  {
-        usingExpandedKeyboard = true;
-      }
-      else
-      {
-        usingExpandedKeyboard = false;
-      }
-    }
-
     setKeyboard()
     setCommaAndPeriodKeysConditionally()
     setCommandBackground()
@@ -1633,8 +1637,7 @@ class KeyboardViewController: UIInputViewController {
       }
     } else {
       letterKeyWidth = (UIScreen.main.bounds.width - 6) / CGFloat(letterKeys[0].count) * 0.9
-      //If we are using expanded keys the numberKeys array is empty, we use symbolKeys
-      numSymKeyWidth = (UIScreen.main.bounds.width - 6) / CGFloat(      (usingExpandedKeyboard) == true ? symbolKeys[0].count: numberKeys[0].count) * 0.9
+      numSymKeyWidth = (UIScreen.main.bounds.width - 6) / CGFloat(symbolKeys[0].count) * 0.9
     }
 
     // Derive keyboard given current states and set widths.
@@ -1673,13 +1676,17 @@ class KeyboardViewController: UIInputViewController {
       }
     }
 
-    if ![.selectVerbConjugation, .selectCaseDeclension, .displayInformation].contains(commandState) { // normal keyboard view
-      for view in [stackView0, stackView1, stackView2, stackView3] {
+    if ![
+      .selectVerbConjugation, .selectCaseDeclension, .displayInformation
+    ].contains(commandState) { // normal keyboard view
+      for view in [stackViewNum, stackView0, stackView1, stackView2, stackView3] {
         view?.isUserInteractionEnabled = true
         view?.isLayoutMarginsRelativeArrangement = true
 
         // Set edge insets for stack views to provide vertical key spacing.
-        if view == stackView0 {
+        if view == stackViewNum {
+          view?.layoutMargins = UIEdgeInsets(top: 3, left: 0, bottom: 4, right: 0)
+        } else if view == stackView0 {
           view?.layoutMargins = UIEdgeInsets(top: 3, left: 0, bottom: 8, right: 0)
         } else if view == stackView1 {
           view?.layoutMargins = UIEdgeInsets(top: 5, left: 0, bottom: 6, right: 0)
@@ -1827,13 +1834,25 @@ class KeyboardViewController: UIInputViewController {
           }
 
           keyboardKeys.append(btn)
-          switch row {
-          case 0: stackView0.addArrangedSubview(btn)
-          case 1: stackView1.addArrangedSubview(btn)
-          case 2: stackView2.addArrangedSubview(btn)
-          case 3: stackView3.addArrangedSubview(btn)
-          default:
-            break
+          if !usingExpandedKeyboard {
+            switch row {
+            case 0: stackView0.addArrangedSubview(btn)
+            case 1: stackView1.addArrangedSubview(btn)
+            case 2: stackView2.addArrangedSubview(btn)
+            case 3: stackView3.addArrangedSubview(btn)
+            default:
+              break
+            }
+          } else {
+            switch row {
+            case 0: stackViewNum.addArrangedSubview(btn)
+            case 1: stackView0.addArrangedSubview(btn)
+            case 2: stackView1.addArrangedSubview(btn)
+            case 3: stackView2.addArrangedSubview(btn)
+            case 4: stackView3.addArrangedSubview(btn)
+            default:
+              break
+            }
           }
 
           // Special key styling.
@@ -1924,7 +1943,7 @@ class KeyboardViewController: UIInputViewController {
           } else {
             widthOfSpacing = (
               (UIScreen.main.bounds.width - 6.0)
-              - (CGFloat((usingExpandedKeyboard) == true ? symbolKeys[0].count : numberKeys[0].count) * numSymKeyWidth)
+                - (CGFloat(usingExpandedKeyboard == true ? symbolKeys[0].count : numberKeys[0].count) * numSymKeyWidth)
             ) / (CGFloat(letterKeys[0].count)
               - 1.0
             )
@@ -1979,7 +1998,7 @@ class KeyboardViewController: UIInputViewController {
 
     } else {
       // Load conjugation view.
-      for view in [stackView0, stackView1, stackView2, stackView3] {
+      for view in [stackViewNum, stackView0, stackView1, stackView2, stackView3] {
         view?.isUserInteractionEnabled = false
       }
 
@@ -2031,9 +2050,9 @@ class KeyboardViewController: UIInputViewController {
     let letterKeysHaveCommaPeriod = userDefaults.bool(forKey: dictionaryKey)
 
     if letterKeysHaveCommaPeriod {
-      letterKeys[3] = ["123", "selectKeyboard", ",", "space", ".", "return"]
-    } else {
-      letterKeys[3] = ["123", "selectKeyboard", "space", "return"]
+      let spaceIndex = letterKeys[3].firstIndex(where: {$0 == "space"})
+      letterKeys[3].insert(",", at: spaceIndex!)
+      letterKeys[3].insert(".", at: spaceIndex! + 2)
     }
   }
 
@@ -2468,8 +2487,7 @@ class KeyboardViewController: UIInputViewController {
       capsLockPossible = true
 
     case "123", ".?123":
-      (usingExpandedKeyboard) == true ? changeKeyboardToSymbolKeys() : changeKeyboardToNumberKeys()
-        
+      usingExpandedKeyboard == true ? changeKeyboardToSymbolKeys() : changeKeyboardToNumberKeys()
 
     case "#+=":
       changeKeyboardToSymbolKeys()

Keyboards/LanguageKeyboards/English/ENInterfaceVariables.swift

@@ -35,21 +35,21 @@ public enum EnglishKeyboardConstants {
     ["q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "delete"],
     ["a", "s", "d", "f", "g", "h", "j", "k", "l", "return"],
     ["shift", "w", "x", "c", "v", "b", "n", "m", ",", ".", "shift"],
-    [".?123", "selectKeyboard", "space", ".?123", "hideKeyboard"], // "undo"
+    ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "undo"
   ]
 
   static let numberKeysPad = [
     ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "delete"],
     ["@", "#", "$", "&", "*", "(", ")", "'", "\"", "return"],
     ["#+=", "%", "_", "+", "=", "/", ";", ":", ",", ".", "#+="],
-    ["ABC", "selectKeyboard", "space", "ABC", "hideKeyboard"], // "undo"
+    ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "undo"
   ]
 
   static let symbolKeysPad = [
     ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "delete"],
     ["€", "£", "¥", "_", "^", "[", "]", "{", "}", "return"],
     ["123", "§", "|", "~", "...", "\\", "<", ">", "!", "?", "123"],
-    ["ABC", "selectKeyboard", "space", "ABC", "hideKeyboard"], // "undo"
+    ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "undo"
   ]
 
   // Expanded iPad keyboard layouts for wider devices.
@@ -98,21 +98,21 @@ func getENKeys() {
     rightKeyChars = ["p", "0", "\"", "=", "·"]
     centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) && !rightKeyChars.contains($0) }
   } else {
-    if (usingExpandedKeyboard)
-    {
-      letterKeys = EnglishKeyboardConstants.letterKeysPadExpanded;
-      symbolKeys = EnglishKeyboardConstants.symbolKeysPadExpanded;
-    }
-    else
-    {
+    // Use the expanded keys layout if the iPad is wide enough and has no home button.
+    if usingExpandedKeyboard {
+      letterKeys = EnglishKeyboardConstants.letterKeysPadExpanded
+      symbolKeys = EnglishKeyboardConstants.symbolKeysPadExpanded
+
+      allKeys = Array(letterKeys.joined()) + Array(symbolKeys.joined())
+    } else {
       letterKeys = EnglishKeyboardConstants.letterKeysPad
       numberKeys = EnglishKeyboardConstants.numberKeysPad
       symbolKeys = EnglishKeyboardConstants.symbolKeysPad
-    }
-    // If the iPad is too small to have a numbers row.
-    letterKeys.removeFirst(1)
 
-    allKeys = Array(letterKeys.joined()) + Array(numberKeys.joined()) + Array(symbolKeys.joined())
+      letterKeys.removeFirst(1)
+
+      allKeys = Array(letterKeys.joined()) + Array(numberKeys.joined()) + Array(symbolKeys.joined())
+    }
 
     leftKeyChars = ["q", "1"]
     // TODO: add "p" to rightKeyChar if the keyboard has 4 rows.

Keyboards/LanguageKeyboards/French/FR-AZERTYInterfaceVariables.swift

@@ -96,21 +96,21 @@ func getFRKeys() {
     rightKeyChars = ["p", "m", "0", "\"", "=", "·"]
     centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) && !rightKeyChars.contains($0) }
   } else {
-    if (usingExpandedKeyboard)
-    {
-      letterKeys = FrenchKeyboardConstants.letterKeysPadExpanded;
-      symbolKeys = FrenchKeyboardConstants.symbolKeysPadExpanded;
-    }
-    else
-    {
+    // Use the expanded keys layout if the iPad is wide enough and has no home button.
+    if usingExpandedKeyboard {
+      letterKeys = FrenchKeyboardConstants.letterKeysPadExpanded
+      symbolKeys = FrenchKeyboardConstants.symbolKeysPadExpanded
+
+      allKeys = Array(letterKeys.joined()) + Array(symbolKeys.joined())
+    } else {
       letterKeys = FrenchKeyboardConstants.letterKeysPad
       numberKeys = FrenchKeyboardConstants.numberKeysPad
       symbolKeys = FrenchKeyboardConstants.symbolKeysPad
-    }
-    // If the iPad is too small to have a numbers row.
-    letterKeys.removeFirst(1)
 
-    allKeys = Array(letterKeys.joined()) + Array(numberKeys.joined()) + Array(symbolKeys.joined())
+      letterKeys.removeFirst(1)
+
+      allKeys = Array(letterKeys.joined()) + Array(numberKeys.joined()) + Array(symbolKeys.joined())
+    }
 
     leftKeyChars = ["q", "a", "1", "@", "~"]
     // TODO: add "p" to rightKeyChar if the keyboard has 4 rows.

Keyboards/LanguageKeyboards/French/FR-QWERTYInterfaceVariables.swift

@@ -47,7 +47,7 @@ public enum FrenchQWERTYKeyboardConstants {
     ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "delete"],
     ["~", "ᵒ", "[", "]", "{", "}", "^", "$", "£", "¥", "return"],
     ["123", "§", "<", ">", "|", "\\", "...", "·", "?", "'", "123"],
-    ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "undo"
+    ["ABC", "selectKeyboard", "space", "ABC", "hideKeyboard"], // "undo"
   ]
 
   // Expanded iPad keyboard layouts for wider devices.
@@ -56,15 +56,15 @@ public enum FrenchQWERTYKeyboardConstants {
     ["indent", "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "^", "ç", ":"],
     ["uppercase", "a", "s", "d", "f", "g", "h", "j", "k", "l", ";", "è", "à", "return"],
     ["shift", "ù", "z", "x", "c", "v", "b", "n", "m", ",", ".", "é", "shift"],
-    ["selectKeyboard", ".?123", "microphone", "space", ".?123", "hideKeyboard"], // "microphone", "scribble"
+    ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "microphone", "scribble"
   ]
 
   static let symbolKeysPadExpanded = [
     ["`", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "<", ">", "delete"],
     ["indent", "[", "]", "{", "}", "#", "%", "^", "*", "+", "=", "\"", "|", "~"],
     ["uppercase", "-", "/", ":", ";", "(", ")", "$", "&", "@", "£", "¥", "~", "return"], // "undo"
     ["shift", "...", ".", ",", "?", "!", "'", "\"", "_", "€"], // "redo"
-    ["selectKeyboard", "ABC", "microphone", "space", "ABC", "hideKeyboard"], // "microphone", "scribble"
+    ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "microphone", "scribble"
   ]
 
   // Alternate key vars.
@@ -94,22 +94,21 @@ func getFRQWERTYKeys() {
     rightKeyChars = ["p", "m", "0", "\"", "=", "·"]
     centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) && !rightKeyChars.contains($0) }
   } else {
-    if (usingExpandedKeyboard)
-    {
-      letterKeys = FrenchQWERTYKeyboardConstants.letterKeysPadExpanded;
-      symbolKeys = FrenchQWERTYKeyboardConstants.symbolKeysPadExpanded;
-    }
-    else
-    {
+    // Use the expanded keys layout if the iPad is wide enough and has no home button.
+    if usingExpandedKeyboard {
+      letterKeys = FrenchQWERTYKeyboardConstants.letterKeysPadExpanded
+      symbolKeys = FrenchQWERTYKeyboardConstants.symbolKeysPadExpanded
+
+      allKeys = Array(letterKeys.joined()) + Array(symbolKeys.joined())
+    } else {
       letterKeys = FrenchQWERTYKeyboardConstants.letterKeysPad
       numberKeys = FrenchQWERTYKeyboardConstants.numberKeysPad
       symbolKeys = FrenchQWERTYKeyboardConstants.symbolKeysPad
-    }
 
-    // If the iPad is too small to have a numbers row.
-    letterKeys.removeFirst(1)
+      letterKeys.removeFirst(1)
 
-    allKeys = Array(letterKeys.joined()) + Array(numberKeys.joined()) + Array(symbolKeys.joined())
+      allKeys = Array(letterKeys.joined()) + Array(numberKeys.joined()) + Array(symbolKeys.joined())
+    }
 
     leftKeyChars = ["q", "a", "1", "@", "~"]
     rightKeyChars = []

Keyboards/LanguageKeyboards/German/DEInterfaceVariables.swift

@@ -99,22 +99,21 @@ func getDEKeys() {
     rightKeyChars = ["ü", "ä", "0", "\"", "=", "·"]
     centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) && !rightKeyChars.contains($0) }
   } else {
-    if (usingExpandedKeyboard)
-    {
-      letterKeys = GermanKeyboardConstants.letterKeysPadExpanded;
-      symbolKeys = GermanKeyboardConstants.symbolKeysPadExpanded;
-    }
-    else
-    {
+    // Use the expanded keys layout if the iPad is wide enough and has no home button.
+    if usingExpandedKeyboard {
+      letterKeys = GermanKeyboardConstants.letterKeysPadExpanded
+      symbolKeys = GermanKeyboardConstants.symbolKeysPadExpanded
+
+      allKeys = Array(letterKeys.joined()) + Array(symbolKeys.joined())
+    } else {
       letterKeys = GermanKeyboardConstants.letterKeysPad
       numberKeys = GermanKeyboardConstants.numberKeysPad
       symbolKeys = GermanKeyboardConstants.symbolKeysPad
-    }
 
-    // If the iPad is too small to have a numbers row.
-    letterKeys.removeFirst(1)
+      letterKeys.removeFirst(1)
 
-    allKeys = Array(letterKeys.joined()) + Array(numberKeys.joined()) + Array(symbolKeys.joined())
+      allKeys = Array(letterKeys.joined()) + Array(numberKeys.joined()) + Array(symbolKeys.joined())
+    }
 
     leftKeyChars = ["q", "a", "1", "\"", "$"]
     // TODO: add "ü" to rightKeyChar if the keyboard has 4 rows.