Merge pull request #35 from cemolcay/fix/cemolcay-keyboard

Fix/cemolcay keyboard

Author: cemolcay

Keyboard/DefaultKeyboard/CustomKeyboard.swift

@@ -37,7 +37,6 @@ public class CustomKeyboard: UIView, KeyboardLayoutDelegate {
     case Symbols
   }
 
-  private(set) var previousShiftState: CustomKeyboardShiftState = .Once
   private(set) var keyboardLayoutState: CustomKeyboardLayoutState = .Letters(shiftState: CustomKeyboardShiftState.Once) {
     didSet {
       keyboardLayoutStateDidChange(oldState: oldValue, newState: keyboardLayoutState)
@@ -128,6 +127,20 @@ public class CustomKeyboard: UIView, KeyboardLayoutDelegate {
     return getKeyboardLayout(ofState: keyboardLayoutState)
   }
 
+  public func enumerateKeyboardLayouts(enumerate: (KeyboardLayout) -> Void) {
+    let layouts = [
+      keyboardLayout.uppercase,
+      keyboardLayout.uppercaseToggled,
+      keyboardLayout.lowercase,
+      keyboardLayout.numbers,
+      keyboardLayout.symbols,
+      ]
+
+    for layout in layouts {
+      enumerate(layout)
+    }
+  }
+
   public func keyboardLayoutStateDidChange(oldState oldState: CustomKeyboardLayoutState?, newState: CustomKeyboardLayoutState) {
     // Remove old keyboard layout
     if let oldState = oldState {
@@ -140,11 +153,6 @@ public class CustomKeyboard: UIView, KeyboardLayoutDelegate {
     let newKeyboardLayout = getKeyboardLayout(ofState: newState)
     newKeyboardLayout.delegate = self
     addSubview(newKeyboardLayout)
-
-    // Set previous shift state
-    if case CustomKeyboardLayoutState.Letters(let shiftState) = newState {
-      previousShiftState = shiftState
-    }
   }
 
   public func reload() {
@@ -260,6 +268,8 @@ public class CustomKeyboard: UIView, KeyboardLayoutDelegate {
   }
 
   public func keyboardLayout(keyboardLayout: KeyboardLayout, didKeyPressEnd keyboardButton: KeyboardButton) {
+    delegate?.customKeyboard?(self, keyboardButtonPressed: keyboardButton)
+
     // If keyboard key is pressed notify no questions asked
     if case KeyboardButtonType.Key(let text) = keyboardButton.type {
       delegate?.customKeyboard?(self, keyButtonPressed: text)
@@ -287,7 +297,7 @@ public class CustomKeyboard: UIView, KeyboardLayoutDelegate {
 
       // Update keyboard layout state
       case .Letters:
-        keyboardLayoutState = .Letters(shiftState: previousShiftState)
+        keyboardLayoutState = .Letters(shiftState: .Off)
       case .Numbers:
         keyboardLayoutState = .Numbers
       case .Symbols:

Keyboard/KeyboardLayoutEngine/KeyboardButton.swift

@@ -98,9 +98,9 @@ public var KeyboardButtonPopupViewTag: Int = 101
 public var KeyboardButtonMenuViewTag: Int = 102
 
 public class KeyboardButton: UIView {
-  public var type: KeyboardButtonType = .Key("")
-  public var widthInRow: KeyboardButtonWidth = .Dynamic
-  public var style: KeyboardButtonStyle!
+  public var type: KeyboardButtonType = .Key("") { didSet { reload() } }
+  public var widthInRow: KeyboardButtonWidth = .Dynamic { didSet { reload() } }
+  public var style: KeyboardButtonStyle! { didSet { reload() } }
   public var keyMenu: KeyMenu?
 
   public var textLabel: UILabel?
@@ -122,8 +122,39 @@ public class KeyboardButton: UIView {
     self.style = style
     self.widthInRow = width
     self.identifier = identifier
+    reload()
+  }
+
+  public required init?(coder aDecoder: NSCoder) {
+    super.init(coder: aDecoder)
+    reload()
+  }
+
+  private func reload() {
     userInteractionEnabled = true
-    setupAppearance()
+    backgroundColor = style.backgroundColor
+    layer.cornerRadius = style.cornerRadius
+
+    // border
+    layer.borderColor = style.borderColor.CGColor
+    layer.borderWidth = style.borderWidth
+
+    // shadow
+    if style.shadowEnabled {
+      layer.shadowColor = style.shadowColor.CGColor
+      layer.shadowOpacity = style.shadowOpacity
+      layer.shadowOffset = style.shadowOffset
+      layer.shadowRadius = style.shadowRadius
+      if let path = style.shadowPath {
+        layer.shadowPath = path.CGPath
+      }
+    }
+
+    // content
+    textLabel?.removeFromSuperview()
+    textLabel = nil
+    imageView?.removeFromSuperview()
+    imageView = nil
 
     switch type {
     case .Key(let text):
@@ -153,28 +184,6 @@ public class KeyboardButton: UIView {
     }
   }
 
-  public required init?(coder aDecoder: NSCoder) {
-    super.init(coder: aDecoder)
-  }
-
-  private func setupAppearance() {
-    backgroundColor = style.backgroundColor
-    layer.cornerRadius = style.cornerRadius
-    // border
-    layer.borderColor = style.borderColor.CGColor
-    layer.borderWidth = style.borderWidth
-    // shadow
-    if style.shadowEnabled {
-      layer.shadowColor = style.shadowColor.CGColor
-      layer.shadowOpacity = style.shadowOpacity
-      layer.shadowOffset = style.shadowOffset
-      layer.shadowRadius = style.shadowRadius
-      if let path = style.shadowPath {
-        layer.shadowPath = path.CGPath
-      }
-    }
-  }
-
   // MARK: Layout
   public override func layoutSubviews() {
     super.layoutSubviews()

KeyboardLayoutEngine.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "KeyboardLayoutEngine"
-  s.version      = "0.9"
+  s.version      = "0.9.1"
   s.summary      = "⌨️ Simplest custom keyboard generator for iOS ever!"
 
   # This description is used to generate tags and improve search results.
@@ -336,7 +336,7 @@ optional func defaultKeyboardDidPressReturnButton(defaultKeyboard: DefaultKeyboa
   #  Supports git, hg, bzr, svn and HTTP.
   #
 
-  s.source       = { :git => "https://github.com/cemolcay/KeyboardLayoutEngine.git", :tag => "0.9" }
+  s.source       = { :git => "https://github.com/cemolcay/KeyboardLayoutEngine.git", :tag => "0.9.1" }
 
 
   # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #