Merge pull request #74 from gao-sun/v1.4.3

v1.4.3

Resource/de.lproj/Localizable.strings

@@ -119,6 +119,7 @@
 "language.de" = "Deutsch";
 "language.ru" = "Русский";
 "language.es" = "Español";
+"language.pt" = "Português";
 
 // MARK: General UI
 "ui.app" = "App";

Resource/en.lproj/Localizable.strings

@@ -119,6 +119,7 @@
 "language.de" = "Deutsch";
 "language.ru" = "Русский";
 "language.es" = "Español";
+"language.pt" = "Português";
 
 // MARK: General UI
 "ui.app" = "App";

Resource/es.lproj/Localizable.strings

@@ -119,6 +119,7 @@
 "language.de" = "Deutsch";
 "language.ru" = "Русский";
 "language.es" = "Español";
+"language.pt" = "Português";
 
 // MARK: General UI
 "ui.app" = "Aplicación";

Resource/pt.lproj/Localizable.strings

@@ -33,7 +33,7 @@
 "cpu.temperature" = "Temp";
 "gpu.temperature" = "Temp GPU";
 "cpu.info" = "Info";
-"cpu.physical_cores" = Núcleos Físicos";
+"cpu.physical_cores" = "Núcleos Físicos";
 "cpu.logical_cores" = "Núcleos Lógicos";
 "cpu.up_time" = "Tempo de Atividade";
 "cpu.thermal_level" = "Nvl. Térmico";
@@ -81,7 +81,7 @@
 "temp.kelvin" = "Kelvin";
 
 // MARK: Text Display
-"text_display" = Estilo de Texto";
+"text_display" = "Estilo de Texto";
 "text_display.compact" = "compacto";
 "text_display.single_line" = "uma linha";
 

Resource/ru.lproj/Localizable.strings

@@ -119,6 +119,7 @@
 "language.de" = "Deutsch";
 "language.ru" = "Русский";
 "language.es" = "Español";
+"language.pt" = "Português";
 
 // MARK: General UI
 "ui.app" = "Приложение";

Resource/zh-Hans.lproj/Localizable.strings

@@ -119,6 +119,7 @@
 "language.de" = "Deutsch";
 "language.ru" = "Русский";
 "language.es" = "Español";
+"language.pt" = "Português";
 
 // MARK: General UI
 "ui.app" = "App";

SharedLibrary/Extension/Int.swift

@@ -18,4 +18,24 @@ public extension Int {
         }
         return count
     }
+
+    var readableTimeInMin: String {
+        if self <= 0 {
+            return "0 min"
+        }
+
+        var result = [String]()
+        let hour = self / 60
+        let minute = self % 60
+
+        if hour > 0 {
+            result.append("\(hour) hr")
+        }
+
+        if minute > 0 {
+            result.append("\(minute) min")
+        }
+
+        return result.joined(separator: " ")
+    }
 }

SharedLibrary/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>

SharedLibrary/Utilities/ByteUnit.swift

@@ -38,7 +38,7 @@ public struct ByteUnit {
     public var readable: String {
         switch bytes {
         case 0..<(kilo * kilo):
-            return "\(String(format: "%.\(kilobytes >= 100 ? 0 : 1)f", kilobytes)) KB"
+            return "\(String(format: "%.\(0)f", kilobytes)) KB"
         case kilo..<(kilo * kilo * kilo):
             return "\(String(format: "%.\(megabytes >= 100 ? 0 : 1)f", megabytes)) MB"
         case (kilo * kilo * kilo)...UInt64.max:

eul/Extension/View.swift

@@ -49,6 +49,6 @@ extension View {
             .environmentObject(PreferenceStore.shared)
             .environmentObject(sharedComponentsStore)
             .environmentObject(sharedMenuComponentsStore)
-            .environmentObject(StatusComponentConfigStore.shared)
+            .environmentObject(ComponentConfigStore.shared)
     }
 }

eul/Schema/EulComponent.swift

@@ -18,7 +18,7 @@ enum EulComponent: String, CaseIterable, Identifiable, Codable {
         "component.\(rawValue.lowercased())".localized()
     }
 
-    var graphAvailable: Bool {
+    var isGraphAvailable: Bool {
         guard self == .CPU || self == .Memory else {
             return false
         }

eul/Schema/FramePreferenceKey.swift

@@ -0,0 +1,24 @@
+//
+//  FramePreferenceKey.swift
+//  eul
+//
+//  Created by Gao Sun on 2020/11/11.
+//  Copyright © 2020 Gao Sun. All rights reserved.
+//
+
+import SwiftUI
+
+struct FramePreferenceData: Equatable {
+    let index: Int
+    let frame: CGRect
+}
+
+struct FramePreferenceKey: PreferenceKey {
+    typealias Value = [FramePreferenceData]
+
+    static var defaultValue: [FramePreferenceData] = []
+
+    static func reduce(value: inout [FramePreferenceData], nextValue: () -> [FramePreferenceData]) {
+        value += nextValue()
+    }
+}

eul/Schema/SizeChangeView.swift

@@ -14,14 +14,16 @@ typealias SizeChangeViewBuilder = (SizeChange) -> AnyView
 
 protocol SizeChangeView: View {
     var onSizeChange: SizeChange { get }
-    func reportSize(_ geometry: GeometryProxy) -> Color
+    func reportSize(_ geometry: GeometryProxy) -> AnyView
 }
 
 extension SizeChangeView {
-    func reportSize(_ geometry: GeometryProxy) -> Color {
-        DispatchQueue.main.async {
-            self.onSizeChange?(geometry.size)
-        }
-        return Color.clear
+    func reportSize(_ geometry: GeometryProxy) -> AnyView {
+        AnyView(
+            Color.clear.preference(
+                key: SizePreferenceKey.self,
+                value: [geometry.size]
+            )
+        )
     }
 }

eul/Schema/SizePreferenceKey.swift

@@ -0,0 +1,19 @@
+//
+//  SizePreferenceKey.swift
+//  eul
+//
+//  Created by Gao Sun on 2020/11/11.
+//  Copyright © 2020 Gao Sun. All rights reserved.
+//
+
+import SwiftUI
+
+struct SizePreferenceKey: PreferenceKey {
+    typealias Value = [CGSize]
+
+    static var defaultValue: [CGSize] = []
+
+    static func reduce(value: inout [CGSize], nextValue: () -> [CGSize]) {
+        value += nextValue()
+    }
+}

eul/StatusBar/StatusBarItem.swift

@@ -20,15 +20,17 @@ class StatusBarItem: NSObject, NSMenuDelegate {
     private var statusView: NSHostingView<AnyView>?
     private var menuView: NSHostingView<AnyView>?
     private var shouldCloseObserver: NSObjectProtocol?
+    private var visibilityTimer: Timer?
 
     var isVisible: Bool {
         get { item.isVisible }
         set {
             item.isVisible = newValue
             if newValue {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                visibilityTimer?.invalidate()
+                visibilityTimer = Timer.scheduledTimer(withTimeInterval: 1.5, repeats: false, block: { _ in
                     self.checkStatusItemVisibility()
-                }
+                })
             }
         }
     }
@@ -90,6 +92,7 @@ class StatusBarItem: NSObject, NSMenuDelegate {
             let customItem = NSMenuItem()
             menuView = StatusBarMenuHostingView(rootView: menuBuilder(onMenuSizeChange))
             menuView?.translatesAutoresizingMaskIntoConstraints = false
+            menuView?.setFrameSize(NSSize(width: 1, height: 1))
             customItem.view = menuView
             statusBarMenu.addItem(customItem)
         }

eul/Store/StatusComponentConfigStore.swift → eul/Store/ComponentConfigStore.swift

@@ -1,5 +1,5 @@
 //
-//  StatusComponentConfigStore.swift
+//  ComponentConfigStore.swift
 //  eul
 //
 //  Created by Gao Sun on 2020/11/8.
@@ -10,9 +10,9 @@ import Combine
 import Foundation
 import SwiftyJSON
 
-class StatusComponentConfigStore: ObservableObject {
-    static let shared = StatusComponentConfigStore()
-    private let userDefaultsKey = "statusComponentConfig"
+class ComponentConfigStore: ObservableObject {
+    static let shared = ComponentConfigStore()
+    private let userDefaultsKey = "componentConfig"
     private var cancellable: AnyCancellable?
 
     @Published var configDict: [EulComponent: EulComponentConfig] = [:]

eul/Store/CpuStore.swift

@@ -41,7 +41,7 @@ class CpuStore: ObservableObject, Refreshable {
     private func getUsage() {
         let usage = Info.system.usageCPU()
         usageCPU = usage
-        usageString = String(format: "%.1f%%", usage.system + usage.user)
+        usageString = String(format: "%.0f%%", usage.system + usage.user)
         usageHistory = (usageHistory + [usage.system + usage.user]).suffix(10)
     }
 

eul/ViewModifier/StableWidth.swift

@@ -9,21 +9,43 @@
 import SwiftUI
 
 extension View {
-    func stableWidth(_ factor: CGFloat = 10) -> some View {
-        modifier(StableWidth(factor: factor))
+    func stableWidth(_ factor: CGFloat = 8, minWidth: CGFloat? = nil) -> some View {
+        modifier(StableWidth(factor: factor, minWidth: minWidth))
+    }
+}
+
+private struct CGFloatPreferenceKey: PreferenceKey {
+    typealias Value = [CGFloat]
+
+    static var defaultValue: [CGFloat] = []
+
+    static func reduce(value: inout [CGFloat], nextValue: () -> [CGFloat]) {
+        value += nextValue()
     }
 }
 
 struct StableWidth: ViewModifier {
     @State private var idealWidth: CGFloat?
 
     var factor: CGFloat
+    var minWidth: CGFloat?
 
-    func getSize(_ proxy: GeometryProxy) -> some View {
-        DispatchQueue.main.async { [self] in
-            idealWidth = factor * ceil(proxy.size.width / factor)
+    var computedIdealWidth: CGFloat? {
+        if let idealWidth = idealWidth {
+            if let minWidth = minWidth {
+                return max(idealWidth, minWidth)
+            }
+            return idealWidth
         }
-        return Color.clear
+
+        return nil
+    }
+
+    func getSize(_ proxy: GeometryProxy) -> some View {
+        Color.clear.preference(
+            key: CGFloatPreferenceKey.self,
+            value: [factor * ceil(proxy.size.width / factor)]
+        )
     }
 
     func body(content: Content) -> some View {
@@ -33,7 +55,10 @@ struct StableWidth: ViewModifier {
                 .fixedSize()
                 .background(GeometryReader { getSize($0) })
         }
-        .frame(idealWidth: idealWidth)
+        .frame(idealWidth: computedIdealWidth)
         .fixedSize()
+        .onPreferenceChange(CGFloatPreferenceKey.self, perform: { value in
+            idealWidth = value.first
+        })
     }
 }

eul/Views/Menu/BatteryMenuBlockView.swift

@@ -22,14 +22,14 @@ struct BatteryMenuBlockView: View {
                     .menuSection()
                 Spacer()
                 if io.isCharging && io.timeToFullCharge >= 0 {
-                    Text("\(io.timeToFullCharge) min")
+                    Text(io.timeToFullCharge.readableTimeInMin)
                         .displayText()
                     Text("battery.to_full_charge".localized())
                         .miniSection()
                         .padding(.trailing, 4)
                 }
                 if !io.isCharging && !io.isCharged && io.timeToEmpty >= 0 {
-                    Text("\(io.timeToEmpty) min")
+                    Text(io.timeToEmpty.readableTimeInMin)
                         .displayText()
                     Text("battery.to_empty".localized())
                         .miniSection()

eul/Views/Menu/StatusMenuView.swift

@@ -35,5 +35,10 @@ struct StatusMenuView: SizeChangeView {
         .fixedSize()
         .animation(.none)
         .background(GeometryReader { self.reportSize($0) })
+        .onPreferenceChange(SizePreferenceKey.self, perform: { value in
+            if let size = value.first {
+                onSizeChange?(size)
+            }
+        })
     }
 }

eul/Views/Preference/PreferenceComponentsView.swift

@@ -18,12 +18,12 @@ extension Preference {
         @GestureState var offsetWidth: CGFloat = 0
 
         func updateFrame(geometry: GeometryProxy, index: Int) -> some View {
-            if !componentsStore.isActiveComponentToggling {
-                DispatchQueue.main.async {
-                    self.frames[index] = geometry.frame(in: CoordinateSpace.named(coordinateSpace))
-                }
-            }
-            return Color.clear
+            Color.clear.preference(
+                key: FramePreferenceKey.self,
+                value: componentsStore.isActiveComponentToggling
+                    ? []
+                    : [FramePreferenceData(index: index, frame: geometry.frame(in: CoordinateSpace.named(coordinateSpace)))]
+            )
         }
 
         var body: some View {
@@ -177,6 +177,11 @@ extension Preference {
                     }
                 }
             }
+            .onPreferenceChange(FramePreferenceKey.self, perform: { value in
+                for data in value {
+                    self.frames[data.index] = data.frame
+                }
+            })
         }
     }
 }

eul/Views/Preference/PreferenceMenuViewView.swift

@@ -18,12 +18,12 @@ extension Preference {
         @GestureState var offsetHeight: CGFloat = 0
 
         func updateFrame(geometry: GeometryProxy, index: Int) -> some View {
-            if !componentsStore.isActiveComponentToggling {
-                DispatchQueue.main.async {
-                    self.frames[index] = geometry.frame(in: CoordinateSpace.named(coordinateSpace))
-                }
-            }
-            return Color.clear
+            Color.clear.preference(
+                key: FramePreferenceKey.self,
+                value: componentsStore.isActiveComponentToggling
+                    ? []
+                    : [FramePreferenceData(index: index, frame: geometry.frame(in: CoordinateSpace.named(coordinateSpace)))]
+            )
         }
 
         var body: some View {
@@ -187,6 +187,11 @@ extension Preference {
                 }
             }
             .padding(.vertical, 8)
+            .onPreferenceChange(FramePreferenceKey.self, perform: { value in
+                for data in value {
+                    self.frames[data.index] = data.frame
+                }
+            })
         }
     }
 }