Add pe- prefix to all image resources and use BundleResource for easier distribution.

Dominique Louis · Dominique Louis · commit 51e771e4528a · 2019-02-06T10:39:43.000Z
diff --git a/Xamarin.PropertyEditing.Mac.Standalone/Xamarin.PropertyEditing.Mac.Standalone.csproj b/Xamarin.PropertyEditing.Mac.Standalone/Xamarin.PropertyEditing.Mac.Standalone.csproj
@@ -123,7 +123,7 @@
     </ItemGroup>
     <Copy 
       SourceFiles="@(PropertyEditingResourceBundlePath)" 
-      DestinationFiles="@(PropertyEditingResourceBundlePath->'$(OutDir)\PropertyEditingResource.bundle\%(RecursiveDir)%(Filename)%(Extension)')" 
+      DestinationFiles="@(PropertyEditingResourceBundlePath->'$(AppBundleDir)\Contents\MonoBundle\PropertyEditingResource.bundle\%(RecursiveDir)%(Filename)%(Extension)')"
       SkipUnchangedFiles="true" 
       OverwriteReadOnlyFiles="true" 
       Retries="3" 
diff --git a/Xamarin.PropertyEditing.Mac/HostResourceProvider.cs b/Xamarin.PropertyEditing.Mac/HostResourceProvider.cs
@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using AppKit;
 using Foundation;
 
@@ -17,7 +18,9 @@ public NSAppearance CurrentAppearance
 
 		public HostResourceProvider ()
 		{
-			this.resourceBundle = new NSBundle ("../../../PropertyEditingResource.bundle");
+			var containingDir = Path.GetDirectoryName (typeof (HostResourceProvider).Assembly.Location);
+			var bundlePath = Path.Combine (containingDir, "PropertyEditingResource.bundle");
+			this.resourceBundle = new NSBundle (bundlePath);
 		}
 
 		public virtual NSAppearance GetVibrantAppearance (NSAppearance appearance)
diff --git a/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj b/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj
@@ -170,163 +170,5 @@
       <LastGenOutput>LocalizationResources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-browse-16.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-browse-16%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-browse-16~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-browse-16~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-edit-16.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-edit-16%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-edit-16~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-edit-16~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-palette-16.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-palette-16%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-palette-16~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-palette-16~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-reveal-16.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-reveal-16%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-reveal-16~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-reveal-16~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-typography-16.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-typography-16%402x 13-35-55-102.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-typography-16~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-typography-16~dark%402x 13-35-55-083.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-warning-16.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-warning-16%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-warning-16~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-action-warning-16~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-custom-expression-32.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-custom-expression-32%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-custom-expression-32~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-custom-expression-32~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-group-by-category-16.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-group-by-category-16%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-group-by-category-16~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-group-by-category-16~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-gradient-16.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-gradient-16%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-gradient-16~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-gradient-16~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-gradient-16~dark~sel.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-gradient-16~dark~sel%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-gradient-16~sel.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-gradient-16~sel%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-image-16.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-image-16%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-image-16~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-image-16~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-image-16~dark~sel.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-image-16~dark~sel%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-image-16~sel.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-image-16~sel%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-none-16.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-none-16%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-none-16~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-none-16~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-none-16~dark~sel.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-none-16~dark~sel%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-none-16~sel.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-none-16~sel%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-palette-16.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-palette-16%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-palette-16~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-palette-16~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-palette-16~dark~sel.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-palette-16~dark~sel%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-palette-16~sel.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-palette-16~sel%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-resources-16.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-resources-16%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-resources-16~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-resources-16~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-resources-16~dark~sel.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-resources-16~dark~sel%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-resources-16~sel.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-resources-16~sel%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-solid-16.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-solid-16%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-solid-16~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-solid-16~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-solid-16~dark~sel.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-solid-16~dark~sel%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-solid-16~sel.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-brush-solid-16~sel%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-bound-mac-10.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-bound-mac-10%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-bound-mac-10~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-bound-mac-10~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-bound-mac-active-10.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-bound-mac-active-10%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-bound-mac-active-10~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-bound-mac-active-10~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-default-mac-10.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-default-mac-10%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-default-mac-10~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-default-mac-10~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-default-mac-active-10.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-default-mac-active-10%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-default-mac-active-10~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-default-mac-active-10~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-inherited-mac-10.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-inherited-mac-10%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-inherited-mac-10~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-inherited-mac-10~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-inherited-mac-active-10.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-inherited-mac-active-10%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-inherited-mac-active-10~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-inherited-mac-active-10~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-local-mac-10.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-local-mac-10%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-local-mac-10~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-local-mac-10~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-local-mac-active-10.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-local-mac-active-10%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-local-mac-active-10~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-property-button-local-mac-active-10~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-resource-editor-16.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-resource-editor-16%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-resource-editor-16~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-resource-editor-16~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-resource-editor-16~dark~sel.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-resource-editor-16~dark~sel%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-resource-editor-16~sel.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-resource-editor-16~sel%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-resource-editor-32.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-resource-editor-32%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-resource-editor-32~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-resource-editor-32~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-resource-editor-32~dark~sel.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-resource-editor-32~dark~sel%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-resource-editor-32~sel.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-resource-editor-32~sel%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-sort-alphabetically-16.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-sort-alphabetically-16%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-sort-alphabetically-16~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-sort-alphabetically-16~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-down-focus-blue.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-down-focus-blue%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-down-focus-blue~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-down-focus-blue~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-down-focus-graphite.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-down-focus-graphite%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-down-focus-graphite~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-down-focus-graphite~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-down.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-down%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-down~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-down~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-up-focus-blue.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-up-focus-blue%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-up-focus-blue~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-up-focus-blue~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-up-focus-graphite.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-up-focus-graphite%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-up-focus-graphite~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-up-focus-graphite~dark%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-up.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-up%402x.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-up~dark.png" />
-    <None Include="PropertyEditingResource\Contents\Resources\pe-stepper-up~dark%402x.png" />
-  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.IO;`
`2`	`3`	`using AppKit;`
`3`	`4`	`using Foundation;`
`4`	`5`
`@@ -17,7 +18,9 @@ public NSAppearance CurrentAppearance`
`17`	`18`
`18`	`19`	`public HostResourceProvider ()`
`19`	`20`	`{`
`20`		`- this.resourceBundle = new NSBundle ("../../../PropertyEditingResource.bundle");`
	`21`	`+ var containingDir = Path.GetDirectoryName (typeof (HostResourceProvider).Assembly.Location);`
	`22`	`+ var bundlePath = Path.Combine (containingDir, "PropertyEditingResource.bundle");`
	`23`	`+ this.resourceBundle = new NSBundle (bundlePath);`
`21`	`24`	`}`
`22`	`25`
`23`	`26`	`public virtual NSAppearance GetVibrantAppearance (NSAppearance appearance)`