Merge branch 'dev' into SUCountdown

Author: mikhailChelbaev

.github/workflows/swiftlint.yml

@@ -0,0 +1,18 @@
+name: SwiftLint
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/swiftlint.yml'
+      - '.swiftlint.yml'
+      - '**/*.swift'
+
+jobs:
+  SwiftLint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Run SwiftLint
+        uses: norio-nomura/[email protected]
+        with:
+          args: --strict

.swiftlint.yml

@@ -409,7 +409,6 @@ function_body_length:
 
 included:
   - Sources
-  - Examples
 
 excluded:
   - .swiftpm

ComponentsKit.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -38,9 +38,9 @@ struct UKComponentPreview<View, Model>: UIViewRepresentable where View: UKCompon
   let model: Model
   let view: View
 
-  init(model: Model, view: @escaping () -> View) {
-    self.view = view()
-    self.model = model
+  init(view: View) {
+    self.view = view
+    self.model = view.model
   }
 
   func makeUIView(context: Context) -> Container {
@@ -51,3 +51,9 @@ struct UKComponentPreview<View, Model>: UIViewRepresentable where View: UKCompon
     container.component.model = self.model
   }
 }
+
+extension UKComponent {
+  var preview: some View {
+    UKComponentPreview(view: self)
+  }
+}

Examples/DemosApp/DemosApp/ComponentsPreview/Helpers/UKComponentPreview.swift

@@ -10,9 +10,8 @@ struct ButtonPreview: View {
   var body: some View {
     VStack {
       PreviewWrapper(title: "UIKit") {
-        UKComponentPreview(model: self.model) {
-          UKButton(model: self.model)
-        }
+        UKButton(model: self.model)
+          .preview
       }
       PreviewWrapper(title: "SwiftUI") {
         SUButton(model: self.model)
@@ -28,12 +27,12 @@ struct ButtonPreview: View {
         Toggle("Full Width", isOn: self.$model.isFullWidth)
         SizePicker(selection: self.$model.size)
         Picker("Style", selection: self.$model.style) {
-          Text("Filled").tag(ButtonStyle.filled)
-          Text("Plain").tag(ButtonStyle.plain)
-          Text("Bordered with small border").tag(ButtonStyle.bordered(.small))
-          Text("Bordered with medium border").tag(ButtonStyle.bordered(.medium))
-          Text("Bordered with large border").tag(ButtonStyle.bordered(.large))
-          Text("Bordered with custom border: 6px").tag(ButtonStyle.bordered(.custom(6)))
+          Text("Filled").tag(ButtonVM.Style.filled)
+          Text("Plain").tag(ButtonVM.Style.plain)
+          Text("Bordered with small border").tag(ButtonVM.Style.bordered(.small))
+          Text("Bordered with medium border").tag(ButtonVM.Style.bordered(.medium))
+          Text("Bordered with large border").tag(ButtonVM.Style.bordered(.large))
+          Text("Bordered with custom border: 6px").tag(ButtonVM.Style.bordered(.custom(6)))
         }
       }
     }

Examples/DemosApp/DemosApp/ComponentsPreview/PreviewPages/ButtonPreview.swift

@@ -12,12 +12,11 @@ struct CheckboxPreview: View {
   var body: some View {
     VStack {
       PreviewWrapper(title: "UIKit") {
-        UKComponentPreview(model: self.model) {
-          UKCheckbox(
-            initialValue: false,
-            model: self.model
-          )
-        }
+        UKCheckbox(
+          initialValue: false,
+          model: self.model
+        )
+        .preview
       }
       PreviewWrapper(title: "SwiftUI") {
         SUCheckbox(

Examples/DemosApp/DemosApp/ComponentsPreview/PreviewPages/CheckboxPreview.swift

@@ -8,17 +8,16 @@ struct DividerPreview: View {
   var body: some View {
     VStack {
       PreviewWrapper(title: "UIKit") {
-        UKComponentPreview(model: self.model) {
-          UKDivider(model: self.model)
-        }
+        UKDivider(model: self.model)
+          .preview
       }
       PreviewWrapper(title: "SwiftUI") {
         SUDivider(model: self.model)
       }
       Form {
         Picker("Orientation", selection: self.$model.orientation) {
-          Text("Horizontal").tag(DividerVM.DividerOrientation.horizontal)
-          Text("Vertical").tag(DividerVM.DividerOrientation.vertical)
+          Text("Horizontal").tag(DividerVM.Orientation.horizontal)
+          Text("Vertical").tag(DividerVM.Orientation.vertical)
         }
         SizePicker(selection: self.$model.size)
         Picker("Color", selection: self.$model.color) {

Examples/DemosApp/DemosApp/ComponentsPreview/PreviewPages/DividerPreview.swift

@@ -4,21 +4,24 @@ import SwiftUI
 import UIKit
 
 struct InputFieldPreview: View {
-  @State private var model = InputFieldVM {
-    $0.title = "Title"
-  }
+  @State private var model = Self.initialModel
 
   @State private var text: String = ""
   @FocusState private var isFocused: Bool
 
-  @ObservedObject private var inputField = PreviewInputField()
+  @ObservedObject private var inputField = PreviewInputField(model: Self.initialModel)
 
   var body: some View {
     VStack {
       PreviewWrapper(title: "UIKit") {
-        UKComponentPreview(model: self.model) {
-          self.inputField
-        }
+        self.inputField
+          .preview
+          .onAppear {
+            self.inputField.model = Self.initialModel
+          }
+          .onChange(of: self.model) { newValue in
+            self.inputField.model = newValue
+          }
       }
       PreviewWrapper(title: "SwiftUI") {
         SUInputField(
@@ -74,6 +77,12 @@ struct InputFieldPreview: View {
       }
     }
   }
+
+  private static var initialModel: InputFieldVM {
+    return .init {
+      $0.title = "Title"
+    }
+  }
 }
 
 private final class PreviewInputField: UKInputField, ObservableObject, UITextFieldDelegate {

Examples/DemosApp/DemosApp/ComponentsPreview/PreviewPages/InputFieldPreview.swift

@@ -8,9 +8,8 @@ struct LoadingPreview: View {
   var body: some View {
     VStack {
       PreviewWrapper(title: "UIKit") {
-        UKComponentPreview(model: self.model) {
-          UKLoading(model: self.model)
-        }
+        UKLoading(model: self.model)
+          .preview
       }
       PreviewWrapper(title: "SwiftUI") {
         SULoading(model: self.model)
@@ -23,7 +22,7 @@ struct LoadingPreview: View {
         }
         SizePicker(selection: self.$model.size)
         Picker("Style", selection: self.$model.style) {
-          Text("Spinner").tag(LoadingStyle.spinner)
+          Text("Spinner").tag(LoadingVM.Style.spinner)
         }
       }
     }

Examples/DemosApp/DemosApp/ComponentsPreview/PreviewPages/LoadingPreview.swift

@@ -23,9 +23,8 @@ struct RadioGroupPreview: View {
   var body: some View {
     VStack {
       PreviewWrapper(title: "UIKit") {
-        UKComponentPreview(model: self.model) {
-          UKRadioGroup(model: self.model)
-        }
+        UKRadioGroup(model: self.model)
+          .preview
       }
       PreviewWrapper(title: "SwiftUI") {
         SURadioGroup(selectedId: $selectedId, model: self.model)