diff --git a/MTMR/Assets.xcassets/brightnessDown.imageset/Contents.json b/MTMR/Assets.xcassets/brightnessDown.imageset/Contents.json new file mode 100644 index 0000000..cd7e69d --- /dev/null +++ b/MTMR/Assets.xcassets/brightnessDown.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "brightnessDown.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/MTMR/Assets.xcassets/brightnessDown.imageset/brightnessDown.png b/MTMR/Assets.xcassets/brightnessDown.imageset/brightnessDown.png new file mode 100644 index 0000000..a7bc8a9 Binary files /dev/null and b/MTMR/Assets.xcassets/brightnessDown.imageset/brightnessDown.png differ diff --git a/MTMR/Assets.xcassets/brightnessUp.imageset/Contents.json b/MTMR/Assets.xcassets/brightnessUp.imageset/Contents.json new file mode 100644 index 0000000..d038817 --- /dev/null +++ b/MTMR/Assets.xcassets/brightnessUp.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "brightnessUp.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/MTMR/Assets.xcassets/brightnessUp.imageset/brightnessUp.png b/MTMR/Assets.xcassets/brightnessUp.imageset/brightnessUp.png new file mode 100644 index 0000000..028aa26 Binary files /dev/null and b/MTMR/Assets.xcassets/brightnessUp.imageset/brightnessUp.png differ diff --git a/MTMR/ItemsParsing.swift b/MTMR/ItemsParsing.swift index 3b6a773..888a790 100644 --- a/MTMR/ItemsParsing.swift +++ b/MTMR/ItemsParsing.swift @@ -43,8 +43,14 @@ class SupportedTypesHolder { typealias ParametersDecoder = (Decoder) throws ->(item: ItemType, action: ActionType, parameters: [GeneralParameter]) private var supportedTypes: [String: ParametersDecoder] = [ "escape": { _ in return (item: .staticButton(title: "esc"), action: .keyPress(keycode: 53), parameters: []) }, - "brightnessUp": { _ in return (item: .staticButton(title: "🔆"), action: .keyPress(keycode: 113), parameters: []) }, - "brightnessDown": { _ in return (item: .staticButton(title: "🔅"), action: .keyPress(keycode: 107), parameters: []) }, + "brightnessUp": { _ in + let imageParameter = GeneralParameter.image(source: #imageLiteral(resourceName: "brightnessUp")) + return (item: .staticButton(title: ""), action: .keyPress(keycode: 113), parameters: [imageParameter]) + }, + "brightnessDown": { _ in + let imageParameter = GeneralParameter.image(source: #imageLiteral(resourceName: "brightnessDown")) + return (item: .staticButton(title: ""), action: .keyPress(keycode: 107), parameters: [imageParameter]) + }, "volumeDown": { _ in let imageParameter = GeneralParameter.image(source: NSImage(named: .touchBarVolumeDownTemplate)!) return (item: .staticButton(title: ""), action: .hidKey(keycode: NX_KEYTYPE_SOUND_DOWN), parameters: [imageParameter])