Skip to content

Added Background Colours & Updated to swift 3 #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mattpaletta wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added Background Colours & Updated to swift 3 #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 16 additions & 21 deletions Keyboard/Catboard.swift
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,21 @@ class Catboard: KeyboardViewController {

let takeDebugScreenshot: Bool = false

override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
NSUserDefaults.standardUserDefaults().registerDefaults([kCatTypeEnabled: true])
override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
UserDefaults.standard.register(defaults: [kCatTypeEnabled: true])
super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
}

required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}

override func keyPressed(key: Key) {
override func keyPressed(_ key: Key) {
let textDocumentProxy = self.textDocumentProxy

let keyOutput = key.outputForCase(self.shiftState.uppercase())

if !NSUserDefaults.standardUserDefaults().boolForKey(kCatTypeEnabled) {
textDocumentProxy.insertText(keyOutput)
return
}

if key.type == .Character || key.type == .SpecialCharacter {
if key.type == .character || key.type == .specialCharacter {
if let context = textDocumentProxy.documentContextBeforeInput {
if context.characters.count < 2 {
textDocumentProxy.insertText(keyOutput)
Expand All @@ -47,18 +42,18 @@ class Catboard: KeyboardViewController {

var index = context.endIndex

index = index.predecessor()
index = context.index(before: index)
if context[index] != " " {
textDocumentProxy.insertText(keyOutput)
return
}

index = index.predecessor()
index = context.index(before: index)
if context[index] == " " {
textDocumentProxy.insertText(keyOutput)
return
}

textDocumentProxy.insertText("\(randomCat())")
textDocumentProxy.insertText(" ")
textDocumentProxy.insertText(keyOutput)
Expand Down Expand Up @@ -87,7 +82,7 @@ class Catboard: KeyboardViewController {
for rowKeys in page.rows {
for key in rowKeys {
if let keyView = self.layout!.viewForKey(key) {
keyView.addTarget(self, action: "takeScreenshotDelay", forControlEvents: .TouchDown)
keyView.addTarget(self, action: "takeScreenshotDelay", for: .touchDown)
}
}
}
Expand All @@ -96,31 +91,31 @@ class Catboard: KeyboardViewController {
}

override func createBanner() -> ExtraView? {
return CatboardBanner(globalColors: self.dynamicType.globalColors, darkMode: false, solidColorMode: self.solidColorMode())
return CatboardBanner(globalColors: type(of: self).globalColors, darkMode: false, solidColorMode: self.solidColorMode())
}

func takeScreenshotDelay() {
NSTimer.scheduledTimerWithTimeInterval(0.1, target: self, selector: Selector("takeScreenshot"), userInfo: nil, repeats: false)
Timer.scheduledTimer(timeInterval: 0.1, target: self, selector: #selector(Catboard.takeScreenshot), userInfo: nil, repeats: false)
}

func takeScreenshot() {
if !CGRectIsEmpty(self.view.bounds) {
UIDevice.currentDevice().beginGeneratingDeviceOrientationNotifications()
if !self.view.bounds.isEmpty {
UIDevice.current.beginGeneratingDeviceOrientationNotifications()

let oldViewColor = self.view.backgroundColor
self.view.backgroundColor = UIColor(hue: (216/360.0), saturation: 0.05, brightness: 0.86, alpha: 1)

let rect = self.view.bounds
UIGraphicsBeginImageContextWithOptions(rect.size, true, 0)
var context = UIGraphicsGetCurrentContext()
self.view.drawViewHierarchyInRect(self.view.bounds, afterScreenUpdates: true)
self.view.drawHierarchy(in: self.view.bounds, afterScreenUpdates: true)
let capturedImage = UIGraphicsGetImageFromCurrentImageContext()
UIGraphicsEndImageContext()
let name = (self.interfaceOrientation.isPortrait ? "Screenshot-Portrait" : "Screenshot-Landscape")
let imagePath = "/Users/archagon/Documents/Programming/OSX/RussianPhoneticKeyboard/External/tasty-imitation-keyboard/\(name).png"

if let pngRep = UIImagePNGRepresentation(capturedImage) {
pngRep.writeToFile(imagePath, atomically: true)
if let pngRep = UIImagePNGRepresentation(capturedImage!) {
try? pngRep.write(to: URL(fileURLWithPath: imagePath), options: [.atomic])
}

self.view.backgroundColor = oldViewColor
Expand All @@ -134,7 +129,7 @@ func randomCat() -> String {
let numCats = cats.characters.count
let randomCat = arc4random() % UInt32(numCats)

let index = cats.startIndex.advancedBy(Int(randomCat))
let index = cats.characters.index(cats.startIndex, offsetBy: Int(randomCat))
let character = cats[index]

return String(character)
Expand Down
12 changes: 6 additions & 6 deletions Keyboard/CatboardBanner.swift
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ class CatboardBanner: ExtraView {
self.addSubview(self.catSwitch)
self.addSubview(self.catLabel)

self.catSwitch.on = NSUserDefaults.standardUserDefaults().boolForKey(kCatTypeEnabled)
self.catSwitch.transform = CGAffineTransformMakeScale(0.75, 0.75)
self.catSwitch.addTarget(self, action: Selector("respondToSwitch"), forControlEvents: UIControlEvents.ValueChanged)
self.catSwitch.isOn = UserDefaults.standard.bool(forKey: kCatTypeEnabled)
self.catSwitch.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
self.catSwitch.addTarget(self, action: #selector(CatboardBanner.respondToSwitch), for: UIControlEvents.valueChanged)

self.updateAppearance()
}
Expand All @@ -44,16 +44,16 @@ class CatboardBanner: ExtraView {

self.catSwitch.center = self.center
self.catLabel.center = self.center
self.catLabel.frame.origin = CGPointMake(self.catSwitch.frame.origin.x + self.catSwitch.frame.width + 8, self.catLabel.frame.origin.y)
self.catLabel.frame.origin = CGPoint(x: self.catSwitch.frame.origin.x + self.catSwitch.frame.width + 8, y: self.catLabel.frame.origin.y)
}

func respondToSwitch() {
NSUserDefaults.standardUserDefaults().setBool(self.catSwitch.on, forKey: kCatTypeEnabled)
UserDefaults.standard.set(self.catSwitch.isOn, forKey: kCatTypeEnabled)
self.updateAppearance()
}

func updateAppearance() {
if self.catSwitch.on {
if self.catSwitch.isOn {
self.catLabel.text = "😺"
self.catLabel.alpha = 1
}
Expand Down
36 changes: 18 additions & 18 deletions Keyboard/DefaultKeyboard.swift
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,78 +10,78 @@ func defaultKeyboard() -> Keyboard {
let defaultKeyboard = Keyboard()

for key in ["Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P"] {
let keyModel = Key(.Character)
let keyModel = Key(.character)
keyModel.setLetter(key)
defaultKeyboard.addKey(keyModel, row: 0, page: 0)
}

for key in ["A", "S", "D", "F", "G", "H", "J", "K", "L"] {
let keyModel = Key(.Character)
let keyModel = Key(.character)
keyModel.setLetter(key)
defaultKeyboard.addKey(keyModel, row: 1, page: 0)
}

let keyModel = Key(.Shift)
let keyModel = Key(.shift)
defaultKeyboard.addKey(keyModel, row: 2, page: 0)

for key in ["Z", "X", "C", "V", "B", "N", "M"] {
let keyModel = Key(.Character)
let keyModel = Key(.character)
keyModel.setLetter(key)
defaultKeyboard.addKey(keyModel, row: 2, page: 0)
}

let backspace = Key(.Backspace)
let backspace = Key(.backspace)
defaultKeyboard.addKey(backspace, row: 2, page: 0)

let keyModeChangeNumbers = Key(.ModeChange)
let keyModeChangeNumbers = Key(.modeChange)
keyModeChangeNumbers.uppercaseKeyCap = "123"
keyModeChangeNumbers.toMode = 1
defaultKeyboard.addKey(keyModeChangeNumbers, row: 3, page: 0)

let keyboardChange = Key(.KeyboardChange)
let keyboardChange = Key(.keyboardChange)
defaultKeyboard.addKey(keyboardChange, row: 3, page: 0)

let settings = Key(.Settings)
let settings = Key(.settings)
defaultKeyboard.addKey(settings, row: 3, page: 0)

let space = Key(.Space)
let space = Key(.space)
space.uppercaseKeyCap = "space"
space.uppercaseOutput = " "
space.lowercaseOutput = " "
defaultKeyboard.addKey(space, row: 3, page: 0)

let returnKey = Key(.Return)
let returnKey = Key(.return)
returnKey.uppercaseKeyCap = "return"
returnKey.uppercaseOutput = "\n"
returnKey.lowercaseOutput = "\n"
defaultKeyboard.addKey(returnKey, row: 3, page: 0)

for key in ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"] {
let keyModel = Key(.SpecialCharacter)
let keyModel = Key(.specialCharacter)
keyModel.setLetter(key)
defaultKeyboard.addKey(keyModel, row: 0, page: 1)
}

for key in ["-", "/", ":", ";", "(", ")", "$", "&", "@", "\""] {
let keyModel = Key(.SpecialCharacter)
let keyModel = Key(.specialCharacter)
keyModel.setLetter(key)
defaultKeyboard.addKey(keyModel, row: 1, page: 1)
}

let keyModeChangeSpecialCharacters = Key(.ModeChange)
let keyModeChangeSpecialCharacters = Key(.modeChange)
keyModeChangeSpecialCharacters.uppercaseKeyCap = "#+="
keyModeChangeSpecialCharacters.toMode = 2
defaultKeyboard.addKey(keyModeChangeSpecialCharacters, row: 2, page: 1)

for key in [".", ",", "?", "!", "'"] {
let keyModel = Key(.SpecialCharacter)
let keyModel = Key(.specialCharacter)
keyModel.setLetter(key)
defaultKeyboard.addKey(keyModel, row: 2, page: 1)
}

defaultKeyboard.addKey(Key(backspace), row: 2, page: 1)

let keyModeChangeLetters = Key(.ModeChange)
let keyModeChangeLetters = Key(.modeChange)
keyModeChangeLetters.uppercaseKeyCap = "ABC"
keyModeChangeLetters.toMode = 0
defaultKeyboard.addKey(keyModeChangeLetters, row: 3, page: 1)
Expand All @@ -95,21 +95,21 @@ func defaultKeyboard() -> Keyboard {
defaultKeyboard.addKey(Key(returnKey), row: 3, page: 1)

for key in ["[", "]", "{", "}", "#", "%", "^", "*", "+", "="] {
let keyModel = Key(.SpecialCharacter)
let keyModel = Key(.specialCharacter)
keyModel.setLetter(key)
defaultKeyboard.addKey(keyModel, row: 0, page: 2)
}

for key in ["_", "\\", "|", "~", "<", ">", "€", "£", "¥", "•"] {
let keyModel = Key(.SpecialCharacter)
let keyModel = Key(.specialCharacter)
keyModel.setLetter(key)
defaultKeyboard.addKey(keyModel, row: 1, page: 2)
}

defaultKeyboard.addKey(Key(keyModeChangeNumbers), row: 2, page: 2)

for key in [".", ",", "?", "!", "'"] {
let keyModel = Key(.SpecialCharacter)
let keyModel = Key(.specialCharacter)
keyModel.setLetter(key)
defaultKeyboard.addKey(keyModel, row: 2, page: 2)
}
Expand Down
Loading