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

Merge branch 'master' into actionURL

Browse Source
This commit is contained in:
ad 2018-04-20 14:20:24 +03:00
commit 6f3425f4c3
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MTMR/CurrencyBarItem.swift
View File

@ -9,14 +9,13 @@
import Cocoa import Cocoa
import CoreLocation import CoreLocation
class CurrencyBarItem: NSCustomTouchBarItem { class CurrencyBarItem: CustomButtonTouchBarItem {
private var timer: Timer! private var timer: Timer!
private var interval: TimeInterval! private var interval: TimeInterval!
private var prefix: String private var prefix: String
private var from: String private var from: String
private var to: String private var to: String
private var oldValue: Float32! private var oldValue: Float32!
private let button = NSButton(title: "", target: nil, action: nil)
private let currencies = [ private let currencies = [
"USD": "$", "USD": "$",
@ -35,7 +34,7 @@ class CurrencyBarItem: NSCustomTouchBarItem {
"CHF": "Fr." "CHF": "Fr."
] ]
init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval, from: String, to: String) { init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval, from: String, to: String, onTap: @escaping () -> ()) {
self.interval = interval self.interval = interval
self.from = from self.from = from
self.to = to self.to = to
@ -46,10 +45,9 @@ class CurrencyBarItem: NSCustomTouchBarItem {
self.prefix = from self.prefix = from
} }
super.init(identifier: identifier) super.init(identifier: identifier, title: "⏳", onTap: onTap)
button.bezelColor = .clear button.bezelColor = .clear
button.title = "⏳"
self.view = button self.view = button
timer = Timer.scheduledTimer(timeInterval: interval, target: self, selector: #selector(updateCurrency), userInfo: nil, repeats: true) timer = Timer.scheduledTimer(timeInterval: interval, target: self, selector: #selector(updateCurrency), userInfo: nil, repeats: true)

4
MTMR/TouchBarController.swift
View File

@ -179,9 +179,9 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
barItem = BrightnessViewController(identifier: identifier, refreshInterval: interval) barItem = BrightnessViewController(identifier: identifier, refreshInterval: interval)
} }
case .weather(interval: let interval, units: let units, api_key: let api_key, icon_type: let icon_type): case .weather(interval: let interval, units: let units, api_key: let api_key, icon_type: let icon_type):
barItem = WeatherBarItem(identifier: identifier, interval: interval, units: units, api_key: api_key, icon_type: icon_type) barItem = WeatherBarItem(identifier: identifier, interval: interval, units: units, api_key: api_key, icon_type: icon_type, onTap: action)
case .currency(interval: let interval, from: let from, to: let to): case .currency(interval: let interval, from: let from, to: let to):
barItem = CurrencyBarItem(identifier: identifier, interval: interval, from: from, to: to) barItem = CurrencyBarItem(identifier: identifier, interval: interval, from: from, to: to, onTap: action)
} }
if case .width(let value)? = item.additionalParameters[.width], let widthBarItem = barItem as? CanSetWidth { if case .width(let value)? = item.additionalParameters[.width], let widthBarItem = barItem as? CanSetWidth {

8
MTMR/WeatherBarItem.swift
View File

@ -9,14 +9,13 @@
import Cocoa import Cocoa
import CoreLocation import CoreLocation
class WeatherBarItem: NSCustomTouchBarItem, CLLocationManagerDelegate { class WeatherBarItem: CustomButtonTouchBarItem, CLLocationManagerDelegate {
private let dateFormatter = DateFormatter() private let dateFormatter = DateFormatter()
private var timer: Timer! private var timer: Timer!
private var interval: TimeInterval! private var interval: TimeInterval!
private var units: String private var units: String
private var api_key: String private var api_key: String
private var units_str = "°F" private var units_str = "°F"
private let button = NSButton(title: "", target: nil, action: nil)
private var prev_location: CLLocation! private var prev_location: CLLocation!
private var location: CLLocation! private var location: CLLocation!
private let iconsImages = ["01d": "☀️", "01n": "☀️", "02d": "⛅️", "02n": "⛅️", "03d": "☁️", "03n": "☁️", "04d": "☁️", "04n": "☁️", "09d": "⛅️", "09n": "⛅️", "10d": "🌦", "10n": "🌦", "11d": "🌩", "11n": "🌩", "13d": "❄️", "13n": "❄️", "50d": "🌫", "50n": "🌫"] private let iconsImages = ["01d": "☀️", "01n": "☀️", "02d": "⛅️", "02n": "⛅️", "03d": "☁️", "03n": "☁️", "04d": "☁️", "04n": "☁️", "09d": "⛅️", "09n": "⛅️", "10d": "🌦", "10n": "🌦", "11d": "🌩", "11n": "🌩", "13d": "❄️", "13n": "❄️", "50d": "🌫", "50n": "🌫"]
@ -25,7 +24,7 @@ class WeatherBarItem: NSCustomTouchBarItem, CLLocationManagerDelegate {
private var manager:CLLocationManager! private var manager:CLLocationManager!
init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval, units: String, api_key: String, icon_type: String? = "text") { init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval, units: String, api_key: String, icon_type: String? = "text", onTap: @escaping () -> ()) {
self.interval = interval self.interval = interval
self.units = units self.units = units
self.api_key = api_key self.api_key = api_key
@ -40,10 +39,9 @@ class WeatherBarItem: NSCustomTouchBarItem, CLLocationManagerDelegate {
iconsSource = iconsText iconsSource = iconsText
} }
super.init(identifier: identifier) super.init(identifier: identifier, title: "⏳", onTap: onTap)
button.bezelColor = .clear button.bezelColor = .clear
button.title = "⏳"
self.view = button self.view = button
let status = CLLocationManager.authorizationStatus() let status = CLLocationManager.authorizationStatus()