working on UIView

Sources/Cacao/NSStringDrawing.swift

@@ -33,7 +33,7 @@ public extension String {
 
         let font = textAttributes.font
 
-        let descender = (Double(font.silicaFont.scaledFont.descent) * font.size) / Double(font.silicaFont.scaledFont.unitsPerEm)
+        let descender = (Double(font.cgFont.scaledFont.descent) * font.pointSize) / Double(font.cgFont.scaledFont.unitsPerEm)
 
         textFrame.height -= descender
 
@@ -57,7 +57,7 @@ public extension TextAttributes {
             textAttributes.font = font
         }
 
-        if let textColor = (attributes[NSForegroundColorAttributeName] as? UIColor)?.cgColor {
+        if let textColor = (attributes[NSForegroundColorAttributeName] as? UIColor) {
 
             textAttributes.color = textColor
         }

Sources/Cacao/TextRendering.swift

@@ -31,7 +31,7 @@ public extension String {
 
         // calculate frame
 
-        let textWidth = attributes.font.cgFont.singleLineWidth(text: self, fontSize: attributes.font.size, textMatrix: textMatrix)
+        let textWidth = attributes.font.cgFont.singleLineWidth(text: self, fontSize: attributes.font.pointSize, textMatrix: textMatrix)
 
         let lines = 1
 
@@ -87,8 +87,8 @@ public extension Silica.Context {
 
     func setTextAttributes(_ attributes: TextAttributes) {
 
-        self.fontSize = attributes.font.size
-        self.setFont(attributes.font.silicaFont)
-        self.fillColor = attributes.color
+        self.fontSize = attributes.font.pointSize
+        self.setFont(attributes.font.cgFont)
+        self.fillColor = attributes.color.cgColor
     }
 }

Sources/Cacao/UIApplication.swift

@@ -261,9 +261,9 @@ extension UIApplicationLaunchOptionsKey: Hashable {
 // Default implementations
 public extension UIApplicationDelegate {
 
-    func application(_ application: UIApplication, willFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]?) -> Bool { }
+    func application(_ application: UIApplication, willFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]?) -> Bool { return true }
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]) -> Bool { }
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]) -> Bool { return true }
 
     func applicationDidBecomeActive(_ application: UIApplication) { }
 

Sources/Cacao/UIColor.swift

@@ -8,7 +8,7 @@
 
 import Silica
 
-public final class UIColor {
+public struct UIColor {
 
     // MARK: - Properties
 
@@ -80,14 +80,3 @@ public final class UIColor {
 
     public static var black = UIColor(cgColor: Color.black)
 }
-
-// MARK: - CacaoConvertible
-
-extension UIColor: CacaoConvertible {
-
-    public func toCacao() -> Silica.Color {
-
-        return cgColor
-    }
-}
-

Sources/Cacao/Label.swift → Sources/Cacao/UILabel.swift

@@ -14,9 +14,9 @@ open class UILabel: UIView {
 
     public final var text: String = "" { didSet { setNeedsDisplay() } }
 
-    public final var font: Font = UILabel.appearance().font { didSet { setNeedsDisplay() } }
+    public final var font: UIFont = UIFont(name: "Helvetica", size: 17)! { didSet { setNeedsDisplay() } }
 
-    public final var color: Color = UILabel.appearance().color { didSet { setNeedsDisplay() } }
+    public final var color: UIColor = UIColor.black { didSet { setNeedsDisplay() } }
 
     public final var textAlignment: TextAlignment = .left { didSet { setNeedsDisplay() } }
 
@@ -43,18 +43,6 @@ extension UILabel {
 
     public static func appearance() -> UILabel {
 
-        struct Static {
-            static let value = create()
-            static func create() -> UILabel {
-
-                let font = UIFont(name: "Helvetica", size: 17)!
-
-                let color = UIColor.black
-
-                let label = UILabel(frame: CGRect())
-            }
-        }
-
-        return Static.value
+        return UILabel(frame: CGRect())
     }
 }

Sources/Cacao/UIView.swift

@@ -451,7 +451,7 @@ open class UIView {
         UIGraphicsPushContext(CGContext(context))
 
         // draw background color
-        context.fillColor = backgroundColor?.cgColor
+        context.fillColor = backgroundColor?.cgColor ?? CGColor.clear
         context.add(rect: bounds)
         try! context.fill()
 

Sources/Cacao/UIViewContentMode.swift

@@ -40,16 +40,13 @@ public extension UIViewContentMode {
 
         switch self {
 
-        case .redraw:
-
-            // tiled?
-            fallthrough
+        case .redraw: fallthrough
 
         case .scaleToFill:
 
             return Rect(size: bounds.size)
 
-        case .aspectFit:
+        case .scaleAspectFit:
 
             let widthRatio = bounds.width / size.width
             let heightRatio = bounds.height / size.height
@@ -73,7 +70,7 @@ public extension UIViewContentMode {
 
             return Rect(origin: origin, size: newSize)
 
-        case .aspectFill:
+        case .scaleAspectFill:
 
             let widthRatio = (bounds.size.width / size.width)
             let heightRatio = (bounds.size.height / size.height)

Sources/Cacao/UIWindow.swift

@@ -16,10 +16,10 @@ open class UIWindow: UIView {
     public final var rootViewController: UIViewController?
 
     /// The screen on which the window is displayed.
-    public final var screen: UIScreen { return UIScreen.main }
+    public final var screen: UIScreen = UIScreen.main
 
     /// The position of the window in the z-axis.
-    public final var windowLevel: UIWindowLevel = .normal
+    public final var windowLevel: UIWindowLevel = UIWindowLevelNormal
 
     /// A Boolean value that indicates whether the window is the key window for the app.
     public final var isKeyWindow: Bool { return UIScreen.main.keyWindow === self }
@@ -31,7 +31,7 @@ open class UIWindow: UIView {
 
         makeKey()
 
-        hidden = false
+        isHidden = false
     }
 
     /// Makes the receiver the key window.
@@ -63,10 +63,10 @@ open class UIWindow: UIView {
 public typealias UIWindowLevel = CGFloat
 
 /// The default level. Use this level for the majority of your content, including for your app’s main window.
-public let UIWindowLevelNormal: UIWindowLevel
+public let UIWindowLevelNormal: UIWindowLevel = 0
 
 /// The level for an alert view. Windows at this level appear on top of windows at the UIWindowLevelNormal level.
-public let UIWindowLevelAlert: UIWindowLevel
+public let UIWindowLevelAlert: UIWindowLevel = 2000
 
 /// The level for a status window. Windows at this level appear on top of windows at the UIWindowLevelAlert level.
-public let UIWindowLevelStatusBar: UIWindowLevel
+public let UIWindowLevelStatusBar: UIWindowLevel = 1000

Tests/CacaoTests/FontTests.swift

@@ -23,8 +23,8 @@ final class FontTests: XCTestCase {
 
         let expectedFullName = "Times New Roman"
 
-        XCTAssert(font.name == font.silicaFont.name)
-        XCTAssert(expectedFullName == font.silicaFont.scaledFont.fullName, "\(expectedFullName) == \(font.silicaFont.scaledFont.fullName)")
+        XCTAssert(font.name == font.cgFont.name)
+        XCTAssert(expectedFullName == font.cgFont.scaledFont.fullName, "\(expectedFullName) == \(font.cgFont.scaledFont.fullName)")
     }
 
     func testCreateTraitFont() {
@@ -34,7 +34,7 @@ final class FontTests: XCTestCase {
 
         let expectedFullName = "Times New Roman"
 
-        XCTAssert(font.name == font.silicaFont.name)
-        XCTAssert(expectedFullName == font.silicaFont.scaledFont.fullName, "\(expectedFullName) == \(font.silicaFont.scaledFont.fullName)")
+        XCTAssert(font.name == font.cgFont.name)
+        XCTAssert(expectedFullName == font.cgFont.scaledFont.fullName, "\(expectedFullName) == \(font.cgFont.scaledFont.fullName)")
     }
 }