1.5.0

Examples/DemosApp/DemosApp/ComponentsPreview/Helpers/ModalPreview+Helpers.swift

@@ -60,10 +60,10 @@ struct ModalPreviewHelpers {
       Section("Properties") {
         Picker("Background Color", selection: self.$model.backgroundColor) {
           Text("Default").tag(Optional<UniversalColor>.none)
-          Text("Accent Background").tag(ComponentColor.accent.background)
-          Text("Success Background").tag(ComponentColor.success.background)
-          Text("Warning Background").tag(ComponentColor.warning.background)
-          Text("Danger Background").tag(ComponentColor.danger.background)
+          Text("Accent Background").tag(UniversalColor.accentBackground)
+          Text("Success Background").tag(UniversalColor.successBackground)
+          Text("Warning Background").tag(UniversalColor.warningBackground)
+          Text("Danger Background").tag(UniversalColor.dangerBackground)
         }
         BorderWidthPicker(selection: self.$model.borderWidth)
         Toggle("Closes On Overlay Tap", isOn: self.$model.closesOnOverlayTap)
@@ -203,16 +203,20 @@ Enim habitant laoreet inceptos scelerisque senectus, tellus molestie ut. Eros ri
   }
 
   static func suBody(body: ContentBody) -> some View {
-    Group {
-      switch body {
-      case .shortText:
-        Text(self.bodyShortText)
-      case .longText:
-        Text(self.bodyLongText)
+    HStack {
+      Group {
+        switch body {
+        case .shortText:
+          Text(self.bodyShortText)
+        case .longText:
+          Text(self.bodyLongText)
+        }
       }
+      .font(self.bodyFont.font)
+      .multilineTextAlignment(.leading)
+
+      Spacer()
     }
-    .font(self.bodyFont.font)
-    .multilineTextAlignment(.leading)
   }
 
   static func suFooter(

Examples/DemosApp/DemosApp/ComponentsPreview/PreviewPages/AlertPreview.swift

@@ -84,10 +84,10 @@ struct AlertPreview: View {
         Section("Main Properties") {
           Picker("Background Color", selection: self.$model.backgroundColor) {
             Text("Default").tag(Optional<UniversalColor>.none)
-            Text("Accent Background").tag(ComponentColor.accent.background)
-            Text("Success Background").tag(ComponentColor.success.background)
-            Text("Warning Background").tag(ComponentColor.warning.background)
-            Text("Danger Background").tag(ComponentColor.danger.background)
+            Text("Accent Background").tag(UniversalColor.accentBackground)
+            Text("Success Background").tag(UniversalColor.successBackground)
+            Text("Warning Background").tag(UniversalColor.warningBackground)
+            Text("Danger Background").tag(UniversalColor.dangerBackground)
           }
           BorderWidthPicker(selection: self.$model.borderWidth)
           Toggle("Closes On Overlay Tap", isOn: self.$model.closesOnOverlayTap)
@@ -154,7 +154,7 @@ Enim habitant laoreet inceptos scelerisque senectus, tellus molestie ut. Eros ri
   }
   static let initialSecondaryButton = AlertButtonVM {
     $0.title = SecondaryButtonText.short.rawValue
-    $0.style = .light
+    $0.style = .plain
   }
 
   var primaryButtonVMOrDefault: Binding<AlertButtonVM> {

Examples/DemosApp/DemosApp/ComponentsPreview/PreviewPages/BadgePreview.swift

@@ -17,21 +17,17 @@ struct BadgePreview: View {
         SUBadge(model: self.model)
       }
       Form {
+        ComponentOptionalColorPicker(selection: self.$model.color)
+        ComponentRadiusPicker(selection: self.$model.cornerRadius) {
+          Text("Custom: 4px").tag(ComponentRadius.custom(4))
+        }
+        Toggle("Enabled", isOn: self.$model.isEnabled)
         Picker("Font", selection: self.$model.font) {
-          Text("Default").tag(Optional<UniversalFont>.none)
           Text("Small").tag(UniversalFont.smButton)
           Text("Medium").tag(UniversalFont.mdButton)
           Text("Large").tag(UniversalFont.lgButton)
           Text("Custom: system bold of size 16").tag(UniversalFont.system(size: 16, weight: .bold))
         }
-        ComponentOptionalColorPicker(selection: self.$model.color)
-        ComponentRadiusPicker(selection: self.$model.cornerRadius) {
-          Text("Custom: 4px").tag(ComponentRadius.custom(4))
-        }
-        Picker("Style", selection: self.$model.style) {
-          Text("Filled").tag(BadgeVM.Style.filled)
-          Text("Light").tag(BadgeVM.Style.light)
-        }
         Picker("Paddings", selection: self.$model.paddings) {
           Text("8px; 6px")
             .tag(Paddings(top: 6, leading: 8, bottom: 6, trailing: 8))
@@ -40,6 +36,10 @@ struct BadgePreview: View {
           Text("12px; 10px")
             .tag(Paddings(top: 10, leading: 12, bottom: 10, trailing: 12))
         }
+        Picker("Style", selection: self.$model.style) {
+          Text("Filled").tag(BadgeVM.Style.filled)
+          Text("Light").tag(BadgeVM.Style.light)
+        }
       }
     }
   }

Examples/DemosApp/DemosApp/ComponentsPreview/PreviewPages/BottomModalPreview.swift

@@ -62,7 +62,7 @@ struct BottomModalPreview: View {
           footer: self.$contentFooter,
           additionalPickers: {
             Toggle("Draggable", isOn: self.$model.isDraggable)
-            Toggle("Hides On Swap", isOn: self.$model.hidesOnSwap)
+            Toggle("Hides On Swipe", isOn: self.$model.hidesOnSwipe)
           }
         )
       }

Examples/DemosApp/DemosApp/ComponentsPreview/PreviewPages/CardPreview.swift

@@ -18,10 +18,10 @@ struct CardPreview: View {
         Picker("Background Color", selection: self.$model.backgroundColor) {
           Text("Default").tag(Optional<UniversalColor>.none)
           Text("Secondary Background").tag(UniversalColor.secondaryBackground)
-          Text("Accent Background").tag(ComponentColor.accent.background)
-          Text("Success Background").tag(ComponentColor.success.background)
-          Text("Warning Background").tag(ComponentColor.warning.background)
-          Text("Danger Background").tag(ComponentColor.danger.background)
+          Text("Accent Background").tag(UniversalColor.accentBackground)
+          Text("Success Background").tag(UniversalColor.successBackground)
+          Text("Warning Background").tag(UniversalColor.warningBackground)
+          Text("Danger Background").tag(UniversalColor.dangerBackground)
         }
         BorderWidthPicker(selection: self.$model.borderWidth)
         Picker("Content Paddings", selection: self.$model.contentPaddings) {
@@ -37,7 +37,7 @@ struct CardPreview: View {
           Text("Small").tag(Shadow.small)
           Text("Medium").tag(Shadow.medium)
           Text("Large").tag(Shadow.large)
-          Text("Custom").tag(Shadow.custom(20.0, .zero, ComponentColor.accent.background))
+          Text("Custom").tag(Shadow.custom(20.0, .zero, UniversalColor.accentBackground))
         }
       }
     }

Examples/DemosApp/DemosApp/ComponentsPreview/PreviewPages/CircularProgressPreview.swift

@@ -4,11 +4,8 @@ import UIKit
 
 struct CircularProgressPreview: View {
   @State private var model = Self.initialModel
-  @State private var currentValue: CGFloat = Self.initialValue
 
-  private let circularProgress = UKCircularProgress(
-    model: Self.initialModel
-  )
+  private let circularProgress = UKCircularProgress(model: Self.initialModel)
 
   private let timer = Timer
     .publish(every: 0.5, on: .main, in: .common)
@@ -20,58 +17,54 @@ struct CircularProgressPreview: View {
         self.circularProgress
           .preview
           .onAppear {
-            self.circularProgress.currentValue = Self.initialValue
             self.circularProgress.model = Self.initialModel
           }
           .onChange(of: model) { newModel in
             self.circularProgress.model = newModel
           }
-          .onChange(of: self.currentValue) { newValue in
-            self.circularProgress.currentValue = newValue
-          }
       }
       PreviewWrapper(title: "SwiftUI") {
-        SUCircularProgress(currentValue: self.currentValue, model: self.model)
+        SUCircularProgress(model: self.model)
       }
       Form {
         ComponentColorPicker(selection: self.$model.color)
         CaptionFontPicker(selection: self.$model.font)
+        Picker("Line Cap", selection: self.$model.lineCap) {
+          Text("Rounded").tag(CircularProgressVM.LineCap.rounded)
+          Text("Square").tag(CircularProgressVM.LineCap.square)
+        }
         Picker("Line Width", selection: self.$model.lineWidth) {
           Text("Default").tag(Optional<CGFloat>.none)
           Text("2").tag(Optional<CGFloat>.some(2))
           Text("4").tag(Optional<CGFloat>.some(4))
           Text("8").tag(Optional<CGFloat>.some(8))
         }
-        SizePicker(selection: self.$model.size)
-        Picker("Style", selection: self.$model.style) {
-          Text("Light").tag(CircularProgressVM.Style.light)
-          Text("Striped").tag(CircularProgressVM.Style.striped)
+        Picker("Shape", selection: self.$model.shape) {
+          Text("Circle").tag(CircularProgressVM.Shape.circle)
+          Text("Arc").tag(CircularProgressVM.Shape.arc)
         }
+        SizePicker(selection: self.$model.size)
       }
       .onReceive(self.timer) { _ in
-        if self.currentValue < self.model.maxValue {
+        if self.model.currentValue < self.model.maxValue {
           let step = (self.model.maxValue - self.model.minValue) / 100
-          self.currentValue = min(
+          self.model.currentValue = min(
             self.model.maxValue,
-            self.currentValue + CGFloat(Int.random(in: 1...20)) * step
+            self.model.currentValue + CGFloat(Int.random(in: 1...20)) * step
           )
         } else {
-          self.currentValue = self.model.minValue
+          self.model.currentValue = self.model.minValue
         }
-        self.model.label = "\(Int(self.currentValue))%"
+        self.model.label = "\(Int(self.model.currentValue))%"
       }
     }
   }
 
   // MARK: - Helpers
 
-  private static var initialValue: Double {
-    return 0.0
-  }
-
   private static var initialModel = CircularProgressVM {
     $0.label = "0%"
-    $0.style = .light
+    $0.currentValue = 0.0
   }
 }
 

Examples/DemosApp/DemosApp/ComponentsPreview/PreviewPages/ProgressBarPreview.swift

@@ -4,10 +4,9 @@ import UIKit
 
 struct ProgressBarPreview: View {
   @State private var model = Self.initialModel
-  @State private var currentValue: CGFloat = Self.initialValue
-
-  private let progressBar = UKProgressBar(initialValue: Self.initialValue, model: Self.initialModel)
-
+
+  private let progressBar = UKProgressBar(model: Self.initialModel)
+
   private let timer = Timer
     .publish(every: 0.5, on: .main, in: .common)
     .autoconnect()
@@ -18,15 +17,14 @@ struct ProgressBarPreview: View {
         self.progressBar
           .preview
           .onAppear {
-            self.progressBar.currentValue = self.currentValue
             self.progressBar.model = Self.initialModel
           }
           .onChange(of: self.model) { newValue in
             self.progressBar.model = newValue
           }
       }
       PreviewWrapper(title: "SwiftUI") {
-        SUProgressBar(currentValue: self.$currentValue, model: self.model)
+        SUProgressBar(model: self.model)
       }
       Form {
         ComponentColorPicker(selection: self.$model.color)
@@ -42,25 +40,20 @@ struct ProgressBarPreview: View {
       }
     }
     .onReceive(self.timer) { _ in
-      if self.currentValue < self.model.maxValue {
+      if self.model.currentValue < self.model.maxValue {
         let step = (self.model.maxValue - self.model.minValue) / 100
-        self.currentValue = min(
+        self.model.currentValue = min(
           self.model.maxValue,
-          self.currentValue + CGFloat(Int.random(in: 1...20)) * step
+          self.model.currentValue + CGFloat(Int.random(in: 1...20)) * step
         )
       } else {
-        self.currentValue = self.model.minValue
+        self.model.currentValue = self.model.minValue
       }
-
-      self.progressBar.currentValue = self.currentValue
     }
   }
 
   // MARK: - Helpers
 
-  private static var initialValue: Double {
-    return 0.0
-  }
   private static var initialModel: ProgressBarVM {
     return .init()
   }

Examples/DemosApp/DemosApp/Core/App.swift

@@ -41,15 +41,15 @@ struct App: View {
         NavigationLinkWithTitle("Loading") {
           LoadingPreview()
         }
-        NavigationLinkWithTitle("Progress Bar") {
-          ProgressBarPreview()
-        }
         NavigationLinkWithTitle("Modal (Bottom)") {
           BottomModalPreview()
         }
         NavigationLinkWithTitle("Modal (Center)") {
           CenterModalPreview()
         }
+        NavigationLinkWithTitle("Progress Bar") {
+          ProgressBarPreview()
+        }
         NavigationLinkWithTitle("Radio Group") {
           RadioGroupPreview()
         }