diff --git a/Mini vMac/Assets.xcassets/KBCapsLock.imageset/Contents.json b/Mini vMac/Assets.xcassets/KBCapsLock.imageset/Contents.json index cbe56fb..68dd648 100644 --- a/Mini vMac/Assets.xcassets/KBCapsLock.imageset/Contents.json +++ b/Mini vMac/Assets.xcassets/KBCapsLock.imageset/Contents.json @@ -5,28 +5,31 @@ "scale" : "1x" }, { - "idiom" : "iphone", "filename" : "KBCapsLock~iphone@2x.png", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "iphone", "filename" : "KBCapsLock~iphone@3x.png", + "idiom" : "iphone", "scale" : "3x" }, { - "idiom" : "ipad", "filename" : "KBCapsLock~ipad.png", + "idiom" : "ipad", "scale" : "1x" }, { - "idiom" : "ipad", "filename" : "KBCapsLock~ipad@2x.png", + "idiom" : "ipad", "scale" : "2x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Mini vMac/Assets.xcassets/KBClearDown.imageset/Contents.json b/Mini vMac/Assets.xcassets/KBClearDown.imageset/Contents.json index 07d949d..b6f380c 100644 --- a/Mini vMac/Assets.xcassets/KBClearDown.imageset/Contents.json +++ b/Mini vMac/Assets.xcassets/KBClearDown.imageset/Contents.json @@ -5,28 +5,31 @@ "scale" : "1x" }, { - "idiom" : "iphone", "filename" : "KBClearDown~iphone@2x.png", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "iphone", "filename" : "KBClearDown~iphone@3x.png", + "idiom" : "iphone", "scale" : "3x" }, { - "idiom" : "ipad", "filename" : "KBClearDown~ipad.png", + "idiom" : "ipad", "scale" : "1x" }, { - "idiom" : "ipad", "filename" : "KBClearDown~ipad@2x.png", + "idiom" : "ipad", "scale" : "2x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Mini vMac/Assets.xcassets/KBClearUp.imageset/Contents.json b/Mini vMac/Assets.xcassets/KBClearUp.imageset/Contents.json index 83c2f96..8143eda 100644 --- a/Mini vMac/Assets.xcassets/KBClearUp.imageset/Contents.json +++ b/Mini vMac/Assets.xcassets/KBClearUp.imageset/Contents.json @@ -5,28 +5,31 @@ "scale" : "1x" }, { - "idiom" : "iphone", "filename" : "KBClearUp~iphone.png", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "iphone", "filename" : "KBClearUp~iphone@3x.png", + "idiom" : "iphone", "scale" : "3x" }, { - "idiom" : "ipad", "filename" : "KBClearUp~ipad.png", + "idiom" : "ipad", "scale" : "1x" }, { - "idiom" : "ipad", "filename" : "KBClearUp~ipad@2x.png", + "idiom" : "ipad", "scale" : "2x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Mini vMac/Assets.xcassets/KBCommand.imageset/Contents.json b/Mini vMac/Assets.xcassets/KBCommand.imageset/Contents.json index ed1d2ce..94564ff 100644 --- a/Mini vMac/Assets.xcassets/KBCommand.imageset/Contents.json +++ b/Mini vMac/Assets.xcassets/KBCommand.imageset/Contents.json @@ -5,28 +5,31 @@ "scale" : "1x" }, { - "idiom" : "iphone", "filename" : "KBKeyCommand@2x.png", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "iphone", "filename" : "KBKeyCommand@3x.png", + "idiom" : "iphone", "scale" : "3x" }, { - "idiom" : "ipad", "filename" : "KBCommand~ipad.png", + "idiom" : "ipad", "scale" : "1x" }, { - "idiom" : "ipad", "filename" : "KBCommand@2x~ipad.png", + "idiom" : "ipad", "scale" : "2x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Mini vMac/Assets.xcassets/KBDeleteDown.imageset/Contents.json b/Mini vMac/Assets.xcassets/KBDeleteDown.imageset/Contents.json index a201c9c..c22e522 100644 --- a/Mini vMac/Assets.xcassets/KBDeleteDown.imageset/Contents.json +++ b/Mini vMac/Assets.xcassets/KBDeleteDown.imageset/Contents.json @@ -5,28 +5,31 @@ "scale" : "1x" }, { - "idiom" : "iphone", "filename" : "KBDeleteDown~iphone@2x.png", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "iphone", "filename" : "KBDeleteDown~iphone@3x.png", + "idiom" : "iphone", "scale" : "3x" }, { - "idiom" : "ipad", "filename" : "KBDeleteDown~ipad.png", + "idiom" : "ipad", "scale" : "1x" }, { - "idiom" : "ipad", "filename" : "KBDeleteDown~ipad@2x.png", + "idiom" : "ipad", "scale" : "2x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Mini vMac/Assets.xcassets/KBDeleteUp.imageset/Contents.json b/Mini vMac/Assets.xcassets/KBDeleteUp.imageset/Contents.json index 5d79b1a..e46a6d3 100644 --- a/Mini vMac/Assets.xcassets/KBDeleteUp.imageset/Contents.json +++ b/Mini vMac/Assets.xcassets/KBDeleteUp.imageset/Contents.json @@ -5,28 +5,31 @@ "scale" : "1x" }, { - "idiom" : "iphone", "filename" : "KBDeleteUp~iphone.png", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "iphone", "filename" : "KBDeleteUp~iphone@3x.png", + "idiom" : "iphone", "scale" : "3x" }, { - "idiom" : "ipad", "filename" : "KBDeleteUp~ipad.png", + "idiom" : "ipad", "scale" : "1x" }, { - "idiom" : "ipad", "filename" : "KBDeleteUp~ipad@2x.png", + "idiom" : "ipad", "scale" : "2x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Mini vMac/Assets.xcassets/KBForwardDeleteDown.imageset/Contents.json b/Mini vMac/Assets.xcassets/KBForwardDeleteDown.imageset/Contents.json index 4fccb24..50d4167 100644 --- a/Mini vMac/Assets.xcassets/KBForwardDeleteDown.imageset/Contents.json +++ b/Mini vMac/Assets.xcassets/KBForwardDeleteDown.imageset/Contents.json @@ -5,28 +5,31 @@ "scale" : "1x" }, { - "idiom" : "iphone", "filename" : "KBForwardDeleteDown~iphone@2x.png", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "iphone", "filename" : "KBForwardDeleteDown~iphone@3x.png", + "idiom" : "iphone", "scale" : "3x" }, { - "idiom" : "ipad", "filename" : "KBForwardDeleteDown~ipad.png", + "idiom" : "ipad", "scale" : "1x" }, { - "idiom" : "ipad", "filename" : "KBForwardDeleteDown~ipad@2x.png", + "idiom" : "ipad", "scale" : "2x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Mini vMac/Assets.xcassets/KBForwardDeleteUp.imageset/Contents.json b/Mini vMac/Assets.xcassets/KBForwardDeleteUp.imageset/Contents.json index 9b6aa14..f9eb364 100644 --- a/Mini vMac/Assets.xcassets/KBForwardDeleteUp.imageset/Contents.json +++ b/Mini vMac/Assets.xcassets/KBForwardDeleteUp.imageset/Contents.json @@ -5,28 +5,31 @@ "scale" : "1x" }, { - "idiom" : "iphone", "filename" : "KBForwardDeleteUp~iphone.png", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "iphone", "filename" : "KBForwardDeleteUp~iphone@3x.png", + "idiom" : "iphone", "scale" : "3x" }, { - "idiom" : "ipad", "filename" : "KBForwardDeleteUp~ipad.png", + "idiom" : "ipad", "scale" : "1x" }, { - "idiom" : "ipad", "filename" : "KBForwardDeleteUp~ipad@2x.png", + "idiom" : "ipad", "scale" : "2x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Mini vMac/Assets.xcassets/KBHide.imageset/Contents.json b/Mini vMac/Assets.xcassets/KBHide.imageset/Contents.json index c09f57b..f01cb0e 100644 --- a/Mini vMac/Assets.xcassets/KBHide.imageset/Contents.json +++ b/Mini vMac/Assets.xcassets/KBHide.imageset/Contents.json @@ -5,28 +5,31 @@ "scale" : "1x" }, { - "idiom" : "iphone", "filename" : "KBHide~iphone@2x.png", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "iphone", "filename" : "KBHide~iphone@3x.png", + "idiom" : "iphone", "scale" : "3x" }, { - "idiom" : "ipad", "filename" : "KBHide~ipad.png", + "idiom" : "ipad", "scale" : "1x" }, { - "idiom" : "ipad", "filename" : "KBHide~ipad@2x.png", + "idiom" : "ipad", "scale" : "2x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Mini vMac/Assets.xcassets/KBKey.imageset/Contents.json b/Mini vMac/Assets.xcassets/KBKey.imageset/Contents.json index db12060..a77a97f 100644 --- a/Mini vMac/Assets.xcassets/KBKey.imageset/Contents.json +++ b/Mini vMac/Assets.xcassets/KBKey.imageset/Contents.json @@ -1,103 +1,228 @@ { "images" : [ { + "filename" : "KBKey.png", + "idiom" : "iphone", "resizing" : { - "mode" : "9-part", - "center" : { - "mode" : "tile", - "width" : 1, - "height" : 1 - }, "cap-insets" : { "bottom" : 8, - "top" : 8, + "left" : 8, "right" : 8, - "left" : 8 - } + "top" : 8 + }, + "center" : { + "height" : 1, + "mode" : "tile", + "width" : 1 + }, + "mode" : "9-part" }, - "idiom" : "iphone", - "filename" : "KBKey.png", "scale" : "1x" }, { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "KBKey-1.png", + "idiom" : "iphone", "resizing" : { - "mode" : "9-part", - "center" : { - "mode" : "tile", - "width" : 2, - "height" : 2 + "cap-insets" : { + "bottom" : 8, + "left" : 8, + "right" : 8, + "top" : 8 }, + "center" : { + "height" : 1, + "mode" : "tile", + "width" : 1 + }, + "mode" : "9-part" + }, + "scale" : "1x" + }, + { + "filename" : "KBKey@2x.png", + "idiom" : "iphone", + "resizing" : { "cap-insets" : { "bottom" : 16, - "top" : 16, + "left" : 16, "right" : 16, - "left" : 16 - } + "top" : 16 + }, + "center" : { + "height" : 2, + "mode" : "tile", + "width" : 2 + }, + "mode" : "9-part" }, - "idiom" : "iphone", - "filename" : "KBKey@2x.png", "scale" : "2x" }, { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "KBKey@2x-1.png", + "idiom" : "iphone", "resizing" : { - "mode" : "9-part", - "center" : { - "mode" : "tile", - "width" : 3, - "height" : 3 + "cap-insets" : { + "bottom" : 16, + "left" : 16, + "right" : 16, + "top" : 16 }, + "center" : { + "height" : 2, + "mode" : "tile", + "width" : 2 + }, + "mode" : "9-part" + }, + "scale" : "2x" + }, + { + "filename" : "KBKey@3x.png", + "idiom" : "iphone", + "resizing" : { "cap-insets" : { "bottom" : 24, - "top" : 24, + "left" : 24, "right" : 24, - "left" : 24 - } + "top" : 24 + }, + "center" : { + "height" : 3, + "mode" : "tile", + "width" : 3 + }, + "mode" : "9-part" }, - "idiom" : "iphone", - "filename" : "KBKey@3x.png", "scale" : "3x" }, { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "KBKey@3x-2.png", + "idiom" : "iphone", "resizing" : { - "mode" : "9-part", - "center" : { - "mode" : "tile", - "width" : 1, - "height" : 1 + "cap-insets" : { + "bottom" : 24, + "left" : 24, + "right" : 24, + "top" : 24 }, + "center" : { + "height" : 3, + "mode" : "tile", + "width" : 3 + }, + "mode" : "9-part" + }, + "scale" : "3x" + }, + { + "filename" : "KBKey~ipad.png", + "idiom" : "ipad", + "resizing" : { "cap-insets" : { "bottom" : 16, - "top" : 16, + "left" : 16, "right" : 16, - "left" : 16 - } + "top" : 16 + }, + "center" : { + "height" : 1, + "mode" : "tile", + "width" : 1 + }, + "mode" : "9-part" }, - "idiom" : "ipad", - "filename" : "KBKey~ipad.png", "scale" : "1x" }, { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "KBKey~ipad-2.png", + "idiom" : "ipad", "resizing" : { - "mode" : "9-part", - "center" : { - "mode" : "tile", - "width" : 2, - "height" : 2 + "cap-insets" : { + "bottom" : 16, + "left" : 16, + "right" : 16, + "top" : 16 }, + "center" : { + "height" : 1, + "mode" : "tile", + "width" : 1 + }, + "mode" : "9-part" + }, + "scale" : "1x" + }, + { + "filename" : "KBKey@2x~ipad.png", + "idiom" : "ipad", + "resizing" : { "cap-insets" : { "bottom" : 32, - "top" : 32, + "left" : 32, "right" : 32, - "left" : 32 - } + "top" : 32 + }, + "center" : { + "height" : 2, + "mode" : "tile", + "width" : 2 + }, + "mode" : "9-part" }, + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "KBKey@2x~ipad-2.png", "idiom" : "ipad", - "filename" : "KBKey@2x~ipad.png", + "resizing" : { + "cap-insets" : { + "bottom" : 32, + "left" : 32, + "right" : 32, + "top" : 32 + }, + "center" : { + "height" : 2, + "mode" : "tile", + "width" : 2 + }, + "mode" : "9-part" + }, "scale" : "2x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Mini vMac/Assets.xcassets/KBKey.imageset/KBKey-1.png b/Mini vMac/Assets.xcassets/KBKey.imageset/KBKey-1.png new file mode 100644 index 0000000..e321899 Binary files /dev/null and b/Mini vMac/Assets.xcassets/KBKey.imageset/KBKey-1.png differ diff --git a/Mini vMac/Assets.xcassets/KBKey.imageset/KBKey@2x-1.png b/Mini vMac/Assets.xcassets/KBKey.imageset/KBKey@2x-1.png new file mode 100644 index 0000000..7a4e3a5 Binary files /dev/null and b/Mini vMac/Assets.xcassets/KBKey.imageset/KBKey@2x-1.png differ diff --git a/Mini vMac/Assets.xcassets/KBKey.imageset/KBKey@2x~ipad-2.png b/Mini vMac/Assets.xcassets/KBKey.imageset/KBKey@2x~ipad-2.png new file mode 100644 index 0000000..89ef4d1 Binary files /dev/null and b/Mini vMac/Assets.xcassets/KBKey.imageset/KBKey@2x~ipad-2.png differ diff --git a/Mini vMac/Assets.xcassets/KBKey.imageset/KBKey@3x-2.png b/Mini vMac/Assets.xcassets/KBKey.imageset/KBKey@3x-2.png new file mode 100644 index 0000000..1c8d4e6 Binary files /dev/null and b/Mini vMac/Assets.xcassets/KBKey.imageset/KBKey@3x-2.png differ diff --git a/Mini vMac/Assets.xcassets/KBKey.imageset/KBKey~ipad-2.png b/Mini vMac/Assets.xcassets/KBKey.imageset/KBKey~ipad-2.png new file mode 100644 index 0000000..c6c162c Binary files /dev/null and b/Mini vMac/Assets.xcassets/KBKey.imageset/KBKey~ipad-2.png differ diff --git a/Mini vMac/Assets.xcassets/KBKeyDark.imageset/Contents.json b/Mini vMac/Assets.xcassets/KBKeyDark.imageset/Contents.json index dff8b2e..975f84b 100644 --- a/Mini vMac/Assets.xcassets/KBKeyDark.imageset/Contents.json +++ b/Mini vMac/Assets.xcassets/KBKeyDark.imageset/Contents.json @@ -1,103 +1,228 @@ { "images" : [ { + "filename" : "KBKeyDark.png", + "idiom" : "iphone", "resizing" : { - "mode" : "9-part", - "center" : { - "mode" : "tile", - "width" : 1, - "height" : 1 - }, "cap-insets" : { "bottom" : 8, - "top" : 8, + "left" : 8, "right" : 8, - "left" : 8 - } + "top" : 8 + }, + "center" : { + "height" : 1, + "mode" : "tile", + "width" : 1 + }, + "mode" : "9-part" }, - "idiom" : "iphone", - "filename" : "KBKeyDark.png", "scale" : "1x" }, { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "KBKeyDark-1.png", + "idiom" : "iphone", "resizing" : { - "mode" : "9-part", - "center" : { - "mode" : "tile", - "width" : 2, - "height" : 2 + "cap-insets" : { + "bottom" : 8, + "left" : 8, + "right" : 8, + "top" : 8 }, + "center" : { + "height" : 1, + "mode" : "tile", + "width" : 1 + }, + "mode" : "9-part" + }, + "scale" : "1x" + }, + { + "filename" : "KBKeyDark@2x.png", + "idiom" : "iphone", + "resizing" : { "cap-insets" : { "bottom" : 16, - "top" : 16, + "left" : 16, "right" : 16, - "left" : 16 - } + "top" : 16 + }, + "center" : { + "height" : 2, + "mode" : "tile", + "width" : 2 + }, + "mode" : "9-part" }, - "idiom" : "iphone", - "filename" : "KBKeyDark@2x.png", "scale" : "2x" }, { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "KBKeyDark@2x-1.png", + "idiom" : "iphone", "resizing" : { - "mode" : "9-part", - "center" : { - "mode" : "tile", - "width" : 3, - "height" : 3 + "cap-insets" : { + "bottom" : 16, + "left" : 16, + "right" : 16, + "top" : 16 }, + "center" : { + "height" : 2, + "mode" : "tile", + "width" : 2 + }, + "mode" : "9-part" + }, + "scale" : "2x" + }, + { + "filename" : "KBKeyDark@3x.png", + "idiom" : "iphone", + "resizing" : { "cap-insets" : { "bottom" : 24, - "top" : 24, + "left" : 24, "right" : 24, - "left" : 24 - } + "top" : 24 + }, + "center" : { + "height" : 3, + "mode" : "tile", + "width" : 3 + }, + "mode" : "9-part" }, - "idiom" : "iphone", - "filename" : "KBKeyDark@3x.png", "scale" : "3x" }, { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "KBKeyDark@3x-1.png", + "idiom" : "iphone", "resizing" : { - "mode" : "9-part", - "center" : { - "mode" : "tile", - "width" : 1, - "height" : 1 + "cap-insets" : { + "bottom" : 24, + "left" : 24, + "right" : 24, + "top" : 24 }, + "center" : { + "height" : 3, + "mode" : "tile", + "width" : 3 + }, + "mode" : "9-part" + }, + "scale" : "3x" + }, + { + "filename" : "KBKeyDark~ipad.png", + "idiom" : "ipad", + "resizing" : { "cap-insets" : { "bottom" : 16, - "top" : 16, + "left" : 16, "right" : 16, - "left" : 16 - } + "top" : 16 + }, + "center" : { + "height" : 1, + "mode" : "tile", + "width" : 1 + }, + "mode" : "9-part" }, - "idiom" : "ipad", - "filename" : "KBKeyDark~ipad.png", "scale" : "1x" }, { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "KBKeyDark~ipad-1.png", + "idiom" : "ipad", "resizing" : { - "mode" : "9-part", - "center" : { - "mode" : "tile", - "width" : 2, - "height" : 2 + "cap-insets" : { + "bottom" : 16, + "left" : 16, + "right" : 16, + "top" : 16 }, + "center" : { + "height" : 1, + "mode" : "tile", + "width" : 1 + }, + "mode" : "9-part" + }, + "scale" : "1x" + }, + { + "filename" : "KBKeyDark@2x~ipad.png", + "idiom" : "ipad", + "resizing" : { "cap-insets" : { "bottom" : 32, - "top" : 32, + "left" : 32, "right" : 32, - "left" : 32 - } + "top" : 32 + }, + "center" : { + "height" : 2, + "mode" : "tile", + "width" : 2 + }, + "mode" : "9-part" }, + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "KBKeyDark@2x~ipad-1.png", "idiom" : "ipad", - "filename" : "KBKeyDark@2x~ipad.png", + "resizing" : { + "cap-insets" : { + "bottom" : 32, + "left" : 32, + "right" : 32, + "top" : 32 + }, + "center" : { + "height" : 2, + "mode" : "tile", + "width" : 2 + }, + "mode" : "9-part" + }, "scale" : "2x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Mini vMac/Assets.xcassets/KBKeyDark.imageset/KBKeyDark-1.png b/Mini vMac/Assets.xcassets/KBKeyDark.imageset/KBKeyDark-1.png new file mode 100644 index 0000000..7ead08e Binary files /dev/null and b/Mini vMac/Assets.xcassets/KBKeyDark.imageset/KBKeyDark-1.png differ diff --git a/Mini vMac/Assets.xcassets/KBKeyDark.imageset/KBKeyDark@2x-1.png b/Mini vMac/Assets.xcassets/KBKeyDark.imageset/KBKeyDark@2x-1.png new file mode 100644 index 0000000..a087264 Binary files /dev/null and b/Mini vMac/Assets.xcassets/KBKeyDark.imageset/KBKeyDark@2x-1.png differ diff --git a/Mini vMac/Assets.xcassets/KBKeyDark.imageset/KBKeyDark@2x~ipad-1.png b/Mini vMac/Assets.xcassets/KBKeyDark.imageset/KBKeyDark@2x~ipad-1.png new file mode 100644 index 0000000..ea0372a Binary files /dev/null and b/Mini vMac/Assets.xcassets/KBKeyDark.imageset/KBKeyDark@2x~ipad-1.png differ diff --git a/Mini vMac/Assets.xcassets/KBKeyDark.imageset/KBKeyDark@3x-1.png b/Mini vMac/Assets.xcassets/KBKeyDark.imageset/KBKeyDark@3x-1.png new file mode 100644 index 0000000..234b089 Binary files /dev/null and b/Mini vMac/Assets.xcassets/KBKeyDark.imageset/KBKeyDark@3x-1.png differ diff --git a/Mini vMac/Assets.xcassets/KBKeyDark.imageset/KBKeyDark~ipad-1.png b/Mini vMac/Assets.xcassets/KBKeyDark.imageset/KBKeyDark~ipad-1.png new file mode 100644 index 0000000..5190f7b Binary files /dev/null and b/Mini vMac/Assets.xcassets/KBKeyDark.imageset/KBKeyDark~ipad-1.png differ diff --git a/Mini vMac/Assets.xcassets/KBNumPad.imageset/Contents.json b/Mini vMac/Assets.xcassets/KBNumPad.imageset/Contents.json index 60d8cbd..ddc90b7 100644 --- a/Mini vMac/Assets.xcassets/KBNumPad.imageset/Contents.json +++ b/Mini vMac/Assets.xcassets/KBNumPad.imageset/Contents.json @@ -5,28 +5,31 @@ "scale" : "1x" }, { - "idiom" : "iphone", "filename" : "KBNumPad@2x.png", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "iphone", "filename" : "KBNumPad@3x.png", + "idiom" : "iphone", "scale" : "3x" }, { - "idiom" : "ipad", "filename" : "KBNumPad~ipad.png", + "idiom" : "ipad", "scale" : "1x" }, { - "idiom" : "ipad", "filename" : "KBNumPad@2x~ipad.png", + "idiom" : "ipad", "scale" : "2x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Mini vMac/Assets.xcassets/KBOption.imageset/Contents.json b/Mini vMac/Assets.xcassets/KBOption.imageset/Contents.json index 5b949a1..bfe4b76 100644 --- a/Mini vMac/Assets.xcassets/KBOption.imageset/Contents.json +++ b/Mini vMac/Assets.xcassets/KBOption.imageset/Contents.json @@ -5,28 +5,31 @@ "scale" : "1x" }, { - "idiom" : "iphone", "filename" : "KBKeyOption@2x.png", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "iphone", "filename" : "KBKeyOption@3x.png", + "idiom" : "iphone", "scale" : "3x" }, { - "idiom" : "ipad", "filename" : "KBOption~ipad.png", + "idiom" : "ipad", "scale" : "1x" }, { - "idiom" : "ipad", "filename" : "KBOption@2x~ipad.png", + "idiom" : "ipad", "scale" : "2x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Mini vMac/Assets.xcassets/KBShiftDown.imageset/Contents.json b/Mini vMac/Assets.xcassets/KBShiftDown.imageset/Contents.json index 81045bd..e6d47eb 100644 --- a/Mini vMac/Assets.xcassets/KBShiftDown.imageset/Contents.json +++ b/Mini vMac/Assets.xcassets/KBShiftDown.imageset/Contents.json @@ -5,28 +5,31 @@ "scale" : "1x" }, { - "idiom" : "iphone", "filename" : "KBShiftDown~iphone@2x.png", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "iphone", "filename" : "KBShiftDown~iphone@3x.png", + "idiom" : "iphone", "scale" : "3x" }, { - "idiom" : "ipad", "filename" : "KBShiftDown~ipad.png", + "idiom" : "ipad", "scale" : "1x" }, { - "idiom" : "ipad", "filename" : "KBShiftDown~ipad@2x.png", + "idiom" : "ipad", "scale" : "2x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Mini vMac/Assets.xcassets/KBShiftUp.imageset/Contents.json b/Mini vMac/Assets.xcassets/KBShiftUp.imageset/Contents.json index ba0f658..6a811f9 100644 --- a/Mini vMac/Assets.xcassets/KBShiftUp.imageset/Contents.json +++ b/Mini vMac/Assets.xcassets/KBShiftUp.imageset/Contents.json @@ -5,28 +5,31 @@ "scale" : "1x" }, { - "idiom" : "iphone", "filename" : "KBShiftUp~iphone@2x.png", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "iphone", "filename" : "KBShiftUp~iphone@3x.png", + "idiom" : "iphone", "scale" : "3x" }, { - "idiom" : "ipad", "filename" : "KBShiftUp~ipad.png", + "idiom" : "ipad", "scale" : "1x" }, { - "idiom" : "ipad", "filename" : "KBShiftUp~ipad@2x.png", + "idiom" : "ipad", "scale" : "2x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Mini vMac/KBKey.m b/Mini vMac/KBKey.m index c5d192a..0a384ae 100644 --- a/Mini vMac/KBKey.m +++ b/Mini vMac/KBKey.m @@ -20,13 +20,20 @@ const NSUInteger KBKeyEventStickyKey = 1 << 24; self.titleLabel.lineBreakMode = NSLineBreakByTruncatingTail; self.titleLabel.minimumScaleFactor = 0.5; self.titleEdgeInsets = UIEdgeInsetsMake(0, 2, 0, 2); - [self setTitleColor:[UIColor blackColor] forState:UIControlStateNormal]; + UIColor *labelColor; + if (@available(iOS 13.0, *)) { + labelColor = [UIColor labelColor]; + } else { + labelColor = [UIColor darkTextColor]; + } + [self setTitleColor:labelColor forState:UIControlStateNormal]; + self.tintColor = labelColor; } return self; } - (void)awakeFromNib { - [self awakeFromNib]; + [super awakeFromNib]; self.dark = NO; } diff --git a/Mini vMac/KBKeyboardView.m b/Mini vMac/KBKeyboardView.m index dce810c..fd6b2bd 100644 --- a/Mini vMac/KBKeyboardView.m +++ b/Mini vMac/KBKeyboardView.m @@ -29,7 +29,14 @@ self = [super initWithFrame:frame]; if (self) { safeAreaInsets = insets; - self.backgroundColor = [UIColor colorWithRed:0xEB / 255.0 green:0xF0 / 255.0 blue:0xF7 / 255.0 alpha:0.9]; + if (@available(iOS 13.0, *)) { + self.backgroundColor = [UIColor clearColor]; + UIVisualEffectView *backgroundView = [[UIVisualEffectView alloc] initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleSystemThickMaterial]]; + backgroundView.frame = self.bounds; + [self addSubview: backgroundView]; + } else { + self.backgroundColor = [UIColor colorWithRed:0xEB / 255.0 green:0xF0 / 255.0 blue:0xF7 / 255.0 alpha:0.9]; + } modifiers = [NSMutableSet setWithCapacity:4]; keysDown = [NSMutableIndexSet indexSet]; }