Merge branch 'develop'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zepcode",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "Generates Swift snippets from colors, fonts and layers.",
   "lint-staged": {
     "src/**/*.{js,json}": [

src/index.js

@@ -37,29 +37,29 @@ function layer(context, layerParams) {
 
   if (layerParams.opacity !== 1) {
     const opacity = Math.round(layerParams.opacity * 100) / 100;
-    string += `view.alpha = ${opacity}\n`;
+    string += `view.alpha = ${opacity}`;
   }
 
   if (layerParams.borders.length) {
     const border = layerParams.borders[0];
     const { color } = border.fill;
-    string += `view.layer.borderWidth = ${border.thickness.toString()}\n`;
+    string += `\nview.layer.borderWidth = ${border.thickness.toString()}`;
 
     if (color !== undefined) {
       const borderColorString = zepcodeInstance.cgColorString(
         border.fill.color
       );
-      string += `view.layer.borderColor = ${borderColorString}\n`;
+      string += `\nview.layer.borderColor = ${borderColorString}`;
     }
   }
 
   if (layerParams.borderRadius > 0) {
-    string += `view.layer.cornerRadius = ${layerParams.borderRadius}`;
+    string += `\nview.layer.cornerRadius = ${layerParams.borderRadius}`;
   }
 
   if (layerParams.shadows.length) {
     const shadow = layerParams.shadows[0];
-    string += zepcodeInstance.shadow(shadow);
+    string += `\n${zepcodeInstance.shadow(shadow)}`;
   }
 
   let result = {};

src/templates/color-extension.js

@@ -6,10 +6,10 @@ const colorExtensionTemplate = (colors, needHeader, extensionOptions) =>`import
 extension UIColor {
 ${
     extensionOptions.useCustomColorInitializer
-    ? `\n    convenience init(r red: Int, g green: Int, b blue: Int, a: CGFloat = 1) { // swiftlint:disable:this identifier_name
-        self.init(red: CGFloat(red) / 255,
-                  green: CGFloat(green) / 255,
-                  blue: CGFloat(blue) / 255,
+    ? `\n    convenience init(r: Int, g: Int, b: Int, a: CGFloat = 1) { // swiftlint:disable:this identifier_name
+        self.init(red: CGFloat(r) / 255,
+                  green: CGFloat(g) / 255,
+                  blue: CGFloat(b) / 255,
                   alpha: a)
     }\n`
 	  : ``}

src/templates/linear-gradient.js

@@ -65,25 +65,24 @@ final class LinearGradientLayer: CALayer {
 
 final class GradientView: UIView {
 
-    lazy var gradientLayer: LinearGradientLayer = {
-        let gradientLayer = LinearGradientLayer()
-        gradientLayer.colors = [${colorStopsString}]
-        return gradientLayer
-    }()
+    lazy var gradientLayer = layer as! LinearGradientLayer
+
+    override class var layerClass: AnyClass {
+        return LinearGradientLayer.self
+    }
 
     override init(frame: CGRect) {
         super.init(frame: frame)
-        layer.insertSublayer(gradientLayer, at: 0)
+        configure()
     }
 
     required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
-        layer.insertSublayer(gradientLayer, at: 0)
+        configure()
     }
 
-    override func layoutSubviews() {
-        super.layoutSubviews()
-        gradientLayer.frame = bounds
+    func configure() {
+        gradientLayer.colors = [${colorStopsString}]
     }
 }`;