[Mac] Initial Variations Implementation

Author: Dominique Louis

Xamarin.PropertyEditing.Mac/Controls/Custom/BasePopOverViewModelControl.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using AppKit;
 using Xamarin.PropertyEditing.ViewModels;
 
 namespace Xamarin.PropertyEditing.Mac
@@ -9,6 +10,8 @@ internal class BasePopOverViewModelControl : BasePopOverControl
 	{
 		internal PropertyViewModel ViewModel { get; }
 
+		public AutoClosePopOver PopOver { get; internal set; }
+
 		public BasePopOverViewModelControl (IHostResourceProvider hostResources, PropertyViewModel viewModel, string title, string imageNamed)
 			: base (hostResources, title, imageNamed)
 		{

Xamarin.PropertyEditing.Mac/Controls/Custom/PropertyButton.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using AppKit;
 using CoreGraphics;
 using Xamarin.PropertyEditing.ViewModels;
@@ -19,6 +20,7 @@ internal PropertyViewModel ViewModel
 			set {
 				if (this.viewModel != null) {
 					this.viewModel.PropertyChanged -= OnPropertyChanged;
+					this.viewModel.CreateVariantRequested -= OnCreateVariantRequested;
 				}
 
 				this.viewModel = value;
@@ -110,13 +112,27 @@ private void PopUpContextMenu ()
 				this.popUpContextMenu.AddItem (NSMenuItem.SeparatorItem);
 
 				// TODO If we add more menu items consider making the Label/Command a dictionary that we can iterate over to populate everything.
-				this.popUpContextMenu.AddItem (new CommandMenuItem (Properties.Resources.Reset, viewModel.ClearValueCommand) {
+				this.popUpContextMenu.AddItem (new CommandMenuItem (Properties.Resources.Reset, this.viewModel.ClearValueCommand) {
 					AttributedTitle = new Foundation.NSAttributedString (
 						Properties.Resources.Reset,
 						new CoreText.CTStringAttributes {
 							Font = new CoreText.CTFont (PropertyEditorControl.DefaultFontName, PropertyEditorControl.DefaultFontSize + 1),
 						})
 				});
+
+				this.popUpContextMenu.AddItem (NSMenuItem.SeparatorItem);
+
+				if (this.viewModel.HasVariations) {
+					this.popUpContextMenu.AddItem (new CommandMenuItem (Properties.Resources.AddVariant, this.viewModel.RequestCreateVariantCommand) {
+						AttributedTitle = new Foundation.NSAttributedString (
+							Properties.Resources.AddVariant,
+							new CoreText.CTStringAttributes {
+								Font = new CoreText.CTFont (PropertyEditorControl.DefaultFontName, PropertyEditorControl.DefaultFontSize + 1),
+							})
+					});
+
+					this.viewModel.CreateVariantRequested += OnCreateVariantRequested;
+				}
 			}
 
 			var menuOrigin = this.Superview.ConvertPointToView (new CGPoint (Frame.Location.X - 1, Frame.Location.Y + Frame.Size.Height + 4), null);
@@ -166,34 +182,34 @@ private void ToggleFocusImage (bool focused = false)
 		private void ValueSourceChanged (ValueSource valueSource)
 		{
 			switch (valueSource) {
-				case ValueSource.Binding:
-					ToolTip = Properties.Resources.Binding;
-					break;
-
-				case ValueSource.Default:
-					ToolTip = Properties.Resources.Default;
-					return;
-
-				case ValueSource.Local:
-					ToolTip = Properties.Resources.Local;
-					break;
-
-				case ValueSource.Inherited:
-					ToolTip = Properties.Resources.Inherited;
-					break;
-
-				case ValueSource.Resource:
-					ToolTip = (this.viewModel?.Resource?.Name != null) ? String.Format (Properties.Resources.ResourceWithName, this.viewModel.Resource.Name) : Properties.Resources.Resource;
-					break;
-
-				case ValueSource.Unset:
-					ToolTip = Properties.Resources.Unset;
-					break;
-
-				default:
-					// To Handle ValueSource.DefaultStyle, ValueSource.Style etc.
-					ToolTip = string.Empty;
-					break;
+			case ValueSource.Binding:
+				ToolTip = Properties.Resources.Binding;
+				break;
+
+			case ValueSource.Default:
+				ToolTip = Properties.Resources.Default;
+				return;
+
+			case ValueSource.Local:
+				ToolTip = Properties.Resources.Local;
+				break;
+
+			case ValueSource.Inherited:
+				ToolTip = Properties.Resources.Inherited;
+				break;
+
+			case ValueSource.Resource:
+				ToolTip = (this.viewModel?.Resource?.Name != null) ? String.Format (Properties.Resources.ResourceWithName, this.viewModel.Resource.Name) : Properties.Resources.Resource;
+				break;
+
+			case ValueSource.Unset:
+				ToolTip = Properties.Resources.Unset;
+				break;
+
+			default:
+				// To Handle ValueSource.DefaultStyle, ValueSource.Style etc.
+				ToolTip = string.Empty;
+				break;
 			}
 
 			ToggleFocusImage ();
@@ -228,13 +244,37 @@ private void OnResourceRequested (object sender, EventArgs e)
 				Appearance = EffectiveAppearance
 			};
 
-			var resourceSelectorPopOver = new AutoClosePopOver(this.hostResources) {
+			var resourceSelectorPopOver = new AutoClosePopOver (this.hostResources) {
 				ContentViewController = new NSViewController (null, null) { View = requestResourceView },
 			};
 
 			requestResourceView.PopOver = resourceSelectorPopOver;
 
 			resourceSelectorPopOver.Show (requestResourceView.Frame, (NSView)this, NSRectEdge.MinYEdge);
 		}
+
+		private void OnCreateVariantRequested (object sender, CreateVariantEventArgs e)
+		{
+			/*var createVariantView = new CreateVariantView (this.hostResources, this.viewModel, new CreateVariantViewModel (this.viewModel.Property)) {
+				Appearance = EffectiveAppearance
+			};
+
+			var createVariantPopOver = new AutoClosePopOver (this.hostResources) {
+				ContentViewController = new NSViewController (null, null) { View = createVariantView },
+			};
+
+			createVariantView.PopOver = createVariantPopOver;
+
+			createVariantPopOver.Show (createVariantView.Frame, (NSView)this, NSRectEdge.MinYEdge);*/
+
+			var createVariantWindow = new CreateVariantWindow (this.hostResources, this.viewModel) {
+				Appearance = EffectiveAppearance,
+			};
+
+			var result = (NSModalResponse)(int)NSApplication.SharedApplication.RunModalForWindow (createVariantWindow);
+			if (result == NSModalResponse.OK) {
+				e.Variation = Task.FromResult (createVariantWindow.ViewModel?.Variation);
+			}
+		}
 	}
 }

Xamarin.PropertyEditing.Mac/Controls/CustomExpressionView.cs

@@ -15,8 +15,6 @@ internal class CustomExpressionView : BasePopOverViewModelControl
 		private const string PreviewCustomExpressionString = "PreviewCustomExpression";
 		private const string AutocompleteItemsString = "AutocompleteItems";
 
-		public AutoClosePopOver PopOver { get; internal set; }
-
 		public CustomExpressionView (IHostResourceProvider hostResources, PropertyViewModel viewModel)
 			: base (hostResources, viewModel,  Properties.Resources.CustomExpression, "pe-custom-expression-32")
 		{

Xamarin.PropertyEditing.Mac/Controls/EntryPropertyEditor.cs

@@ -8,7 +8,7 @@ namespace Xamarin.PropertyEditing.Mac
 	internal abstract class EntryPropertyEditor<T>
 		: PropertyEditorControl<PropertyViewModel<T>>
 	{
-		public EntryPropertyEditor (IHostResourceProvider hostResources)
+		protected EntryPropertyEditor (IHostResourceProvider hostResources)
 			: base (hostResources)
 		{
 			Entry = new PropertyTextField {

Xamarin.PropertyEditing.Mac/Controls/RequestResource/RequestResourceView.cs

@@ -26,9 +26,6 @@ internal class RequestResourceView
 		NSSegmentedControl segmentedControl;
 		NSButton showPreviewImage;
 		RequestResourcePanel resourceSelectorPanel;
-
-		public NSPopover PopOver { get; internal set; }
-
 		private bool showPreview;
 		public bool ShowPreview
 		{