Compare commits

..
9 Commits
Author SHA1 Message Date
toxblh b718b1c9dd Style format 2019-01-24 00:04:30 +03:00
toxblh acc248a579 Close #135 2019-01-24 00:04:14 +03:00
toxblh 59581ffdc8 Merge branch 'master' of https://github.com/Toxblh/MTMR 2019-01-23 12:43:54 +03:00
toxblh 238b15b6a4 fix drop MTMR without timeZone 2019-01-23 12:43:25 +03:00
toxblh 732fd5c5b5 add helpers for fast update homebrew 2019-01-22 19:20:40 +03:00
toxblh f4b8e1f39a switch from localized to custom templates 2019-01-22 12:46:17 +03:00
Anton Palgunov e988951ff9 Update README.md 2019-01-22 12:26:42 +03:00
toxblh 807290ff0c improve build.sh 2019-01-22 12:21:38 +03:00
toxblh 0775ea0412 added timeZone settings for timeButton. #136 2019-01-22 12:11:31 +03:00
12 changed files with 131 additions and 118 deletions
+5 -1
View File
@@ -50,7 +50,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {
return frontmostId return frontmostId
} }
isBlockedApp = blacklistAppIdentifiers.index(of: frontmostApplicationIdentifier!) != nil if frontmostApplicationIdentifier != nil {
isBlockedApp = blacklistAppIdentifiers.index(of: frontmostApplicationIdentifier!) != nil
} else {
isBlockedApp = false
}
createMenu() createMenu()
} }
+2 -2
View File
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.19.1</string> <string>0.19.4</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>125</string> <string>140</string>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string> <string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
+5 -3
View File
@@ -303,7 +303,7 @@ class SupportedTypesHolder {
action: try ActionType(from: decoder), action: try ActionType(from: decoder),
longAction: try LongActionType(from: decoder), longAction: try LongActionType(from: decoder),
parameters: [:] parameters: [:]
)} ) }
} }
func register(typename: String, decoder: @escaping ParametersDecoder) { func register(typename: String, decoder: @escaping ParametersDecoder) {
@@ -325,7 +325,7 @@ class SupportedTypesHolder {
enum ItemType: Decodable { enum ItemType: Decodable {
case staticButton(title: String) case staticButton(title: String)
case appleScriptTitledButton(source: SourceProtocol, refreshInterval: Double) case appleScriptTitledButton(source: SourceProtocol, refreshInterval: Double)
case timeButton(formatTemplate: String) case timeButton(formatTemplate: String, timeZone: String?)
case battery() case battery()
case dock() case dock()
case volume() case volume()
@@ -347,6 +347,7 @@ enum ItemType: Decodable {
case from case from
case to case to
case full case full
case timeZone
case units case units
case api_key case api_key
case icon_type case icon_type
@@ -392,7 +393,8 @@ enum ItemType: Decodable {
case .timeButton: case .timeButton:
let template = try container.decodeIfPresent(String.self, forKey: .formatTemplate) ?? "HH:mm" let template = try container.decodeIfPresent(String.self, forKey: .formatTemplate) ?? "HH:mm"
self = .timeButton(formatTemplate: template) let timeZone = try container.decodeIfPresent(String.self, forKey: .timeZone) ?? nil
self = .timeButton(formatTemplate: template, timeZone: timeZone)
case .battery: case .battery:
self = .battery() self = .battery()
+22 -25
View File
@@ -6,17 +6,17 @@
// Copyright © 2018 Anton Palgunov. All rights reserved. // Copyright © 2018 Anton Palgunov. All rights reserved.
// //
import Foundation
import AppKit import AppKit
import Foundation
extension String { extension String {
func trim() -> String { func trim() -> String {
return self.trimmingCharacters(in: NSCharacterSet.whitespaces) return trimmingCharacters(in: NSCharacterSet.whitespaces)
} }
func stripComments() -> String { func stripComments() -> String {
// ((\s|,)\/\*[\s\S]*?\*\/)|(( |, ")\/\/.*) // ((\s|,)\/\*[\s\S]*?\*\/)|(( |, ")\/\/.*)
return self.replacingOccurrences(of: "((\\s|,)\\/\\*[\\s\\S]*?\\*\\/)|(( |, \\\")\\/\\/.*)", with: "", options: .regularExpression) return replacingOccurrences(of: "((\\s|,)\\/\\*[\\s\\S]*?\\*\\/)|(( |, \\\")\\/\\/.*)", with: "", options: .regularExpression)
} }
var hexColor: NSColor? { var hexColor: NSColor? {
@@ -39,21 +39,20 @@ extension String {
} }
extension NSImage { extension NSImage {
func resize(maxSize:NSSize) -> NSImage { func resize(maxSize: NSSize) -> NSImage {
var ratio:Float = 0.0 var ratio: Float = 0.0
let imageWidth = Float(self.size.width) let imageWidth = Float(size.width)
let imageHeight = Float(self.size.height) let imageHeight = Float(size.height)
let maxWidth = Float(maxSize.width) let maxWidth = Float(maxSize.width)
let maxHeight = Float(maxSize.height) let maxHeight = Float(maxSize.height)
// Get ratio (landscape or portrait) // Get ratio (landscape or portrait)
if (imageWidth > imageHeight) { if imageWidth > imageHeight {
// Landscape // Landscape
ratio = maxWidth / imageWidth; ratio = maxWidth / imageWidth
} } else {
else {
// Portrait // Portrait
ratio = maxHeight / imageHeight; ratio = maxHeight / imageHeight
} }
// Calculate new size based on the ratio // Calculate new size based on the ratio
@@ -61,11 +60,11 @@ extension NSImage {
let newHeight = imageHeight * ratio let newHeight = imageHeight * ratio
// Create a new NSSize object with the newly calculated size // Create a new NSSize object with the newly calculated size
let newSize:NSSize = NSSize(width: Int(newWidth), height: Int(newHeight)) let newSize: NSSize = NSSize(width: Int(newWidth), height: Int(newHeight))
// Cast the NSImage to a CGImage // Cast the NSImage to a CGImage
var imageRect:NSRect = NSMakeRect(0, 0, self.size.width, self.size.height) var imageRect: NSRect = NSMakeRect(0, 0, size.width, size.height)
let imageRef = self.cgImage(forProposedRect: &imageRect, context: nil, hints: nil) let imageRef = cgImage(forProposedRect: &imageRect, context: nil, hints: nil)
// Create NSImage from the CGImage using the new size // Create NSImage from the CGImage using the new size
let imageWithNewSize = NSImage(cgImage: imageRef!, size: newSize) let imageWithNewSize = NSImage(cgImage: imageRef!, size: newSize)
@@ -74,34 +73,32 @@ extension NSImage {
return imageWithNewSize return imageWithNewSize
} }
func rotateByDegreess(degrees:CGFloat) -> NSImage { func rotateByDegreess(degrees: CGFloat) -> NSImage {
var imageBounds = NSZeroRect; imageBounds.size = size
var imageBounds = NSZeroRect ; imageBounds.size = self.size
let pathBounds = NSBezierPath(rect: imageBounds) let pathBounds = NSBezierPath(rect: imageBounds)
var transform = NSAffineTransform() var transform = NSAffineTransform()
transform.rotate(byDegrees: degrees) transform.rotate(byDegrees: degrees)
pathBounds.transform(using: transform as AffineTransform) pathBounds.transform(using: transform as AffineTransform)
let rotatedBounds:NSRect = NSMakeRect(NSZeroPoint.x, NSZeroPoint.y , self.size.width, self.size.height ) let rotatedBounds: NSRect = NSMakeRect(NSZeroPoint.x, NSZeroPoint.y, size.width, size.height)
let rotatedImage = NSImage(size: rotatedBounds.size) let rotatedImage = NSImage(size: rotatedBounds.size)
//Center the image within the rotated bounds // Center the image within the rotated bounds
imageBounds.origin.x = NSMidX(rotatedBounds) - (NSWidth(imageBounds) / 2) imageBounds.origin.x = NSMidX(rotatedBounds) - (NSWidth(imageBounds) / 2)
imageBounds.origin.y = NSMidY(rotatedBounds) - (NSHeight(imageBounds) / 2) imageBounds.origin.y = NSMidY(rotatedBounds) - (NSHeight(imageBounds) / 2)
// Start a new transform // Start a new transform
transform = NSAffineTransform() transform = NSAffineTransform()
// Move coordinate system to the center (since we want to rotate around the center) // Move coordinate system to the center (since we want to rotate around the center)
transform.translateX(by: +(NSWidth(rotatedBounds) / 2 ), yBy: +(NSHeight(rotatedBounds) / 2)) transform.translateX(by: +(NSWidth(rotatedBounds) / 2), yBy: +(NSHeight(rotatedBounds) / 2))
transform.rotate(byDegrees: degrees) transform.rotate(byDegrees: degrees)
// Move the coordinate system bak to normal // Move the coordinate system bak to normal
transform.translateX(by: -(NSWidth(rotatedBounds) / 2 ), yBy: -(NSHeight(rotatedBounds) / 2)) transform.translateX(by: -(NSWidth(rotatedBounds) / 2), yBy: -(NSHeight(rotatedBounds) / 2))
// Draw the original image, rotated, into the new image // Draw the original image, rotated, into the new image
rotatedImage.lockFocus() rotatedImage.lockFocus()
transform.concat() transform.concat()
self.draw(in: imageBounds, from: NSZeroRect, operation: NSCompositingOperation.copy, fraction: 1.0) draw(in: imageBounds, from: NSZeroRect, operation: NSCompositingOperation.copy, fraction: 1.0)
rotatedImage.unlockFocus() rotatedImage.unlockFocus()
return rotatedImage return rotatedImage
} }
} }
+61 -68
View File
@@ -17,14 +17,13 @@ let appSupportDirectory = NSSearchPathForDirectoriesInDomains(.applicationSuppor
let standardConfigPath = appSupportDirectory.appending("/items.json") let standardConfigPath = appSupportDirectory.appending("/items.json")
extension ItemType { extension ItemType {
var identifierBase: String { var identifierBase: String {
switch self { switch self {
case .staticButton(title: _): case .staticButton(title: _):
return "com.toxblh.mtmr.staticButton." return "com.toxblh.mtmr.staticButton."
case .appleScriptTitledButton(source: _): case .appleScriptTitledButton(source: _):
return "com.toxblh.mtmr.appleScriptButton." return "com.toxblh.mtmr.appleScriptButton."
case .timeButton(formatTemplate: _): case .timeButton(formatTemplate: _, timeZone: _):
return "com.toxblh.mtmr.timeButton." return "com.toxblh.mtmr.timeButton."
case .battery(): case .battery():
return "com.toxblh.mtmr.battery." return "com.toxblh.mtmr.battery."
@@ -52,7 +51,6 @@ extension ItemType {
return PomodoroBarItem.identifier return PomodoroBarItem.identifier
} }
} }
} }
extension NSTouchBarItem.Identifier { extension NSTouchBarItem.Identifier {
@@ -60,7 +58,6 @@ extension NSTouchBarItem.Identifier {
} }
class TouchBarController: NSObject, NSTouchBarDelegate { class TouchBarController: NSObject, NSTouchBarDelegate {
static let shared = TouchBarController() static let shared = TouchBarController()
var touchBar: NSTouchBar! var touchBar: NSTouchBar!
@@ -87,25 +84,23 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
var blacklistAppIdentifiers: [String] = [] var blacklistAppIdentifiers: [String] = []
var frontmostApplicationIdentifier: String? { var frontmostApplicationIdentifier: String? {
get { guard let frontmostId = NSWorkspace.shared.frontmostApplication?.bundleIdentifier else { return nil }
guard let frontmostId = NSWorkspace.shared.frontmostApplication?.bundleIdentifier else { return nil } return frontmostId
return frontmostId
}
} }
private override init() { private override init() {
super.init() super.init()
SupportedTypesHolder.sharedInstance.register(typename: "exitTouchbar", item: .staticButton(title: "exit"), action: .custom(closure: { [weak self] in self?.dismissTouchBar()}), longAction: .none) SupportedTypesHolder.sharedInstance.register(typename: "exitTouchbar", item: .staticButton(title: "exit"), action: .custom(closure: { [weak self] in self?.dismissTouchBar() }), longAction: .none)
SupportedTypesHolder.sharedInstance.register(typename: "close") { _ in SupportedTypesHolder.sharedInstance.register(typename: "close") { _ in
return (item: .staticButton(title: ""), action: .custom(closure: { [weak self] in (item: .staticButton(title: ""), action: .custom(closure: { [weak self] in
guard let `self` = self else { return } guard let `self` = self else { return }
self.reloadPreset(path: self.lastPresetPath) self.reloadPreset(path: self.lastPresetPath)
}), longAction: .none, parameters: [.width: .width(30), .image: .image(source: (NSImage(named: NSImage.stopProgressFreestandingTemplateName))!)]) }), longAction: .none, parameters: [.width: .width(30), .image: .image(source: (NSImage(named: NSImage.stopProgressFreestandingTemplateName))!)])
} }
if let blackListed = UserDefaults.standard.stringArray(forKey: "com.toxblh.mtmr.blackListedApps") { if let blackListed = UserDefaults.standard.stringArray(forKey: "com.toxblh.mtmr.blackListedApps") {
self.blacklistAppIdentifiers = blackListed blacklistAppIdentifiers = blackListed
} }
NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(activeApplicationChanged), name: NSWorkspace.didLaunchApplicationNotification, object: nil) NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(activeApplicationChanged), name: NSWorkspace.didLaunchApplicationNotification, object: nil)
@@ -119,37 +114,37 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
if let oldBar = self.touchBar { if let oldBar = self.touchBar {
minimizeSystemModal(oldBar) minimizeSystemModal(oldBar)
} }
self.touchBar = NSTouchBar() touchBar = NSTouchBar()
self.jsonItems = newJsonItems jsonItems = newJsonItems
self.itemDefinitions = [:] itemDefinitions = [:]
self.items = [:] items = [:]
self.leftIdentifiers = [] leftIdentifiers = []
self.centerItems = [] centerItems = []
self.rightIdentifiers = [] rightIdentifiers = []
loadItemDefinitions(jsonItems: self.jsonItems) loadItemDefinitions(jsonItems: jsonItems)
createItems() createItems()
centerItems = centerIdentifiers.compactMap({ (identifier) -> NSTouchBarItem? in centerItems = centerIdentifiers.compactMap({ (identifier) -> NSTouchBarItem? in
return items[identifier] items[identifier]
}) })
self.centerScrollArea = NSTouchBarItem.Identifier("com.toxblh.mtmr.scrollArea.".appending(UUID().uuidString)) centerScrollArea = NSTouchBarItem.Identifier("com.toxblh.mtmr.scrollArea.".appending(UUID().uuidString))
self.scrollArea = ScrollViewItem(identifier: centerScrollArea, items: centerItems) scrollArea = ScrollViewItem(identifier: centerScrollArea, items: centerItems)
touchBar.delegate = self touchBar.delegate = self
touchBar.defaultItemIdentifiers = [] touchBar.defaultItemIdentifiers = []
touchBar.defaultItemIdentifiers = self.leftIdentifiers + [centerScrollArea] + self.rightIdentifiers touchBar.defaultItemIdentifiers = leftIdentifiers + [centerScrollArea] + rightIdentifiers
self.updateActiveApp() updateActiveApp()
} }
@objc func activeApplicationChanged(_ n: Notification) { @objc func activeApplicationChanged(_: Notification) {
updateActiveApp() updateActiveApp()
} }
func updateActiveApp() { func updateActiveApp() {
if self.blacklistAppIdentifiers.index(of: self.frontmostApplicationIdentifier!) != nil { if frontmostApplicationIdentifier != nil && blacklistAppIdentifiers.index(of: frontmostApplicationIdentifier!) != nil {
dismissTouchBar() dismissTouchBar()
} else { } else {
presentTouchBar() presentTouchBar()
@@ -194,8 +189,8 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
} }
func createItems() { func createItems() {
for (identifier, definition) in self.itemDefinitions { for (identifier, definition) in itemDefinitions {
self.items[identifier] = self.createItem(forIdentifier: identifier, definition: definition) items[identifier] = createItem(forIdentifier: identifier, definition: definition)
} }
} }
@@ -212,7 +207,7 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
} }
@objc private func presentTouchBar() { @objc private func presentTouchBar() {
if self.showControlStripState { if showControlStripState {
updateControlStripPresence() updateControlStripPresence()
presentSystemModal(touchBar, systemTrayItemIdentifier: .controlStripItem) presentSystemModal(touchBar, systemTrayItemIdentifier: .controlStripItem)
} else { } else {
@@ -230,9 +225,9 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
presentTouchBar() presentTouchBar()
} }
func touchBar(_ touchBar: NSTouchBar, makeItemForIdentifier identifier: NSTouchBarItem.Identifier) -> NSTouchBarItem? { func touchBar(_: NSTouchBar, makeItemForIdentifier identifier: NSTouchBarItem.Identifier) -> NSTouchBarItem? {
if identifier == centerScrollArea { if identifier == centerScrollArea {
return self.scrollArea return scrollArea
} }
guard let item = self.items[identifier], guard let item = self.items[identifier],
@@ -244,46 +239,45 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
} }
func createItem(forIdentifier identifier: NSTouchBarItem.Identifier, definition item: BarItemDefinition) -> NSTouchBarItem? { func createItem(forIdentifier identifier: NSTouchBarItem.Identifier, definition item: BarItemDefinition) -> NSTouchBarItem? {
var barItem: NSTouchBarItem! var barItem: NSTouchBarItem!
switch item.type { switch item.type {
case .staticButton(title: let title): case let .staticButton(title: title):
barItem = CustomButtonTouchBarItem(identifier: identifier, title: title) barItem = CustomButtonTouchBarItem(identifier: identifier, title: title)
case .appleScriptTitledButton(source: let source, refreshInterval: let interval): case let .appleScriptTitledButton(source: source, refreshInterval: interval):
barItem = AppleScriptTouchBarItem(identifier: identifier, source: source, interval: interval) barItem = AppleScriptTouchBarItem(identifier: identifier, source: source, interval: interval)
case .timeButton(formatTemplate: let template): case let .timeButton(formatTemplate: template, timeZone: timeZone):
barItem = TimeTouchBarItem(identifier: identifier, formatTemplate: template) barItem = TimeTouchBarItem(identifier: identifier, formatTemplate: template, timeZone: timeZone)
case .battery(): case .battery():
barItem = BatteryBarItem(identifier: identifier) barItem = BatteryBarItem(identifier: identifier)
case .dock: case .dock:
barItem = AppScrubberTouchBarItem(identifier: identifier) barItem = AppScrubberTouchBarItem(identifier: identifier)
case .volume: case .volume:
if case .image(let source)? = item.additionalParameters[.image] { if case let .image(source)? = item.additionalParameters[.image] {
barItem = VolumeViewController(identifier: identifier, image: source.image) barItem = VolumeViewController(identifier: identifier, image: source.image)
} else { } else {
barItem = VolumeViewController(identifier: identifier) barItem = VolumeViewController(identifier: identifier)
} }
case .brightness(refreshInterval: let interval): case let .brightness(refreshInterval: interval):
if case .image(let source)? = item.additionalParameters[.image] { if case let .image(source)? = item.additionalParameters[.image] {
barItem = BrightnessViewController(identifier: identifier, refreshInterval: interval, image: source.image) barItem = BrightnessViewController(identifier: identifier, refreshInterval: interval, image: source.image)
} else { } else {
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 let .weather(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) barItem = WeatherBarItem(identifier: identifier, interval: interval, units: units, api_key: api_key, icon_type: icon_type)
case .currency(interval: let interval, from: let from, to: let to, full: let full): case let .currency(interval: interval, from: from, to: to, full: full):
barItem = CurrencyBarItem(identifier: identifier, interval: interval, from: from, to: to, full: full) barItem = CurrencyBarItem(identifier: identifier, interval: interval, from: from, to: to, full: full)
case .inputsource(): case .inputsource():
barItem = InputSourceBarItem(identifier: identifier) barItem = InputSourceBarItem(identifier: identifier)
case .music(interval: let interval): case let .music(interval: interval):
barItem = MusicBarItem(identifier: identifier, interval: interval) barItem = MusicBarItem(identifier: identifier, interval: interval)
case .groupBar(items: let items): case let .groupBar(items: items):
barItem = GroupBarItem(identifier: identifier, items: items) barItem = GroupBarItem(identifier: identifier, items: items)
case .nightShift(): case .nightShift():
barItem = NightShiftBarItem(identifier: identifier) barItem = NightShiftBarItem(identifier: identifier)
case .dnd(): case .dnd():
barItem = DnDBarItem(identifier: identifier) barItem = DnDBarItem(identifier: identifier)
case .pomodoro(workTime: let workTime, restTime: let restTime): case let .pomodoro(workTime: workTime, restTime: restTime):
barItem = PomodoroBarItem(identifier: identifier, workTime: workTime, restTime: restTime) barItem = PomodoroBarItem(identifier: identifier, workTime: workTime, restTime: restTime)
} }
@@ -293,19 +287,19 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
if let longAction = self.longAction(forItem: item), let item = barItem as? CustomButtonTouchBarItem { if let longAction = self.longAction(forItem: item), let item = barItem as? CustomButtonTouchBarItem {
item.longTapClosure = longAction item.longTapClosure = longAction
} }
if case .bordered(let bordered)? = item.additionalParameters[.bordered], let item = barItem as? CustomButtonTouchBarItem { if case let .bordered(bordered)? = item.additionalParameters[.bordered], let item = barItem as? CustomButtonTouchBarItem {
item.isBordered = bordered item.isBordered = bordered
} }
if case .background(let color)? = item.additionalParameters[.background], let item = barItem as? CustomButtonTouchBarItem { if case let .background(color)? = item.additionalParameters[.background], let item = barItem as? CustomButtonTouchBarItem {
item.backgroundColor = color item.backgroundColor = color
} }
if case .width(let value)? = item.additionalParameters[.width], let widthBarItem = barItem as? CanSetWidth { if case let .width(value)? = item.additionalParameters[.width], let widthBarItem = barItem as? CanSetWidth {
widthBarItem.setWidth(value: value) widthBarItem.setWidth(value: value)
} }
if case .image(let source)? = item.additionalParameters[.image], let item = barItem as? CustomButtonTouchBarItem { if case let .image(source)? = item.additionalParameters[.image], let item = barItem as? CustomButtonTouchBarItem {
item.image = source.image item.image = source.image
} }
if case .title(let value)? = item.additionalParameters[.title] { if case let .title(value)? = item.additionalParameters[.title] {
if let item = barItem as? GroupBarItem { if let item = barItem as? GroupBarItem {
item.collapsedRepresentationLabel = value item.collapsedRepresentationLabel = value
} else if let item = barItem as? CustomButtonTouchBarItem { } else if let item = barItem as? CustomButtonTouchBarItem {
@@ -315,13 +309,13 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
return barItem return barItem
} }
func action(forItem item: BarItemDefinition) -> (()->())? { func action(forItem item: BarItemDefinition) -> (() -> Void)? {
switch item.action { switch item.action {
case .hidKey(keycode: let keycode): case let .hidKey(keycode: keycode):
return { HIDPostAuxKey(keycode) } return { HIDPostAuxKey(keycode) }
case .keyPress(keycode: let keycode): case let .keyPress(keycode: keycode):
return { GenericKeyPress(keyCode: CGKeyCode(keycode)).send() } return { GenericKeyPress(keyCode: CGKeyCode(keycode)).send() }
case .appleScript(source: let source): case let .appleScript(source: source):
guard let appleScript = source.appleScript else { guard let appleScript = source.appleScript else {
print("cannot create apple script for item \(item)") print("cannot create apple script for item \(item)")
return {} return {}
@@ -335,38 +329,37 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
} }
} }
} }
case .shellScript(executable: let executable, parameters: let parameters): case let .shellScript(executable: executable, parameters: parameters):
return { return {
let task = Process() let task = Process()
task.launchPath = executable task.launchPath = executable
task.arguments = parameters task.arguments = parameters
task.launch() task.launch()
} }
case .openUrl(url: let url): case let .openUrl(url: url):
return { return {
if let url = URL(string: url), NSWorkspace.shared.open(url) { if let url = URL(string: url), NSWorkspace.shared.open(url) {
#if DEBUG #if DEBUG
print("URL was successfully opened") print("URL was successfully opened")
#endif #endif
} else { } else {
print("error", url) print("error", url)
} }
} }
case .custom(closure: let closure): case let .custom(closure: closure):
return closure return closure
case .none: case .none:
return nil return nil
} }
} }
func longAction(forItem item: BarItemDefinition) -> (() -> Void)? {
func longAction(forItem item: BarItemDefinition) -> (()->())? {
switch item.longAction { switch item.longAction {
case .hidKey(keycode: let keycode): case let .hidKey(keycode: keycode):
return { HIDPostAuxKey(keycode) } return { HIDPostAuxKey(keycode) }
case .keyPress(keycode: let keycode): case let .keyPress(keycode: keycode):
return { GenericKeyPress(keyCode: CGKeyCode(keycode)).send() } return { GenericKeyPress(keyCode: CGKeyCode(keycode)).send() }
case .appleScript(source: let source): case let .appleScript(source: source):
guard let appleScript = source.appleScript else { guard let appleScript = source.appleScript else {
print("cannot create apple script for item \(item)") print("cannot create apple script for item \(item)")
return {} return {}
@@ -378,24 +371,24 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
print("error \(error) when handling \(item) ") print("error \(error) when handling \(item) ")
} }
} }
case .shellScript(executable: let executable, parameters: let parameters): case let .shellScript(executable: executable, parameters: parameters):
return { return {
let task = Process() let task = Process()
task.launchPath = executable task.launchPath = executable
task.arguments = parameters task.arguments = parameters
task.launch() task.launch()
} }
case .openUrl(url: let url): case let .openUrl(url: url):
return { return {
if let url = URL(string: url), NSWorkspace.shared.open(url) { if let url = URL(string: url), NSWorkspace.shared.open(url) {
#if DEBUG #if DEBUG
print("URL was successfully opened") print("URL was successfully opened")
#endif #endif
} else { } else {
print("error", url) print("error", url)
} }
} }
case .custom(closure: let closure): case let .custom(closure: closure):
return closure return closure
case .none: case .none:
return nil return nil
@@ -409,13 +402,13 @@ protocol CanSetWidth {
extension NSCustomTouchBarItem: CanSetWidth { extension NSCustomTouchBarItem: CanSetWidth {
func setWidth(value: CGFloat) { func setWidth(value: CGFloat) {
self.view.widthAnchor.constraint(equalToConstant: value).isActive = true view.widthAnchor.constraint(equalToConstant: value).isActive = true
} }
} }
extension BarItemDefinition { extension BarItemDefinition {
var align: Align { var align: Align {
if case .align(let result)? = self.additionalParameters[.align] { if case let .align(result)? = additionalParameters[.align] {
return result return result
} }
return .center return .center
+1
View File
@@ -34,6 +34,7 @@ class PomodoroBarItem: CustomButtonTouchBarItem, Widget {
case rest case rest
case none case none
} }
private let defaultTitle = "🍅" private let defaultTitle = "🍅"
private let workTime: TimeInterval private let workTime: TimeInterval
private let restTime: TimeInterval private let restTime: TimeInterval
+5 -2
View File
@@ -4,8 +4,11 @@ class TimeTouchBarItem: CustomButtonTouchBarItem {
private let dateFormatter = DateFormatter() private let dateFormatter = DateFormatter()
private var timer: Timer! private var timer: Timer!
init(identifier: NSTouchBarItem.Identifier, formatTemplate: String) { init(identifier: NSTouchBarItem.Identifier, formatTemplate: String, timeZone: String? = nil) {
dateFormatter.setLocalizedDateFormatFromTemplate(formatTemplate) dateFormatter.dateFormat = formatTemplate
if let abbr = timeZone {
dateFormatter.timeZone = TimeZone(abbreviation: abbr)
}
super.init(identifier: identifier, title: " ") super.init(identifier: identifier, title: " ")
timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(updateTime), userInfo: nil, repeats: true) timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(updateTime), userInfo: nil, repeats: true)
isBordered = false isBordered = false
@@ -1,7 +1,6 @@
import XCTest import XCTest
class AppleScriptDefinitionTests: XCTestCase { class AppleScriptDefinitionTests: XCTestCase {
func testInline() { func testInline() {
let buttonNoActionFixture = """ let buttonNoActionFixture = """
[ { "type": "appleScriptTitledButton", "source": { "inline": "tell everything fine" } } ] [ { "type": "appleScriptTitledButton", "source": { "inline": "tell everything fine" } } ]
@@ -37,5 +36,4 @@ class AppleScriptDefinitionTests: XCTestCase {
return return
} }
} }
} }
+2 -4
View File
@@ -1,13 +1,12 @@
import XCTest import XCTest
class BackgroundColorTests: XCTestCase { class BackgroundColorTests: XCTestCase {
func testOpaque() { func testOpaque() {
let buttonNoActionFixture = """ let buttonNoActionFixture = """
[ { "type": "staticButton", "title": "Pew", "background": "#FF0000" } ] [ { "type": "staticButton", "title": "Pew", "background": "#FF0000" } ]
""".data(using: .utf8)! """.data(using: .utf8)!
let result = try? JSONDecoder().decode([BarItemDefinition].self, from: buttonNoActionFixture) let result = try? JSONDecoder().decode([BarItemDefinition].self, from: buttonNoActionFixture)
guard case .background(let color)? = result?.first?.additionalParameters[.background] else { guard case let .background(color)? = result?.first?.additionalParameters[.background] else {
XCTFail() XCTFail()
return return
} }
@@ -19,11 +18,10 @@ class BackgroundColorTests: XCTestCase {
[ { "type": "staticButton", "title": "Pew", "background": "#FF000080" } ] [ { "type": "staticButton", "title": "Pew", "background": "#FF000080" } ]
""".data(using: .utf8)! """.data(using: .utf8)!
let result = try? JSONDecoder().decode([BarItemDefinition].self, from: buttonNoActionFixture) let result = try? JSONDecoder().decode([BarItemDefinition].self, from: buttonNoActionFixture)
guard case .background(let color)? = result?.first?.additionalParameters[.background] else { guard case let .background(color)? = result?.first?.additionalParameters[.background] else {
XCTFail() XCTFail()
return return
} }
XCTAssertEqual(color.alphaComponent, 0.5, accuracy: 0.01) XCTAssertEqual(color.alphaComponent, 0.5, accuracy: 0.01)
} }
} }
-2
View File
@@ -1,7 +1,6 @@
import XCTest import XCTest
class ParseConfig: XCTestCase { class ParseConfig: XCTestCase {
func testButtonNoAction() { func testButtonNoAction() {
let buttonNoActionFixture = """ let buttonNoActionFixture = """
[ { "type": "staticButton", "title": "Pew" } ] [ { "type": "staticButton", "title": "Pew" } ]
@@ -65,5 +64,4 @@ class ParseConfig: XCTestCase {
return return
} }
} }
} }
+10
View File
@@ -119,6 +119,16 @@ To close a group, use the button:
``` ```
## Native plugins ## Native plugins
#### `timeButton`
> Attention! Works not all: https://en.wikipedia.org/wiki/List_of_time_zone_abbreviations
```js
{
"type": "timeButton",
"formatTemplate": "dd HH:mm",
"timeZone": "UTC"
}
```
#### `weather` #### `weather`
> Provider: https://openweathermap.org Need allowance location service > Provider: https://openweathermap.org Need allowance location service
```js ```js
+9
View File
@@ -26,6 +26,7 @@ VERSION=`/usr/libexec/PlistBuddy -c "Print CFBundleShortVersionString" ${NAME}.a
MINIMUM=`/usr/libexec/PlistBuddy -c "Print LSMinimumSystemVersion" ${NAME}.app/Contents/Info.plist` MINIMUM=`/usr/libexec/PlistBuddy -c "Print LSMinimumSystemVersion" ${NAME}.app/Contents/Info.plist`
SIZE=`stat -f%z MTMR\ ${VERSION}.dmg` SIZE=`stat -f%z MTMR\ ${VERSION}.dmg`
SIGN=`~/Sparkle/bin/sign_update MTMR\ ${VERSION}.dmg ~/Sparkle/bin/dsa_priv.pem | awk '{printf "%s",$0} END {print ""}'` SIGN=`~/Sparkle/bin/sign_update MTMR\ ${VERSION}.dmg ~/Sparkle/bin/dsa_priv.pem | awk '{printf "%s",$0} END {print ""}'`
SHA256=`shasum -a 256 MTMR\ ${VERSION}.dmg | awk '{print $1}'`
# ditto -c -k --sequesterRsrc --keepParent "${NAME}.app" "${NAME}v${VERSION}.zip" # ditto -c -k --sequesterRsrc --keepParent "${NAME}.app" "${NAME}v${VERSION}.zip"
@@ -57,5 +58,13 @@ echo "<?xml version=\"1.0\" standalone=\"yes\"?>
</channel> </channel>
</rss>" > appcast.xml </rss>" > appcast.xml
echo ""
echo "Homebrew https://github.com/Homebrew/homebrew-cask/edit/master/Casks/mtmr.rb"
echo ""
echo " version '${VERSION}'"
echo " sha256 '${SHA256}'"
echo ""
echo "Update MTMR v${VERSION}"
scp MTMR\ ${VERSION}.dmg do:/var/www/mtmr scp MTMR\ ${VERSION}.dmg do:/var/www/mtmr
scp appcast.xml do:/var/www/mtmr scp appcast.xml do:/var/www/mtmr