- Redundant setting ~ Demo → @Defaults

Cork/CorkApp.swift

@@ -30,7 +30,7 @@ struct CorkApp: App
     @StateObject var updateProgressTracker: UpdateProgressTracker = .init()
     @State var outdatedPackagesTracker: OutdatedPackagesTracker = .init()
 
-    @AppStorage("demoActivatedAt") var demoActivatedAt: Date?
+    @Default(.demoActivatedAt) var demoActivatedAt: Date?
     @AppStorage("hasValidatedEmail") var hasValidatedEmail: Bool = false
 
     @AppStorage("hasFinishedOnboarding") var hasFinishedOnboarding: Bool = false

Cork/Localizable.xcstrings

@@ -45765,6 +45765,7 @@
       }
     },
     "settings.discoverability.time-span.month" : {
+      "extractionState" : "stale",
       "localizations" : {
         "cs" : {
           "stringUnit" : {
@@ -45853,6 +45854,7 @@
       }
     },
     "settings.discoverability.time-span.quarter-year" : {
+      "extractionState" : "stale",
       "localizations" : {
         "cs" : {
           "stringUnit" : {
@@ -45941,6 +45943,7 @@
       }
     },
     "settings.discoverability.time-span.year" : {
+      "extractionState" : "stale",
       "localizations" : {
         "cs" : {
           "stringUnit" : {

Cork/Views/Installation/Install Package.swift

@@ -33,7 +33,6 @@ struct AddFormulaView: View
 
     @FocusState var isSearchFieldFocused: Bool
 
-    @AppStorage("showPackagesStillLeftToInstall") var showPackagesStillLeftToInstall: Bool = false
     @Default(.notifyAboutPackageInstallationResults) var notifyAboutPackageInstallationResults
 
     var shouldShowSheetTitle: Bool

Cork/Views/Licensing/Licensing View.swift

@@ -7,10 +7,11 @@
 
 import CorkShared
 import SwiftUI
+import Defaults
 
 struct LicensingView: View
 {
-    @AppStorage("demoActivatedAt") var demoActivatedAt: Date?
+    @Default(.demoActivatedAt) var demoActivatedAt: Date?
     @AppStorage("hasValidatedEmail") var hasValidatedEmail: Bool = false
 
     @Environment(AppState.self) var appState: AppState

Cork/Views/Licensing/Sub-Views/Bought/Licensing - Bought View.swift

@@ -6,10 +6,11 @@
 //
 
 import SwiftUI
+import Defaults
 
 struct Licensing_BoughtView: View
 {
-    @AppStorage("demoActivatedAt") var demoActivatedAt: Date?
+    @Default(.demoActivatedAt) var demoActivatedAt: Date?
     @AppStorage("hasFinishedLicensingWorkflow") var hasFinishedLicensingWorkflow: Bool = false
     @AppStorage("hasValidatedEmail") var hasValidatedEmail: Bool = false
 

Cork/Views/Licensing/Sub-Views/Demo/Licensing - Demo View.swift

@@ -7,10 +7,11 @@
 
 import SwiftUI
 import CorkShared
+import Defaults
 
 struct Licensing_DemoView: View
 {
-    @AppStorage("demoActivatedAt") var demoActivatedAt: Date?
+    @Default(.demoActivatedAt) var demoActivatedAt: Date?
 
     @Environment(\.dismiss) var dismiss: DismissAction
 

Cork/Views/Licensing/Sub-Views/Not Bought Or Activated Demo/Licensing - Not Bought Or Activated View.swift

@@ -8,10 +8,11 @@
 import SwiftUI
 import CorkShared
 import ButtonKit
+import Defaults
 
 struct Licensing_NotBoughtOrActivatedView: View
 {
-    @AppStorage("demoActivatedAt") var demoActivatedAt: Date?
+    @Default(.demoActivatedAt) var demoActivatedAt: Date?
 
     @Environment(\.dismiss) var dismiss: DismissAction
 

Cork/Views/Licensing/Sub-Views/Self-Compiled/Self-Compiled View.swift

@@ -6,10 +6,11 @@
 //
 
 import SwiftUI
+import Defaults
 
 struct Licensing_SelfCompiledView: View
 {
-    @AppStorage("demoActivatedAt") var demoActivatedAt: Date?
+    @Default(.demoActivatedAt) var demoActivatedAt: Date?
     @AppStorage("hasFinishedLicensingWorkflow") var hasFinishedLicensingWorkflow: Bool = false
 
     @Environment(\.dismiss) var dismiss: DismissAction

Cork/Views/Settings/Panes/Installation Pane.swift

@@ -16,8 +16,6 @@ struct InstallationAndUninstallationPane: View
     @Default(.showCompatibilityWarning) var showCompatibilityWarning
     @Default(.includeGreedyOutdatedPackages) var includeGreedyOutdatedPackages: Bool
 
-    @AppStorage("showPackagesStillLeftToInstall") var showPackagesStillLeftToInstall: Bool = false
-
     @AppStorage("purgeCacheAfterEveryUninstallation") var purgeCacheAfterEveryUninstallation: Bool = false
     @AppStorage("removeOrphansAfterEveryUninstallation") var removeOrphansAfterEveryUninstallation: Bool = false
 
@@ -40,35 +38,6 @@ struct InstallationAndUninstallationPane: View
         {
             Form
             {
-                /*
-                 LabeledContent
-                 {
-                 Toggle(isOn: $showPackagesStillLeftToInstall)
-                 {
-                 Text("settings.install-uninstall.installation.toggle")
-                 }
-                 } label: {
-                 Text("settings.install-uninstall.installation")
-                 }
-
-                 LabeledContent
-                 {
-                 VStack(alignment: .leading)
-                 {
-                 Toggle(isOn: $purgeCacheAfterEveryUninstallation)
-                 {
-                 Text("settings.install-uninstall.uninstallation.purge-cache")
-                 }
-                 Toggle(isOn: $removeOrphansAfterEveryUninstallation)
-                 {
-                 Text("settings.install-uninstall.uninstallation.remove-orphans")
-                 }
-                 }
-                 } label: {
-                 Text("settings.install-uninstall.uninstallation")
-                 }
-                 */
-
                 LabeledContent
                 {
                     Toggle(isOn: $shouldRequestPackageRemovalConfirmation)

Modules/Shared/Defaults/Demo.swift

@@ -0,0 +1,15 @@
+//
+//  Demo.swift
+//  CorkShared
+//
+//  Created by David Bureš - P on 15.05.2025.
+//
+
+import Foundation
+import Defaults
+
+public extension Defaults.Keys
+{
+    /// When the demo was activated. If it's `nil`, it hasn't been activated
+    static let demoActivatedAt: Key<Date?> = .init("demoActivatedAt", default: nil)
+}