toxblh/MTMR
1
0
Fork 0
mirror of https://github.com/Toxblh/MTMR.git synced 2026-01-09 16:48:38 +00:00
Code Issues Releases Wiki Activity

Currency bar update (#293)

Browse Source 
* Updated CurrenyBarItem to display second currency (TO FROM>RATE) and also correct number of decimal places.
Added INR to list of currencies.

* Update CurrencyBarItem.swift

* Updated else statements

Co-authored-by: medden <si@medden.co.uk>
This commit is contained in:
Simon Rogers 2020-04-09 18:49:39 +01:00 committed by GitHub
parent f61550e510
commit 502f989417
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
MTMR/Widgets/CurrencyBarItem.swift
View File

@ -15,6 +15,9 @@ class CurrencyBarItem: CustomButtonTouchBarItem {
private var postfix: String
private var from: String
private var to: String
private var decimal: Int
private var decimalValue: Float32!
private var decimalString: String!
private var oldValue: Float32!
private var full: Bool = false
@ -32,11 +35,29 @@ class CurrencyBarItem: CustomButtonTouchBarItem {
"IDR": "Rp",
"MXN": "$",
"SGD": "$",
"CHF": "Fr.",
"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": 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) {
activity = NSBackgroundActivityScheduler(identifier: "\(identifier.rawValue).updatecheck")
@ -57,6 +78,14 @@ class CurrencyBarItem: CustomButtonTouchBarItem {
postfix = to
}
if let decimal = decimals[to] {
self.decimal = decimal
} else {
decimal = 2
}
super.init(identifier: identifier, title: "⏳")
activity.repeats = true
@ -114,10 +143,12 @@ 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: "%@‣%.2f%@", prefix, value, postfix)
title = String(format: "%@%@‣%@", prefix, postfix, decimalString)
} else {
title = String(format: "%@%.2f", prefix, value)
}