Merge pull request #12 from thisIsTheFoxe/feature/general-latin-layout

Add general latin language layout
thisIsTheFoxe · Oct 8, 2023 · e710554 · e710554
2 parents b6f408c + efbd386
commit e710554
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/Sources/SimpleKeyboard/Models/Language.swift b/Sources/SimpleKeyboard/Models/Language.swift
@@ -23,6 +23,9 @@ public enum Language: CaseIterable {
 
     case english, german, spanish, french, russian, hindi
     case swedish, danish, norwegian, finnish
+
+    /// General purpose layout using QWERTY with the common diacritics
+    case latinWithAccents
 
     var alternateKeys: [String: String] {
         switch self {
@@ -35,6 +38,17 @@ public enum Language: CaseIterable {
         // Though not in the official alphabet, á is a Swedish (old-fashioned) letter. In native Swedish personal names, ü and è and others are also used.
         case .swedish: return ["a":"á", "u":"ü", "e": "è"]
         case .finnish: return ["s": "š", "z": "ž"]
+        case .latinWithAccents:
+
+            // 300 = Grave;         301 = Acute;
+            // 302 = Circumflex;    303 = Tilde;
+            // 308 = Diaeresis;     30A = Ring;
+            // 327 = Cedilla;       30C = Caron;
+            return [
+                "\u{0300}": "\u{0301}",
+                "\u{0302}": "\u{0303}",
+                "\u{0308}": "\u{030A}",
+                "\u{0327}": "\u{030C}",]
         default: return [:]
         }
     }
@@ -90,25 +104,33 @@ public enum Language: CaseIterable {
                 ["a", "s", "d", "f", "g", "h", "j", "k", "l", "æ", "ø"],
                 ["z", "x", "c", "v", "b", "n", "m"]
             ]
-
         case .norwegian:
             result = [
                 ["q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "å"],
                 ["a", "s", "d", "f", "g", "h", "j", "k", "l", "ö", "ä"],
                 ["z", "x", "c", "v", "b", "n", "m"]
             ]
-
         case .finnish:
             result = [
                 ["q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "å"],
                 ["a", "s", "d", "f", "g", "h", "j", "k", "l", "ø", "æ"],
                 ["z", "x", "c", "v", "b", "n", "m"]
             ]
 
+        case .latinWithAccents:
+            result = [
+                ["q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "\u{0300}"],
+                ["a", "s", "d", "f", "g", "h", "j", "k", "l", "\u{0302}", "\u{0308}"],
+                ["z", "x", "c", "v", "b", "n", "m", "\u{0327}"]
+            ]
         }
 
         if areUppercased {
-            result = result.map { $0.map { $0.uppercased() } }
+            result = result.map { $0.map {
+                let upper = $0.uppercased()
+                if $0 != upper { return upper }
+                return alternateKeys[$0] ?? $0
+            } }
         }
 
         return result

diff --git a/Sources/SimpleKeyboard/Views/KeyButton.swift b/Sources/SimpleKeyboard/Views/KeyButton.swift
@@ -77,6 +77,7 @@ struct KeyButton: View, ClickableKey {
 }
 
 /// Replaces the last typed character with another (special) character. E.g. "a" -> "ä"
+@available(*, deprecated, message: "Use `Language.alternateKeys` instead")
 struct AccentKeyButton: View, ClickableKey {
     @Binding var text: String
     /// The lookup for modified characters all lowercased. E.g. `["a": "ä"]`

diff --git a/Sources/SimpleKeyboard/Views/SimpleStandardKeyboard.swift b/Sources/SimpleKeyboard/Views/SimpleStandardKeyboard.swift
@@ -116,7 +116,7 @@ struct SimpleStandardKeyboard_Previews: PreviewProvider {
                         isUpperCase: true))
                 SimpleStandardKeyboard(
                     settings: KeyboardSettings(
-                        language: .spanish,
+                        language: .latinWithAccents,
                         textInput: nil,
                         theme: .system,
                         actionButton: .search,