~ More migration to @Defaults

buresdv · buresdv · commit cf44793cda5c · 2025-04-10T16:02:11.000+02:00
diff --git a/Cork/AppDelegate.swift b/Cork/AppDelegate.swift
@@ -10,6 +10,7 @@ import DavidFoundation
 import Foundation
 import SwiftUI
 import CorkShared
+import Defaults
 
 class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject
 {
diff --git a/Cork/Enums/Package Sorting.swift b/Cork/Enums/Package Sorting.swift
@@ -7,7 +7,4 @@
 
 import Foundation
 
-enum PackageSortingOptions: String, Codable, CaseIterable
-{
-    case alphabetically, byInstallDate, bySize
-}
+
diff --git a/Cork/Localizable.xcstrings b/Cork/Localizable.xcstrings
@@ -46561,6 +46561,7 @@
       }
     },
     "settings.general.sort-packages.alphabetically" : {
+      "extractionState" : "stale",
       "localizations" : {
         "cs" : {
           "stringUnit" : {
@@ -46643,6 +46644,7 @@
       }
     },
     "settings.general.sort-packages.install-date" : {
+      "extractionState" : "stale",
       "localizations" : {
         "cs" : {
           "stringUnit" : {
@@ -46725,6 +46727,7 @@
       }
     },
     "settings.general.sort-packages.size" : {
+      "extractionState" : "stale",
       "localizations" : {
         "cs" : {
           "stringUnit" : {
diff --git a/Cork/Views/Installation/Install Package.swift b/Cork/Views/Installation/Install Package.swift
@@ -9,6 +9,7 @@ import CorkNotifications
 import CorkShared
 import SwiftUI
 import ButtonKit
+import Defaults
 
 struct AddFormulaView: View
 {
diff --git a/Cork/Views/Installation/Sub-Views/Initial.swift b/Cork/Views/Installation/Sub-Views/Initial.swift
@@ -7,6 +7,7 @@
 
 import SwiftUI
 import CorkShared
+import Defaults
 
 struct InstallationInitialView: View
 {
diff --git a/Cork/Views/Installation/Sub-Views/Status Views/Installation Finished Successfully.swift b/Cork/Views/Installation/Sub-Views/Status Views/Installation Finished Successfully.swift
@@ -8,6 +8,7 @@
 import CorkNotifications
 import CorkShared
 import SwiftUI
+import Defaults
 
 struct InstallationFinishedSuccessfullyView: View
 {
diff --git a/Cork/Views/Settings/Panes/General Pane.swift b/Cork/Views/Settings/Panes/General Pane.swift
@@ -37,14 +37,11 @@ struct GeneralPane: View
         {
             Form
             {
-                Picker(selection: $sortPackagesBy)
-                {
-                    Text("settings.general.sort-packages.alphabetically")
-                        .tag(PackageSortingOptions.alphabetically)
-                    Text("settings.general.sort-packages.install-date")
-                        .tag(PackageSortingOptions.byInstallDate)
-                    Text("settings.general.sort-packages.size")
-                        .tag(PackageSortingOptions.bySize)
+                Picker(selection: $sortPackagesBy) {
+                    ForEach(PackageSortingOptions.allCases)
+                    { packageSortingOption in
+                        Text(packageSortingOption.description)
+                    }
                 } label: {
                     Text("settings.general.sort-packages")
                 }
diff --git a/Cork/Views/Updating/Complete Updating/Sub-Views/Stages/Errored Out Stage.swift b/Cork/Views/Updating/Complete Updating/Sub-Views/Stages/Errored Out Stage.swift
@@ -5,9 +5,10 @@
 //  Created by David Bureš on 17.10.2023.
 //
 
-import SwiftUI
-import CorkShared
 import CorkNotifications
+import CorkShared
+import Defaults
+import SwiftUI
 
 struct ErroredOutStageView: View
 {
diff --git a/Cork/Views/Updating/Complete Updating/Sub-Views/Stages/Finished Stage.swift b/Cork/Views/Updating/Complete Updating/Sub-Views/Stages/Finished Stage.swift
@@ -5,8 +5,9 @@
 //  Created by David Bureš on 17.10.2023.
 //
 
-import SwiftUI
 import CorkNotifications
+import Defaults
+import SwiftUI
 
 struct FinishedStageView: View
 {
diff --git a/Cork/Views/Updating/Complete Updating/Sub-Views/Stages/No Updates Available.swift b/Cork/Views/Updating/Complete Updating/Sub-Views/Stages/No Updates Available.swift
@@ -5,9 +5,10 @@
 //  Created by David Bureš on 17.10.2023.
 //
 
-import SwiftUI
-import CorkShared
 import CorkNotifications
+import CorkShared
+import Defaults
+import SwiftUI
 
 struct NoUpdatesAvailableStageView: View
 {
diff --git a/Modules/Shared/Enums/Package Sorting.swift b/Modules/Shared/Enums/Package Sorting.swift
@@ -8,7 +8,22 @@
 import Foundation
 import Defaults
 
-public enum PackageSortingOptions: String, Codable, CaseIterable, Defaults.Serializable
+public enum PackageSortingOptions: Codable, CaseIterable, Identifiable, Defaults.Serializable
 {
     case alphabetically, byInstallDate, bySize
+    
+    public var id: Self { self }
+
+    public var description: LocalizedStringResource
+    {
+        switch self
+        {
+        case .alphabetically:
+            return "settings.general.sort-packages.alphabetically"
+        case .byInstallDate:
+            return "settings.general.sort-packages.install-date"
+        case .bySize:
+            return "settings.general.sort-packages.size"
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import DavidFoundation`
`10`	`10`	`import Foundation`
`11`	`11`	`import SwiftUI`
`12`	`12`	`import CorkShared`
	`13`	`+import Defaults`
`13`	`14`
`14`	`15`	`class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject`
`15`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import CorkNotifications`
`9`	`9`	`import CorkShared`
`10`	`10`	`import SwiftUI`
`11`	`11`	`import ButtonKit`
	`12`	`+import Defaults`
`12`	`13`
`13`	`14`	`struct AddFormulaView: View`
`14`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`import SwiftUI`
`9`	`9`	`import CorkShared`
	`10`	`+import Defaults`
`10`	`11`
`11`	`12`	`struct InstallationInitialView: View`
`12`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`import CorkNotifications`
`9`	`9`	`import CorkShared`
`10`	`10`	`import SwiftUI`
	`11`	`+import Defaults`
`11`	`12`
`12`	`13`	`struct InstallationFinishedSuccessfullyView: View`
`13`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,9 @@`
`5`	`5`	`// Created by David Bureš on 17.10.2023.`
`6`	`6`	`//`
`7`	`7`
`8`		`-import SwiftUI`
`9`	`8`	`import CorkNotifications`
	`9`	`+import Defaults`
	`10`	`+import SwiftUI`
`10`	`11`
`11`	`12`	`struct FinishedStageView: View`
`12`	`13`	`{`