+ weather widget

MTMR.xcodeproj/project.pbxproj

@@ -18,6 +18,7 @@
 		6027D1BA2080E52A004FFDC7 /* VolumeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6027D1B82080E52A004FFDC7 /* VolumeViewController.swift */; };
 		6042B6A72083E03A00C525C8 /* AppScrubberTouchBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6042B6A62083E03A00C525C8 /* AppScrubberTouchBarItem.swift */; };
 		6042B6AA2083E27000C525C8 /* DeprecatedCarbonAPI.c in Sources */ = {isa = PBXBuildFile; fileRef = 6042B6A92083E27000C525C8 /* DeprecatedCarbonAPI.c */; };
+		607EEA4B2087835F009DA5F0 /* WeatherBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607EEA4A2087835F009DA5F0 /* WeatherBarItem.swift */; };
 		B0008E552080286C003AD4DD /* SupportHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0008E542080286C003AD4DD /* SupportHelpers.swift */; };
 		B05600D32083E9BB00EB218D /* CustomSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = B05600D22083E9BB00EB218D /* CustomSlider.swift */; };
 		B059D622205E03F5006E6B86 /* TouchBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B059D621205E03F5006E6B86 /* TouchBarController.swift */; };
@@ -66,6 +67,7 @@
 		6042B6A62083E03A00C525C8 /* AppScrubberTouchBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppScrubberTouchBarItem.swift; sourceTree = "<group>"; };
 		6042B6A82083E1F500C525C8 /* DeprecatedCarbonAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeprecatedCarbonAPI.h; sourceTree = "<group>"; };
 		6042B6A92083E27000C525C8 /* DeprecatedCarbonAPI.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = DeprecatedCarbonAPI.c; sourceTree = "<group>"; };
+		607EEA4A2087835F009DA5F0 /* WeatherBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeatherBarItem.swift; sourceTree = "<group>"; };
 		B0008E542080286C003AD4DD /* SupportHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SupportHelpers.swift; sourceTree = "<group>"; };
 		B05600D22083E9BB00EB218D /* CustomSlider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomSlider.swift; sourceTree = "<group>"; };
 		B059D621205E03F5006E6B86 /* TouchBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TouchBarController.swift; sourceTree = "<group>"; };
@@ -172,6 +174,7 @@
 				368EDDE620812A1D00E10953 /* ScrollViewItem.swift */,
 				6042B6A62083E03A00C525C8 /* AppScrubberTouchBarItem.swift */,
 				B05600D22083E9BB00EB218D /* CustomSlider.swift */,
+				607EEA4A2087835F009DA5F0 /* WeatherBarItem.swift */,
 			);
 			path = MTMR;
 			sourceTree = "<group>";
@@ -340,6 +343,7 @@
 				B082B253205C7D8000BC04DC /* AppDelegate.swift in Sources */,
 				B059D624205E04F3006E6B86 /* CustomButtonTouchBarItem.swift in Sources */,
 				6027D1BA2080E52A004FFDC7 /* VolumeViewController.swift in Sources */,
+				607EEA4B2087835F009DA5F0 /* WeatherBarItem.swift in Sources */,
 				6042B6AA2083E27000C525C8 /* DeprecatedCarbonAPI.c in Sources */,
 				B09EB1E4207C082000D5C1E0 /* HapticFeedback.swift in Sources */,
 				36C2ECDB207C3FE7003CDA33 /* ItemsParsing.swift in Sources */,

MTMR.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildSystemType</key>
+	<string>Latest</string>
+</dict>
+</plist>

MTMR/Info.plist

@@ -26,6 +26,8 @@
 	<true/>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2018 Anton Palgunov. All rights reserved.</string>
+	<key>NSLocationUsageDescription</key>
+	<string>...</string>
 	<key>NSMainStoryboardFile</key>
 	<string>Main</string>
 	<key>NSPrincipalClass</key>

MTMR/ItemsParsing.swift

@@ -73,12 +73,12 @@ class SupportedTypesHolder {
             return (item: .staticButton(title: ""), action: .hidKey(keycode: NX_KEYTYPE_NEXT), parameters: [.image: imageParameter])
         },
         "weather": { decoder in
-            enum CodingKeys: String, CodingKey { case refreshInterval }
+            enum CodingKeys: String, CodingKey { case refreshInterval; case units; case api_key }
             let container = try decoder.container(keyedBy: CodingKeys.self)
             let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval)
-            let scriptPath = Bundle.main.path(forResource: "Weather", ofType: "scpt")!
+            let units = try container.decodeIfPresent(String.self, forKey: .units)
-            let item = ItemType.appleScriptTitledButton(source: Source(filePath: scriptPath), refreshInterval: interval ?? 1800.0)
+            let api_key = try container.decodeIfPresent(String.self, forKey: .api_key)
-            return (item: item, action: .none, parameters: [:])
+            return (item: .weather(interval: interval ?? 1800.00, units: units ?? "metric", api_key: api_key ?? "32c4256d09a4c52b38aecddba7a078f6"), action: .none, parameters: [:])
         },
         "dock": { decoder in
             return (item: .dock(), action: .none, parameters: [:])
@@ -140,12 +140,15 @@ enum ItemType: Decodable {
     case dock()
     case volume()
     case brightness(refreshInterval: Double)
+    case weather(interval: Double, units: String, api_key: String)
 
     private enum CodingKeys: String, CodingKey {
         case type
         case title
         case source
         case refreshInterval
+        case units
+        case api_key
         case formatTemplate
         case image
     }
@@ -157,6 +160,7 @@ enum ItemType: Decodable {
         case dock
         case volume
         case brightness
+        case weather
     }
 
     init(from decoder: Decoder) throws {
@@ -180,6 +184,11 @@ enum ItemType: Decodable {
         case .brightness:
             let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval) ?? 0.5
             self = .brightness(refreshInterval: interval)
+        case .weather:
+            let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval) ?? 1800.0
+            let units = try container.decodeIfPresent(String.self, forKey: .units) ?? "metric"
+            let api_key = try container.decodeIfPresent(String.self, forKey: .api_key) ?? "32c4256d09a4c52b38aecddba7a078f6"
+            self = .weather(interval: interval, units: units, api_key: api_key)
         }
     }
 }

MTMR/TouchBarController.swift

@@ -29,6 +29,8 @@ extension ItemType {
             return "com.toxblh.mtmr.volume"
         case .brightness(refreshInterval: _):
             return "com.toxblh.mtmr.brightness"
+        case .weather(interval: _, units: _, api_key: _):
+            return "com.toxblh.mtmr.weather"
         }
     }
 
@@ -166,7 +168,10 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
             } else {
                 barItem = BrightnessViewController(identifier: identifier, refreshInterval: interval)
             }
+        case .weather(interval: let interval, units: let units, api_key: let api_key):
+            barItem = WeatherBarItem(identifier: identifier, interval: interval, units: units, api_key: api_key)
         }
+        
         if case .width(let value)? = item.additionalParameters[.width], let widthBarItem = barItem as? CanSetWidth {
             widthBarItem.setWidth(value: value)
         }

MTMR/WeatherBarItem.swift

@@ -0,0 +1,152 @@
+//
+//  WeatherBarItem.swift
+//  MTMR
+//
+//  Created by Daniel Apatin on 18.04.2018.
+//  Copyright © 2018 Anton Palgunov. All rights reserved.
+//
+
+import Cocoa
+import CoreLocation
+
+class WeatherBarItem: NSCustomTouchBarItem, CLLocationManagerDelegate {
+    private let dateFormatter = DateFormatter()
+    private var timer: Timer!
+    private var interval: TimeInterval!
+    private var units: String
+    private var api_key: String
+    private var units_str = "°F"
+    private let button = NSButton(title: "", target: nil, action: nil)
+    private var prev_location: CLLocation!
+    private var location: CLLocation!
+    
+    private var manager:CLLocationManager!
+    
+    init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval, units: String, api_key: String) {
+        self.interval = interval
+        self.units = units
+        self.api_key = api_key
+        
+        if self.units == "metric" {
+            units_str = "°C"
+        }
+        
+        super.init(identifier: identifier)
+
+        button.bezelColor = .clear
+        button.title = "⏳"
+        self.view = button
+        
+        let status = CLLocationManager.authorizationStatus()
+        if status == .restricted || status == .denied {
+            print("User permission not given")
+            return
+        }
+        
+        if !CLLocationManager.locationServicesEnabled() {
+            print("not enabled");
+            return
+        }
+        
+        timer = Timer.scheduledTimer(timeInterval: interval, target: self, selector: #selector(updateWeather), userInfo: nil, repeats: true)
+        
+        manager = CLLocationManager()
+        manager.delegate = self
+        manager.desiredAccuracy = kCLLocationAccuracyHundredMeters
+        manager.startUpdatingLocation()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    @objc func updateWeather() {
+        if self.location != nil {
+            let urlRequest = URLRequest(url: URL(string: "https://api.openweathermap.org/data/2.5/weather?lat=\(location.coordinate.latitude)&lon=\(location.coordinate.longitude)&units=\(self.units)&appid=\(self.api_key)")!)
+            
+            let task = URLSession.shared.dataTask(with: urlRequest) { (data, response, error) in
+                
+                if error == nil {
+                    do {
+                        let json = try JSONSerialization.jsonObject(with: data!, options: .mutableContainers) as! [String : AnyObject]
+                        
+                        var temperature: Int!
+                        var condition_icon = ""
+                        
+                        if let main = json["main"] as? [String : AnyObject] {
+                            if let temp = main["temp"] as? Int {
+                                temperature = temp
+                            }
+                        }
+                        
+                        if let weather = json["weather"] as? NSArray, let item = weather[0] as? NSDictionary {
+                            let icon = item["icon"] as! String
+                            switch (icon) {
+                            case "01d", "01n":
+                                condition_icon = "☀️"
+                                break
+                            case "02d", "02n":
+                                condition_icon = "⛅️"
+                                break
+                            case "03d", "03n", "04d", "04n":
+                                condition_icon = "☁️"
+                                break
+                            case "09d", "09n":
+                                condition_icon = "⛅️"
+                                break
+                            case "10d", "10n":
+                                condition_icon = "🌦"
+                                break
+                            case "11d", "11n":
+                                condition_icon = "🌩"
+                                break
+                            case "13d", "13n":
+                                condition_icon = "❄️"
+                                break
+                            case "50d", "50n":
+                                condition_icon = "🌫"
+                                break
+                            default:
+                                condition_icon = ""
+                            }
+                        }
+                        
+                        if temperature != nil {
+                            DispatchQueue.main.async {
+                                self.setWeather(text: "\(condition_icon) \(temperature!)\(self.units_str)")
+                            }
+                        }
+                    } catch let jsonError {
+                        print(jsonError.localizedDescription)
+                    }
+                }
+            }
+            
+            task.resume()
+        }
+    }
+    
+    func setWeather(text: String) {
+        button.title = text
+    }
+    
+    func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
+        let lastLocation = locations.last!
+        self.location = lastLocation
+        if prev_location == nil {
+            updateWeather()
+        }
+        prev_location = lastLocation
+    }
+    
+    func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
+        print(error);
+    }
+    
+    func locationManager(_ manager: CLLocationManager, didChangeAuthorization status: CLAuthorizationStatus) {
+        print("inside didChangeAuthorization ");
+        updateWeather()
+    }
+    
+}
+