New Indonesian Keyboard

Keyboards/KeyboardsBase/InterfaceVariables.swift

@@ -145,6 +145,7 @@ let languagesAbbrDict = [
   "English": "en",
   "French": "fr",
   "German": "de",
+  "Indonesian": "id",
   "Italian": "it",
   "Norwegian": "nb",
   "Portuguese": "pt",
@@ -157,6 +158,7 @@ let languagesStringDict = [
   "English": NSLocalizedString("app._global.english", value: "English", comment: ""),
   "French": NSLocalizedString("app._global.french", value: "French", comment: ""),
   "German": NSLocalizedString("app._global.german", value: "German", comment: ""),
+  "Indonesian": NSLocalizedString("app._global.indonesian", value: "Indonesian", comment: ""),
   "Italian": NSLocalizedString("app._global.italian", value: "Italian", comment: ""),
   "Portuguese": NSLocalizedString("app._global.portuguese", value: "Portuguese", comment: ""),
   "Russian": NSLocalizedString("app._global.russian", value: "Russian", comment: ""),
@@ -196,6 +198,7 @@ let keyboardLayoutDict: [String: () -> Void] = [
   "English": setENKeyboardLayout,
   "French": setFRKeyboardLayout,
   "German": setDEKeyboardLayout,
+  "Indonesian": setIDKeyboardLayout,
   "Italian": setITKeyboardLayout,
   "Portuguese": setPTKeyboardLayout,
   "Russian": setRUKeyboardLayout,

Keyboards/KeyboardsBase/KeyboardViewController.swift

@@ -279,6 +279,12 @@ class KeyboardViewController: UIInputViewController {
     rightAutoPartition.backgroundColor = .clear
   }
 
+  // Toggles visibility of the Conjugate and Plural buttons.
+  func hideConjugateAndPluralKeys(state: Bool) {
+    conjugateKey.isHidden = state
+    pluralKey.isHidden = state
+  }
+
   // Logic to create notification tooltip.
   func createInformationStateDatasource(text: NSMutableAttributedString, backgroundColor: UIColor) -> ToolTipViewDatasource {
     let theme = ToolTipViewTheme(backgroundColor: backgroundColor, textFont: nil, textColor: keyCharColor, textAlignment: .center, cornerRadius: 10, masksToBounds: true)
@@ -643,6 +649,10 @@ class KeyboardViewController: UIInputViewController {
       deactivateBtn(btn: padEmojiKey1)
       deactivateBtn(btn: padEmojiKey2)
 
+      if controllerLanguage == "Indonesian" {
+        hideConjugateAndPluralKeys(state: false)
+      }
+
       if autoAction0Visible {
         allowUndo = false
         firstCompletionIsHighlighted = false
@@ -916,12 +926,14 @@ class KeyboardViewController: UIInputViewController {
   /// Sets up all buttons that are associated with Scribe commands.
   func setCommandBtns() {
     setBtn(btn: translateKey, color: commandKeyColor, name: "Translate", canBeCapitalized: false, isSpecial: false)
-    setBtn(btn: conjugateKey, color: commandKeyColor, name: "Conjugate", canBeCapitalized: false, isSpecial: false)
-    setBtn(btn: pluralKey, color: commandKeyColor, name: "Plural", canBeCapitalized: false, isSpecial: false)
-
     activateBtn(btn: translateKey)
-    activateBtn(btn: conjugateKey)
-    activateBtn(btn: pluralKey)
+
+    if controllerLanguage != "Indonesian" {
+      setBtn(btn: conjugateKey, color: commandKeyColor, name: "Conjugate", canBeCapitalized: false, isSpecial: false)
+      setBtn(btn: pluralKey, color: commandKeyColor, name: "Plural", canBeCapitalized: false, isSpecial: false)
+      activateBtn(btn: conjugateKey)
+      activateBtn(btn: pluralKey)
+    }
   }
 
   /// Hides all emoji dividers based on conditions determined by the keyboard state.
@@ -1210,6 +1222,7 @@ class KeyboardViewController: UIInputViewController {
   /// Sets up all buttons and labels for the conjugation view given constraints to determine the dimensions.
   func setConjugationBtns() {
     // Add swipe functionality to the conjugation and declension views.
+    guard controllerLanguage != "Indonesian" else { return }
     let swipeRight = UISwipeGestureRecognizer(target: self, action: #selector(shiftLeft))
     keyboardView.addGestureRecognizer(swipeRight)
     let swipeLeft = UISwipeGestureRecognizer(target: self, action: #selector(shiftRight))
@@ -1716,15 +1729,15 @@ class KeyboardViewController: UIInputViewController {
             (
               commandState != .translate
               && (
-                ["English", "Portuguese", "Italian"].contains(controllerLanguage)
+                ["English", "Indonesian", "Italian", "Portuguese"].contains(controllerLanguage)
                 || (
                   ["German", "Spanish", "Swedish"].contains(controllerLanguage)
                   && disableAccentCharacters
                 )
               )
             ) || (
               commandState == .translate
-              && ["en", "pt", "it"].contains(getControllerTranslateLangCode())
+              && ["en", "in", "it", "pt"].contains(getControllerTranslateLangCode())
           )) {
           leftPadding = keyWidth / 4
           addPadding(to: stackView1, width: leftPadding, key: "a")
@@ -1735,10 +1748,10 @@ class KeyboardViewController: UIInputViewController {
           && (
             (
               commandState != .translate
-              && ["English", "Portuguese", "Italian"].contains(controllerLanguage)
+              && ["English", "Indonesian", "Italian", "Portuguese"].contains(controllerLanguage)
             ) || (
               commandState == .translate
-              && ["en", "pt", "it"].contains(getControllerTranslateLangCode())
+              && ["en", "in", "it", "pt"].contains(getControllerTranslateLangCode())
           )) {
             leftPadding = keyWidth / 3
             addPadding(to: stackView1, width: leftPadding, key: "a")
@@ -1749,10 +1762,10 @@ class KeyboardViewController: UIInputViewController {
           && (
             (
               commandState != .translate
-              && ["English", "Portuguese", "Italian"].contains(controllerLanguage)
+              && ["English", "Italian", "Portuguese"].contains(controllerLanguage)
             ) || (
               commandState == .translate
-              && ["en", "pt", "it"].contains(getControllerTranslateLangCode())
+              && ["en", "it", "pt"].contains(getControllerTranslateLangCode())
           )) {
           leftPadding = keyWidth / 3
           addPadding(to: stackView1, width: leftPadding, key: "@")
@@ -1873,15 +1886,15 @@ class KeyboardViewController: UIInputViewController {
             (
               commandState != .translate
               && (
-                ["English", "Portuguese", "Italian"].contains(controllerLanguage)
+                ["English", "Indonesian", "Italian", "Portuguese"].contains(controllerLanguage)
                 || (
                   ["German", "Spanish", "Swedish"].contains(controllerLanguage)
                   && disableAccentCharacters
                 )
               )
             ) || (
               commandState == .translate
-              && ["en", "pt", "it"].contains(getControllerTranslateLangCode())
+              && ["en", "in", "it", "pt"].contains(getControllerTranslateLangCode())
           )) {
           rightPadding = keyWidth / 4
           addPadding(to: stackView1, width: rightPadding, key: "l")
@@ -2020,7 +2033,9 @@ class KeyboardViewController: UIInputViewController {
     setCommaAndPeriodKeysConditionally()
     setCommandBackground()
     setCommandBtns()
-    setConjugationBtns()
+    if controllerLanguage != "Indonesian" {
+      setConjugationBtns()
+    }
 
     // Clear annotation state if a keyboard state change dictates it.
     if !annotationState {
@@ -2131,8 +2146,12 @@ class KeyboardViewController: UIInputViewController {
 
       if commandState == .selectCommand {
         styleBtn(btn: translateKey, title: translateKeyLbl, radius: commandKeyCornerRadius)
-        styleBtn(btn: conjugateKey, title: conjugateKeyLbl, radius: commandKeyCornerRadius)
-        styleBtn(btn: pluralKey, title: pluralKeyLbl, radius: commandKeyCornerRadius)
+        if controllerLanguage == "Indonesian" {
+          hideConjugateAndPluralKeys(state: true)
+        } else {
+            styleBtn(btn: conjugateKey, title: conjugateKeyLbl, radius: commandKeyCornerRadius)
+            styleBtn(btn: pluralKey, title: pluralKeyLbl, radius: commandKeyCornerRadius)
+}
 
         scribeKey.toEscape()
         scribeKey.setFullCornerRadius()
@@ -2141,9 +2160,11 @@ class KeyboardViewController: UIInputViewController {
         commandBar.hide()
         hideAutoActionPartitions()
       } else {
-        deactivateBtn(btn: conjugateKey)
+        if controllerLanguage != "Indonesian" {
+          deactivateBtn(btn: conjugateKey)
+          deactivateBtn(btn: pluralKey)
+        }
         deactivateBtn(btn: translateKey)
-        deactivateBtn(btn: pluralKey)
 
         deactivateBtn(btn: phoneEmojiKey0)
         deactivateBtn(btn: phoneEmojiKey1)

Keyboards/KeyboardsBase/LanguageDBManager.swift

@@ -66,7 +66,11 @@ class LanguageDBManager {
       try database?.read { db in
         if let row = try Row.fetchOne(db, sql: query, arguments: args) {
           for col in outputCols {
-            outputValues.append(row[col])
+            if let stringValue = row[col] as? String {
+              outputValues.append(stringValue)
+            } else {
+              outputValues.append("")  // default to empty string if NULL or wrong type
+            }
           }
         }
       }
@@ -79,7 +83,7 @@ class LanguageDBManager {
       )
     } catch {}
 
-    if outputValues == [String]() {
+    if outputValues.isEmpty {
       // Append an empty string so that we can check for it and trigger commandState = .invalid.
       outputValues.append("")
     }

Keyboards/LanguageKeyboards/Indonesian/IDCommandVariables.swift

@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/**
+ * Variables associated with commands for the Indonesian Scribe keyboard.
+ */