From 49adfd0b7ae386a4185dc60c2c96db388f499199 Mon Sep 17 00:00:00 2001 From: mostazomarc <105717367+mostazomarc@users.noreply.github.com> Date: Sun, 5 May 2024 13:05:37 +0200 Subject: [PATCH 1/3] #421 removed 'trailing_comma' from disabled rules in .swiftlint.yaml --- .swiftlint.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.swiftlint.yaml b/.swiftlint.yaml index 778bf12e..4e8a6d78 100644 --- a/.swiftlint.yaml +++ b/.swiftlint.yaml @@ -11,7 +11,6 @@ disabled_rules: - file_length - type_body_length # WARNINGS IN PROJECT CURRENTLY - - trailing_comma - todo - orphaned_doc_comment - opening_brace From 3374f9e369877a35d76e9c1c95bcee7d450b1b50 Mon Sep 17 00:00:00 2001 From: mostazomarc <105717367+mostazomarc@users.noreply.github.com> Date: Sun, 5 May 2024 13:05:48 +0200 Subject: [PATCH 2/3] #421 ran swiftlint --fix to solve 'trailing_comma' errors --- .../KeyboardsBase/InterfaceVariables.swift | 6 ++--- Keyboards/KeyboardsBase/KeyAltChars.swift | 2 +- Keyboards/KeyboardsBase/KeyboardStyling.swift | 2 +- .../KeyboardViewController.swift | 22 ++++++++--------- .../ScribeFunctionality/Annotate.swift | 6 ++--- .../ScribeFunctionality/CommandBar.swift | 2 +- .../CommandVariables.swift | 2 +- .../ScribeFunctionality/Conjugate.swift | 6 ++--- .../ScribeFunctionality/ScribeKey.swift | 4 ++-- .../Model/InformationToolTipData.swift | 8 +++---- .../Danish/DAInterfaceVariables.swift | 16 ++++++------- .../English/ENInterfaceVariables.swift | 18 +++++++------- .../French/FR-AZERTYInterfaceVariables.swift | 18 +++++++------- .../French/FR-QWERTYInterfaceVariables.swift | 16 ++++++------- .../German/DECommandVariables.swift | 2 +- .../German/DEInterfaceVariables.swift | 24 +++++++++---------- .../Hebrew/HEInterfaceVariables.swift | 16 ++++++------- .../Italian/ITInterfaceVariables.swift | 16 ++++++------- .../Norwegian/NBInterfaceVariables.swift | 16 ++++++------- .../Portuguese/PTInterfaceVariables.swift | 16 ++++++------- .../Russian/RUInterfaceVariables.swift | 16 ++++++------- .../Spanish/ESInterfaceVariables.swift | 24 +++++++++---------- .../Swedish/SVInterfaceVariables.swift | 22 ++++++++--------- Scribe/AboutTab/AboutTableData.swift | 8 +++---- Scribe/AppTexts/AppTextStyling.swift | 4 ++-- .../English/ENThirdPartyLicenses.swift | 2 +- .../English/ENWikimediaAndScribe.swift | 2 +- Scribe/InstallationTab/InstallationVC.swift | 2 +- Scribe/SettingsTab/SettingsTableData.swift | 10 ++++---- 29 files changed, 154 insertions(+), 154 deletions(-) diff --git a/Keyboards/KeyboardsBase/InterfaceVariables.swift b/Keyboards/KeyboardsBase/InterfaceVariables.swift index d70d9698..c769d03a 100644 --- a/Keyboards/KeyboardsBase/InterfaceVariables.swift +++ b/Keyboards/KeyboardsBase/InterfaceVariables.swift @@ -29,7 +29,7 @@ var keyboard = [[String]]() var usingExpandedKeyboard = false var allKeys = [String]() let specialKeys = [ - SpecialKeys.indent, SpecialKeys.capsLock, "shift", "delete", "ABC", "АБВ", "123", "#+=", "selectKeyboard", "space", "return", ".?123", "hideKeyboard", + SpecialKeys.indent, SpecialKeys.capsLock, "shift", "delete", "ABC", "АБВ", "123", "#+=", "selectKeyboard", "space", "return", ".?123", "hideKeyboard" ] var allNonSpecialKeys = [String]() var keyboardHeight: CGFloat! @@ -169,7 +169,7 @@ let languagesAbbrDict = [ "Portuguese": "pt", "Russian": "ru", "Spanish": "es", - "Swedish": "sv", + "Swedish": "sv" ] /// Returns the abbreviation of the language for use in commands. @@ -189,7 +189,7 @@ let keyboardLayoutDict: [String: () -> Void] = [ "Portuguese": setPTKeyboardLayout, "Russian": setRUKeyboardLayout, "Spanish": setESKeyboardLayout, - "Swedish": setSVKeyboardLayout, + "Swedish": setSVKeyboardLayout ] /// Sets the keyboard layout and its alternate keys. diff --git a/Keyboards/KeyboardsBase/KeyAltChars.swift b/Keyboards/KeyboardsBase/KeyAltChars.swift index 2f99b178..9f2ed63f 100644 --- a/Keyboards/KeyboardsBase/KeyAltChars.swift +++ b/Keyboards/KeyboardsBase/KeyAltChars.swift @@ -55,7 +55,7 @@ func setKeyboardAlternateKeys() { "'": apostropheAlternateKeys, "\"": quotationAlternateKeys, "=": equalSignAlternateKeys, - currencySymbol: currencySymbolAlternates, + currencySymbol: currencySymbolAlternates ] } diff --git a/Keyboards/KeyboardsBase/KeyboardStyling.swift b/Keyboards/KeyboardsBase/KeyboardStyling.swift index ab10f422..ba1cc311 100644 --- a/Keyboards/KeyboardsBase/KeyboardStyling.swift +++ b/Keyboards/KeyboardsBase/KeyboardStyling.swift @@ -56,7 +56,7 @@ var keysThatAreSlightlyLarger = [ "capslock", "capslock.fill", "arrow.forward.to.line", - "arrowtriangle.right.fill", + "arrowtriangle.right.fill" ] /// Get the icon configurations for keys if the device is an iPhone. diff --git a/Keyboards/KeyboardsBase/KeyboardViewController.swift b/Keyboards/KeyboardsBase/KeyboardViewController.swift index eb28a8a5..4ca59290 100644 --- a/Keyboards/KeyboardsBase/KeyboardViewController.swift +++ b/Keyboards/KeyboardsBase/KeyboardViewController.swift @@ -977,7 +977,7 @@ class KeyboardViewController: UIInputViewController { /// Returns all buttons for the 3x2 conjugation display. func get3x2FormDisplayButtons() -> [UIButton] { let conjugationButtons: [UIButton] = [ - formKeyFPS, formKeySPS, formKeyTPS, formKeyFPP, formKeySPP, formKeyTPP, + formKeyFPS, formKeySPS, formKeyTPS, formKeyFPP, formKeySPP, formKeyTPP ] return conjugationButtons @@ -995,7 +995,7 @@ class KeyboardViewController: UIInputViewController { /// Returns all labels for the 3x2 conjugation display. func get3x2FormDisplayLabels() -> [UIButton] { let conjugationLabels: [UIButton] = [ - formLblFPS, formLblSPS, formLblTPS, formLblFPP, formLblSPP, formLblTPP, + formLblFPS, formLblSPS, formLblTPS, formLblFPP, formLblSPP, formLblTPP ] return conjugationLabels @@ -1032,7 +1032,7 @@ class KeyboardViewController: UIInputViewController { /// Returns all buttons for the 3x1 conjugation display func get3x1FormDisplayButtons() -> [UIButton] { let conjugationButtons: [UIButton] = [ - formKeyTop, formKeyMiddle, formKeyBottom, + formKeyTop, formKeyMiddle, formKeyBottom ] return conjugationButtons @@ -1045,7 +1045,7 @@ class KeyboardViewController: UIInputViewController { /// Returns all labels for the 3x1 conjugation display. func get3x1FormDisplayLabels() -> [UIButton] { let conjugationLabels: [UIButton] = [ - formLblTop, formLblMiddle, formLblBottom, + formLblTop, formLblMiddle, formLblBottom ] return conjugationLabels @@ -1080,7 +1080,7 @@ class KeyboardViewController: UIInputViewController { /// Returns all buttons for the 2x2 conjugation display func get2x2FormDisplayButtons() -> [UIButton] { let conjugationButtons: [UIButton] = [ - formKeyTL, formKeyTR, formKeyBL, formKeyBR, + formKeyTL, formKeyTR, formKeyBL, formKeyBR ] return conjugationButtons @@ -1094,7 +1094,7 @@ class KeyboardViewController: UIInputViewController { /// Returns all labels for the 2x2 conjugation display. func get2x2FormDisplayLabels() -> [UIButton] { let conjugationLabels: [UIButton] = [ - formLblTL, formLblTR, formLblBL, formLblBR, + formLblTL, formLblTR, formLblBL, formLblBR ] return conjugationLabels @@ -1129,7 +1129,7 @@ class KeyboardViewController: UIInputViewController { /// Returns all buttons for the 1x2 conjugation display func get1x2FormDisplayButtons() -> [UIButton] { let conjugationButtons: [UIButton] = [ - formKeyLeft, formKeyRight, + formKeyLeft, formKeyRight ] return conjugationButtons @@ -1141,7 +1141,7 @@ class KeyboardViewController: UIInputViewController { /// Returns all labels for the 1x2 conjugation display. func get1x2FormDisplayLabels() -> [UIButton] { let conjugationLabels: [UIButton] = [ - formLblLeft, formLblRight, + formLblLeft, formLblRight ] return conjugationLabels @@ -1172,7 +1172,7 @@ class KeyboardViewController: UIInputViewController { /// Returns all buttons for the 1x1 conjugation display func get1x1FormDisplayButtons() -> [UIButton] { let conjugationButtons: [UIButton] = [ - formKeySingle, + formKeySingle ] return conjugationButtons @@ -1183,7 +1183,7 @@ class KeyboardViewController: UIInputViewController { /// Returns all labels for the 1x1 conjugation display. func get1x1FormDisplayLabels() -> [UIButton] { let conjugationLabels: [UIButton] = [ - formLblSingle, + formLblSingle ] return conjugationLabels @@ -1253,7 +1253,7 @@ class KeyboardViewController: UIInputViewController { && [ .accusativeDefinite, .accusativeIndefinite, .accusativeDemonstrative, .dativeDefinite, .dativeIndefinite, .dativeDemonstrative, - .genitiveDefinite, .genitiveIndefinite, .genitiveDemonstrative, + .genitiveDefinite, .genitiveIndefinite, .genitiveDemonstrative ].contains(deCaseDeclensionState) { formsDisplayDimensions = .view2x2 diff --git a/Keyboards/KeyboardsBase/ScribeFunctionality/Annotate.swift b/Keyboards/KeyboardsBase/ScribeFunctionality/Annotate.swift index 11757035..7575d3c6 100644 --- a/Keyboards/KeyboardsBase/ScribeFunctionality/Annotate.swift +++ b/Keyboards/KeyboardsBase/ScribeFunctionality/Annotate.swift @@ -30,19 +30,19 @@ var nounFormToColorDict = [ "Ж": annotateRed, "М": annotateBlue, "Н": annotateGreen, - "МН": annotateOrange, + "МН": annotateOrange ] // Dictionary to convert noun annotations into the keyboard language. let nounAnnotationConversionDict = [ "Swedish": ["C": "U"], - "Russian": ["F": "Ж", "M": "М", "N": "Н", "PL": "МН"], + "Russian": ["F": "Ж", "M": "М", "N": "Н", "PL": "МН"] ] // Dictionary to convert case annotations into the keyboard language. let prepAnnotationConversionDict = [ "German": ["Acc": "Akk"], - "Russian": ["Acc": "Вин", "Dat": "Дат", "Gen": "Род", "Loc": "Мес", "Pre": "Пре", "Ins": "Инс"], + "Russian": ["Acc": "Вин", "Dat": "Дат", "Gen": "Род", "Loc": "Мес", "Pre": "Пре", "Ins": "Инс"] ] /// The base function for annotation that's accessed by `selectedWordAnnotation` and `typedWordAnnotation`. diff --git a/Keyboards/KeyboardsBase/ScribeFunctionality/CommandBar.swift b/Keyboards/KeyboardsBase/ScribeFunctionality/CommandBar.swift index bc6faa8f..df0cae0d 100644 --- a/Keyboards/KeyboardsBase/ScribeFunctionality/CommandBar.swift +++ b/Keyboards/KeyboardsBase/ScribeFunctionality/CommandBar.swift @@ -96,7 +96,7 @@ class CommandBar: UILabel { infoButton.heightAnchor.constraint(equalTo: heightAnchor), infoButton.widthAnchor.constraint(equalTo: heightAnchor), infoButton.centerYAnchor.constraint(equalTo: centerYAnchor), - infoButton.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -8), + infoButton.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -8) ]) } diff --git a/Keyboards/KeyboardsBase/ScribeFunctionality/CommandVariables.swift b/Keyboards/KeyboardsBase/ScribeFunctionality/CommandVariables.swift index 5f0f248d..983f7d01 100644 --- a/Keyboards/KeyboardsBase/ScribeFunctionality/CommandVariables.swift +++ b/Keyboards/KeyboardsBase/ScribeFunctionality/CommandVariables.swift @@ -163,7 +163,7 @@ var formLabelsDict = [ "BR": "", "Left": "", "Right": "", - "Single": "", + "Single": "" ] var verbToConjugate = "" diff --git a/Keyboards/KeyboardsBase/ScribeFunctionality/Conjugate.swift b/Keyboards/KeyboardsBase/ScribeFunctionality/Conjugate.swift index f1e6782b..14a85996 100644 --- a/Keyboards/KeyboardsBase/ScribeFunctionality/Conjugate.swift +++ b/Keyboards/KeyboardsBase/ScribeFunctionality/Conjugate.swift @@ -27,7 +27,7 @@ let keyboardConjTitleDict: [String: Any] = [ "Portuguese": ptGetConjugationTitle, "Russian": ruGetConjugationTitle, "Spanish": esGetConjugationTitle, - "Swedish": svGetConjugationTitle, + "Swedish": svGetConjugationTitle ] // Dictionary for accessing keyboard conjugation state. @@ -38,7 +38,7 @@ let keyboardConjStateDict: [String: Any] = [ "Portuguese": ptGetConjugationState, "Russian": ruGetConjugationState, "Spanish": esGetConjugationState, - "Swedish": svGetConjugationState, + "Swedish": svGetConjugationState ] // Dictionary for accessing keyboard conjugation state. @@ -49,7 +49,7 @@ let keyboardConjLabelDict: [String: Any] = [ "Portuguese": ptSetConjugationLabels, "Russian": ruSetConjugationLabels, "Spanish": esSetConjugationLabels, - "Swedish": svSetConjugationLabels, + "Swedish": svSetConjugationLabels ] /// Returns a declension once a user presses a key in the conjugateView. diff --git a/Keyboards/KeyboardsBase/ScribeFunctionality/ScribeKey.swift b/Keyboards/KeyboardsBase/ScribeFunctionality/ScribeKey.swift index b50a4c20..e6b62f52 100644 --- a/Keyboards/KeyboardsBase/ScribeFunctionality/ScribeKey.swift +++ b/Keyboards/KeyboardsBase/ScribeFunctionality/ScribeKey.swift @@ -78,7 +78,7 @@ class ScribeKey: UIButton { func setFullCornerRadius() { layer.borderColor = UIColor.clear.cgColor // border is set by the shadow layer.maskedCorners = [ - .layerMinXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMinYCorner, .layerMaxXMaxYCorner, + .layerMinXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMinYCorner, .layerMaxXMaxYCorner ] } @@ -102,7 +102,7 @@ class ScribeKey: UIButton { shadow.backgroundColor = specialKeyColor shadow.layer.cornerRadius = commandKeyCornerRadius shadow.layer.maskedCorners = [ - .layerMinXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMinYCorner, .layerMaxXMaxYCorner, + .layerMinXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMinYCorner, .layerMaxXMaxYCorner ] shadow.clipsToBounds = true shadow.layer.masksToBounds = false diff --git a/Keyboards/KeyboardsBase/ToolTip/Model/InformationToolTipData.swift b/Keyboards/KeyboardsBase/ToolTip/Model/InformationToolTipData.swift index 8baabe10..b4d0ef2e 100644 --- a/Keyboards/KeyboardsBase/ToolTip/Model/InformationToolTipData.swift +++ b/Keyboards/KeyboardsBase/ToolTip/Model/InformationToolTipData.swift @@ -26,7 +26,7 @@ enum InformationToolTipData { attributes: [ NSAttributedString.Key.font: UIFont.systemFont( ofSize: DeviceType.isPhone ? letterKeyWidth / 2 : letterKeyWidth / 2.5 - ), + ) ] ) @@ -35,7 +35,7 @@ enum InformationToolTipData { attributes: [ NSAttributedString.Key.font: UIFont.systemFont( ofSize: DeviceType.isPhone ? letterKeyWidth / 2 : letterKeyWidth / 2.5 - ), + ) ] ) @@ -44,7 +44,7 @@ enum InformationToolTipData { attributes: [ NSAttributedString.Key.font: UIFont.systemFont( ofSize: DeviceType.isPhone ? letterKeyWidth / 2 : letterKeyWidth / 2.75 - ), + ) ] ) @@ -52,7 +52,7 @@ enum InformationToolTipData { [ InformationToolTipData.wikiDataExplanation, InformationToolTipData.wikiDataContationOrigin, - InformationToolTipData.howToContribute, + InformationToolTipData.howToContribute ] } } diff --git a/Keyboards/LanguageKeyboards/Danish/DAInterfaceVariables.swift b/Keyboards/LanguageKeyboards/Danish/DAInterfaceVariables.swift index 91d3c21c..56406753 100644 --- a/Keyboards/LanguageKeyboards/Danish/DAInterfaceVariables.swift +++ b/Keyboards/LanguageKeyboards/Danish/DAInterfaceVariables.swift @@ -25,21 +25,21 @@ public enum DanishKeyboardConstants { ["q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "å"], ["a", "s", "d", "f", "g", "h", "j", "k", "l", "æ", "ø"], ["shift", "z", "x", "c", "v", "b", "n", "m", "delete"], - ["123", "selectKeyboard", "space", "return"], // "undo" + ["123", "selectKeyboard", "space", "return"] // "undo" ] static let numberKeysPhone = [ ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"], ["-", "/", ":", ";", "(", ")", "€", "&", "@", "\""], ["#+=", ".", ",", "?", "!", "'", "delete"], - ["ABC", "selectKeyboard", "space", "return"], // "undo" + ["ABC", "selectKeyboard", "space", "return"] // "undo" ] static let symbolKeysPhone = [ ["[", "]", "{", "}", "#", "%", "^", "*", "+", "="], ["_", "\\", "|", "~", "<", ">", "€", "£", "¥", "·"], ["123", ".", ",", "?", "!", "'", "delete"], - ["ABC", "selectKeyboard", "space", "return"], // "undo" + ["ABC", "selectKeyboard", "space", "return"] // "undo" ] // iPad keyboard layouts. @@ -48,21 +48,21 @@ public enum DanishKeyboardConstants { ["q", "w", "e", "r", "t", "y", "u", "i", "o", "æ", "ø", "delete"], ["a", "s", "d", "f", "g", "h", "j", "k", "l", "ö", "ä", "return"], ["shift", "z", "x", "c", "v", "b", "n", "m", ",", ".", "-", "shift"], - ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "undo" + ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"] // "undo" ] static let numberKeysPad = [ ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "`", "delete"], ["@", "#", "kr", "&", "*", "(", ")", "'", "\"", "+", "·", "return"], ["#+=", "%", "_", "-", "=", "/", ";", ":", ",", ".", "?", "#+="], - ["selectKeyboard", "ABC", "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"], - ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "undo" + ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "undo" ] // Expanded iPad keyboard layouts for wider devices. @@ -71,7 +71,7 @@ public enum DanishKeyboardConstants { [SpecialKeys.indent, "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "å", "@", "¨"], [SpecialKeys.capsLock, "a", "s", "d", "f", "g", "h", "j", "k", "l", "æ", "ø", "'", "return"], ["shift", "*", "z", "x", "c", "v", "b", "n", "m", ",", ".", "-", "shift"], - ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"] // "microphone", "scribble" ] static let symbolKeysPadExpanded = [ @@ -79,7 +79,7 @@ public enum DanishKeyboardConstants { [SpecialKeys.indent, "[", "]", "{", "}", "#", "%", "^", "*", "+", "=", "\"", "|", "—"], [SpecialKeys.capsLock, "°", "/", ":", ";", "(", ")", "$", "&", "@", "£", "¥", "~", "return"], // "undo" ["shift", "…", "?", "!", "≠", "'", "\"", "_", "€", ",", ".", "-", "shift"], // "redo" - ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "microphone", "scribble" ] // Alternate key vars. diff --git a/Keyboards/LanguageKeyboards/English/ENInterfaceVariables.swift b/Keyboards/LanguageKeyboards/English/ENInterfaceVariables.swift index b4b9c286..98cd9339 100644 --- a/Keyboards/LanguageKeyboards/English/ENInterfaceVariables.swift +++ b/Keyboards/LanguageKeyboards/English/ENInterfaceVariables.swift @@ -25,21 +25,21 @@ public enum EnglishKeyboardConstants { ["q", "w", "e", "r", "t", "y", "u", "i", "o", "p"], ["a", "s", "d", "f", "g", "h", "j", "k", "l"], ["shift", "z", "x", "c", "v", "b", "n", "m", "delete"], - ["123", "selectKeyboard", "space", "return"], // "undo" + ["123", "selectKeyboard", "space", "return"] // "undo" ] static let numberKeysPhone = [ ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"], ["-", "/", ":", ";", "(", ")", "$", "&", "@", "\""], ["#+=", ".", ",", "?", "!", "'", "delete"], - ["ABC", "selectKeyboard", "space", "return"], // "undo" + ["ABC", "selectKeyboard", "space", "return"] // "undo" ] static let symbolKeysPhone = [ ["[", "]", "{", "}", "#", "%", "^", "*", "+", "="], ["_", "\\", "|", "~", "<", ">", "€", "£", "¥", "·"], ["123", ".", ",", "?", "!", "'", "delete"], - ["ABC", "selectKeyboard", "space", "return"], // "undo" + ["ABC", "selectKeyboard", "space", "return"] // "undo" ] // iPad keyboard layouts. @@ -48,21 +48,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"], - ["selectKeyboard", ".?123", "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"], ["#+=", "%", "_", "+", "=", "/", ";", ":", ",", ".", "#+="], - ["selectKeyboard", "ABC", "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"], - ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "undo" + ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "undo" ] // Expanded iPad keyboard layouts for wider devices. @@ -71,7 +71,7 @@ public enum EnglishKeyboardConstants { [SpecialKeys.indent, "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "[", "]", "\\"], [SpecialKeys.capsLock, "a", "s", "d", "f", "g", "h", "j", "k", "l", ":", ";", "'", "return"], ["shift", "-", "z", "x", "c", "v", "b", "n", "m", ",", ".", "/", "shift"], - ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"] // "microphone", "scribble" ] static let symbolKeysPadExpanded = [ @@ -79,7 +79,7 @@ public enum EnglishKeyboardConstants { [SpecialKeys.indent, "[", "]", "{", "}", "#", "%", "^", "*", "+", "=", "—", "~", "°"], [SpecialKeys.capsLock, "-", "\\", ":", ";", "(", ")", "&", "@", "$", "£", "¥", "€", "return"], // "undo" ["shift", "…", "?", "!", "≠", "'", "\"", "|", "_", ".", ",", "/", "shift"], // "redo" - ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "microphone", "scribble" ] // Alternate key vars. @@ -166,7 +166,7 @@ func setENKeyboardLayout() { "she": "presTPS", "it": "presTPS", "we": "presFPP", - "they": "presTPP", + "they": "presTPP" ] translateKeyLbl = "Translate" diff --git a/Keyboards/LanguageKeyboards/French/FR-AZERTYInterfaceVariables.swift b/Keyboards/LanguageKeyboards/French/FR-AZERTYInterfaceVariables.swift index eff82cd8..b27791ab 100644 --- a/Keyboards/LanguageKeyboards/French/FR-AZERTYInterfaceVariables.swift +++ b/Keyboards/LanguageKeyboards/French/FR-AZERTYInterfaceVariables.swift @@ -25,21 +25,21 @@ public enum FrenchKeyboardConstants { ["a", "z", "e", "r", "t", "y", "u", "i", "o", "p"], ["q", "s", "d", "f", "g", "h", "j", "k", "l", "m"], ["shift", "w", "x", "c", "v", "b", "n", "´", "delete"], - ["123", "selectKeyboard", "space", "return"], // "undo" + ["123", "selectKeyboard", "space", "return"] // "undo" ] static let numberKeysPhone = [ ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"], ["-", "/", ":", ";", "(", ")", "€", "&", "@", "\""], ["#+=", ".", ",", "?", "!", "'", "delete"], - ["ABC", "selectKeyboard", "space", "return"], // "undo" + ["ABC", "selectKeyboard", "space", "return"] // "undo" ] static let symbolKeysPhone = [ ["[", "]", "{", "}", "#", "%", "^", "*", "+", "="], ["_", "\\", "|", "~", "<", ">", "$", "£", "¥", "·"], ["123", ".", ",", "?", "!", "'", "delete"], - ["ABC", "selectKeyboard", "space", "return"], // "undo" + ["ABC", "selectKeyboard", "space", "return"] // "undo" ] // iPad keyboard layouts. @@ -48,21 +48,21 @@ public enum FrenchKeyboardConstants { ["a", "z", "e", "r", "t", "y", "u", "i", "o", "p", "delete"], ["q", "s", "d", "f", "g", "h", "j", "k", "l", "m", "return"], ["shift", "w", "x", "c", "v", "b", "n", "´", ",", ".", "shift"], - ["selectKeyboard", ".?123", "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"], ["#+=", "%", "_", "+", "=", "/", ";", ":", ",", ".", "#+="], - ["selectKeyboard", "ABC", "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"], - ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "undo" + ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "undo" ] // Expanded iPad keyboard layouts for wider devices. @@ -71,7 +71,7 @@ public enum FrenchKeyboardConstants { [SpecialKeys.indent, "a", "z", "e", "r", "t", "y", "u", "i", "o", "p", "^", "+", "*"], [SpecialKeys.capsLock, "q", "s", "d", "f", "g", "h", "j", "k", "l", "m", "ù", "#", "return"], ["shift", "/", "w", "x", "c", "v", "b", "n", ":", "-", ",", ".", "shift"], - ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"] // "microphone", "scribble" ] static let symbolKeysPadExpanded = [ @@ -79,7 +79,7 @@ public enum FrenchKeyboardConstants { [SpecialKeys.indent, "\"", "|", "§", "[", "]", "{", "}", "-", "%", "=", "^", "+", "*"], [SpecialKeys.capsLock, "/", "…", "_", "(", ")", "&", "$", "£", "¥", "€", "@", "#", "return"], // "undo" ["shift", "'", "?", "!", "~", "≠", "°", ";", ":", "-", ",", ".", "shift"], // "redo" - ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "microphone", "scribble" ] // Alternate key vars. @@ -165,7 +165,7 @@ func setFRKeyboardLayout() { "nous": "presFPP", "vous": "presSPP", "ils": "presTPP", - "elles": "presTPP", + "elles": "presTPP" ] translateKeyLbl = "Traduire" diff --git a/Keyboards/LanguageKeyboards/French/FR-QWERTYInterfaceVariables.swift b/Keyboards/LanguageKeyboards/French/FR-QWERTYInterfaceVariables.swift index 5e7aa7a4..9e6d4fbe 100644 --- a/Keyboards/LanguageKeyboards/French/FR-QWERTYInterfaceVariables.swift +++ b/Keyboards/LanguageKeyboards/French/FR-QWERTYInterfaceVariables.swift @@ -23,21 +23,21 @@ public enum FrenchQWERTYKeyboardConstants { ["q", "w", "e", "r", "t", "y", "u", "i", "o", "p"], ["a", "s", "d", "f", "g", "h", "j", "k", "l", "´"], ["shift", "z", "x", "c", "v", "b", "n", "m", "delete"], - ["123", "selectKeyboard", "space", "return"], // "undo" + ["123", "selectKeyboard", "space", "return"] // "undo" ] static let numberKeysPhone = [ ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"], ["-", "/", ":", ";", "(", ")", "$", "&", "@", "\""], ["#+=", ".", ",", "?", "!", "'", "delete"], - ["ABC", "selectKeyboard", "space", "return"], // "undo" + ["ABC", "selectKeyboard", "space", "return"] // "undo" ] static let symbolKeysPhone = [ ["[", "]", "{", "}", "#", "%", "^", "*", "+", "="], ["_", "\\", "|", "~", "<", ">", "€", "£", "¥", "·"], ["123", ".", ",", "?", "!", "'", "delete"], - ["ABC", "selectKeyboard", "space", "return"], // "undo" + ["ABC", "selectKeyboard", "space", "return"] // "undo" ] // iPad keyboard layouts. @@ -46,21 +46,21 @@ public enum FrenchQWERTYKeyboardConstants { ["a", "z", "e", "r", "t", "y", "u", "i", "o", "p", "delete"], ["q", "s", "d", "f", "g", "h", "j", "k", "l", "m", "return"], ["shift", "w", "x", "c", "v", "b", "n", "´", ",", ".", "shift"], - ["selectKeyboard", ".?123", "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"], ["#+=", "%", "_", "+", "=", "/", ";", ":", ",", ".", "#+="], - ["selectKeyboard", "ABC", "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" + ["ABC", "selectKeyboard", "space", "ABC", "hideKeyboard"] // "undo" ] // Expanded iPad keyboard layouts for wider devices. @@ -69,7 +69,7 @@ public enum FrenchQWERTYKeyboardConstants { [SpecialKeys.indent, "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "^", "ç", ":"], [SpecialKeys.capsLock, "a", "s", "d", "f", "g", "h", "j", "k", "l", ";", "è", "à", "return"], ["shift", "ù", "z", "x", "c", "v", "b", "n", "m", ",", ".", "é", "shift"], - ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"] // "microphone", "scribble" ] static let symbolKeysPadExpanded = [ @@ -77,7 +77,7 @@ public enum FrenchQWERTYKeyboardConstants { [SpecialKeys.indent, "[", "]", "{", "}", "#", "%", "^", "*", "+", "=", "\"", "|", "~"], [SpecialKeys.capsLock, "-", "/", ":", ";", "(", ")", "$", "&", "@", "£", "¥", "~", "return"], // "undo" ["shift", "…", "?", "!", "≠", "°", "'", "\"", "_", ",", ".", "€", "shift"], // "redo" - ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "microphone", "scribble" ] // Alternate key vars. diff --git a/Keyboards/LanguageKeyboards/German/DECommandVariables.swift b/Keyboards/LanguageKeyboards/German/DECommandVariables.swift index 6104290a..37e27179 100644 --- a/Keyboards/LanguageKeyboards/German/DECommandVariables.swift +++ b/Keyboards/LanguageKeyboards/German/DECommandVariables.swift @@ -40,7 +40,7 @@ func deSetCaseDeclensionLabels() { if [ .accusativeDefinite, .accusativeIndefinite, .accusativeDemonstrative, .dativeDefinite, .dativeIndefinite, .dativeDemonstrative, - .genitiveDefinite, .genitiveIndefinite, .genitiveDemonstrative, + .genitiveDefinite, .genitiveIndefinite, .genitiveDemonstrative ].contains(deCaseDeclensionState) { formLabelsDict["TL"] = "M" formLabelsDict["TR"] = "F" diff --git a/Keyboards/LanguageKeyboards/German/DEInterfaceVariables.swift b/Keyboards/LanguageKeyboards/German/DEInterfaceVariables.swift index 8345734b..a409b166 100644 --- a/Keyboards/LanguageKeyboards/German/DEInterfaceVariables.swift +++ b/Keyboards/LanguageKeyboards/German/DEInterfaceVariables.swift @@ -25,28 +25,28 @@ public enum GermanKeyboardConstants { ["q", "w", "e", "r", "t", "z", "u", "i", "o", "p", "ü"], ["a", "s", "d", "f", "g", "h", "j", "k", "l", "ö", "ä"], ["shift", "y", "x", "c", "v", "b", "n", "m", "delete"], - ["123", "selectKeyboard", "space", "return"], // "undo" + ["123", "selectKeyboard", "space", "return"] // "undo" ] static let letterKeysPhoneDisableAccents = [ ["q", "w", "e", "r", "t", "z", "u", "i", "o", "p"], ["a", "s", "d", "f", "g", "h", "j", "k", "l"], ["shift", "y", "x", "c", "v", "b", "n", "m", "delete"], - ["123", "selectKeyboard", "space", "return"], // "undo" + ["123", "selectKeyboard", "space", "return"] // "undo" ] static let numberKeysPhone = [ ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"], ["-", "/", ":", ";", "(", ")", "€", "&", "@", "\""], ["#+=", ".", ",", "?", "!", "'", "delete"], - ["ABC", "selectKeyboard", "space", "return"], // "undo" + ["ABC", "selectKeyboard", "space", "return"] // "undo" ] static let symbolKeysPhone = [ ["[", "]", "{", "}", "#", "%", "^", "*", "+", "="], ["_", "\\", "|", "~", "<", ">", "$", "£", "¥", "·"], ["123", ".", ",", "?", "!", "'", "delete"], - ["ABC", "selectKeyboard", "space", "return"], // "undo" + ["ABC", "selectKeyboard", "space", "return"] // "undo" ] // iPad keyboard layouts. @@ -55,7 +55,7 @@ public enum GermanKeyboardConstants { ["q", "w", "e", "r", "t", "z", "u", "i", "o", "p", "ü", "delete"], ["a", "s", "d", "f", "g", "h", "j", "k", "l", "ö", "ä", "return"], ["shift", "y", "x", "c", "v", "b", "n", "m", ",", ".", "ß", "shift"], - ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "undo" + ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"] // "undo" ] static let letterKeysPadDisableAccents = [ @@ -63,21 +63,21 @@ public enum GermanKeyboardConstants { ["q", "w", "e", "r", "t", "z", "u", "i", "o", "p", "delete"], ["a", "s", "d", "f", "g", "h", "j", "k", "l", "return"], ["shift", "y", "x", "c", "v", "b", "n", "m", ",", ".", "ß", "shift"], - ["selectKeyboard", ".?123", "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"], ["#+=", "—", "`", "'", "...", "@", ";", ":", ",", ".", "-", "#+="], - ["selectKeyboard", "ABC", "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"], - ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "undo" + ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "undo" ] // Expanded iPad keyboard layouts for wider devices. @@ -86,7 +86,7 @@ public enum GermanKeyboardConstants { [SpecialKeys.indent, "q", "w", "e", "r", "t", "z", "u", "i", "o", "p", "ü", "+", "*"], [SpecialKeys.capsLock, "a", "s", "d", "f", "g", "h", "j", "k", "l", "ö", "ä", "#", "return"], ["shift", "'", "y", "x", "c", "v", "b", "n", "m", "-", ",", ".", "shift"], - ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"] // "microphone", "scribble" ] static let letterKeysPadExpandedDisableAccents = [ @@ -94,7 +94,7 @@ public enum GermanKeyboardConstants { [SpecialKeys.indent, "q", "w", "e", "r", "t", "z", "u", "i", "o", "p", "=", "+", "*"], [SpecialKeys.capsLock, "a", "s", "d", "f", "g", "h", "j", "k", "l", "/", "@", "#", "return"], ["shift", "'", "y", "x", "c", "v", "b", "n", "m", "-", ",", ".", "shift"], - ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"] // "microphone", "scribble" ] static let symbolKeysPadExpanded = [ @@ -102,7 +102,7 @@ public enum GermanKeyboardConstants { [SpecialKeys.indent, "\"", "|", "§", "[", "]", "{", "}", "—", "%", "^", "=", "+", "*"], [SpecialKeys.capsLock, ":", ";", "(", ")", "&", "$", "£", "¥", "€", "/", "@", "#", "return"], // "undo" ["shift", "'", "?", "!", "~", "≠", "°", "…", "_", "-", ",", ".", "shift"], // "redo" - ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "microphone", "scribble" ] // Alternate key vars. @@ -221,7 +221,7 @@ func setDEKeyboardLayout() { "es": "presTPS", "wir": "presFPP", "ihr": "presSPP", - "Sie": "presTPP", + "Sie": "presTPP" ] translateKeyLbl = "Übersetzen" diff --git a/Keyboards/LanguageKeyboards/Hebrew/HEInterfaceVariables.swift b/Keyboards/LanguageKeyboards/Hebrew/HEInterfaceVariables.swift index 98dba7f5..a05915c7 100644 --- a/Keyboards/LanguageKeyboards/Hebrew/HEInterfaceVariables.swift +++ b/Keyboards/LanguageKeyboards/Hebrew/HEInterfaceVariables.swift @@ -25,21 +25,21 @@ public enum HebrewKeyboardConstants { ["פ", "ם", "ן", "ו", "ט", "א", "ר", "ק", "delete"], ["ף", "ך", "ל", "ח", "י", "ע", "כ", "ג", "ד", "ש"], ["ץ", "ת", "צ", "מ", "נ", "ה", "ב", "ס", "ז"], - ["123", "selectKeyboard", "space", "return"], // "undo", "accent" + ["123", "selectKeyboard", "space", "return"] // "undo", "accent" ] static let numberKeysPhone = [ ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"], ["-", "/", ":", ";", "(", ")", "$", "&", "@", "\""], ["#+=", ".", ",", "?", "!", "'", "delete"], - ["ABC", "selectKeyboard", "space", "return"], // "undo", "accent" + ["ABC", "selectKeyboard", "space", "return"] // "undo", "accent" ] static let symbolKeysPhone = [ ["[", "]", "{", "}", "#", "%", "^", "*", "+", "="], ["_", "\\", "|", "~", "<", ">", "€", "£", "¥", "·"], ["123", ".", ",", "?", "!", "'", "delete"], - ["ABC", "selectKeyboard", "space", "return"], // "undo", "accent" + ["ABC", "selectKeyboard", "space", "return"] // "undo", "accent" ] // iPad keyboard layouts. @@ -48,21 +48,21 @@ public enum HebrewKeyboardConstants { [",", ".", "פ", "ם", "ן", "ו", "ט", "א", "ר", "ק", "delete"], ["ף", "ך", "ל", "ח", "י", "ע", "כ", "ג", "ד", "ש"], ["ץ", "ת", "צ", "מ", "נ", "ה", "ב", "ס", "ז", "return"], - ["selectKeyboard", ".?123", "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"], ["#+=", "%", "...", "&", ";", ":", "=", "+", "/", "?", "#+="], - ["selectKeyboard", "ABC", "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"], - ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "undo" + ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "undo" ] // Expanded iPad keyboard layouts for wider devices. @@ -71,7 +71,7 @@ public enum HebrewKeyboardConstants { [SpecialKeys.indent, "/", "'", "פ", "ם", "ן", "ו", "ט", "א", "ר", "ק", "[", "]", "+"], [SpecialKeys.capsLock, "ף", "ך", "ל", "ח", "י", "ע", "כ", "ג", "ד", "ש", ",", "\"", "return"], // "accent" ["shift", ";", "ץ", "ת", "צ", "מ", "נ", "ה", "ב", "ס", "ז", ".", "shift"], - ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"] // "microphone", "scribble" ] static let symbolKeysPadExpanded = [ @@ -79,7 +79,7 @@ public enum HebrewKeyboardConstants { [SpecialKeys.indent, "[", "]", "{", "}", "#", "%", "^", "*", "+", "=", "\"", "|", "—"], [SpecialKeys.capsLock, "°", "/", ":", ";", "(", ")", "$", "&", "@", "£", "¥", "€", "return"], // "undo" ["shift", "…", "?", "!", "~", "≠", "'", "\"", "_", ",", ".", "-", "shift"], // "redo" - ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "microphone", "scribble" ] // Alternate key vars. diff --git a/Keyboards/LanguageKeyboards/Italian/ITInterfaceVariables.swift b/Keyboards/LanguageKeyboards/Italian/ITInterfaceVariables.swift index d57a5060..75ddba38 100644 --- a/Keyboards/LanguageKeyboards/Italian/ITInterfaceVariables.swift +++ b/Keyboards/LanguageKeyboards/Italian/ITInterfaceVariables.swift @@ -25,21 +25,21 @@ public enum ItalianKeyboardConstants { ["q", "w", "e", "r", "t", "y", "u", "i", "o", "p"], ["a", "s", "d", "f", "g", "h", "j", "k", "l"], ["shift", "z", "x", "c", "v", "b", "n", "m", "delete"], - ["123", "selectKeyboard", "space", "return"], // "undo" + ["123", "selectKeyboard", "space", "return"] // "undo" ] static let numberKeysPhone = [ ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"], ["-", "/", ":", ";", "(", ")", "€", "&", "@", "\""], ["#+=", ".", ",", "?", "!", "'", "delete"], - ["ABC", "selectKeyboard", "space", "return"], // "undo" + ["ABC", "selectKeyboard", "space", "return"] // "undo" ] static let symbolKeysPhone = [ ["[", "]", "{", "}", "#", "%", "^", "*", "+", "="], ["_", "\\", "|", "~", "<", ">", "$", "£", "¥", "·"], ["123", ".", ",", "?", "!", "'", "delete"], - ["ABC", "selectKeyboard", "space", "return"], // "undo" + ["ABC", "selectKeyboard", "space", "return"] // "undo" ] // iPad keyboard layouts. @@ -48,21 +48,21 @@ public enum ItalianKeyboardConstants { ["q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "delete"], ["a", "s", "d", "f", "g", "h", "j", "k", "l", "return"], ["shift", "z", "x", "c", "v", "b", "n", "m", ",", ".", "shift"], - ["selectKeyboard", ".?123", "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"], ["#+=", "%", "-", "+", "=", "/", ";", ":", ",", ".", "#+="], - ["selectKeyboard", "ABC", "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"], - ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "undo" + ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "undo" ] // Expanded iPad keyboard layouts for wider devices. @@ -71,7 +71,7 @@ public enum ItalianKeyboardConstants { [SpecialKeys.indent, "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "è", "+", "*"], [SpecialKeys.capsLock, "a", "s", "d", "f", "g", "h", "j", "k", "l", "ò", "à", "ù", "return"], ["shift", "'", "z", "x", "c", "v", "b", "n", "m", "-", ",", ".", "shift"], - ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"] // "microphone", "scribble" ] static let symbolKeysPadExpanded = [ @@ -79,7 +79,7 @@ public enum ItalianKeyboardConstants { [SpecialKeys.indent, "[", "]", "{", "}", "#", "%", "^", "*", "+", "=", "\"", "|", "§"], [SpecialKeys.capsLock, "°", "/", ":", ";", "(", ")", "&", "@", "$", "£", "¥", "~", "return"], // "undo" ["shift", "…", "?", "!", "≠", "'", "\"", "_", "€", "-", ",", ".", "shift"], // "shift" - ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "microphone", "scribble" ] // Alternate key vars. diff --git a/Keyboards/LanguageKeyboards/Norwegian/NBInterfaceVariables.swift b/Keyboards/LanguageKeyboards/Norwegian/NBInterfaceVariables.swift index 67d74bcf..10af3cc8 100644 --- a/Keyboards/LanguageKeyboards/Norwegian/NBInterfaceVariables.swift +++ b/Keyboards/LanguageKeyboards/Norwegian/NBInterfaceVariables.swift @@ -25,21 +25,21 @@ public enum NorwegianBokmålKeyboardConstants { ["q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "å"], ["a", "s", "d", "f", "g", "h", "j", "k", "l", "ø", "æ"], ["shift", "z", "x", "c", "v", "b", "n", "m", "delete"], - ["123", "selectKeyboard", "space", "return"], // "undo" + ["123", "selectKeyboard", "space", "return"] // "undo" ] static let numberKeysPhone = [ ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"], ["-", "/", ":", ";", "(", ")", "$", "&", "@", "\""], ["#+=", ".", ",", "?", "!", "'", "delete"], - ["ABC", "selectKeyboard", "space", "return"], // "undo" + ["ABC", "selectKeyboard", "space", "return"] // "undo" ] static let symbolKeysPhone = [ ["[", "]", "{", "}", "#", "%", "^", "*", "+", "="], ["_", "\\", "|", "~", "<", ">", "€", "£", "¥", "·"], ["123", ".", ",", "?", "!", "'", "delete"], - ["ABC", "selectKeyboard", "space", "return"], // "undo" + ["ABC", "selectKeyboard", "space", "return"] // "undo" ] // iPad keyboard layouts. @@ -48,21 +48,21 @@ public enum NorwegianBokmålKeyboardConstants { ["q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "å", "delete"], ["a", "s", "d", "f", "g", "h", "j", "k", "l", "ø", "æ", "return"], ["shift", "z", "x", "c", "v", "b", "n", "m", ",", ".", "?", "shift"], - ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "undo" + ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"] // "undo" ] static let numberKeysPad = [ ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "`", "delete"], ["@", "#", "kr", "&", "*", "(", ")", "'", "\"", "+", "·", "return"], ["#+=", "%", "_", "-", "=", "/", ";", ":", ",", ".", "≈", "#+="], - ["selectKeyboard", "ABC", "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"], - ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "undo" + ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "undo" ] // Expanded iPad keyboard layouts for wider devices. @@ -71,7 +71,7 @@ public enum NorwegianBokmålKeyboardConstants { [SpecialKeys.indent, "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "å", "^", "*"], [SpecialKeys.capsLock, "a", "s", "d", "f", "g", "h", "j", "k", "l", "ø", "æ", "@", "return"], ["shift", "'", "z", "x", "c", "v", "b", "n", "m", ",", ".", "-", "shift"], - ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"] // "microphone", "scribble" ] static let symbolKeysPadExpanded = [ @@ -79,7 +79,7 @@ public enum NorwegianBokmålKeyboardConstants { [SpecialKeys.indent, "[", "]", "{", "}", "#", "%", "^", "*", "+", "=", "\"", "|", "°"], [SpecialKeys.capsLock, "—", "/", ":", ";", "(", ")", "&", "@", "$", "£", "¥", "~", "return"], // "undo" ["shift", "…", "?", "!", "≠", "'", "\"", "_", "€", ",", ".", "-", "shift"], // "redo" - ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "microphone", "scribble" ] // Alternate key vars. diff --git a/Keyboards/LanguageKeyboards/Portuguese/PTInterfaceVariables.swift b/Keyboards/LanguageKeyboards/Portuguese/PTInterfaceVariables.swift index b722591c..db91ce7c 100644 --- a/Keyboards/LanguageKeyboards/Portuguese/PTInterfaceVariables.swift +++ b/Keyboards/LanguageKeyboards/Portuguese/PTInterfaceVariables.swift @@ -25,21 +25,21 @@ public enum PortugueseKeyboardConstants { ["q", "w", "e", "r", "t", "y", "u", "i", "o", "p"], ["a", "s", "d", "f", "g", "h", "j", "k", "l"], ["shift", "z", "x", "c", "v", "b", "n", "m", "delete"], - ["123", "selectKeyboard", "space", "return"], // "undo" + ["123", "selectKeyboard", "space", "return"] // "undo" ] static let numberKeysPhone = [ ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"], ["-", "/", ":", ";", "(", ")", "€", "&", "@", "\""], ["#+=", ".", ",", "?", "!", "'", "delete"], - ["ABC", "selectKeyboard", "space", "return"], // "undo" + ["ABC", "selectKeyboard", "space", "return"] // "undo" ] static let symbolKeysPhone = [ ["[", "]", "{", "}", "#", "%", "^", "*", "+", "="], ["_", "\\", "|", "~", "<", ">", "$", "£", "¥", "·"], ["123", ".", ",", "?", "!", "'", "delete"], - ["ABC", "selectKeyboard", "space", "return"], // "undo" + ["ABC", "selectKeyboard", "space", "return"] // "undo" ] // iPad keyboard layouts. @@ -48,21 +48,21 @@ public enum PortugueseKeyboardConstants { ["q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "delete"], ["a", "s", "d", "f", "g", "h", "j", "k", "l", "return"], ["shift", "z", "x", "c", "v", "b", "n", "m", "!", "?", "shift"], - ["selectKeyboard", ".?123", "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"], ["#+=", "%", "-", "+", "=", "/", ";", ":", ",", ".", "#+="], - ["selectKeyboard", "ABC", "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"], - ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "undo" + ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "undo" ] // Expanded iPad keyboard layouts for wider devices. @@ -71,7 +71,7 @@ public enum PortugueseKeyboardConstants { [SpecialKeys.indent, "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "[", "]", "\\"], [SpecialKeys.capsLock, "a", "s", "d", "f", "g", "h", "j", "k", "l", ":", ";", "ç", "return"], ["shift", "'", "z", "x", "c", "v", "b", "n", "m", ",", ".", "/", "shift"], - ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"] // "microphone", "scribble" ] static let symbolKeysPadExpanded = [ @@ -79,7 +79,7 @@ public enum PortugueseKeyboardConstants { [SpecialKeys.indent, "[", "]", "{", "}", "#", "%", "^", "*", "+", "=", "—", "|", "~"], [SpecialKeys.capsLock, "°", "\\", ":", ";", "(", ")", "&", "@", "$", "£", "¥", "€", "return"], // "undo" ["shift", "…", "?", "!", "≠", "'", "\"", "_", "-", ",", ".", "/", "shift"], // "redo" - ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "microphone", "scribble" ] // Alternate key vars. diff --git a/Keyboards/LanguageKeyboards/Russian/RUInterfaceVariables.swift b/Keyboards/LanguageKeyboards/Russian/RUInterfaceVariables.swift index e186e1c8..13e4f2d5 100644 --- a/Keyboards/LanguageKeyboards/Russian/RUInterfaceVariables.swift +++ b/Keyboards/LanguageKeyboards/Russian/RUInterfaceVariables.swift @@ -25,21 +25,21 @@ public enum RussianKeyboardConstants { ["й", "ц", "у", "к", "е", "н", "г", "ш", "щ", "з", "х"], ["ф", "ы", "в", "а", "п", "р", "о", "л", "д", "ж", "э"], ["shift", "я", "ч", "с", "м", "и", "т", "ь", "б", "ю", "delete"], - ["123", "selectKeyboard", "space", "return"], // "undo" + ["123", "selectKeyboard", "space", "return"] // "undo" ] static let numberKeysPhone = [ ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"], ["-", "/", ":", ";", "(", ")", "₽", "&", "@", "\""], ["#+=", ".", ",", "?", "!", "'", "delete"], - ["АБВ", "selectKeyboard", "space", "return"], // "undo" + ["АБВ", "selectKeyboard", "space", "return"] // "undo" ] static let symbolKeysPhone = [ ["[", "]", "{", "}", "#", "%", "^", "*", "+", "="], ["_", "\\", "|", "~", "<", ">", "$", "€", "£", "·"], ["123", ".", ",", "?", "!", "'", "delete"], - ["АБВ", "selectKeyboard", "space", "return"], // "undo" + ["АБВ", "selectKeyboard", "space", "return"] // "undo" ] // iPad keyboard layouts. @@ -48,21 +48,21 @@ public enum RussianKeyboardConstants { ["й", "ц", "у", "к", "е", "н", "г", "ш", "щ", "з", "х", "delete"], ["ф", "ы", "в", "а", "п", "р", "о", "л", "д", "ж", "э", "return"], ["shift", "я", "ч", "с", "м", "и", "т", "ь", "б", "ю", ".", "shift"], - ["selectKeyboard", ".?123", "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"], ["#+=", "%", "_", "-", "+", "=", "≠", ";", ":", ",", ".", "#+="], - ["selectKeyboard", "АБВ", "space", "АБВ", "hideKeyboard"], // "undo" + ["selectKeyboard", "АБВ", "space", "АБВ", "hideKeyboard"] // "undo" ] static let symbolKeysPad = [ ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "—", "delete"], ["$", "€", "£", "¥", "±", "·", "`", "[", "]", "{", "}", "return"], ["123", "§", "|", "~", "...", "^", "\\", "<", ">", "!", "?", "123"], - ["selectKeyboard", "АБВ", "space", "АБВ", "hideKeyboard"], // "undo" + ["selectKeyboard", "АБВ", "space", "АБВ", "hideKeyboard"] // "undo" ] // Expanded iPad keyboard layouts for wider devices. @@ -71,7 +71,7 @@ public enum RussianKeyboardConstants { [SpecialKeys.indent, "й", "ц", "у", "к", "е", "н", "г", "ш", "щ", "з", "х", "ъ", "+"], [SpecialKeys.capsLock, "ф", "ы", "в", "а", "п", "р", "о", "л", "д", "ж", "э", "ё", "return"], ["shift", "'", "я", "ч", "с", "м", "и", "т", "ь", "б", "ю", "/", "shift"], - ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"] // "microphone", "scribble" ] static let symbolKeysPadExpanded = [ @@ -79,7 +79,7 @@ public enum RussianKeyboardConstants { [SpecialKeys.indent, "[", "]", "{", "}", "#", "%", "^", "*", "+", "=", "\\", "|", "₽"], [SpecialKeys.capsLock, "—", "/", ":", ";", "(", ")", "&", "@", "$", "£", "¥", "~", "return"], // "undo" ["shift", "…", "?", "!", "≠", "'", "\"", "_", "€", "-", ",", ".", "shift"], // "redo" - ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "microphone", "scribble" ] // Alternate key vars. diff --git a/Keyboards/LanguageKeyboards/Spanish/ESInterfaceVariables.swift b/Keyboards/LanguageKeyboards/Spanish/ESInterfaceVariables.swift index 821bb6ac..86656a9d 100644 --- a/Keyboards/LanguageKeyboards/Spanish/ESInterfaceVariables.swift +++ b/Keyboards/LanguageKeyboards/Spanish/ESInterfaceVariables.swift @@ -25,28 +25,28 @@ public enum SpanishKeyboardConstants { ["q", "w", "e", "r", "t", "y", "u", "i", "o", "p"], ["a", "s", "d", "f", "g", "h", "j", "k", "l", "ñ"], ["shift", "z", "x", "c", "v", "b", "n", "m", "delete"], - ["123", "selectKeyboard", "space", "return"], // "undo" + ["123", "selectKeyboard", "space", "return"] // "undo" ] static let letterKeysPhoneDisableAccents = [ ["q", "w", "e", "r", "t", "y", "u", "i", "o", "p"], ["a", "s", "d", "f", "g", "h", "j", "k", "l"], ["shift", "z", "x", "c", "v", "b", "n", "m", "delete"], - ["123", "selectKeyboard", "space", "return"], // "undo" + ["123", "selectKeyboard", "space", "return"] // "undo" ] static let numberKeysPhone = [ ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"], ["-", "/", ":", ";", "(", ")", "$", "&", "@", "\""], ["#+=", ".", ",", "?", "!", "'", "delete"], - ["ABC", "selectKeyboard", "space", "return"], // "undo" + ["ABC", "selectKeyboard", "space", "return"] // "undo" ] static let symbolKeysPhone = [ ["[", "]", "{", "}", "#", "%", "^", "*", "+", "="], ["_", "\\", "|", "~", "<", ">", "€", "£", "¥", "·"], ["123", ".", ",", "?", "!", "'", "delete"], - ["ABC", "selectKeyboard", "space", "return"], // "undo" + ["ABC", "selectKeyboard", "space", "return"] // "undo" ] // iPad keyboard layouts. @@ -55,7 +55,7 @@ public enum SpanishKeyboardConstants { ["q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "delete"], ["a", "s", "d", "f", "g", "h", "j", "k", "l", "ñ", "return"], ["shift", "z", "x", "c", "v", "b", "n", "m", ",", ".", "shift"], - ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "undo" + ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"] // "undo" ] static let letterKeysPadDisableAccents = [ @@ -63,21 +63,21 @@ public enum SpanishKeyboardConstants { ["q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "delete"], ["a", "s", "d", "f", "g", "h", "j", "k", "l", "return"], ["shift", "z", "x", "c", "v", "b", "n", "m", ",", ".", "shift"], - ["selectKeyboard", ".?123", "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"], ["#+=", "%", "_", "-", "=", "/", ";", ":", ",", ".", "#+="], - ["selectKeyboard", "ABC", "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"], - ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "undo" + ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "undo" ] // Expanded iPad keyboard layouts for wider devices. @@ -86,7 +86,7 @@ public enum SpanishKeyboardConstants { [SpecialKeys.indent, "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "´", "+", "*"], [SpecialKeys.capsLock, "a", "s", "d", "f", "g", "h", "j", "k", "l", "ñ", "{", "}", "return"], ["shift", "'", "z", "x", "c", "v", "b", "n", "m", ",", ".", "-", "shift"], - ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"] // "microphone", "scribble" ] static let letterKeysPadExpandedDisableAccents = [ @@ -94,7 +94,7 @@ public enum SpanishKeyboardConstants { [SpecialKeys.indent, "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "´", "+", "*"], [SpecialKeys.capsLock, "a", "s", "d", "f", "g", "h", "j", "k", "l", "~", "{", "}", "return"], ["shift", "'", "z", "x", "c", "v", "b", "n", "m", ",", ".", "-", "shift"], - ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"] // "microphone", "scribble" ] static let symbolKeysPadExpanded = [ @@ -102,7 +102,7 @@ public enum SpanishKeyboardConstants { [SpecialKeys.indent, "(", ")", "{", "}", "#", "%", "^", "*", "+", "=", "\\", "|", "§"], [SpecialKeys.capsLock, "—", "/", ":", ";", "&", "@", "$", "£", "¥", "~", "[", "]", "return"], // "undo" ["shift", "…", "?", "!", "≠", "'", "\"", "_", "€", ",", ".", "-", "shift"], // "redo" - ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "microphone", "scribble" ] // Alternate key vars. @@ -216,7 +216,7 @@ func setESKeyboardLayout() { "vosotras": "presSPP", "ellos": "presTPP", "ellas": "presTPP", - "ustedes": "presTPP", + "ustedes": "presTPP" ] translateKeyLbl = "Traducir" diff --git a/Keyboards/LanguageKeyboards/Swedish/SVInterfaceVariables.swift b/Keyboards/LanguageKeyboards/Swedish/SVInterfaceVariables.swift index c8246794..2f802dc6 100644 --- a/Keyboards/LanguageKeyboards/Swedish/SVInterfaceVariables.swift +++ b/Keyboards/LanguageKeyboards/Swedish/SVInterfaceVariables.swift @@ -27,28 +27,28 @@ public enum SwedishKeyboardConstants { ["q", "w", "e", "r", "t", "z", "u", "i", "o", "p", "å"], ["a", "s", "d", "f", "g", "h", "j", "k", "l", "ö", "ä"], ["shift", "y", "x", "c", "v", "b", "n", "m", "delete"], - ["123", "selectKeyboard", "space", "return"], // "undo" + ["123", "selectKeyboard", "space", "return"] // "undo" ] static let letterKeysPhoneDisableAccents = [ ["q", "w", "e", "r", "t", "z", "u", "i", "o", "p"], ["a", "s", "d", "f", "g", "h", "j", "k", "l"], ["shift", "y", "x", "c", "v", "b", "n", "m", "delete"], - ["123", "selectKeyboard", "space", "return"], // "undo" + ["123", "selectKeyboard", "space", "return"] // "undo" ] static let numberKeysPhone = [ ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"], ["-", "/", ":", ";", "(", ")", "kr", "&", "@", "\""], ["#+=", ".", ",", "?", "!", "'", "delete"], - ["ABC", "selectKeyboard", "space", "return"], // "undo" + ["ABC", "selectKeyboard", "space", "return"] // "undo" ] static let symbolKeysPhone = [ ["[", "]", "{", "}", "#", "%", "^", "*", "+", "="], ["_", "\\", "|", "~", "<", ">", "€", "$", "£", "·"], ["123", ".", ",", "?", "!", "'", "delete"], - ["ABC", "selectKeyboard", "space", "return"], // "undo" + ["ABC", "selectKeyboard", "space", "return"] // "undo" ] // iPad keyboard layouts. @@ -57,7 +57,7 @@ public enum SwedishKeyboardConstants { ["q", "w", "e", "r", "t", "z", "u", "i", "o", "p", "å", "delete"], ["a", "s", "d", "f", "g", "h", "j", "k", "l", "ö", "ä", "return"], ["shift", "y", "x", "c", "v", "b", "n", "m", ",", ".", "?", "shift"], - ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "undo" + ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"] // "undo" ] static let letterKeysPadDisableAccents = [ @@ -65,21 +65,21 @@ public enum SwedishKeyboardConstants { ["q", "w", "e", "r", "t", "z", "u", "i", "o", "p", "delete"], ["a", "s", "d", "f", "g", "h", "j", "k", "l", "return"], ["shift", "y", "x", "c", "v", "b", "n", "m", ",", ".", "?", "shift"], - ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "undo" + ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"] // "undo" ] static let numberKeysPad = [ ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "`", "delete"], ["@", "#", "kr", "&", "*", "(", ")", "'", "\"", "+", "·", "return"], ["#+=", "%", "≈", "±", "=", "/", ";", ":", ",", ".", "-", "#+="], - ["selectKeyboard", "ABC", "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"], - ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "undo" + ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "undo" ] // Expanded iPad keyboard layouts for wider devices. @@ -88,7 +88,7 @@ public enum SwedishKeyboardConstants { [SpecialKeys.indent, "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "å", "^", "*"], [SpecialKeys.capsLock, "a", "s", "d", "f", "g", "h", "j", "k", "l", "ö", "ä", "'", "return"], ["shift", "'", "z", "x", "c", "v", "b", "n", "m", ",", ".", "-", "shift"], - ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"] // "microphone", "scribble" ] static let letterKeysPadExpandedDisableAccents = [ @@ -96,7 +96,7 @@ public enum SwedishKeyboardConstants { [SpecialKeys.indent, "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "\"", "^", "*"], [SpecialKeys.capsLock, "a", "s", "d", "f", "g", "h", "j", "k", "l", "(", ")", "'", "return"], ["shift", "'", "z", "x", "c", "v", "b", "n", "m", ",", ".", "-", "shift"], - ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"] // "microphone", "scribble" ] static let symbolKeysPadExpanded = [ @@ -104,7 +104,7 @@ public enum SwedishKeyboardConstants { [SpecialKeys.indent, "[", "]", "{", "}", "#", "%", "^", "*", "+", "=", "°", "|", "§"], [SpecialKeys.capsLock, "—", "/", ":", ";", "(", ")", "&", "@", "$", "£", "¥", "~", "return"], // "undo" ["shift", "…", "?", "!", "≠", "'", "\"", "_", "€", ",", ".", "-", "shift"], // "redo" - ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "microphone", "scribble" + ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "microphone", "scribble" ] // Alternate key vars. diff --git a/Scribe/AboutTab/AboutTableData.swift b/Scribe/AboutTab/AboutTableData.swift index 96efb05c..0d152b9c 100644 --- a/Scribe/AboutTab/AboutTableData.swift +++ b/Scribe/AboutTab/AboutTableData.swift @@ -28,7 +28,7 @@ struct AboutTableData { Section(sectionTitle: "Chat with the team on Matrix", imageString: "matrix", sectionState: .matrix, externalLink: true), Section(sectionTitle: "Share Scribe", imageString: "square.and.arrow.up", sectionState: .shareScribe, externalLink: true), // Section(sectionTitle: "View all Scribe apps", imageString: "scribeIcon", sectionState: .scribeApps, externalLink: true) - Section(sectionTitle: "Wikimedia and Scribe", imageString: "wikimedia", hasNestedNavigation: true, sectionState: .wikimedia), + Section(sectionTitle: "Wikimedia and Scribe", imageString: "wikimedia", hasNestedNavigation: true, sectionState: .wikimedia) ], hasDynamicData: nil ), @@ -37,7 +37,7 @@ struct AboutTableData { section: [ Section(sectionTitle: "Rate Scribe", imageString: "star", sectionState: .rateScribe, externalLink: true), Section(sectionTitle: "Report a bug", imageString: "ant", sectionState: .bugReport, externalLink: true), - Section(sectionTitle: "Send us an email", imageString: "envelope", sectionState: .email, externalLink: true), + Section(sectionTitle: "Send us an email", imageString: "envelope", sectionState: .email, externalLink: true) // Section(sectionTitle: "Reset app hints", imageString: "lightbulb", sectionState: .appHints) ], hasDynamicData: nil @@ -46,9 +46,9 @@ struct AboutTableData { headingTitle: "Legal", section: [ Section(sectionTitle: "Privacy policy", imageString: "lock.shield", hasNestedNavigation: true, sectionState: .privacyPolicy), - Section(sectionTitle: "Third-party licenses", imageString: "thirdPartyLicenses", hasNestedNavigation: true, sectionState: .licenses), + Section(sectionTitle: "Third-party licenses", imageString: "thirdPartyLicenses", hasNestedNavigation: true, sectionState: .licenses) ], hasDynamicData: nil - ), + ) ] } diff --git a/Scribe/AppTexts/AppTextStyling.swift b/Scribe/AppTexts/AppTextStyling.swift index f2063c62..5a90532f 100644 --- a/Scribe/AppTexts/AppTextStyling.swift +++ b/Scribe/AppTexts/AppTextStyling.swift @@ -181,7 +181,7 @@ func setPrivacyPolicy(fontSize: CGFloat, text: String) -> NSMutableAttributedStr scribeEmail: "mailto:" + scribeEmail, gitHubLogoLicensing: gitHubLogoLicensing, wikidataLogoLicensing: wikidataLogoLicensing, - customKeyboardLicense: customKeyboardLicense, + customKeyboardLicense: customKeyboardLicense ], fontSize: fontSize ) @@ -195,7 +195,7 @@ func setThirdPartyLicenses(fontSize: CGFloat, text: String, listElements: [Strin let thirdPartyLicensesTextWithLink = addHyperLinks( originalText: text, links: [ - licensesLink: licensesLink, + licensesLink: licensesLink ], fontSize: fontSize ) diff --git a/Scribe/AppTexts/English/ENThirdPartyLicenses.swift b/Scribe/AppTexts/English/ENThirdPartyLicenses.swift index f3327104..f7054eb4 100644 --- a/Scribe/AppTexts/English/ENThirdPartyLicenses.swift +++ b/Scribe/AppTexts/English/ENThirdPartyLicenses.swift @@ -35,5 +35,5 @@ The following is a list of all used source code, the main author or authors of t let enThirdPartyLicensesListItems = [ "• Author: EthanSK", "• License: MIT", - "• Link: https://github.com/EthanSK/CustomKeyboard/blob/master/LICENSE", + "• Link: https://github.com/EthanSK/CustomKeyboard/blob/master/LICENSE" ] diff --git a/Scribe/AppTexts/English/ENWikimediaAndScribe.swift b/Scribe/AppTexts/English/ENWikimediaAndScribe.swift index f93dab90..e93e964a 100644 --- a/Scribe/AppTexts/English/ENWikimediaAndScribe.swift +++ b/Scribe/AppTexts/English/ENWikimediaAndScribe.swift @@ -29,5 +29,5 @@ let enWikiMediaAndScribeText = [ """, """ \n\nWikipedia is a multilingual free online encyclopedia written and maintained by a community of volunteers through open collaboration and a wiki-based editing system. Scribe uses data from Wikipedia to produce autosuggestions by deriving the most common words in a language as well as the most common words that follow them.\n - """, + """ ] diff --git a/Scribe/InstallationTab/InstallationVC.swift b/Scribe/InstallationTab/InstallationVC.swift index 963c0f93..fad5e84f 100644 --- a/Scribe/InstallationTab/InstallationVC.swift +++ b/Scribe/InstallationTab/InstallationVC.swift @@ -152,7 +152,7 @@ class InstallationVC: UIViewController { textView.linkTextAttributes = [ NSAttributedString.Key.foregroundColor: linkBlueColor, - NSAttributedString.Key.underlineStyle: NSUnderlineStyle.single.rawValue, + NSAttributedString.Key.underlineStyle: NSUnderlineStyle.single.rawValue ] } } diff --git a/Scribe/SettingsTab/SettingsTableData.swift b/Scribe/SettingsTab/SettingsTableData.swift index a0159dc4..3d5a1e0b 100644 --- a/Scribe/SettingsTab/SettingsTableData.swift +++ b/Scribe/SettingsTab/SettingsTableData.swift @@ -24,7 +24,7 @@ enum SettingsTableData { ParentTableCellModel( headingTitle: NSLocalizedString("settings.appSettings", comment: "The title of the app settings section"), section: [ - Section(sectionTitle: NSLocalizedString("settings.appSettings.appLanguage", comment: "Change the language of the Scribe App"), imageString: "globe", hasToggle: false, sectionState: .appLang), + Section(sectionTitle: NSLocalizedString("settings.appSettings.appLanguage", comment: "Change the language of the Scribe App"), imageString: "globe", hasToggle: false, sectionState: .appLang) ], hasDynamicData: nil ), @@ -34,7 +34,7 @@ enum SettingsTableData { // Section(sectionTitle: "All keyboards", imageString: "globe", sectionState: .specificLang("all")), ], hasDynamicData: .installedKeyboards - ), + ) ] static let languageSettingsData: [ParentTableCellModel] = [ @@ -53,7 +53,7 @@ enum SettingsTableData { hasToggle: true, sectionState: .none(.toggleAccentCharacters), shortDescription: NSLocalizedString("settings.layout.disableAccentCharacters.description", comment: "") - ), + ) ], hasDynamicData: nil ), @@ -65,10 +65,10 @@ enum SettingsTableData { hasToggle: true, sectionState: .none(.autosuggestEmojis), shortDescription: NSLocalizedString("settings.layout.autoSuggestEmoji.description", comment: "") - ), + ) ], hasDynamicData: nil - ), + ) ] static func getInstalledKeyboardsSections() -> [Section] { From 846e5349c02454a8d05ad655e63f2b8c746af69e Mon Sep 17 00:00:00 2001 From: Andrew Tavis McAllister Date: Tue, 14 May 2024 22:51:36 +0200 Subject: [PATCH 3/3] Rename swiftlint YAML file to hopefully fix PR workflow --- .swiftlint.yaml => .swiftlint.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .swiftlint.yaml => .swiftlint.yml (100%) diff --git a/.swiftlint.yaml b/.swiftlint.yml similarity index 100% rename from .swiftlint.yaml rename to .swiftlint.yml