Merge pull request #375 from henrikth93/henrikth93-#372

Remove Disable accent characters for menus that it's not needed on #372
scribe-org · Nov 2, 2023 · f450a0a · f450a0a
2 parents 859bf2f + ec65b37
commit f450a0a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/Keyboards/KeyboardsBase/InterfaceVariables.swift b/Keyboards/KeyboardsBase/InterfaceVariables.swift
@@ -132,6 +132,7 @@ let languagesAbbrDict = [
   "Swedish": "sv",
 ]
 
+
 /// Returns the abbreviation of the language for use in commands.
 func getControllerLanguageAbbr() -> String {
   guard let abbreviation = languagesAbbrDict[controllerLanguage] else {

diff --git a/Scribe/Components/ParentTableViewCell/ParentTableViewCell.swift b/Scribe/Components/ParentTableViewCell/ParentTableViewCell.swift
@@ -144,6 +144,21 @@ extension ParentTableViewCell: UITableViewDelegate {
 
       case .specificLang:
         if let viewController = parentViewController?.storyboard?.instantiateViewController(identifier: "TableViewTemplateViewController") as? TableViewTemplateViewController {
+          let accentKeyLanguages: [String] = ["Swedish", "German", "Spanish"]; //Languages where we can disable accent keys
+          let accentKeyOptionIndex = SettingsTableData.languageSettingsData[0].section.firstIndex(where: {s in s.sectionTitle.elementsEqual("Disable accent characters")}) ?? -1
+          if (accentKeyLanguages.firstIndex(of: section.sectionTitle) == nil && accentKeyOptionIndex != -1)
+            {
+              let accentKeySettings = SettingsTableData.languageSettingsData[0].section.remove(at: accentKeyOptionIndex )//since there are no accent keys we can remove the option.
+              print(accentKeySettings)
+            }
+          else if (accentKeyLanguages.firstIndex(of: section.sectionTitle) != nil && accentKeyOptionIndex == -1)
+          {
+              SettingsTableData.languageSettingsData[0].section.insert(Section(
+                sectionTitle: "Disable accent characters",
+                imageString: "info.circle",
+                hasToggle: true,
+                sectionState: .none(.toggleAccentCharacters)), at: 1)
+          }
           viewController.configureTable(for: SettingsTableData.languageSettingsData, parentSection: section)
 
           parentViewController?.navigationController?.pushViewController(viewController, animated: true)

diff --git a/Scribe/Components/TableViewTemplateViewController.swift b/Scribe/Components/TableViewTemplateViewController.swift
@@ -7,7 +7,7 @@ import UIKit
 class TableViewTemplateViewController: UIViewController {
   @IBOutlet var mainTable: UITableView!
 
-  var screenTitle: String = ""
+  var screenTitle: String = "" 
   var tableData: [ParentTableCellModel] = []
   var parentSection: Section?
 

diff --git a/Scribe/SettingsTab/SettingsTableData.swift b/Scribe/SettingsTab/SettingsTableData.swift
@@ -21,7 +21,7 @@ struct SettingsTableData {
       hasDynamicData: .installedKeyboards
     ),
   ]
-
+  
   static var languageSettingsData: [ParentTableCellModel] = [
     ParentTableCellModel(
       headingTitle: "Layout",
@@ -32,12 +32,12 @@ struct SettingsTableData {
           hasToggle: true,
           sectionState: .none(.toggleCommaAndPeriod)
         ),
-        Section(
+       Section(
           sectionTitle: "Disable accent characters",
           imageString: "info.circle",
           hasToggle: true,
           sectionState: .none(.toggleAccentCharacters)
-        ),
+        )
       ],
       hasDynamicData: nil
     ),
@@ -54,7 +54,7 @@ struct SettingsTableData {
       hasDynamicData: nil
     )
   ]
-
+  
   static func getInstalledKeyboardsSections() -> [Section] {
     var installedKeyboards = [String]()
 
@@ -86,3 +86,5 @@ struct SettingsTableData {
     return sections
   }
 }
+
+