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

Merge pull request #45 from ad/master

Browse Source 
Allow multiple instances of currency and weather widgets (different schedulers for one type widget)
This commit is contained in:
Anton Palgunov 2018-04-24 10:59:22 +01:00 committed by GitHub
commit ae4b0aa870
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MTMR/Widgets/CurrencyBarItem.swift
View File

@ -10,7 +10,7 @@ import Cocoa
import CoreLocation import CoreLocation
class CurrencyBarItem: CustomButtonTouchBarItem { class CurrencyBarItem: CustomButtonTouchBarItem {
private let activity = NSBackgroundActivityScheduler(identifier: "com.toxblh.mtmr.currency.updatecheck") private let activity: NSBackgroundActivityScheduler
private var prefix: String private var prefix: String
private var from: String private var from: String
private var to: String private var to: String
@ -37,6 +37,7 @@ class CurrencyBarItem: CustomButtonTouchBarItem {
] ]
init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval, from: String, to: String, onTap: @escaping () -> (), onLongTap: @escaping () -> ()) { init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval, from: String, to: String, onTap: @escaping () -> (), onLongTap: @escaping () -> ()) {
activity = NSBackgroundActivityScheduler(identifier: "\(identifier.rawValue).updatecheck")
activity.interval = interval activity.interval = interval
self.from = from self.from = from
self.to = to self.to = to
@ -71,7 +72,6 @@ class CurrencyBarItem: CustomButtonTouchBarItem {
if error == nil { if error == nil {
do { do {
let json = try JSONSerialization.jsonObject(with: data!, options: .mutableContainers) as! [String : AnyObject] let json = try JSONSerialization.jsonObject(with: data!, options: .mutableContainers) as! [String : AnyObject]
// print(json)
var value: Float32! var value: Float32!
if let data_array = json["data"] as? [String : AnyObject] { if let data_array = json["data"] as? [String : AnyObject] {

3
MTMR/Widgets/WeatherBarItem.swift
View File

@ -10,7 +10,7 @@ import Cocoa
import CoreLocation import CoreLocation
class WeatherBarItem: CustomButtonTouchBarItem, CLLocationManagerDelegate { class WeatherBarItem: CustomButtonTouchBarItem, CLLocationManagerDelegate {
private let activity = NSBackgroundActivityScheduler(identifier: "com.toxblh.mtmr.weather.updatecheck") private let activity: NSBackgroundActivityScheduler
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"
@ -23,6 +23,7 @@ class WeatherBarItem: CustomButtonTouchBarItem, CLLocationManagerDelegate {
private var manager:CLLocationManager! private var manager:CLLocationManager!
init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval, units: String, api_key: String, icon_type: String? = "text", onTap: @escaping () -> (), onLongTap: @escaping () -> ()) { init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval, units: String, api_key: String, icon_type: String? = "text", onTap: @escaping () -> (), onLongTap: @escaping () -> ()) {
activity = NSBackgroundActivityScheduler(identifier: "\(identifier.rawValue).updatecheck")
activity.interval = interval activity.interval = interval
self.units = units self.units = units
self.api_key = api_key self.api_key = api_key