Implemented a picker for status bar disk selection from gao-sun#169

87kangsw · Jan 31, 2021 · 391efb7 · 391efb7
1 parent 477c7bf
commit 391efb7
Show file tree

Hide file tree

Showing 17 changed files with 48 additions and 2 deletions.
diff --git a/Resource/ar.lproj/Localizable.strings b/Resource/ar.lproj/Localizable.strings
@@ -120,6 +120,7 @@
 
 // MARK: Disk
 "disk.eject" = "Eject";
+"disk.select" = "Select disk";
 
 // MARK: Language
 "language" = "اللغة";

diff --git a/Resource/cs.lproj/Localizable.strings b/Resource/cs.lproj/Localizable.strings
@@ -119,6 +119,7 @@
 
 // MARK: Disk
 "disk.eject" = "Vysunout";
+"disk.select" = "Select disk";
 
 // MARK: Language
 "language" = "Language";

diff --git a/Resource/de.lproj/Localizable.strings b/Resource/de.lproj/Localizable.strings
@@ -120,6 +120,7 @@
 
 // MARK: Disk
 "disk.eject" = "Eject";
+"disk.select" = "Select disk";
 
 // MARK: Language
 "language" = "Sprache:";

diff --git a/Resource/en.lproj/Localizable.strings b/Resource/en.lproj/Localizable.strings
@@ -120,6 +120,7 @@
 
 // MARK: Disk
 "disk.eject" = "Eject";
+"disk.select" = "Select disk";
 
 // MARK: Language
 "language" = "Language";

diff --git a/Resource/es.lproj/Localizable.strings b/Resource/es.lproj/Localizable.strings
@@ -120,6 +120,7 @@
 
 // MARK: Disk
 "disk.eject" = "Eject";
+"disk.select" = "Select disk";
 
 // MARK: Language
 "language" = "Idioma";

diff --git a/Resource/fr.lproj/Localizable.strings b/Resource/fr.lproj/Localizable.strings
@@ -120,6 +120,7 @@
 
 // MARK: Disk
 "disk.eject" = "Ejecter";
+"disk.select" = "Select disk";
 
 // MARK: Language
 "language" = "Language";

diff --git a/Resource/ja.lproj/Localizable.strings b/Resource/ja.lproj/Localizable.strings
@@ -120,6 +120,7 @@
 
 // MARK: Disk
 "disk.eject" = "Eject";
+"disk.select" = "Select disk";
 
 // MARK: Language
 "language" = "言語";

diff --git a/Resource/ko.lproj/Localizable.strings b/Resource/ko.lproj/Localizable.strings
@@ -123,6 +123,7 @@
 
 // MARK: Disk
 "disk.eject" = "Eject";
+"disk.select" = "Select disk";
 
 // MARK: Language
 "language" = "언어";

diff --git a/Resource/mn.lproj/Localizable.strings b/Resource/mn.lproj/Localizable.strings
@@ -120,6 +120,7 @@
 
 // MARK: Disk
 "disk.eject" = "Eject";
+"disk.select" = "Select disk";
 
 // MARK: Language
 "language" = "Хэл";

diff --git a/Resource/pt.lproj/Localizable.strings b/Resource/pt.lproj/Localizable.strings
@@ -120,6 +120,7 @@
 
 // MARK: Disk
 "disk.eject" = "Eject";
+"disk.select" = "Select disk";
 
 // MARK: Language
 "language" = "Língua";

diff --git a/Resource/ru.lproj/Localizable.strings b/Resource/ru.lproj/Localizable.strings
@@ -120,6 +120,7 @@
 
 // MARK: Disk
 "disk.eject" = "Eject";
+"disk.select" = "Select disk";
 
 // MARK: Language
 "language" = "Язык";

diff --git a/Resource/uk.lproj/Localizable.strings b/Resource/uk.lproj/Localizable.strings
@@ -120,6 +120,7 @@
 
 // MARK: Disk
 "disk.eject" = "Eject";
+"disk.select" = "Select disk";
 
 // MARK: Language
 "language" = "Мова";

diff --git a/Resource/zh-Hans.lproj/Localizable.strings b/Resource/zh-Hans.lproj/Localizable.strings
@@ -120,6 +120,7 @@
 
 // MARK: Disk
 "disk.eject" = "推出";
+"disk.select" = "Select disk";
 
 // MARK: Language
 "language" = "语言";

diff --git a/eul/Schema/EulComponent.swift b/eul/Schema/EulComponent.swift
@@ -26,6 +26,13 @@ enum EulComponent: String, CaseIterable, Identifiable, Codable, JSONCodabble, Lo
         return true
     }
 
+    var isDiskSelectionAvailable: Bool {
+        guard [.Disk].contains(self) else {
+            return false
+        }
+        return true
+    }
+
     func getView() -> AnyView {
         switch self {
         case .Battery:

diff --git a/eul/Schema/EulComponentConfig.swift b/eul/Schema/EulComponentConfig.swift
@@ -13,12 +13,14 @@ struct EulComponentConfig: Codable {
     var component: EulComponent
     var showIcon: Bool = true
     var showGraph: Bool = false
+    var diskSelection: String = SharedStore.disk.list?.disks.first?.name ?? "N/A"
 
     var json: JSON {
         JSON([
             "component": component.rawValue,
             "showIcon": showIcon,
             "showGraph": showGraph,
+            "diskSelection": diskSelection,
         ])
     }
 }
@@ -38,5 +40,9 @@ extension EulComponentConfig {
         if let bool = json["showGraph"].bool {
             showGraph = bool
         }
+
+        if let string = json["diskSelection"].string {
+            diskSelection = string
+        }
     }
 }
diff --git a/eul/Store/DiskStore.swift b/eul/Store/DiskStore.swift
@@ -16,15 +16,21 @@ class DiskStore: ObservableObject, Refreshable {
 
     @ObservedObject var componentsStore = SharedStore.components
     @ObservedObject var menuComponentsStore = SharedStore.menuComponents
+    var config: EulComponentConfig {
+        SharedStore.componentConfig[EulComponent.Disk]
+    }
 
     @Published var list: DiskList?
+    @Published var selectedDisk: DiskList.Disk?
 
     var ceilingBytes: UInt64? {
-        list?.disks.reduce(0) { $0 + $1.size }
+        // list?.disks.reduce(0) { $0 + $1.size }
+        selectedDisk?.size
     }
 
     var freeBytes: UInt64? {
-        list?.disks.reduce(0) { $0 + $1.freeSize }
+        // list?.disks.reduce(0) { $0 + $1.freeSize }
+        selectedDisk?.freeSize
     }
 
     var usageString: String {
@@ -89,6 +95,9 @@ class DiskStore: ObservableObject, Refreshable {
                 isEjectable: isEjectable
             )
         })
+        if config.diskSelection != "", let list = list {
+            selectedDisk = list.disks.filter { $0.name == config.diskSelection }.first
+        }
     }
 
     init() {

diff --git a/eul/Views/Preference/PreferenceComponentConfigView.swift b/eul/Views/Preference/PreferenceComponentConfigView.swift
@@ -36,6 +36,7 @@ extension Preference {
     struct ComponentConfigView: View {
         @EnvironmentObject var batteryStore: BatteryStore
         @EnvironmentObject var componentConfigStore: ComponentConfigStore
+        @EnvironmentObject var diskStore: DiskStore
 
         var component: EulComponent
         var config: Binding<EulComponentConfig> {
@@ -56,6 +57,16 @@ extension Preference {
                                     .inlineSection()
                             }
                         }
+                        if config.wrappedValue.component.isDiskSelectionAvailable {
+                            let disks = diskStore.list?.disks ?? []
+                            Picker(selection: config.diskSelection, label: Text("disk.select".localized()).inlineSection(), content: {
+                                ForEach(disks) {
+                                    Text($0.name)
+                                        .inlineSection()
+                                }
+                            })
+                                .frame(width: 200)
+                        }
                     }
                     if component == .CPU {
                         ComponentTextConfigView<CpuTextComponent>()