From 877618862dc40da5a8634809db7d6a4b92054ba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesu=CC=81s=20A=2E=20A=CC=81lvarez?= Date: Sun, 10 May 2020 19:41:01 +0200 Subject: [PATCH] support dark mode in settings and insert disk views --- .../document.imageset/Contents.json | 15 ++-- .../floppy.imageset/Contents.json | 15 ++-- .../floppy30.imageset/Contents.json | 15 ++-- .../floppyV.imageset/Contents.json | 15 ++-- .../folder.imageset/Contents.json | 15 ++-- .../hardDisk.imageset/Contents.json | 15 ++-- Mini vMac/Base.lproj/Main.storyboard | 81 +++++++++---------- 7 files changed, 91 insertions(+), 80 deletions(-) diff --git a/Mini vMac/Assets.xcassets/document.imageset/Contents.json b/Mini vMac/Assets.xcassets/document.imageset/Contents.json index 49cb64a..3e3c8f6 100644 --- a/Mini vMac/Assets.xcassets/document.imageset/Contents.json +++ b/Mini vMac/Assets.xcassets/document.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "document.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "document@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "document@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "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/floppy.imageset/Contents.json b/Mini vMac/Assets.xcassets/floppy.imageset/Contents.json index e1aee3e..9d9e85d 100644 --- a/Mini vMac/Assets.xcassets/floppy.imageset/Contents.json +++ b/Mini vMac/Assets.xcassets/floppy.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "floppy.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "floppy@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "floppy@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "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/floppy30.imageset/Contents.json b/Mini vMac/Assets.xcassets/floppy30.imageset/Contents.json index 1c58f23..83bb691 100644 --- a/Mini vMac/Assets.xcassets/floppy30.imageset/Contents.json +++ b/Mini vMac/Assets.xcassets/floppy30.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "floppy30.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "floppy30@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "floppy30@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "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/floppyV.imageset/Contents.json b/Mini vMac/Assets.xcassets/floppyV.imageset/Contents.json index 6aa05a2..adde13d 100644 --- a/Mini vMac/Assets.xcassets/floppyV.imageset/Contents.json +++ b/Mini vMac/Assets.xcassets/floppyV.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "floppyV.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "floppyV@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "floppyV@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "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/folder.imageset/Contents.json b/Mini vMac/Assets.xcassets/folder.imageset/Contents.json index 07206c2..477e49e 100644 --- a/Mini vMac/Assets.xcassets/folder.imageset/Contents.json +++ b/Mini vMac/Assets.xcassets/folder.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "folder.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "folder@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "folder@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "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/hardDisk.imageset/Contents.json b/Mini vMac/Assets.xcassets/hardDisk.imageset/Contents.json index 607b390..53a0f09 100644 --- a/Mini vMac/Assets.xcassets/hardDisk.imageset/Contents.json +++ b/Mini vMac/Assets.xcassets/hardDisk.imageset/Contents.json @@ -1,23 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "hardDisk.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "hardDisk@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "hardDisk@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "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/Base.lproj/Main.storyboard b/Mini vMac/Base.lproj/Main.storyboard index bd4ad34..53e7360 100644 --- a/Mini vMac/Base.lproj/Main.storyboard +++ b/Mini vMac/Base.lproj/Main.storyboard @@ -1,12 +1,9 @@ - - - - + + - - + @@ -50,19 +47,19 @@ - + - + - + - + - + @@ -85,14 +82,14 @@ - + - + - + @@ -114,41 +111,39 @@ - + - + - + - + @@ -156,14 +151,14 @@ - + - + - + @@ -182,41 +177,39 @@ - + - + - + - + @@ -251,7 +244,7 @@ - + @@ -267,33 +260,33 @@ - + - + - + + @@ -339,18 +332,18 @@ - + - + - +