Brendan Chen
2d609043f3
Replace the Opal-style custom presentation with the bare iOS design language, keeping the backend, flows, and accessibility identifiers: - Home: NavigationStack + List; rules now presented as list rows with kind icon, block summary, and trailing live status; '+' in the toolbar - New Rule: plain list of rule types and presets; editor still pushed via navigationDestination - Editor: native Form (DatePicker rows, day circles with summary in the section header, toggle rows with footers, stepper rows); create commits with a prominent 'Add Rule' button replacing Hold to Commit; edit uses toolbar Done plus red Disable/Delete rows - Detail: sheet with inline title + status caption, LabeledContent rows; Edit Rule pushes the editor natively - Default color scheme: drop forced dark mode and custom tint; system appearance and accent throughout - Delete Theme, HoldToCommitButton, RuleCardView and custom chrome - Use concrete Color.primary/secondary in button row labels (the hierarchical styles resolve against the button tint) - Tests: 93 passing; only delta is holdToCommitButton press → commitRuleButton tap in 5 call sites - Spec: add §6 mapping the original presentation to the native one
91 lines
3.0 KiB
Swift
91 lines
3.0 KiB
Swift
//
|
|
// AppSelectionSheet.swift
|
|
// Severed
|
|
//
|
|
|
|
import FamilyControls
|
|
import SwiftUI
|
|
|
|
/// App/category/website selection wrapping Apple's `FamilyActivityPicker`,
|
|
/// presented as a plain sheet with a segmented Block / Allow Only control.
|
|
struct AppSelectionSheet: View {
|
|
@Binding var draft: RuleDraft
|
|
@Environment(\.dismiss) private var dismiss
|
|
|
|
@State private var selection: FamilyActivitySelection
|
|
@State private var mode: SelectionMode
|
|
|
|
init(draft: Binding<RuleDraft>) {
|
|
self._draft = draft
|
|
self._selection = State(
|
|
initialValue: AppSelectionCodec.decode(draft.wrappedValue.selectionData)
|
|
)
|
|
self._mode = State(initialValue: draft.wrappedValue.selectionMode)
|
|
}
|
|
|
|
var body: some View {
|
|
NavigationStack {
|
|
VStack(spacing: 0) {
|
|
Picker("Mode", selection: $mode) {
|
|
ForEach(SelectionMode.allCases, id: \.self) { mode in
|
|
Text(mode.displayName).tag(mode)
|
|
}
|
|
}
|
|
.pickerStyle(.segmented)
|
|
.padding(.horizontal)
|
|
.padding(.vertical, 8)
|
|
.accessibilityIdentifier("selectionModePicker")
|
|
|
|
FamilyActivityPicker(selection: $selection)
|
|
}
|
|
.navigationTitle("Selected")
|
|
.navigationBarTitleDisplayMode(.inline)
|
|
.toolbar {
|
|
ToolbarItem(placement: .cancellationAction) {
|
|
Button("Cancel") {
|
|
dismiss()
|
|
}
|
|
.accessibilityIdentifier("selectionBackButton")
|
|
}
|
|
ToolbarItem(placement: .confirmationAction) {
|
|
Button("Done") {
|
|
save()
|
|
}
|
|
.accessibilityIdentifier("confirmSelectionButton")
|
|
}
|
|
}
|
|
.safeAreaInset(edge: .bottom) {
|
|
VStack(spacing: 8) {
|
|
Text(selectionSummary)
|
|
.font(.footnote)
|
|
.foregroundStyle(.secondary)
|
|
.accessibilityIdentifier("selectionCountLabel")
|
|
Button {
|
|
save()
|
|
} label: {
|
|
Text("Save")
|
|
.frame(maxWidth: .infinity)
|
|
}
|
|
.buttonStyle(.borderedProminent)
|
|
.controlSize(.large)
|
|
.accessibilityIdentifier("saveSelectionButton")
|
|
}
|
|
.padding(.horizontal)
|
|
.padding(.bottom, 8)
|
|
}
|
|
}
|
|
}
|
|
|
|
private var selectionSummary: String {
|
|
let count = AppSelectionCodec.count(of: selection)
|
|
return count == 1 ? "1 App Selected" : "\(count) Apps Selected"
|
|
}
|
|
|
|
private func save() {
|
|
draft.selectionData = AppSelectionCodec.encode(selection)
|
|
draft.selectionCount = AppSelectionCodec.count(of: selection)
|
|
draft.selectionMode = mode
|
|
dismiss()
|
|
}
|
|
}
|