feat: re-skin to native three-tab UI and add Uninstall Protection
Replace the custom themed presentation with the bare native iOS design language across a three-tab TabView (Home / Rules / Settings): - MainTabView hosts the enforcement lifecycle (refresh loop, rule-change and scene-active reconcile) so it runs regardless of the selected tab - HomeView: "Currently Blocking" + "Usage" sections (replaces AppsHomeView) - RulesListView: rules grouped into Schedule / Time Limit / Open Limit - SettingsView: Uninstall Protection toggle + Manage App Lists - AppListLibraryView / ManageAppListsView: shared App List management - AppSettings: app-group-backed settings store Uninstall Protection: while enabled and any Hard Mode rule is actively blocking, deny device app-removal via a dedicated ManagedSettingsStore (RulePolicy.shouldDenyAppRemoval -> RuleEnforcer -> ShieldController). Slim AppListPickerSheet to the picker role; drop AppsHomeView and the custom Theme/HoldToCommitButton/RuleCardView chrome. Update spec section 6 and the unit/UI test suites accordingly.
This commit is contained in:
@@ -79,3 +79,60 @@ struct RulePolicyTests {
|
||||
#expect(rule.pausedUntil == nil)
|
||||
}
|
||||
}
|
||||
|
||||
@MainActor
|
||||
@Suite("Uninstall protection policy")
|
||||
struct UninstallProtectionPolicyTests {
|
||||
let mondayDuringWork = date(2025, 1, 6, 10, 0)
|
||||
let mondayEvening = date(2025, 1, 6, 19, 0)
|
||||
|
||||
func scheduleRule(hardMode: Bool) -> BlockingRule {
|
||||
BlockingRule(name: "Work Time", hardMode: hardMode)
|
||||
}
|
||||
|
||||
func hardLimitRule() -> BlockingRule {
|
||||
BlockingRule(
|
||||
name: "Time Keeper",
|
||||
configuration: .timeLimit(TimeLimitConfig(dailyLimitMinutes: 45)),
|
||||
hardMode: true,
|
||||
days: Weekday.everyDay)
|
||||
}
|
||||
|
||||
@Test("App removal is only denied with the setting on AND a hard rule active")
|
||||
func deniedOnlyWhenEnabledAndHardLocked() {
|
||||
let hard = scheduleRule(hardMode: true)
|
||||
// Setting off: never deny, even with an active hard rule.
|
||||
#expect(
|
||||
!RulePolicy.shouldDenyAppRemoval(
|
||||
rules: [hard], enabled: false, at: mondayDuringWork, calendar: utc))
|
||||
// Setting on + active hard rule: deny.
|
||||
#expect(
|
||||
RulePolicy.shouldDenyAppRemoval(
|
||||
rules: [hard], enabled: true, at: mondayDuringWork, calendar: utc))
|
||||
// Setting on but the hard rule is outside its window: do not deny.
|
||||
#expect(
|
||||
!RulePolicy.shouldDenyAppRemoval(
|
||||
rules: [hard], enabled: true, at: mondayEvening, calendar: utc))
|
||||
}
|
||||
|
||||
@Test("A soft rule never triggers app-removal denial")
|
||||
func softRuleNeverDenies() {
|
||||
let soft = scheduleRule(hardMode: false)
|
||||
#expect(
|
||||
!RulePolicy.shouldDenyAppRemoval(
|
||||
rules: [soft], enabled: true, at: mondayDuringWork, calendar: utc))
|
||||
}
|
||||
|
||||
@Test("A spent hard-mode limit rule triggers denial; unspent does not")
|
||||
func spentHardLimitDenies() {
|
||||
let rule = hardLimitRule()
|
||||
#expect(
|
||||
RulePolicy.shouldDenyAppRemoval(
|
||||
rules: [rule], enabled: true, usageFor: { _ in RuleUsage(minutesUsed: 45) },
|
||||
at: mondayDuringWork, calendar: utc))
|
||||
#expect(
|
||||
!RulePolicy.shouldDenyAppRemoval(
|
||||
rules: [rule], enabled: true, usageFor: { _ in RuleUsage(minutesUsed: 10) },
|
||||
at: mondayDuringWork, calendar: utc))
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user