feat: saving user preference on emoji autosuggest based on menu

scribe-org · Jul 25, 2023 · d1ed519 · d1ed519
1 parent 60be461
commit d1ed519
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/Keyboards/KeyboardsBase/KeyboardViewController.swift b/Keyboards/KeyboardsBase/KeyboardViewController.swift
@@ -430,7 +430,9 @@ class KeyboardViewController: UIInputViewController {
         }
 
         // Disable the third auto action button if we'll have emoji suggestions.
-        getEmojiAutoSuggestions(for: currentPrefix)
+        if emojiAutosuggestIsEnabled() {
+          getEmojiAutoSuggestions(for: currentPrefix)
+        }
       } else {
         getDefaultAutosuggestions()
       }
@@ -577,7 +579,9 @@ class KeyboardViewController: UIInputViewController {
     }
 
     // Disable the third auto action button if we'll have emoji suggestions.
-    getEmojiAutoSuggestions(for: prefix)
+    if emojiAutosuggestIsEnabled() {
+      getEmojiAutoSuggestions(for: prefix)
+    }
   }
 
   /// Sets up command buttons to execute autocomplete and autosuggest.
@@ -2008,11 +2012,8 @@ class KeyboardViewController: UIInputViewController {
 
   func setCommaAndPeriodKeysConditionally() {
     let langCode = languagesAbbrDict[controllerLanguage] ?? "unknown"
-
     let userDefaults = UserDefaults(suiteName: "group.scribe.userDefaultsContainer")!
-
     let dictionaryKey = langCode + "CommaAndPeriod"
-
     let letterKeysHaveCommaPeriod = userDefaults.bool(forKey: dictionaryKey)
 
     if letterKeysHaveCommaPeriod {
@@ -2021,6 +2022,14 @@ class KeyboardViewController: UIInputViewController {
       letterKeys[3] = ["123", "selectKeyboard", "space", "return"]
     }
   }
+
+  func emojiAutosuggestIsEnabled() -> Bool {
+    let langCode = languagesAbbrDict[controllerLanguage] ?? "unknown"
+    let userDefaults = UserDefaults(suiteName: "group.scribe.userDefaultsContainer")!
+    let dictionaryKey = langCode + "EmojiAutosuggest"
+
+    return userDefaults.bool(forKey: dictionaryKey)
+  }
 
   // MARK: Button Actions
 

diff --git a/Scribe/Components/InfoChildTableViewCell/InfoChildTableViewCell.swift b/Scribe/Components/InfoChildTableViewCell/InfoChildTableViewCell.swift
@@ -52,7 +52,9 @@ class InfoChildTableViewCell: UITableViewCell {
     case .toggleCommaAndPeriod:
       let dictionaryKey = languageCode + "CommaAndPeriod"
       userDefaults.setValue(toggleSwitch.isOn, forKey: dictionaryKey)
-    case .autosuggestEmojis: break
+    case .autosuggestEmojis:
+      let dictionaryKey = languageCode + "EmojiAutosuggest"
+      userDefaults.setValue(toggleSwitch.isOn, forKey: dictionaryKey)
     case .none: break
     }
 
@@ -64,7 +66,9 @@ class InfoChildTableViewCell: UITableViewCell {
     case .toggleCommaAndPeriod:
       let dictionaryKey = languageCode + "CommaAndPeriod"
       toggleSwitch.isOn = userDefaults.bool(forKey: dictionaryKey)
-    case .autosuggestEmojis: break
+    case .autosuggestEmojis:
+      let dictionaryKey = languageCode + "EmojiAutosuggest"
+      toggleSwitch.isOn = userDefaults.bool(forKey: dictionaryKey)
     case .none: break
     }
   }