Ci (#2)

* Upd ci * Upd * Update ci.yml * Update ci.yml * Fix dependencies * Fix tvOS * Upd * Fix alert router * Up to Swift6
oversizedev · Nov 9, 2024 · 1cfdc31 · 1cfdc31
1 parent 284aa09
commit 1cfdc31
Show file tree

Hide file tree

Showing 12 changed files with 108 additions and 157 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,23 +1,20 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
+import Foundation
 import PackageDescription
 import Foundation
 
 let remoteDependencies: [PackageDescription.Package.Dependency] = [
     .package(url: "https://github.com/oversizedev/OversizeUI.git", .upToNextMajor(from: "3.0.2")),
-    .package(url: "https://github.com/oversizedev/OversizeServices.git", .upToNextMajor(from: "1.4.0")),
     .package(url: "https://github.com/oversizedev/OversizeModels.git", .upToNextMajor(from: "0.1.0")),
-    .package(url: "https://github.com/hmlongco/Factory.git", .upToNextMajor(from: "2.1.3")),
     .package(url: "https://github.com/oversizedev/OversizeLocalizable.git", .upToNextMajor(from: "1.5.0")),
 ]
 
 let localDependencies: [PackageDescription.Package.Dependency] = [
     .package(name: "OversizeUI", path: "../OversizeUI"),
-    .package(name: "OversizeServices", path: "../OversizeServices"),
     .package(name: "OversizeModels", path: "../OversizeModels"),
     .package(name: "OversizeLocalizable", path: "../OversizeLocalizable"),
-    .package(url: "https://github.com/hmlongco/Factory.git", .upToNextMajor(from: "2.1.3")),
 ]
 
 var dependencies: [PackageDescription.Package.Dependency] = localDependencies
@@ -45,10 +42,7 @@ let package = Package(
         .target(
             name: "OversizeRouter",
             dependencies: [
-                .product(name: "OversizeServices", package: "OversizeServices"),
-                .product(name: "OversizeStoreService", package: "OversizeServices"),
                 .product(name: "OversizeUI", package: "OversizeUI"),
-                .product(name: "Factory", package: "Factory"),
                 .product(name: "OversizeModels", package: "OversizeModels"),
                 .product(name: "OversizeLocalizable", package: "OversizeLocalizable"),
             ]

diff --git a/Sources/OversizeRouter/Protocols/Alertable.swift b/Sources/OversizeRouter/Protocols/Alertable.swift
@@ -5,7 +5,7 @@
 
 import Foundation
 
-public protocol Alertable: Equatable, Hashable, Identifiable {}
+public protocol Alertable: Equatable, Hashable, Identifiable, Sendable {}
 
 public extension Alertable {
     static func == (lhs: Self, rhs: Self) -> Bool {

diff --git a/Sources/OversizeRouter/Protocols/Routable.swift b/Sources/OversizeRouter/Protocols/Routable.swift
@@ -5,13 +5,13 @@
 
 import SwiftUI
 
+public protocol Routable: Equatable, Hashable, Identifiable, Sendable {}
+
 public protocol RoutableView: Routable {
     associatedtype ViewType: View
     func view() -> ViewType
 }
 
-public protocol Routable: Equatable, Hashable, Identifiable {}
-
 public extension Routable {
     func hash(into hasher: inout Hasher) {
         hasher.combine(id)

diff --git a/Sources/OversizeRouter/Protocols/Tabable.swift b/Sources/OversizeRouter/Protocols/Tabable.swift
@@ -5,16 +5,16 @@
 
 import SwiftUI
 
+public protocol Tabable: CaseIterable, Equatable, Identifiable, Hashable, Sendable {
+    var icon: Image { get }
+    var title: String { get }
+}
+
 public protocol TabableView: Tabable {
     associatedtype ViewType: View
     func view() -> ViewType
 }
 
-public protocol Tabable: CaseIterable, Equatable, Identifiable, Hashable {
-    var icon: Image { get }
-    var title: String { get }
-}
-
 public extension Tabable {
     func hash(into hasher: inout Hasher) {
         hasher.combine(id)

diff --git a/Sources/OversizeRouter/Router/Alert/AlertResolve.swift b/Sources/OversizeRouter/Router/Alert/AlertResolve.swift
@@ -8,8 +8,9 @@ import OversizeModels
 import SwiftUI
 
 public enum AppAlert: Alertable {
-    case dismiss(_ action: () -> Void)
-    case delete(_ action: () -> Void)
+    case dismiss(_ action: @Sendable () -> Void)
+    case delete(_ action: @Sendable () -> Void)
+    case unsavedChanges(_ action: @Sendable () -> Void)
     case appError(error: AppError)
     case text(_ title: String)
 }
@@ -21,6 +22,8 @@ public extension AppAlert {
             "dismiss"
         case .delete:
             "delete"
+        case .unsavedChanges:
+            "unsavedChanges"
         case .appError:
             "appError"
         case .text:
@@ -44,10 +47,17 @@ public extension AppAlert {
                 primaryButton: .destructive(Text("\(L10n.Button.delete)"), action: action),
                 secondaryButton: .cancel()
             )
+        case let .unsavedChanges(action):
+            Alert(
+                title: Text("You have unsaved changes"),
+                message: Text("Do you want to discard them and switch versions?"),
+                primaryButton: .destructive(Text("Discard Changes"), action: action),
+                secondaryButton: .cancel()
+            )
         case let .appError(error: error):
             Alert(
                 title: Text(error.title),
-                message: Text(error.subtitle.valueOrEmpty),
+                message: error.subtitle == nil ? nil : Text(error.subtitle ?? ""),
                 dismissButton: .cancel()
             )
         case let .text(title):

diff --git a/Sources/OversizeRouter/Router/HUDRouter.swift b/Sources/OversizeRouter/Router/HUDRouter.swift
@@ -5,7 +5,7 @@
 
 import Foundation
 
-public enum HUDMessageType {
+public enum HUDMessageType: Sendable {
     case `default`
     case success
     case destructive
@@ -16,11 +16,19 @@ public enum HUDMessageType {
     case unfavorite
 }
 
+public enum HUDLoaderStatus: Sendable {
+    case progress(Double? = nil)
+    case success
+    case failure
+}
+
 @Observable
 public class HUDRouter {
     public var isShowHud: Bool = false
+    public var isAutoHide: Bool = true
     public var hudText: String = ""
     public var style: HUDMessageType = .default
+    public var loaderStatus: HUDLoaderStatus = .progress(nil)
 
     public init() {}
 }
@@ -29,6 +37,23 @@ public extension HUDRouter {
     func present(_ text: String, style: HUDMessageType = .default) {
         hudText = text
         self.style = style
+        isAutoHide = true
         isShowHud = true
     }
+
+    func presentLoader(_ text: String = "Loading...", style: HUDMessageType = .default) {
+        hudText = text
+        self.style = style
+        isAutoHide = false
+        isShowHud = true
+        loaderStatus = .progress(nil)
+    }
+
+    func hideLoader(style: HUDMessageType = .default, status: HUDLoaderStatus) {
+        hudText = ""
+        self.style = style
+        isAutoHide = true
+        isShowHud = false
+        loaderStatus = status
+    }
 }
diff --git a/Sources/OversizeRouter/Router/Router.swift b/Sources/OversizeRouter/Router/Router.swift
@@ -60,9 +60,7 @@ public extension Router {
             self.sheetWidth = sheetWidth
             self.sheet = sheet
         }
-
     #else
-
         func present(_ sheet: Destination, fullScreen: Bool = false) {
             if fullScreen {
                 if fullScreenCover != nil {

diff --git a/Sources/OversizeRouter/RoutingViews/RoutingSidebarView.swift b/Sources/OversizeRouter/RoutingViews/RoutingSidebarView.swift
@@ -3,7 +3,6 @@
 // RoutingSidebarView.swift, created on 17.08.2024
 //
 
-import OversizeServices
 import OversizeUI
 import SwiftUI
 
@@ -21,20 +20,19 @@ public struct RoutingSidebarView<Tab>: View where Tab: TabableView {
 
     public var body: some View {
         #if os(iOS) || os(macOS) || os(tvOS) || os(visionOS)
-        if #available(iOS 18.0, macOS 15.0, tvOS 18.0, visionOS 2.0, *) {
-            tabView
-            .tabViewStyle(.sidebarAdaptable)
-            .hud(hudRouter.hudText, isPresented: $hudRouter.isShowHud)
-        } else {
-            tabView
-            .hud(hudRouter.hudText, isPresented: $hudRouter.isShowHud)
-        }
+            if #available(iOS 18.0, macOS 15.0, tvOS 18.0, visionOS 2.0, *) {
+                tabView
+                    .tabViewStyle(.sidebarAdaptable)
+                    .hud(hudRouter.hudText, isPresented: $hudRouter.isShowHud)
+            } else {
+                tabView
+                    .hud(hudRouter.hudText, isPresented: $hudRouter.isShowHud)
+            }
         #else
-
-        tabView
+            tabView
         #endif
     }
-    
+
     var tabView: some View {
         TabView(selection: $router.selection) {
             ForEach(router.tabs) { tab in

diff --git a/Sources/OversizeRouter/RoutingViews/RoutingSplitView.swift b/Sources/OversizeRouter/RoutingViews/RoutingSplitView.swift
@@ -3,7 +3,6 @@
 // RoutingSplitView.swift, created on 06.08.2024
 //
 
-import OversizeServices
 import SwiftUI
 
 public struct RoutingSplitView<TopSidebar, BottomSidebar, Tab>: View where Tab: TabableView, TopSidebar: View, BottomSidebar: View {
@@ -37,14 +36,20 @@ public struct RoutingSplitView<TopSidebar, BottomSidebar, Tab>: View where Tab:
 
     public var body: some View {
         NavigationSplitView(columnVisibility: $navigationSplitViewVisibility) {
-            sidebar
-                .navigationSplitViewColumnWidth(200)
+            sidebar.navigationSplitViewColumnWidth(
+                min: 200,
+                ideal: 280,
+                max: 350
+            )
+            .environment(hudRouter)
+            .environment(router)
         } detail: {
-            router.selection.view()
-                .environment(router)
+            router.selection
+                .view()
                 .environment(hudRouter)
+                .environment(router)
         }
-        .hud(hudRouter.hudText, isPresented: $hudRouter.isShowHud)
+        .hud(hudRouter.hudText, autoHide: hudRouter.isAutoHide, isPresented: $hudRouter.isShowHud)
     }
 
     private var sidebar: some View {
@@ -58,13 +63,13 @@ public struct RoutingSplitView<TopSidebar, BottomSidebar, Tab>: View where Tab:
             }
             .listStyle(.sidebar)
         #elseif os(watchOS) || os(tvOS)
-        List {
-            ForEach(router.tabs) { menu in
-                NavigationLink(value: menu) {
-                    Text(menu.title)
+            List {
+                ForEach(router.tabs) { menu in
+                    NavigationLink(value: menu) {
+                        Text(menu.title)
+                    }
                 }
             }
-        }
         #else
             List(selection: $router.selection) {
                 topSidebar
@@ -81,6 +86,20 @@ public struct RoutingSplitView<TopSidebar, BottomSidebar, Tab>: View where Tab:
                 bottomSidebar
             }
             .listStyle(.sidebar)
+            .toolbar {
+                ToolbarItemGroup {
+                    Spacer()
+
+                    Button(
+                        action: {},
+                        label: {
+                            Image(
+                                systemName: "plus.circle.fill"
+                            )
+                        }
+                    )
+                }
+            }
         #endif
     }
 }

diff --git a/Sources/OversizeRouter/RoutingViews/RoutingTabView.swift b/Sources/OversizeRouter/RoutingViews/RoutingTabView.swift
@@ -3,7 +3,6 @@
 // TabRoutingView.swift, created on 06.08.2024
 //
 
-import OversizeServices
 import OversizeUI
 import SwiftUI
 

diff --git a/Sources/OversizeRouter/RoutingViews/RoutingView.swift b/Sources/OversizeRouter/RoutingViews/RoutingView.swift
@@ -3,13 +3,11 @@
 // RoutingView.swift, created on 28.07.2024
 //
 
-import OversizeServices
 import SwiftUI
 
 public struct RoutingView<Content, Destination>: View where Content: View, Destination: RoutableView {
     @State private var router: Router<Destination> = .init()
     @State private var alertRouter: AlertRouter = .init()
-    @State private var hudRouter: HUDRouter = .init()
 
     private let content: () -> Content
 
@@ -24,6 +22,7 @@ public struct RoutingView<Content, Destination>: View where Content: View, Desti
                     destination.view()
                 }
         }
+        .alert(item: $alertRouter.alert) { $0.alert }
         .sheet(
             item: $router.sheet,
             content: { sheet in
@@ -35,39 +34,31 @@ public struct RoutingView<Content, Destination>: View where Content: View, Desti
                         }
                 }
 
+                #if os(macOS)
+                .frame(
+                    width: router.sheetWidth,
+                    height: router.sheetHeight
+                )
+                #endif
                 .presentationDetents(router.sheetDetents)
                 .presentationDragIndicator(router.dragIndicator)
                 .interactiveDismissDisabled(router.dismissDisabled)
-                .systemServices()
-                .environment(router)
-                .environment(alertRouter)
-                .environment(hudRouter)
-                #if os(macOS)
-                    .frame(
-                        width: router.sheetWidth,
-                        height: router.sheetHeight
-                    )
-                #endif
+                .alert(item: $alertRouter.alert) { $0.alert }
             }
         )
-        .systemServices()
-        .environment(router)
-        .environment(alertRouter)
-        .environment(hudRouter)
         #if os(iOS)
-            .fullScreenCover(item: $router.fullScreenCover) { fullScreenCover in
-                NavigationStack(path: $router.sheetPath) {
-                    fullScreenCover
-                        .view()
-                        .navigationDestination(for: Destination.self) { destination in
-                            destination.view()
-                        }
-                }
-                .systemServices()
-                .environment(router)
-                .environment(alertRouter)
-                .environment(hudRouter)
+        .fullScreenCover(item: $router.fullScreenCover) { fullScreenCover in
+            NavigationStack(path: $router.sheetPath) {
+                fullScreenCover
+                    .view()
+                    .navigationDestination(for: Destination.self) { destination in
+                        destination.view()
+                    }
             }
+            .alert(item: $alertRouter.alert) { $0.alert }
+        }
         #endif
+        .environment(router)
+        .environment(alertRouter)
     }
 }