morgan/macos-stats
1
0
Fork 0
mirror of https://github.com/morgan9e/macos-stats synced 2026-04-15 00:34:08 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: system temperature units

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2020-12-15 17:23:34 +01:00
parent 8260f5d40c
commit 9ef862aa5d
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
StatsKit/helpers.swift
View File

@@ -656,6 +656,14 @@ public func LocalizedString(_ key: String, _ params: String..., comment: String
return string
}
extension UnitTemperature {
static var current: UnitTemperature {
let measureFormatter = MeasurementFormatter()
let measurement = Measurement(value: 0, unit: UnitTemperature.celsius)
return measureFormatter.string(from: measurement) == "0°C" ? .celsius : .fahrenheit
}
}
public func Temperature(_ value: Double) -> String {
let stringUnit: String = Store.shared.string(key: "temperature_units", defaultValue: "system")
let formatter = MeasurementFormatter()
@@ -664,9 +672,13 @@ public func Temperature(_ value: Double) -> String {
formatter.unitOptions = .providedUnit
var measurement = Measurement(value: value, unit: UnitTemperature.celsius)
if stringUnit != "system" {
if let temperatureUnit = TemperatureUnits.first(where: { $0.key == stringUnit }), let unit = temperatureUnit.additional as? UnitTemperature {
measurement.convert(to: unit)
if stringUnit == "system" {
measurement.convert(to: UnitTemperature.current)
} else {
if let temperatureUnit = TemperatureUnits.first(where: { $0.key == stringUnit }) {
if let unit = temperatureUnit.additional as? UnitTemperature {
measurement.convert(to: unit)
}
}
}