diff --git a/Colorue.xcworkspace/xcuserdata/DylanWight.xcuserdatad/UserInterfaceState.xcuserstate b/Colorue.xcworkspace/xcuserdata/DylanWight.xcuserdatad/UserInterfaceState.xcuserstate index c671ff9..ebfa15d 100644 Binary files a/Colorue.xcworkspace/xcuserdata/DylanWight.xcuserdatad/UserInterfaceState.xcuserstate and b/Colorue.xcworkspace/xcuserdata/DylanWight.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/MorphuApp/ColorKeyboardView.swift b/MorphuApp/ColorKeyboardView.swift index 1588f0d..10c6c8a 100644 --- a/MorphuApp/ColorKeyboardView.swift +++ b/MorphuApp/ColorKeyboardView.swift @@ -68,7 +68,7 @@ class ColorKeyboardView: UIView, UIGestureRecognizerDelegate { backgroundColor = UIColor(patternImage: R.image.clearPattern()!) let selectorWidth = frame.width/11 - let buttonSize = selectorWidth * 1.25 + let buttonSize = [(selectorWidth * 1.25), 80.0].min()! let colorButtonWrapper = UIView() colorButtonWrapper.frame = CGRect(x: 0, y: buttonSize, width: frame.width, height: frame.height - buttonSize) diff --git a/MorphuApp/DrawingViewController.swift b/MorphuApp/DrawingViewController.swift index b86b27d..0fdb3fd 100644 --- a/MorphuApp/DrawingViewController.swift +++ b/MorphuApp/DrawingViewController.swift @@ -92,7 +92,7 @@ class DrawingViewController: UIViewController, UIGestureRecognizerDelegate, UIPo let keyboardHeight = self.view.frame.height / 5.55833333333333 let canvasHeight = self.view.frame.height - keyboardHeight - 60 - let canvasFrame = CGRect(x:(self.view.frame.width - canvasHeight/1.3)/2, y: 60, width: canvasHeight/1.3, height: canvasHeight) + let canvasFrame = CGRect(x: 0, y: 60, width: view.frame.width, height: canvasHeight) let canvas = CanvasView(frame: canvasFrame) canvas.delegate = self diff --git a/R.generated.swift b/R.generated.swift index c0debad..0015757 100644 --- a/R.generated.swift +++ b/R.generated.swift @@ -176,17 +176,6 @@ struct R: Rswift.Validatable { } #endif - /// This `R.entitlements` struct is generated, and contains static references to 2 properties. - struct entitlements { - static let comAppleDeveloperUbiquityKvstoreIdentifier = infoPlistString(path: [], key: "com.apple.developer.ubiquity-kvstore-identifier") ?? "$(TeamIdentifierPrefix)$(CFBundleIdentifier)" - - struct comAppleDeveloperIcloudContainerIdentifiers { - fileprivate init() {} - } - - fileprivate init() {} - } - /// This `R.file` struct is generated, and contains static references to 3 files. struct file { /// Resource file `GoogleService-Info.plist`. @@ -716,6 +705,24 @@ struct R: Rswift.Validatable { fileprivate init() {} } + /// This `R.info` struct is generated, and contains static references to 1 properties. + struct info { + struct uiApplicationShortcutItems { + struct newDrawing { + static let _key = "NewDrawing" + static let uiApplicationShortcutItemIconType = infoPlistString(path: ["UIApplicationShortcutItems", "NewDrawing"], key: "UIApplicationShortcutItemIconType") ?? "UIApplicationShortcutIconTypeCompose" + static let uiApplicationShortcutItemTitle = infoPlistString(path: ["UIApplicationShortcutItems", "NewDrawing"], key: "UIApplicationShortcutItemTitle") ?? "New Drawing" + static let uiApplicationShortcutItemType = infoPlistString(path: ["UIApplicationShortcutItems", "NewDrawing"], key: "UIApplicationShortcutItemType") ?? "NewDrawing" + + fileprivate init() {} + } + + fileprivate init() {} + } + + fileprivate init() {} + } + /// This `R.reuseIdentifier` struct is generated, and contains static references to 1 reuse identifiers. struct reuseIdentifier { /// Reuse identifier `drawingCell`.