#26 style key pop callouts for keys on the sides of the keyboard

scribe-org · Feb 23, 2022 · cd5ad21 · cd5ad21
1 parent 97fb8ad
commit cd5ad21
Show file tree

Hide file tree

Showing 9 changed files with 220 additions and 126 deletions.
diff --git a/Keyboards/KeyboardsBase/InterfaceVariables.swift b/Keyboards/KeyboardsBase/InterfaceVariables.swift
@@ -103,6 +103,12 @@ let keyboardLayoutDict: [String: () -> Void] = [
   "Swedish": setSVKeyboardLayout
 ]
 
+/// Sets the keyboard layout and its alternate keys.
+func setKeyboard() {
+  setKeyboardLayout()
+  setKeyboardAlternateKeys()
+}
+
 /// Sets the keyboard layouts given the chosen keyboard and device type.
 func setKeyboardLayout() {
   if switchInput {
@@ -115,6 +121,8 @@ func setKeyboardLayout() {
   allPrompts = [translatePromptAndCursor, conjugatePromptAndCursor, pluralPromptAndCursor]
 }
 
+// MARK: Alternate Key Variables
+
 /// Sets the alternates for certain keys given the chosen keyboard.
 func setKeyboardAlternateKeys() {
   if DeviceType.isPhone {
@@ -155,13 +163,6 @@ func setKeyboardAlternateKeys() {
   ]
 }
 
-/// Sets the keyboard layout and its alternate keys.
-func setKeyboard() {
-  setKeyboardLayout()
-  setKeyboardAlternateKeys()
-}
-
-// MARK: Alternate Key Variables
 var alternatesKeyView: UIView!
 var keyCancelled = false
 var keyPopChar = UILabel()
@@ -218,6 +219,24 @@ var cAlternateKeys = [String]()
 var nAlternateKeys = [String]()
 var ьAlternateKeys = [String]()
 
+// MARK: Callout Variables
+
+// Variables that define which keys are positioned on the very left, right or in the center of the keyboard.
+// The purpose of these is to define which key pop up functions should be ran.
+var centralKeyChars: [String] = [String]()
+var leftKeyChars: [String] = [String]()
+var rightKeyChars: [String] = [String]()
+
+// Variables for call out positioning.
+var horizStart = CGFloat(0)
+var vertStart = CGFloat(0)
+var widthMultiplier = CGFloat(0)
+var maxHeightMultiplier = CGFloat(0)
+var maxHeight = CGFloat(0)
+var heightBeforeTopCurves = CGFloat(0)
+var maxHeightCurveControl = CGFloat(0)
+var minHeightCurveControl = CGFloat(0)
+
 // MARK: English Interface Variables
 // Note: here only until there is an English keyboard.
 
@@ -292,7 +311,7 @@ func getENKeys() {
 
     leftKeyChars = ["q", "1", "-", "[", "_"]
     rightKeyChars = ["p", "0", "\"", "=", "·"]
-    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) || !rightKeyChars.contains($0) }
+    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) && !rightKeyChars.contains($0) }
   } else {
     letterKeys = EnglishKeyboardConstants.letterKeysPad
     numberKeys = EnglishKeyboardConstants.numberKeysPad
@@ -301,7 +320,7 @@ func getENKeys() {
 
     leftKeyChars = ["q", "1"]
     rightKeyChars = []
-    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) || !rightKeyChars.contains($0) }
+    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) && !rightKeyChars.contains($0) }
   }
 
   keysWithAlternates = EnglishKeyboardConstants.keysWithAlternates

diff --git a/Keyboards/KeyboardsBase/KeyAnimation.swift b/Keyboards/KeyboardsBase/KeyAnimation.swift
diff --git a/Keyboards/LanguageKeyboards/French/FRInterfaceVariables.swift b/Keyboards/LanguageKeyboards/French/FRInterfaceVariables.swift
@@ -74,7 +74,7 @@ func getFRKeys() {
 
     leftKeyChars = ["a", "q", "1", "-", "[", "_"]
     rightKeyChars = ["p", "m", "0", "\"", "=", "·"]
-    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) || !rightKeyChars.contains($0) }
+    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) && !rightKeyChars.contains($0) }
   } else {
     letterKeys = FrenchKeyboardConstants.letterKeysPad
     numberKeys = FrenchKeyboardConstants.numberKeysPad
@@ -83,7 +83,7 @@ func getFRKeys() {
 
     leftKeyChars = ["q", "a", "1", "@", "~"]
     rightKeyChars = []
-    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) || !rightKeyChars.contains($0) }
+    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) && !rightKeyChars.contains($0) }
   }
 
   keysWithAlternates = FrenchKeyboardConstants.keysWithAlternates

diff --git a/Keyboards/LanguageKeyboards/German/DEInterfaceVariables.swift b/Keyboards/LanguageKeyboards/German/DEInterfaceVariables.swift
@@ -77,7 +77,7 @@ func getDEKeys() {
 
     leftKeyChars = ["q", "a", "1", "-", "[", "_"]
     rightKeyChars = ["ü", "ä", "0", "\"", "=", "·"]
-    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) || !rightKeyChars.contains($0) }
+    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) && !rightKeyChars.contains($0) }
   } else {
     letterKeys = GermanKeyboardConstants.letterKeysPad
     numberKeys = GermanKeyboardConstants.numberKeysPad
@@ -86,7 +86,7 @@ func getDEKeys() {
 
     leftKeyChars = ["q", "a", "1", "\"", "$"]
     rightKeyChars = []
-    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) || !rightKeyChars.contains($0) }
+    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) && !rightKeyChars.contains($0) }
   }
 
   keysWithAlternates = GermanKeyboardConstants.keysWithAlternates

diff --git a/Keyboards/LanguageKeyboards/Italian/ITInterfaceVariables.swift b/Keyboards/LanguageKeyboards/Italian/ITInterfaceVariables.swift
@@ -74,7 +74,7 @@ func getITKeys() {
 
     leftKeyChars = ["q", "1", "-", "[", "_"]
     rightKeyChars = ["p", "0", "\"", "=", "·"]
-    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) || !rightKeyChars.contains($0) }
+    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) && !rightKeyChars.contains($0) }
   } else {
     letterKeys = ItalianKeyboardConstants.letterKeysPad
     numberKeys = ItalianKeyboardConstants.numberKeysPad
@@ -83,7 +83,7 @@ func getITKeys() {
 
     leftKeyChars = ["q", "1"]
     rightKeyChars = []
-    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) || !rightKeyChars.contains($0) }
+    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) && !rightKeyChars.contains($0) }
   }
 
   keysWithAlternates = ItalianKeyboardConstants.keysWithAlternates

diff --git a/Keyboards/LanguageKeyboards/Portuguese/PTInterfaceVariables.swift b/Keyboards/LanguageKeyboards/Portuguese/PTInterfaceVariables.swift
@@ -73,7 +73,7 @@ func getPTKeys() {
 
     leftKeyChars = ["q", "1", "-", "[", "_"]
     rightKeyChars = ["p", "0", "\"", "=", "·"]
-    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) || !rightKeyChars.contains($0) }
+    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) && !rightKeyChars.contains($0) }
   } else {
     letterKeys = PortugueseKeyboardConstants.letterKeysPad
     numberKeys = PortugueseKeyboardConstants.numberKeysPad
@@ -82,7 +82,7 @@ func getPTKeys() {
 
     leftKeyChars = ["q", "1"]
     rightKeyChars = []
-    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) || !rightKeyChars.contains($0) }
+    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) && !rightKeyChars.contains($0) }
   }
 
   keysWithAlternates = PortugueseKeyboardConstants.keysWithAlternates

diff --git a/Keyboards/LanguageKeyboards/Russian/RUInterfaceVariables.swift b/Keyboards/LanguageKeyboards/Russian/RUInterfaceVariables.swift
@@ -68,7 +68,7 @@ func getRUKeys() {
 
     leftKeyChars = ["й", "ф", "1", "-", "[", "_"]
     rightKeyChars = ["х", "э", "0", "\"", "=", "·"]
-    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) || !rightKeyChars.contains($0) }
+    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) && !rightKeyChars.contains($0) }
   } else {
     letterKeys = RussianKeyboardConstants.letterKeysPad
     numberKeys = RussianKeyboardConstants.numberKeysPad
@@ -77,7 +77,7 @@ func getRUKeys() {
 
     leftKeyChars = ["й", "ф", "1", "@", "$"]
     rightKeyChars = []
-    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) || !rightKeyChars.contains($0) }
+    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) && !rightKeyChars.contains($0) }
   }
 
   keysWithAlternates = RussianKeyboardConstants.keysWithAlternates

diff --git a/Keyboards/LanguageKeyboards/Spanish/ESInterfaceVariables.swift b/Keyboards/LanguageKeyboards/Spanish/ESInterfaceVariables.swift
@@ -75,7 +75,7 @@ func getESKeys() {
 
     leftKeyChars = ["q", "a", "1", "-", "[", "_"]
     rightKeyChars = ["p", "ñ", "0", "\"", "=", "·"]
-    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) || !rightKeyChars.contains($0) }
+    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) && !rightKeyChars.contains($0) }
   } else {
     letterKeys = SpanishKeyboardConstants.letterKeysPad
     numberKeys = SpanishKeyboardConstants.numberKeysPad
@@ -84,7 +84,7 @@ func getESKeys() {
 
     leftKeyChars = ["q", "a", "1", "@", "€"]
     rightKeyChars = []
-    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) || !rightKeyChars.contains($0) }
+    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) && !rightKeyChars.contains($0) }
   }
 
   keysWithAlternates = SpanishKeyboardConstants.keysWithAlternates

diff --git a/Keyboards/LanguageKeyboards/Swedish/SVInterfaceVariables.swift b/Keyboards/LanguageKeyboards/Swedish/SVInterfaceVariables.swift
@@ -76,7 +76,7 @@ func getSVKeys() {
 
     leftKeyChars = ["q", "a", "1", "-", "[", "_"]
     rightKeyChars = ["å", "ä", "0", "\"", "=", "·"]
-    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) || !rightKeyChars.contains($0) }
+    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) && !rightKeyChars.contains($0) }
   } else {
     letterKeys = SwedishKeyboardConstants.letterKeysPad
     numberKeys = SwedishKeyboardConstants.numberKeysPad
@@ -85,7 +85,7 @@ func getSVKeys() {
 
     leftKeyChars = ["q", "a", "1", "@", "€"]
     rightKeyChars = []
-    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) || !rightKeyChars.contains($0) }
+    centralKeyChars = allKeys.filter { !leftKeyChars.contains($0) && !rightKeyChars.contains($0) }
   }
 
   keysWithAlternates = SwedishKeyboardConstants.keysWithAlternates