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
8 changes: 8 additions & 0 deletions Normal/Models/Settings+UnblockDurations.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ extension Settings {
}
}

func duration(for request: UnlockDurationRequest) -> TimedUnblockDuration? {
switch request {
case let .fixed(duration): duration
case .useDefault: defaultDuration
case .ask: nil
}
}

func isDefault(_ duration: TimedUnblockDuration) -> Bool {
defaultDuration == duration
}
Expand Down
40 changes: 13 additions & 27 deletions Normal/Modifiers/WidgetActionResponder.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,12 @@ private struct WidgetActionResponder: ViewModifier {
@State private var keyType: KeyType?
@State private var allowBypass = false
@State private var requestID: UUID?
@State private var durationGroup: AppGroup?
@State private var durationTarget: UnblockTarget?

private var unblockDurations: [TimedUnblockDuration] {
allSettings.first?.unblockDurations ?? TimedUnblockDuration.presets
}

private var customDomainsEnabled: Bool {
allSettings.first?.enableCustomDomains ?? false
}

private func customDomains(for group: AppGroup) -> [String] {
customDomainsEnabled ? group.customDomains : []
}

func body(content: Content) -> some View {
content
.protectedAction(
Expand All @@ -40,8 +32,8 @@ private struct WidgetActionResponder: ViewModifier {
keyGroupID: actionGroup?.id,
requestID: requestID
)
.sheet(item: $durationGroup) { group in
GroupTimedUnblockSheet(group: group)
.sheet(item: $durationTarget) { target in
UnblockDurationSheet(target: target)
}
.onOpenURL { coordinator.handle(url: $0) }
.onChange(of: coordinator.pendingGroupAction) { _, request in resolve(request) }
Expand All @@ -68,7 +60,7 @@ private struct WidgetActionResponder: ViewModifier {

private func resolve(_ request: GroupActionRequest?) {
guard let request,
durationGroup == nil,
durationTarget == nil,
allSettings.first?.hasCompletedOnboarding == true,
let group = groups.first(where: { $0.id == request.groupID })
else {
Expand All @@ -94,22 +86,16 @@ private struct WidgetActionResponder: ViewModifier {
}

private func unlock(_ group: AppGroup, duration request: UnlockDurationRequest) {
let duration: TimedUnblockDuration? = switch request {
case let .fixed(duration): duration
case .useDefault: allSettings.first?.defaultDuration
case .ask: nil
}
if let duration {
try? timedUnblockService.startGroup(
duration: duration,
groupId: group.id,
selection: group.selection,
customDomains: customDomains(for: group),
screenTimeService: screenTimeService
)
} else {
durationGroup = group
guard let settings = allSettings.first, let duration = settings.duration(for: request) else {
durationTarget = .group(group)
return
}
try? timedUnblockService.start(
.group(group),
duration: duration,
settings: settings,
screenTimeService: screenTimeService
)
}

private func block(_ group: AppGroup) {
Expand Down
67 changes: 67 additions & 0 deletions Normal/Services/UnblockTarget.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
import FamilyControls
import Foundation

enum UnblockTarget: Identifiable {
case all(SelectedApps)
case group(AppGroup)

var id: String {
switch self {
case .all: "all"
case let .group(group): group.id.uuidString
}
}

var selection: FamilyActivitySelection {
switch self {
case let .all(mainSelection): mainSelection.selection
case let .group(group): group.selection
}
}

func customDomains(settings: Settings) -> [String] {
guard settings.enableCustomDomains else { return [] }
return switch self {
case let .all(mainSelection): mainSelection.customDomains
case let .group(group): group.customDomains
}
}
}

extension TimedUnblockService {
func start(
_ target: UnblockTarget,
duration: TimedUnblockDuration,
settings: Settings,
screenTimeService: any ScreenTimeProviding
) throws {
switch target {
case let .all(mainSelection):
try startMain(
duration: duration,
mainSelection: mainSelection,
settings: settings,
screenTimeService: screenTimeService
)
case let .group(group):
try startGroup(
duration: duration,
groupId: group.id,
selection: group.selection,
customDomains: target.customDomains(settings: settings),
screenTimeService: screenTimeService
)
}
}
}

extension ScreenTimeProviding {
func unblockPermanently(_ target: UnblockTarget, settings: Settings) {
switch target {
case .all:
unblockAll(blockAllPreventsAppDelete: settings.blockAllPreventsAppDelete)
case .group:
unblock(selection: target.selection, customDomains: target.customDomains(settings: settings))
}
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import SwiftData
import SwiftUI

struct UnblockDurationSheet: View {
@Environment(TimedUnblockService.self) private var timedUnblockService
@Environment(ScreenTimeService.self) private var screenTimeService
@Query private var allSettings: [Settings]

let target: UnblockTarget
var onUnblock: () -> Void = {}

private var settings: Settings {
allSettings.unwrapped
}

private var title: String {
switch target {
case .all: "Unblock All"
case let .group(group): "Unblock \(group.name)"
}
}

var body: some View {
TimedUnblockSheet(
title: title,
durations: settings.unblockDurations,
initialDuration: settings.defaultDuration,
onTimedUnblock: { duration in
try timedUnblockService.start(
target,
duration: duration,
settings: settings,
screenTimeService: screenTimeService
)
onUnblock()
},
onPermanentUnblock: {
screenTimeService.unblockPermanently(target, settings: settings)
onUnblock()
}
)
}
}
7 changes: 3 additions & 4 deletions Normal/Views/Groups/GroupListCardView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -247,11 +247,10 @@ struct GroupListCardView: View {
) {
requestAction(allowBypass: false) {
if let duration = settings.defaultDuration {
try? timedUnblockService.startGroup(
try? timedUnblockService.start(
.group(appGroup),
duration: duration,
groupId: appGroup.id,
selection: appGroup.selection,
customDomains: customDomains,
settings: settings,
screenTimeService: screenTimeService
)
} else {
Expand Down
2 changes: 1 addition & 1 deletion Normal/Views/Groups/GroupsView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ struct GroupsView: View {
keyGroupID: pendingGroupID
)
.sheet(item: $pendingDurationGroup) { group in
GroupTimedUnblockSheet(group: group)
UnblockDurationSheet(target: .group(group))
}
}
}
Expand Down
25 changes: 3 additions & 22 deletions Normal/Views/Home/HomeView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -64,26 +64,7 @@ struct HomeView: View {
@ViewBuilder
private var timedUnblockSheet: some View {
if let mainSelection {
TimedUnblockSheet(
title: "Unblock All",
durations: settings.unblockDurations,
initialDuration: settings.defaultDuration,
onTimedUnblock: { duration in
try timedUnblockService.startMain(
duration: duration,
mainSelection: mainSelection,
settings: settings,
screenTimeService: screenTimeService
)
recordUnblockForReview()
},
onPermanentUnblock: {
screenTimeService.unblockAll(
blockAllPreventsAppDelete: settings.blockAllPreventsAppDelete
)
recordUnblockForReview()
}
)
UnblockDurationSheet(target: .all(mainSelection), onUnblock: recordUnblockForReview)
}
}

Expand All @@ -99,9 +80,9 @@ struct HomeView: View {
private func unblockMain(_ selection: SelectedApps) {
if let duration = settings.defaultDuration {
do {
try timedUnblockService.startMain(
try timedUnblockService.start(
.all(selection),
duration: duration,
mainSelection: selection,
settings: settings,
screenTimeService: screenTimeService
)
Expand Down
22 changes: 22 additions & 0 deletions NormalTests/Models/SettingsUnblockDurationTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -132,4 +132,26 @@ struct SettingsUnblockDurationTests {
s.customUnblockDurationSeconds = [3600, 3600, 60, 900]
#expect(s.unblockDurations == [.fifteenMinutes, .oneHour])
}

@Test func fixedRequestUsesItsDuration() {
let s = Settings()
s.defaultDuration = .thirtyMinutes
#expect(s.duration(for: .fixed(.fourHours)) == .fourHours)
}

@Test func defaultRequestUsesDefaultDuration() {
let s = Settings()
s.defaultDuration = .thirtyMinutes
#expect(s.duration(for: .useDefault) == .thirtyMinutes)
}

@Test func defaultRequestWithoutDefaultHasNoDuration() {
#expect(Settings().duration(for: .useDefault) == nil)
}

@Test func askRequestHasNoDuration() {
let s = Settings()
s.defaultDuration = .thirtyMinutes
#expect(s.duration(for: .ask) == nil)
}
}
70 changes: 70 additions & 0 deletions NormalTests/Services/UnblockTargetTests.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
import FamilyControls
@testable import Normal
import Testing

@MainActor
struct UnblockTargetTests {
private let activity = FakeDeviceActivityCenter()
private let store = FakeSharedStore()
private let screenTime = FakeScreenTimeService()
private let service: TimedUnblockService

init() {
service = TimedUnblockService(activityCenter: activity, sharedStore: store, onExpiration: {})
}

private func settings(customDomains: Bool) -> Settings {
let settings = Settings()
settings.enableCustomDomains = customDomains
settings.blockAllPreventsAppDelete = false
return settings
}

@Test func startingAllStartsTheMainUnblock() throws {
let main = SelectedApps(selection: FamilyActivitySelection(), customDomains: ["a.com"])

try service.start(.all(main), duration: .oneHour, settings: settings(customDomains: true), screenTimeService: screenTime)

#expect(service.isMainUnblockActive)
#expect(store.timedUnblocks.first?.customDomains == ["a.com"])
#expect(store.timedUnblocks.first?.isGroupUnblock == false)
}

@Test func startingAGroupStartsItsUnblock() throws {
let group = AppGroup(name: "Social", selection: FamilyActivitySelection(), customDomains: ["b.com"])

try service.start(.group(group), duration: .oneHour, settings: settings(customDomains: true), screenTimeService: screenTime)

#expect(service.isGroupUnblockActive(groupId: group.id))
#expect(store.timedUnblocks.first?.customDomains == ["b.com"])
#expect(store.timedUnblocks.first?.isGroupUnblock == true)
}

@Test func customDomainsAreLeftOutWhenTurnedOff() throws {
let group = AppGroup(name: "Social", selection: FamilyActivitySelection(), customDomains: ["b.com"])

try service.start(.group(group), duration: .oneHour, settings: settings(customDomains: false), screenTimeService: screenTime)

#expect(store.timedUnblocks.first?.customDomains == [])
}

@Test func permanentlyUnblockingAllUnblocksEverything() {
let main = SelectedApps(selection: FamilyActivitySelection())

screenTime.unblockPermanently(.all(main), settings: settings(customDomains: true))

#expect(screenTime.unblockAllCalled)
#expect(screenTime.unblockAllPreventsAppDelete == false)
#expect(!screenTime.unblockCalled)
}

@Test func permanentlyUnblockingAGroupUnblocksItsSelection() {
let group = AppGroup(name: "Social", selection: FamilyActivitySelection(), customDomains: ["b.com"])

screenTime.unblockPermanently(.group(group), settings: settings(customDomains: true))

#expect(screenTime.unblockCalled)
#expect(screenTime.unblockCustomDomains == ["b.com"])
#expect(!screenTime.unblockAllCalled)
}
}
Loading