Merge pull request #34 from cemolcay/fix/cemolcay-remove-pod

FIx cocoapods

Author: cemolcay

Keyboard/KeyboardLayoutEngine/KeyboardButton.swift

@@ -7,7 +7,6 @@
 //
 
 import UIKit
-import ManualLayout
 
 // MARK: - KeyboardButtonType
 public enum KeyboardButtonType {
@@ -229,9 +228,9 @@ public class KeyboardButton: UIView {
     var contentRoundCorners = UIRectCorner.AllCorners
     switch style.keyPopType! {
     case .Default:
-      contentX = (contentWidth - width) / -2.0
+      contentX = (contentWidth - frame.size.width) / -2.0
     case .Right:
-      contentX = width - contentWidth
+      contentX = frame.size.width - contentWidth
       contentRoundCorners = [.TopLeft, .TopRight, .BottomLeft]
     case .Left:
       contentX = 0
@@ -243,13 +242,13 @@ public class KeyboardButton: UIView {
       y: 0,
       width: contentWidth,
       height: frame.size.height * content.style.heightMultiplier)
-    content.bottom = -padding
+    content.frame.origin.y = -(content.frame.size.height + padding)
 
     let bottomRect = CGRect(
       x: 0,
       y: -padding - 1, // a little hack for filling the gap
-      width: width,
-      height: height + padding)
+      width: frame.size.width,
+      height: frame.size.height + padding)
 
     let path = UIBezierPath(
       roundedRect: content.frame,
@@ -272,8 +271,8 @@ public class KeyboardButton: UIView {
       frame: CGRect(
         x: 0,
         y: 0,
-        width: content.width,
-        height: content.height + padding + frame.size.height))
+        width: content.frame.size.width,
+        height: content.frame.size.height + padding + frame.size.height))
     popup.addSubview(content)
     popup.layer.applyShadow(shadow: popStyle.shadow)
     popup.layer.insertSublayer(mask, atIndex: 0)
@@ -304,15 +303,15 @@ public class KeyboardButton: UIView {
   private func createKeyMenu() -> UIView {
     guard let content = keyMenu else { return UIView() }
     let padding = CGFloat(5)
-    content.bottom = -padding
+    content.frame.origin.y = -(content.frame.size.height + padding)
     content.layer.cornerRadius = style.cornerRadius * style.keyPopWidthMultiplier
     content.clipsToBounds = true
 
     let bottomRect = CGRect(
       x: 0,
       y: -padding - 1, // a little hack for filling the gap
-      width: width,
-      height: height + padding)
+      width: frame.size.width,
+      height: frame.size.height + padding)
 
     let path = UIBezierPath(
       roundedRect: content.frame,
@@ -336,8 +335,8 @@ public class KeyboardButton: UIView {
       frame: CGRect(
         x: 0,
         y: 0,
-        width: content.width,
-        height: content.height + padding + frame.size.height))
+        width: content.frame.size.width,
+        height: content.frame.size.height + padding + frame.size.height))
     popup.addSubview(content)
     popup.layer.insertSublayer(mask, atIndex: 0)
     return popup

Keyboard/KeyboardViewController.swift

@@ -32,7 +32,7 @@ class KeyboardViewController: UIInputViewController, CustomKeyboardDelegate {
     // This is how you add extra buttons to layouts for customising CustomKeyboard without even subclass it!
     let customButton = KeyboardButton(
       type: .Text("🕶"),
-      style: customKeyboard.keyboardStyle.keyButtonStyle,
+      style: CustomKeyboardKeyButtonStyle,
       width: .Static(width: 40),
       identifier: "customButton")
     customKeyboard.keyboardLayout.symbols.addKeyboardButton(

KeyboardLayoutEngine.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "KeyboardLayoutEngine"
-  s.version      = "0.8.9
+  s.version      = "0.9"
   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.8.9" }
+  s.source       = { :git => "https://github.com/cemolcay/KeyboardLayoutEngine.git", :tag => "0.9" }
 
 
   # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #

KeyboardLayoutEngine.xcodeproj/project.pbxproj

@@ -17,5 +17,4 @@ end
 
 target 'Keyboard' do
 pod 'Shadow'
-pod 'ManualLayout'
 end

Podfile

@@ -1,13 +1,12 @@
 PODS:
-  - ManualLayout (1.2.1)
   - Shadow (0.1)
 
 DEPENDENCIES:
-  - ManualLayout
   - Shadow
 
 SPEC CHECKSUMS:
-  ManualLayout: 7326e29d60370c9fdfa41338f87f0b0ae350bf54
   Shadow: 1c2e0d6996cea95de76ad7df440b25d9b85183ca
 
-COCOAPODS: 0.39.0
+PODFILE CHECKSUM: df543bce1ee7f6451a25cf49c2b49af81bcb189e
+
+COCOAPODS: 1.0.1