cleanup for colors and layer shape setting

Material.xcodeproj/xcshareddata/xcschemes/Material.xcscheme

 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    version = "1.3">
    <BuildAction
    <BuildAction
       parallelizeBuildables = "YES"
       parallelizeBuildables = "YES"

Sources/iOS/Material+CALayer.swift

@@ -259,20 +259,22 @@ extension CALayer {
       return
       return
     }
     }
     
     
-    if 0 == bounds.width {
-      bounds.size.width = bounds.height
+    if 0 == frame.width {
+      frame.size.width = frame.height
     }
     }
     
     
-    if 0 == bounds.height {
-      bounds.size.height = bounds.width
+    if 0 == frame.height {
+      frame.size.height = frame.width
     }
     }
     
     
     guard .circle == shapePreset else {
     guard .circle == shapePreset else {
+      masksToBounds = false
       cornerRadius = 0
       cornerRadius = 0
       return
       return
     }
     }
     
     
-    cornerRadius = bounds.size.width / 2
+    masksToBounds = true
+    cornerRadius = frame.size.width / 2
   }
   }
   
   
   /// Sets the shadow path.
   /// Sets the shadow path.

Sources/iOS/Material+UIColor.swift

@@ -44,7 +44,11 @@ public extension UIColor {
     let r = argb >> 16
     let r = argb >> 16
     let g = argb >> 8
     let g = argb >> 8
     let b = argb >> 0
     let b = argb >> 0
-    func f(_ v: UInt32) -> CGFloat { return CGFloat(v & 0xff) / 255 }
+    
+    func f(_ v: UInt32) -> CGFloat {
+      return CGFloat(v & 0xff) / 255
+    }
+    
     self.init(red: f(r), green: f(g), blue: f(b), alpha: f(a))
     self.init(red: f(r), green: f(g), blue: f(b), alpha: f(a))
   }
   }
   
   
@@ -55,6 +59,6 @@ public extension UIColor {
    - Parameter rgb: An unsigned 32 bit integer. E.g 0xAA44CC.
    - Parameter rgb: An unsigned 32 bit integer. E.g 0xAA44CC.
    */
    */
   convenience init(rgb: UInt32) {
   convenience init(rgb: UInt32) {
-    self.init(argb: (UInt32(0xff000000)) | rgb)
+    self.init(argb: (0xff000000 as UInt32) | rgb)
   }
   }
 }
 }