Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Normal/Services/NavigationCoordinator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ final class NavigationCoordinator {
}
}

extension NavigationCoordinator {
static let fallback = NavigationCoordinator()
}

extension EnvironmentValues {
@Entry var navigationCoordinator: NavigationCoordinator = .init()
@Entry var navigationCoordinator: NavigationCoordinator = .fallback
}
2 changes: 1 addition & 1 deletion NormalTests/TestSupport/TokenFixtures.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import FamilyControls
import Foundation
import ManagedSettings

enum TokenFixtures {
nonisolated enum TokenFixtures {
static func app(_ id: UInt8) -> ApplicationToken {
decode(id)
}
Expand Down
8 changes: 4 additions & 4 deletions Shared/SharedDTO.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import FamilyControls
import Foundation

struct TimedUnblockDTO: Codable, Sendable, Identifiable {
nonisolated struct TimedUnblockDTO: Codable, Sendable, Identifiable {
let id: String
let selectionData: Data
let endDate: Date
Expand Down Expand Up @@ -37,7 +37,7 @@ struct TimedUnblockDTO: Codable, Sendable, Identifiable {
}
}

struct ScheduleDTO: Codable, Sendable, Identifiable {
nonisolated struct ScheduleDTO: Codable, Sendable, Identifiable {
let id: UUID
let name: String
let selectionData: Data
Expand Down Expand Up @@ -78,7 +78,7 @@ struct ScheduleDTO: Codable, Sendable, Identifiable {
}
}

extension ScheduleDTO {
nonisolated extension ScheduleDTO {
var wrapsPastMidnight: Bool {
startHour * 60 + startMinute + durationMinutes >= 24 * 60
}
Expand All @@ -105,7 +105,7 @@ extension ScheduleDTO {
}
}

extension FamilyActivitySelection {
nonisolated extension FamilyActivitySelection {
func toData() throws -> Data {
try PropertyListEncoder().encode(self)
}
Expand Down
Loading