From b821891f8a3158756cd70cf19326ca270755a780 Mon Sep 17 00:00:00 2001 From: Renato Cordeiro Date: Wed, 25 Nov 2015 23:19:19 -0200 Subject: [PATCH] update code to latest swift version (xcode 7.1.1) --- CustomKeyboard.xcodeproj/project.pbxproj | 2 ++ .../UserInterfaceState.xcuserstate | Bin 0 -> 10231 bytes CustomKeyboard/AppDelegate.swift | 5 +++-- Keyboard/KeyButton.swift | 2 +- Keyboard/KeyboardViewController.swift | 18 +++++++++--------- 5 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 CustomKeyboard.xcodeproj/project.xcworkspace/xcuserdata/RSC.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/CustomKeyboard.xcodeproj/project.pbxproj b/CustomKeyboard.xcodeproj/project.pbxproj index 5bd0c02..1e290ff 100644 --- a/CustomKeyboard.xcodeproj/project.pbxproj +++ b/CustomKeyboard.xcodeproj/project.pbxproj @@ -256,6 +256,8 @@ A870F7C61940D2B400534539 /* Project object */ = { isa = PBXProject; attributes = { + LastSwiftMigration = 0710; + LastSwiftUpdateCheck = 0710; LastUpgradeCheck = 0600; ORGANIZATIONNAME = "Brian Donohue"; TargetAttributes = { diff --git a/CustomKeyboard.xcodeproj/project.xcworkspace/xcuserdata/RSC.xcuserdatad/UserInterfaceState.xcuserstate b/CustomKeyboard.xcodeproj/project.xcworkspace/xcuserdata/RSC.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000000000000000000000000000000000..07ae029080040bc15ec9dd0e8d0238d7a443928c GIT binary patch literal 10231 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
R+mN)ivq{HLq@02h@wz9qN#Ji8`V_Uwwgko%%xc z#p+Ac8`YcCSEzf{yVXCXo6_f|N76T@Z%@BF{l4@E(jQ8HI(>KgzVw6XhtfYw|04aX z^na&+oBnuRrPg9|()vVH7u6bIsU-OaXpysevqD|8( zv`Vd7tI=j@bF_upVr_}GOk1rzLpwuTtMzE>wR5#i+IHps^Ly+NO^uhuWn^ZGXZBK;Em zD*amh2K`m~tM%9Fd-T2fe*GQ#JN0+zAJ#vje@y?P{tf*B{oDF?^zZ3E(0`==M*p4u z2mMd_pY{LMAJPA6&>Kn(ZHBdmYYkfr+YPrG?l9~$+--Q)@S0(dVXtAo;X}hg!y&`x zhA$0Y8-6hyF&s7gW;7Uw7_*Go#*xO+#vJ2#<7vhT#)-!1##-ZSqsLfpoNHWYY&Qms zi;W$|knvpOYU3K?TI0pWON<+hn~c{Rw;69Y-f6tcc)#&MBjk}C{jBgkZ7~eL& zZ~V~svGEh*VG}W_Om5RqQ)G{Q8>G{%%`$~P67s!dZ(HKysNnWkB$Gff^-y=ktg z$rLoLHC<`C&GdljWz#oiW>%SPW{25j9%{}qXPaxy^UclXg=U|bH@BOE=58~X&o^IS zUT414e3|)j^OfeS&Ci(MHh*tEV*btihlN_y7Kg=U8Dhz_46_WkjI@lljJHg%Oteh4 zR9LDkQ!LXgXISQ1e3n&~D=a%LuUOu)d}BFkl~`p~xpk0LX*F8SR;x9`>ae=3Bdi71 z@zz<^R_hY$1=b#GpLL6Mn{|ivHtW0AL)NdY-&nu1{$TydMr}%)&StQgY!=%X+gRHi zTa#_MZLMv+?IPO-+h*H#+pV_SZFkxpx4mS0!}fvgBiljSp^TXs4H?0VB^m28Hf21P z@pQ&l8Heo>yUZ@P53=j+CcDLMvlrMW+NauU?9=Tt?X&ES_IdUN_GbG+d#io1J!S{{ zb@r|Ho%Xx!_uB8bKWKl-{)~N>eYgDu`%CuE91_QH$7Dy1;|#|PN0VcLquJqg_#C{W z+p*4Zkz<2nqhpif3daqO9!H;Ji({MPKF7n3M;(tlo^kAQ>~_51*yDK5@v-9*$ES|3 z9RGHF>-gSr#F^%lI~C5sPKz_c>2SK8L!DX99A}}k*jeH%b5=XgaL#bnIz7&M=Uiu# z)8`C2yPd0?;5^^C-g%L8gY#17EzTXzN1Xq3e(vI2QdgQw;Tr79a^<*+U6WltSID)* z6>-H}%UqYZHo7*su5exDy2f>jYny9_>o(UNuAQ#OTu->3ay{evr)!UEpX+tkN3Mge zL$1$UKf5`%)Sc#5xQDv4+}Z9C?osX{cZs{qJ>FgE?r?|QH@dgFUv}?t|2#xKL^VVo S&zT5g;y33NzZ0KBjQ Bool { + + func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool { + self.window = UIWindow(frame: UIScreen.mainScreen().bounds) self.window!.rootViewController = CustomKeyboardViewController() self.window!.backgroundColor = UIColor.whiteColor() diff --git a/Keyboard/KeyButton.swift b/Keyboard/KeyButton.swift index 6c258c5..fc36123 100644 --- a/Keyboard/KeyButton.swift +++ b/Keyboard/KeyButton.swift @@ -27,7 +27,7 @@ class KeyButton: UIButton { self.contentHorizontalAlignment = .Center } - required init(coder aDecoder: NSCoder) { + required init?(coder aDecoder: NSCoder) { super.init(coder: aDecoder) } } \ No newline at end of file diff --git a/Keyboard/KeyboardViewController.swift b/Keyboard/KeyboardViewController.swift index d5af3b5..3510725 100644 --- a/Keyboard/KeyboardViewController.swift +++ b/Keyboard/KeyboardViewController.swift @@ -49,7 +49,7 @@ class KeyboardViewController: UIInputViewController { border.backgroundColor = UIColor(red: 210.0/255, green: 205.0/255, blue: 193.0/255, alpha: 1) self.view.addSubview(border) - var thirdRowTopPadding: CGFloat = topPadding + (keyHeight + rowSpacing) * 2 + let thirdRowTopPadding: CGFloat = topPadding + (keyHeight + rowSpacing) * 2 shiftKey = KeyButton(frame: CGRect(x: 2.0, y: thirdRowTopPadding, width:shiftWidth, height:shiftHeight)) shiftKey!.addTarget(self, action: Selector("shiftKeyPressed:"), forControlEvents: .TouchUpInside) shiftKey!.selected = true @@ -63,7 +63,7 @@ class KeyboardViewController: UIInputViewController { deleteKey!.setImage(UIImage(named: "delete-selected.png"), forState:.Highlighted) self.view.addSubview(deleteKey!) - var bottomRowTopPadding = topPadding + keyHeight * 3 + rowSpacing * 2 + 10 + let bottomRowTopPadding = topPadding + keyHeight * 3 + rowSpacing * 2 + 10 spaceKey = KeyButton(frame: CGRect(x:(320.0 - spaceWidth) / 2, y: bottomRowTopPadding, width:spaceWidth, height:spaceHeight)) spaceKey!.setTitle(" ", forState: .Normal) spaceKey!.addTarget(self, action: Selector("keyPressed:"), forControlEvents: .TouchUpInside) @@ -82,7 +82,7 @@ class KeyboardViewController: UIInputViewController { self.view.addSubview(returnButton!) var y: CGFloat = topPadding - var width = UIScreen.mainScreen().applicationFrame.size.width + let width = UIScreen.mainScreen().applicationFrame.size.width for row in rows { var x: CGFloat = ceil((width - (CGFloat(row.count) - 1) * (keySpacing + keyWidth) - keyWidth) / 2.0) for label in row { @@ -102,7 +102,7 @@ class KeyboardViewController: UIInputViewController { } func returnKeyPressed(sender: UIButton) { - var proxy = self.textDocumentProxy as UITextDocumentProxy + let proxy = self.textDocumentProxy as UITextDocumentProxy proxy.insertText("\n") numCharacters++ shiftPosArr[shiftPosArr.count - 1]++ @@ -116,7 +116,7 @@ class KeyboardViewController: UIInputViewController { func deleteKeyPressed(sender: UIButton) { if numCharacters > 0 { - var proxy = self.textDocumentProxy as UITextDocumentProxy + let proxy = self.textDocumentProxy as UITextDocumentProxy proxy.deleteBackward() numCharacters-- var charactersSinceShift = shiftPosArr[shiftPosArr.count - 1] @@ -149,7 +149,7 @@ class KeyboardViewController: UIInputViewController { } func keyPressed(sender: UIButton) { - var proxy = self.textDocumentProxy as UITextDocumentProxy + let proxy = self.textDocumentProxy as UITextDocumentProxy if spacePressed && sender.titleLabel?.text == " " { proxy.deleteBackward() proxy.insertText(". ") @@ -197,15 +197,15 @@ class KeyboardViewController: UIInputViewController { } } - override func textWillChange(textInput: UITextInput) { + override func textWillChange(textInput: UITextInput?) { // The app is about to change the document's contents. Perform any preparation here. } - override func textDidChange(textInput: UITextInput) { + override func textDidChange(textInput: UITextInput?) { // The app has just changed the document's contents, the document context has been updated. var textColor: UIColor - var proxy = self.textDocumentProxy as UITextDocumentProxy + let proxy = self.textDocumentProxy as UITextDocumentProxy if proxy.keyboardAppearance == UIKeyboardAppearance.Dark { textColor = UIColor.whiteColor() } else {