Revamp Mac theming

.gitignore

@@ -10,3 +10,4 @@ obj
 /out
 .vs
 packages
+.DS_Store

Xamarin.PropertyEditing.Mac.Standalone/Assets.xcassets/Checkerboard0.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0xFF",
+          "alpha" : "1.000",
+          "blue" : "0xFF",
+          "green" : "0xFF"
+        }
+      }
+    },
+    {
+      "idiom" : "universal",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0.149",
+          "alpha" : "1.000",
+          "blue" : "0.149",
+          "green" : "0.149"
+        }
+      }
+    }
+  ]
+}

Xamarin.PropertyEditing.Mac.Standalone/Assets.xcassets/Checkerboard1.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0xD9",
+          "alpha" : "1.000",
+          "blue" : "0xD9",
+          "green" : "0xD9"
+        }
+      }
+    },
+    {
+      "idiom" : "universal",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0x00",
+          "alpha" : "1.000",
+          "blue" : "0x00",
+          "green" : "0x00"
+        }
+      }
+    }
+  ]
+}

Xamarin.PropertyEditing.Mac.Standalone/Assets.xcassets/Contents.json

@@ -1,4 +1,4 @@
-{
+{
   "info" : {
     "version" : 1,
     "author" : "xcode"

Xamarin.PropertyEditing.Mac.Standalone/Assets.xcassets/DescriptionLabelColor.colorset/Contents.json

@@ -0,0 +1,14 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "reference" : "secondaryLabelColor"
+      }
+    }
+  ]
+}

Xamarin.PropertyEditing.Mac.Standalone/Assets.xcassets/ForegroundColor.colorset/Contents.json

@@ -0,0 +1,14 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "reference" : "labelColor"
+      }
+    }
+  ]
+}

Xamarin.PropertyEditing.Mac.Standalone/Assets.xcassets/PadBackgroundColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0xF0",
+          "alpha" : "1.000",
+          "blue" : "0xF3",
+          "green" : "0xF1"
+        }
+      }
+    },
+    {
+      "idiom" : "universal",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0x26",
+          "alpha" : "1.000",
+          "blue" : "0x26",
+          "green" : "0x26"
+        }
+      }
+    }
+  ]
+}

Xamarin.PropertyEditing.Mac.Standalone/Assets.xcassets/PanelTabBackground.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0xF8",
+          "alpha" : "1.000",
+          "blue" : "0xF7",
+          "green" : "0xF8"
+        }
+      }
+    },
+    {
+      "idiom" : "universal",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0x55",
+          "alpha" : "1.000",
+          "blue" : "0x55",
+          "green" : "0x55"
+        }
+      }
+    }
+  ]
+}

Xamarin.PropertyEditing.Mac.Standalone/Assets.xcassets/PopoverContentBackground.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0xFF",
+          "alpha" : "1.000",
+          "blue" : "0xFF",
+          "green" : "0xFF"
+        }
+      }
+    },
+    {
+      "idiom" : "universal",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0x3D",
+          "alpha" : "1.000",
+          "blue" : "0x3D",
+          "green" : "0x3D"
+        }
+      }
+    }
+  ]
+}

Xamarin.PropertyEditing.Mac.Standalone/Assets.xcassets/TabBorderColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0.000",
+          "alpha" : "0.100",
+          "blue" : "0.000",
+          "green" : "0.000"
+        }
+      }
+    },
+    {
+      "idiom" : "universal",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "1.000",
+          "alpha" : "0.000",
+          "blue" : "1.000",
+          "green" : "1.000"
+        }
+      }
+    }
+  ]
+}

Xamarin.PropertyEditing.Mac.Standalone/Assets.xcassets/ValueBlockBackgroundColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0.000",
+          "alpha" : "0.080",
+          "blue" : "0.000",
+          "green" : "0.000"
+        }
+      }
+    },
+    {
+      "idiom" : "universal",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "1.000",
+          "alpha" : "0.100",
+          "blue" : "1.000",
+          "green" : "1.000"
+        }
+      }
+    }
+  ]
+}

Xamarin.PropertyEditing.Mac.Standalone/Main.storyboard

@@ -720,8 +720,8 @@
                                 <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="qr0-t0-q16">
                                     <font key="font" metaFont="system"/>
                                     <segments>
-                                        <segment label="Dark" width="61" selected="YES"/>
-                                        <segment label="Light" width="61" tag="1"/>
+                                        <segment label="Dark" width="61"/>
+                                        <segment label="Light" width="61" selected="YES" tag="1"/>
                                         <segment label="None"/>
                                     </segments>
                                 </segmentedCell>

Xamarin.PropertyEditing.Mac.Standalone/ViewController.cs

@@ -83,18 +83,19 @@ async Task SetInitialValuesAsync (MockedSampleControlButton mocked)
 		// If theme toggled, then notify our manager
 		partial void OnThemeChanged (NSObject sender)
 		{
-			var themeControl = sender as NSSegmentedControl;
-			switch (themeControl.SelectedSegment) {
-				case 0:
-					PropertyEditorPanel.ThemeManager.Theme = Themes.PropertyEditorTheme.Dark;
-					break;
-				case 1:
-					PropertyEditorPanel.ThemeManager.Theme = Themes.PropertyEditorTheme.Light;
-					break;
-				case 2:
-					PropertyEditorPanel.ThemeManager.Theme = Themes.PropertyEditorTheme.None;
-					break;
+			var themeControl = (NSSegmentedControl)sender;
+
+			NSString appearance = NSAppearance.NameAqua;
+			if (themeControl.SelectedSegment == 0) {
+				if (NSProcessInfo.ProcessInfo.OperatingSystemVersion.Minor > 13)
+					appearance = NSAppearance.NameDarkAqua;
+				else
+					appearance = NSAppearance.NameVibrantDark;
 			}
+
+			var realAppearance = NSAppearance.GetAppearance (appearance);
+			((HostResourceProvider)PropertyPanel.HostResourceProvider).CurrentAppearance = realAppearance;
+			View.Appearance = realAppearance;
 		}
 	}
 }

Xamarin.PropertyEditing.Mac.Standalone/Xamarin.PropertyEditing.Mac.Standalone.csproj

@@ -67,6 +67,15 @@
     <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-512.png" />
     <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-512%402x.png" />
     <ImageAsset Include="Assets.xcassets\Contents.json" />
+    <ImageAsset Include="Assets.xcassets\Checkerboard0.colorset\Contents.json" />
+    <ImageAsset Include="Assets.xcassets\Checkerboard1.colorset\Contents.json" />
+    <ImageAsset Include="Assets.xcassets\ForegroundColor.colorset\Contents.json" />
+    <ImageAsset Include="Assets.xcassets\PadBackgroundColor.colorset\Contents.json" />
+    <ImageAsset Include="Assets.xcassets\PopoverContentBackground.colorset\Contents.json" />
+    <ImageAsset Include="Assets.xcassets\ValueBlockBackgroundColor.colorset\Contents.json" />
+    <ImageAsset Include="Assets.xcassets\DescriptionLabelColor.colorset\Contents.json" />
+    <ImageAsset Include="Assets.xcassets\TabBorderColor.colorset\Contents.json" />
+    <ImageAsset Include="Assets.xcassets\PanelTabBackground.colorset\Contents.json" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\" />