Update routing, onboarding and up to Swift6

oversizedev · Nov 10, 2024 · 6ffd82a · 6ffd82a
1 parent cfc4250
commit 6ffd82a
Show file tree

Hide file tree

Showing 61 changed files with 515 additions and 540 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,7 +6,7 @@ on:
       - "*.*.*"
 
 jobs:
-  build:
+  release:
     name: Create release
     runs-on: ubuntu-latest
     steps:

diff --git a/AppExample/Example (watchOS) Watch App/ContentView.swift b/AppExample/Example (watchOS) Watch App/ContentView.swift
@@ -3,14 +3,14 @@
 // ContentView.swift, created on 19.05.2024
 //
 
-import OversizeKit
+import OversizeCalendarKit
 import OversizeContactsKit
+import OversizeKit
 import OversizeLocationKit
-import OversizePhotoKit
-import OversizeCalendarKit
 import OversizeNoticeKit
 import OversizeNotificationKit
 import OversizeOnboardingKit
+import OversizePhotoKit
 import SwiftUI
 
 struct ContentView: View {

diff --git a/AppExample/Example (watchOS) Watch App/Example__watchOS_App.swift b/AppExample/Example (watchOS) Watch App/Example__watchOS_App.swift
@@ -11,9 +11,8 @@ import SwiftUI
 
 @main
 struct Example__watchOS__Watch_AppApp: App {
-
     @Injected(\.appStateService) var appStateService: AppStateService
-    
+
     var body: some Scene {
         WindowGroup {
             ContentView()

diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/AppExample/Example.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanagement.plist b/AppExample/Example.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,12 +7,12 @@
 		<key>Example (watchOS) Watch App.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>2</integer>
 		</dict>
 		<key>Example.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>1</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

diff --git a/AppExample/Example/Screens/Onboarding/OnboardingView.swift b/AppExample/Example/Screens/Onboarding/OnboardingView.swift
@@ -3,8 +3,6 @@
 // OnboardingView.swift, created on 25.09.2023
 //
 
-
-
 import Factory
 import OversizeServices
 import OversizeUI

diff --git a/AppExample/Example/Test/TestView.swift b/AppExample/Example/Test/TestView.swift
@@ -1,16 +1,16 @@
 //
 // Copyright © 2024 Alexander Romanov
 // TestView.swift, created on 19.05.2024
-//  
+//
 
-import OversizeKit
+import OversizeCalendarKit
 import OversizeContactsKit
+import OversizeKit
 import OversizeLocationKit
-import OversizePhotoKit
-import OversizeCalendarKit
 import OversizeNoticeKit
 import OversizeNotificationKit
 import OversizeOnboardingKit
+import OversizePhotoKit
 import SwiftUI
 
 struct TestView: View {

diff --git a/AppExample/Package.swift b/AppExample/Package.swift
@@ -0,0 +1,4 @@
+// swift-tools-version: 5.6
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
diff --git a/Package.swift b/Package.swift
@@ -1,12 +1,12 @@
-// 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
 
 let productionDependencies: [PackageDescription.Package.Dependency] = [
     .package(url: "https://github.com/oversizedev/OversizeUI.git", .upToNextMajor(from: "3.0.2")),
-    .package(url: "https://github.com/oversizedev/OversizeCore.git", .upToNextMajor(from: "1.3.0")),
+    .package(url: "https://github.com/oversizedev/OversizeCore.git", .upToNextMajor(from: "2.0.0")),
     .package(url: "https://github.com/oversizedev/OversizeServices.git", .upToNextMajor(from: "1.4.0")),
     .package(url: "https://github.com/oversizedev/OversizeLocalizable.git", .upToNextMajor(from: "1.4.0")),
     .package(url: "https://github.com/oversizedev/OversizeComponents.git", .upToNextMajor(from: "1.2.0")),
@@ -43,10 +43,10 @@ if ProcessInfo.processInfo.environment["RELEASE_DEPENDENCIES"].flatMap(Bool.init
 let package = Package(
     name: "OversizeKit",
     platforms: [
-        .iOS(.v16),
-        .macOS(.v13),
-        .tvOS(.v16),
-        .watchOS(.v9),
+        .iOS(.v17),
+        .macOS(.v14),
+        .tvOS(.v17),
+        .watchOS(.v10),
     ],
     products: [
         .library(name: "OversizeKit", targets: ["OversizeKit"]),
@@ -58,7 +58,7 @@ let package = Package(
         .library(name: "OversizeNotificationKit", targets: ["OversizeNotificationKit"]),
         .library(name: "OversizePhotoKit", targets: ["OversizePhotoKit"]),
     ],
-    dependencies: productionDependencies,
+    dependencies: developmentDependencies,
     targets: [
         .target(
             name: "OversizeKit",

diff --git a/Sources/OversizeCalendarKit/CreateEventScreen/CreateEventView.swift b/Sources/OversizeCalendarKit/CreateEventScreen/CreateEventView.swift
@@ -71,7 +71,7 @@ import SwiftUI
                 .controlBorderShape(.capsule)
                 .controlSize(.mini)
             }
-            .navigationBarDividerColor(Color.onSurfaceHighEmphasis.opacity(0.1))
+            .navigationBarDividerColor(Color.onSurfacePrimary.opacity(0.1))
             .safeAreaInset(edge: .bottom) {
                 bottomBar
             }
@@ -98,7 +98,7 @@ import SwiftUI
                 TextField("Event name", text: $viewModel.title)
                     .title(.bold)
                     .focused($focusedField, equals: .title)
-                    .onSurfaceHighEmphasisForegroundColor()
+                    .onSurfacePrimaryForeground()
                     .padding(.bottom, .xxxSmall)
                     .padding(.horizontal, .small)
 
@@ -129,7 +129,7 @@ import SwiftUI
                 HStack {
                     Text("All-day event")
                         .headline(.semibold)
-                        .foregroundColor(.onSurfaceHighEmphasis)
+                        .foregroundColor(.onSurfacePrimary)
                         .padding(.leading, .xxxSmall)
 
                     Spacer()
@@ -148,7 +148,7 @@ import SwiftUI
             var textEditor: some View {
                 VStack(spacing: 2) {
                     TextEditor(text: $viewModel.note)
-                        .onSurfaceHighEmphasisForegroundColor()
+                        .onSurfacePrimaryForeground()
                         .padding(.horizontal, .xSmall)
                         .padding(.vertical, .xxSmall)
                         .focused($focusedField, equals: .note)
@@ -162,7 +162,7 @@ import SwiftUI
                                         if viewModel.note.isEmpty {
                                             Text("Note")
                                                 .body(.medium)
-                                                .onSurfaceDisabledForegroundColor()
+                                                .onSurfaceTertiaryForeground()
                                                 .padding(.small)
                                         }
                                     }
@@ -173,7 +173,7 @@ import SwiftUI
                                         if viewModel.note.isEmpty {
                                             Text("Note")
                                                 .body(.medium)
-                                                .onSurfaceDisabledForegroundColor()
+                                                .onSurfaceTertiaryForeground()
                                                 .padding(.small)
                                         }
                                     }
@@ -183,7 +183,7 @@ import SwiftUI
 
                     TextField("URL", text: $viewModel.url)
                         .focused($focusedField, equals: .url)
-                        .onSurfaceHighEmphasisForegroundColor()
+                        .onSurfacePrimaryForeground()
                         .body(.medium)
                         .padding(.horizontal, .small)
                         .padding(.vertical, 18)
@@ -209,7 +209,7 @@ import SwiftUI
                             viewModel.present(.repeat)
                         } leading: {
                             IconDeprecated(.refresh)
-                                .iconColor(.onSurfaceHighEmphasis)
+                                .iconColor(.onSurfacePrimary)
                         }
                         .rowClearButton(style: .onSurface) {
                             viewModel.repitRule = .never
@@ -235,7 +235,7 @@ import SwiftUI
                                     viewModel.present(.invites)
                                 } leading: {
                                     IconDeprecated(.user)
-                                        .iconColor(.onSurfaceHighEmphasis)
+                                        .iconColor(.onSurfacePrimary)
                                 }
                                 .rowClearButton(style: .onSurface) {
                                     viewModel.members.remove(email)
@@ -269,7 +269,7 @@ import SwiftUI
                                     viewModel.present(.alarm)
                                 } leading: {
                                     IconDeprecated(.bell)
-                                        .iconColor(.onSurfaceHighEmphasis)
+                                        .iconColor(.onSurfacePrimary)
                                 }
                                 .rowClearButton(style: .onSurface) {
                                     viewModel.alarms.remove(alarm)
@@ -303,7 +303,7 @@ import SwiftUI
                                     viewModel.present(.location)
                                 } leading: {
                                     IconDeprecated(.mapPin)
-                                        .iconColor(.onSurfaceHighEmphasis)
+                                        .iconColor(.onSurfacePrimary)
                                 }
                                 .rowClearButton(style: .onSurface) {
                                     viewModel.locationName = nil
@@ -356,16 +356,16 @@ import SwiftUI
                 } label: {
                     VStack(alignment: .leading, spacing: .xxxSmall) {
                         Text("Starts")
-                            .onSurfaceMediumEmphasisForegroundColor()
+                            .onSurfaceSecondaryForeground()
                             .subheadline(.semibold)
 
                         Text(startDateText)
-                            .onSurfaceHighEmphasisForegroundColor()
+                            .onSurfacePrimaryForeground()
                             .headline(.semibold)
 
                         if !isCurrentYearEvent {
                             Text(viewModel.dateStart.formatted(.dateTime.year()))
-                                .onSurfaceHighEmphasisForegroundColor()
+                                .onSurfacePrimaryForeground()
                                 .headline(.semibold)
                         }
                     }
@@ -384,16 +384,16 @@ import SwiftUI
                 } label: {
                     VStack(alignment: .leading, spacing: .xxxSmall) {
                         Text("Ended")
-                            .onSurfaceMediumEmphasisForegroundColor()
+                            .onSurfaceSecondaryForeground()
                             .subheadline(.semibold)
 
                         Text(endDateText)
-                            .onSurfaceHighEmphasisForegroundColor()
+                            .onSurfacePrimaryForeground()
                             .headline(.semibold)
 
                         if !isCurrentYearEvent {
                             Text(viewModel.dateEnd.formatted(.dateTime.year()))
-                                .onSurfaceHighEmphasisForegroundColor()
+                                .onSurfacePrimaryForeground()
                                 .headline(.semibold)
                         }
                     }
@@ -478,13 +478,13 @@ import SwiftUI
             .buttonStyle(.scale)
             .padding(.horizontal, .medium)
             .padding(.vertical, 20)
-            .onSurfaceMediumEmphasisForegroundColor()
+            .onSurfaceSecondaryForeground()
             #if !os(watchOS)
                 .background(.ultraThinMaterial)
             #endif
                 .overlay(alignment: .top) {
                     Rectangle()
-                        .fill(Color.onSurfaceHighEmphasis.opacity(0.05))
+                        .fill(Color.onSurfacePrimary.opacity(0.05))
                         .frame(height: 1)
                 }
         }

diff --git a/Sources/OversizeCalendarKit/CreateEventScreen/CreateEventViewSheet.swift b/Sources/OversizeCalendarKit/CreateEventScreen/CreateEventViewSheet.swift
@@ -102,7 +102,6 @@ import SwiftUI
                     #endif
                 case .repeat:
                     RepeatPicker(selectionRule: $viewModel.repitRule, selectionEndRule: $viewModel.repitEndRule)
-
                 case .alarm:
                     AlarmPicker(selection: $viewModel.alarms)
                         .presentationDetents([.height(630), .large])

diff --git a/Sources/OversizeCalendarKit/CreateEventScreen/SaveForView/SaveForView.swift b/Sources/OversizeCalendarKit/CreateEventScreen/SaveForView/SaveForView.swift
@@ -28,7 +28,7 @@ import SwiftUI
                         } leading: {
                             Image.Date.calendar
                                 .renderingMode(.template)
-                                .foregroundColor(.onSurfaceHighEmphasis)
+                                .foregroundColor(.onSurfacePrimary)
                         }
 
                         Row("Save for feature events") {
@@ -37,7 +37,7 @@ import SwiftUI
                         } leading: {
                             Image.Base.calendar
                                 .renderingMode(.template)
-                                .foregroundColor(.onSurfaceHighEmphasis)
+                                .foregroundColor(.onSurfacePrimary)
                         }
                     }
                 }

diff --git a/Sources/OversizeCalendarKit/Pickers/RepeatPicker.swift b/Sources/OversizeCalendarKit/Pickers/RepeatPicker.swift
@@ -113,7 +113,7 @@ import SwiftUI
                 #if os(iOS)
                 .keyboardType(.numberPad)
                 #endif
-                .textFieldStyle(DefaultPlaceholderTextFieldStyle())
+                .textFieldStyle(.default)
                 .focused($isFocusedRepitCount)
             case .endDate:
                 #if !os(watchOS)

diff --git a/Sources/OversizeContactsKit/AttendeesList/AttendeesView.swift b/Sources/OversizeContactsKit/AttendeesList/AttendeesView.swift
@@ -83,7 +83,7 @@ import SwiftUI
                                 .fillBackgroundPrimary()
                         }
                     Image(systemName: participant.symbolName)
-                        .onPrimaryHighEmphasisForegroundColor()
+                        .onPrimaryForeground()
                         .font(.system(size: 9, weight: .black))
                 }
             }

diff --git a/Sources/OversizeContactsKit/ContactsPicker/EmailPickerView.swift b/Sources/OversizeContactsKit/ContactsPicker/EmailPickerView.swift
@@ -50,7 +50,7 @@ import SwiftUI
             }
             .topToolbar {
                 TextField("Email or name", text: $viewModel.searchText)
-                    .textFieldStyle(DefaultPlaceholderTextFieldStyle())
+                    .textFieldStyle(.default)
                     .focused($isFocusSearth)
                 #if os(iOS)
                     .keyboardType(.emailAddress)
@@ -98,7 +98,7 @@ import SwiftUI
                     Spacer()
                 }
                 .title3()
-                .onSurfaceMediumEmphasisForegroundColor()
+                .onSurfaceSecondaryForeground()
                 .padding(.vertical, .xxSmall)
                 .paddingContent(.horizontal)
 
@@ -136,7 +136,7 @@ import SwiftUI
                     Spacer()
                 }
                 .title3()
-                .onSurfaceMediumEmphasisForegroundColor()
+                .onSurfaceSecondaryForeground()
                 .padding(.vertical, .xxSmall)
                 .paddingContent(.horizontal)
                 .padding(.top, viewModel.lastSelectedEmails.isEmpty ? .zero : .small)

diff --git a/Sources/OversizeKit/AdsKit/AdView.swift b/Sources/OversizeKit/AdsKit/AdView.swift
@@ -30,6 +30,7 @@ public struct AdView: View {
                         await viewModel.fetchAd()
                     }
                 }
+
         case let .result(appAd):
             #if os(iOS)
                 Surface {
@@ -79,7 +80,7 @@ public struct AdView: View {
                 HStack {
                     Text(appAd.title)
                         .subheadline(.bold)
-                        .onSurfaceHighEmphasisForegroundColor()
+                        .onSurfacePrimaryForeground()
 
                     Bage(color: .warning) {
                         Text("Our app")
@@ -89,7 +90,7 @@ public struct AdView: View {
 
                 Text(appAd.description)
                     .subheadline()
-                    .onSurfaceMediumEmphasisForegroundColor()
+                    .onSurfaceSecondaryForeground()
             }
             .padding(.leading, .xSmall)
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ on: @@
           - "*.*.*"
     jobs:
-      build:
+      release:
         name: Create release
         runs-on: ubuntu-latest
         steps:
@@ Expand Down @@