Add ProgressView

Author: carson-katri

Sources/LiveViewNative/BuiltinRegistry.swift

@@ -46,6 +46,8 @@ struct BuiltinRegistry {
             Shape(element: element, context: context, shape: RoundedRectangle(from: element))
         case "lvn-link":
             Link(element: element, context: context)
+        case "progressview":
+            ProgressView(element: element, context: context)
 
         case "phx-form":
             PhxForm<R>(element: element, context: context)

Sources/LiveViewNative/Utils/ElixirDateFormats.swift

@@ -0,0 +1,50 @@
+//
+//  DateParsing.swift
+//  
+//
+//  Created by Carson Katri on 1/17/23.
+//
+
+import Foundation
+
+/// A formatter that parses ISO8601 dates as produced by Elixir's `DateTime`.
+fileprivate let dateTimeFormatter: ISO8601DateFormatter = {
+    let formatter = ISO8601DateFormatter()
+    formatter.formatOptions = [.withFullDate, .withFullTime, .withFractionalSeconds]
+    return formatter
+}()
+
+/// A formatter that parses ISO8601 dates as produced by Elixir's `Date`.
+fileprivate let dateFormatter: DateFormatter = {
+    let formatter = DateFormatter()
+    formatter.dateFormat = "yyyy-MM-dd"
+    return formatter
+}()
+
+struct ElixirDateFormat: ParseableFormatStyle {
+    typealias FormatInput = Date
+    
+    typealias FormatOutput = String
+    
+    func format(_ value: Date) -> String {
+        dateTimeFormatter.string(from: value)
+    }
+    
+    var parseStrategy = ElixirDateParseStrategy()
+}
+
+struct ElixirDateParseStrategy: ParseStrategy {
+    func parse(_ value: String) throws -> Date {
+        guard let value = dateTimeFormatter.date(from: value) ?? dateFormatter.date(from: value)
+        else { throw DateParseError.invalidDate }
+        return value
+    }
+    
+    enum DateParseError: Error {
+        case invalidDate
+    }
+}
+
+extension FormatStyle where Self == ElixirDateFormat {
+    static var elixirDate: ElixirDateFormat { .init() }
+}

Sources/LiveViewNative/Views/Controls and Indicators/Indicators/ProgressView.swift

@@ -0,0 +1,66 @@
+//
+//  Link.swift
+//
+//
+//  Created by Carson Katri on 1/17/23.
+//
+
+import SwiftUI
+
+struct ProgressView<R: CustomRegistry>: View {
+    @ObservedElement private var element: ElementNode
+    let context: LiveContext<R>
+    
+    init(element: ElementNode, context: LiveContext<R>) {
+        self.context = context
+    }
+    
+    public var body: some View {
+        Group {
+            if let timerIntervalStart = element.attributeValue(for: "timer-interval-start").flatMap({ try? ElixirDateParseStrategy().parse($0) }),
+               let timerIntervalEnd = element.attributeValue(for: "timer-interval-end").flatMap({ try? ElixirDateParseStrategy().parse($0) })
+            {
+                SwiftUI.ProgressView(
+                    timerInterval: timerIntervalStart...timerIntervalEnd,
+                    countsDown: element.attributeValue(for: "counts-down") != "false"
+                ) {
+                    context.buildChildren(of: element)
+                }
+            } else if let value = element.attributeValue(for: "value").flatMap(Double.init) {
+                SwiftUI.ProgressView(
+                    value: value,
+                    total: element.attributeValue(for: "total").flatMap(Double.init) ?? 1
+                ) {
+                    context.buildChildren(of: element)
+                } currentValueLabel: {
+                    EmptyView() // TODO: Implement currentValueLabel once we have a design for multi-body content.
+                }
+            } else {
+                SwiftUI.ProgressView {
+                    context.buildChildren(of: element)
+                }
+            }
+        }
+        .applyProgressViewStyle(element.attributeValue(for: "progress-view-style").flatMap(ProgressViewStyle.init) ?? .automatic)
+    }
+}
+
+fileprivate enum ProgressViewStyle: String {
+    case automatic
+    case linear
+    case circular
+}
+
+fileprivate extension View {
+    @ViewBuilder
+    func applyProgressViewStyle(_ style: ProgressViewStyle) -> some View {
+        switch style {
+        case .automatic:
+            self.progressViewStyle(.automatic)
+        case .linear:
+            self.progressViewStyle(.linear)
+        case .circular:
+            self.progressViewStyle(.circular)
+        }
+    }
+}

Sources/LiveViewNative/Views/Images/AsyncImage.swift

@@ -25,7 +25,7 @@ struct AsyncImage<R: CustomRegistry>: View {
             case .failure(let error):
                 SwiftUI.Text(error.localizedDescription)
             case .empty:
-                ProgressView().progressViewStyle(.circular)
+                SwiftUI.ProgressView().progressViewStyle(.circular)
             @unknown default:
                 EmptyView()
             }

Sources/LiveViewNative/Views/Text Input and Output/Text.swift

@@ -7,20 +7,6 @@
 
 import SwiftUI
 
-/// A formatter that parses ISO8601 dates as produced by Elixir's `DateTime`.
-fileprivate let dateTimeFormatter: ISO8601DateFormatter = {
-    let formatter = ISO8601DateFormatter()
-    formatter.formatOptions = [.withFullDate, .withFullTime, .withFractionalSeconds]
-    return formatter
-}()
-
-/// A formatter that parses ISO8601 dates as produced by Elixir's `Date`.
-fileprivate let dateFormatter: DateFormatter = {
-    let formatter = DateFormatter()
-    formatter.dateFormat = "yyyy-MM-dd"
-    return formatter
-}()
-
 struct Text<R: CustomRegistry>: View {
     let element: ElementNode
     let context: LiveContext<R>
@@ -37,7 +23,7 @@ struct Text<R: CustomRegistry>: View {
     }
 
     private func formatDate(_ date: String) -> Date? {
-        dateTimeFormatter.date(from: date) ?? dateFormatter.date(from: date)
+        try? ElixirDateParseStrategy().parse(date)
     }
 
     private var text: SwiftUI.Text {