1
0
mirror of https://github.com/Toxblh/MTMR.git synced 2026-01-10 17:08:39 +00:00

Update CurrencyBarItem.swift

This commit is contained in:
Simon Rogers 2020-04-09 11:36:57 +01:00 committed by GitHub
parent 47561ce71b
commit e011160f0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -15,7 +15,9 @@ class CurrencyBarItem: CustomButtonTouchBarItem {
private var postfix: String
private var from: String
private var to: String
private var decimal as Int
private var decimal: Int
private var decimalValue: Float32!
private var decimalString: String!
private var oldValue: Float32!
private var full: Bool = false
@ -28,36 +30,33 @@ class CurrencyBarItem: CustomButtonTouchBarItem {
"CAD": "$",
"KRW": "",
"CNY": "¥",
"AUD": "Aus",
"AUD": "$",
"BRL": "R$",
"IDR": "Rp",
"INR": "Rp",
"MXN": "Mx",
"SGD": "Sg",
"CHF": "Fr",
"MXN": "$",
"SGD": "$",
"BTC": "฿",
"LTC": "Ł",
"ETH": "Ξ",
]
private let decimals = [
"USD": "4",
"EUR": "4",
"RUB": "2",
"JPY": "2",
"GBP": "4",
"CAD": "4",
"KRW": "4",
"CNY": "4",
"AUD": "4",
"BRL": "4",
"IDR": "0",
"INR": "2",
"MXN": "2",
"SGD": "4",
"CHF": "4",
"BTC": "2",
"LTC": "2",
"ETH": "2",
private let decimals = [
"USD": 4,
"EUR": 4,
"RUB": 2,
"JPY": 2,
"GBP": 4,
"CAD": 4,
"KRW": 4,
"CNY": 4,
"AUD": 4,
"BRL": 4,
"IDR": 1,
"MXN": 2,
"SGD": 4,
"CHF": 4,
"BTC": 2,
"LTC": 2,
"ETH": 2,
]
init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval, from: String, to: String, full: Bool) {
@ -79,12 +78,14 @@ class CurrencyBarItem: CustomButtonTouchBarItem {
postfix = to
}
if let decimal = decimals[to] {
self.decimal = decimal
} else {
decimal = "2"
decimal = 2
}
super.init(identifier: identifier, title: "")
activity.repeats = true
@ -142,12 +143,14 @@ class CurrencyBarItem: CustomButtonTouchBarItem {
}
oldValue = value
decimalValue = (value * pow(10,Float(decimal))).rounded() / pow(10,Float(decimal))
decimalString = String(decimalValue)
var title = ""
if full {
title = String(format: "%@%@‣%.%@f%@", prefix, postfix, decimal, value)
title = String(format: "%@%@‣%@", prefix, postfix, decimalString)
} else {
title = String(format: "%@%.2f", prefix, value)
title = String(format: "%.2f", value)
}
let regularFont = attributedTitle.attribute(.font, at: 0, effectiveRange: nil) as? NSFont ?? NSFont.systemFont(ofSize: 15)