Interfaced handlers for Label, NavigationView, Page (#4841)

* wip * interfaced LabelHandler * interfaced NavigationViewHandler * interfaced PageHandler * fix naming * cleanup formatting
dotnet · Feb 23, 2022 · e23af0b · e23af0b
1 parent d0f2fe0
commit e23af0b
Show file tree

Hide file tree

Showing 19 changed files with 161 additions and 112 deletions.
diff --git a/src/Controls/src/Core/HandlerImpl/Label/Label.cs b/src/Controls/src/Core/HandlerImpl/Label/Label.cs
@@ -6,7 +6,7 @@ namespace Microsoft.Maui.Controls
 	public partial class Label
 	{
 		/// <include file="../../../../docs/Microsoft.Maui.Controls/Label.xml" path="//Member[@MemberName='ControlsLabelMapper']/Docs" />
-		public static IPropertyMapper<ILabel, LabelHandler> ControlsLabelMapper = new PropertyMapper<Label, LabelHandler>(LabelHandler.LabelMapper)
+		public static IPropertyMapper<ILabel, LabelHandler> ControlsLabelMapper = new PropertyMapper<Label, LabelHandler>(LabelHandler.Mapper)
 		{
 			[nameof(TextType)] = MapTextType,
 			[nameof(Text)] = MapText,
@@ -26,7 +26,7 @@ public partial class Label
 			// ILabel does not include the TextType property, so we map it here to handle HTML text
 			// And we map some of the other property handlers to Controls-specific versions that avoid stepping on HTML text settings
 
-			LabelHandler.LabelMapper = ControlsLabelMapper;
+			LabelHandler.Mapper = ControlsLabelMapper;
 		}
 	}
 }
diff --git a/src/Core/src/Handlers/Label/ILabelHandler.cs b/src/Core/src/Handlers/Label/ILabelHandler.cs
@@ -0,0 +1,18 @@
+#if __IOS__ || MACCATALYST
+using PlatformView = Microsoft.Maui.Platform.MauiLabel;
+#elif MONOANDROID
+using PlatformView = AndroidX.AppCompat.Widget.AppCompatTextView;
+#elif WINDOWS
+using PlatformView = Microsoft.UI.Xaml.Controls.TextBlock;
+#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID)
+using PlatformView = System.Object;
+#endif
+
+namespace Microsoft.Maui.Handlers
+{
+	public partial interface ILabelHandler : IViewHandler
+	{
+		new ILabel VirtualView { get; }
+		new PlatformView PlatformView { get; }
+	}
+}
diff --git a/src/Core/src/Handlers/Label/LabelHandler.Android.cs b/src/Core/src/Handlers/Label/LabelHandler.Android.cs
@@ -1,5 +1,4 @@
 using Android.Views;
-using Android.Widget;
 using AndroidX.AppCompat.Widget;
 using Microsoft.Maui.Graphics;
 
@@ -58,59 +57,59 @@ void SetupDefaults(AppCompatTextView platformView)
 			LineSpacingMultDefault = platformView.LineSpacingMultiplier;
 		}
 
-		public static void MapText(LabelHandler handler, ILabel label)
+		public static void MapText(ILabelHandler handler, ILabel label)
 		{
 			handler.PlatformView?.UpdateTextPlainText(label);
 		}
 
-		public static void MapTextColor(LabelHandler handler, ILabel label)
+		public static void MapTextColor(ILabelHandler handler, ILabel label)
 		{
 			handler.PlatformView?.UpdateTextColor(label, DefaultTextColor);
 		}
 
-		public static void MapCharacterSpacing(LabelHandler handler, ILabel label)
+		public static void MapCharacterSpacing(ILabelHandler handler, ILabel label)
 		{
 			handler.PlatformView?.UpdateCharacterSpacing(label);
 		}
 
-		public static void MapHorizontalTextAlignment(LabelHandler handler, ILabel label)
+		public static void MapHorizontalTextAlignment(ILabelHandler handler, ILabel label)
 		{
 			handler.PlatformView?.UpdateHorizontalTextAlignment(label);
 		}
 
-		public static void MapVerticalTextAlignment(LabelHandler handler, ILabel label)
+		public static void MapVerticalTextAlignment(ILabelHandler handler, ILabel label)
 		{
 			handler.PlatformView?.UpdateVerticalTextAlignment(label);
 		}
 
-		public static void MapLineBreakMode(LabelHandler handler, ILabel label)
+		public static void MapLineBreakMode(ILabelHandler handler, ILabel label)
 		{
 			handler.PlatformView?.UpdateLineBreakMode(label);
 		}
 
-		public static void MapMaxLines(LabelHandler handler, ILabel label)
+		public static void MapMaxLines(ILabelHandler handler, ILabel label)
 		{
 			handler.PlatformView?.UpdateMaxLines(label);
 		}
 
-		public static void MapPadding(LabelHandler handler, ILabel label)
+		public static void MapPadding(ILabelHandler handler, ILabel label)
 		{
 			handler.PlatformView?.UpdatePadding(label);
 		}
 
-		public static void MapTextDecorations(LabelHandler handler, ILabel label)
+		public static void MapTextDecorations(ILabelHandler handler, ILabel label)
 		{
 			handler.PlatformView?.UpdateTextDecorations(label);
 		}
 
-		public static void MapFont(LabelHandler handler, ILabel label)
+		public static void MapFont(ILabelHandler handler, ILabel label)
 		{
 			var fontManager = handler.GetRequiredService<IFontManager>();
 
 			handler.PlatformView?.UpdateFont(label, fontManager);
 		}
 
-		public static void MapLineHeight(LabelHandler handler, ILabel label)
+		public static void MapLineHeight(ILabelHandler handler, ILabel label)
 		{
 			handler.PlatformView?.UpdateLineHeight(label);
 		}

diff --git a/src/Core/src/Handlers/Label/LabelHandler.Standard.cs b/src/Core/src/Handlers/Label/LabelHandler.Standard.cs
@@ -6,16 +6,16 @@ public partial class LabelHandler : ViewHandler<ILabel, object>
 	{
 		protected override object CreatePlatformView() => throw new NotImplementedException();
 
-		public static void MapText(IViewHandler handler, ILabel label) { }
-		public static void MapTextColor(IViewHandler handler, ILabel label) { }
-		public static void MapCharacterSpacing(IViewHandler handler, ILabel label) { }
-		public static void MapFont(LabelHandler handler, ILabel label) { }
-		public static void MapHorizontalTextAlignment(LabelHandler handler, ILabel label) { }
-		public static void MapVerticalTextAlignment(LabelHandler handler, ILabel label) { }
-		public static void MapLineBreakMode(LabelHandler handler, ILabel label) { }
-		public static void MapTextDecorations(LabelHandler handler, ILabel label) { }
-		public static void MapMaxLines(IViewHandler handler, ILabel label) { }
-		public static void MapPadding(LabelHandler handler, ILabel label) { }
-		public static void MapLineHeight(LabelHandler handler, ILabel label) { }
+		public static void MapText(ILabelHandler handler, ILabel label) { }
+		public static void MapTextColor(ILabelHandler handler, ILabel label) { }
+		public static void MapCharacterSpacing(ILabelHandler handler, ILabel label) { }
+		public static void MapFont(ILabelHandler handler, ILabel label) { }
+		public static void MapHorizontalTextAlignment(ILabelHandler handler, ILabel label) { }
+		public static void MapVerticalTextAlignment(ILabelHandler handler, ILabel label) { }
+		public static void MapLineBreakMode(ILabelHandler handler, ILabel label) { }
+		public static void MapTextDecorations(ILabelHandler handler, ILabel label) { }
+		public static void MapMaxLines(ILabelHandler handler, ILabel label) { }
+		public static void MapPadding(ILabelHandler handler, ILabel label) { }
+		public static void MapLineHeight(ILabelHandler handler, ILabel label) { }
 	}
 }
diff --git a/src/Core/src/Handlers/Label/LabelHandler.Windows.cs b/src/Core/src/Handlers/Label/LabelHandler.Windows.cs
@@ -11,55 +11,55 @@ public partial class LabelHandler : ViewHandler<ILabel, TextBlock>
 			VirtualView?.Background != null ||
 			base.NeedsContainer;
 
-		public static void MapBackground(LabelHandler handler, ILabel label)
+		public static void MapBackground(ILabelHandler handler, ILabel label)
 		{
 			handler.UpdateValue(nameof(IViewHandler.ContainerView));
 
 			handler.ToPlatform().UpdateBackground(label);
 		}
 
-		public static void MapOpacity(LabelHandler handler, ILabel label)
+		public static void MapOpacity(ILabelHandler handler, ILabel label)
 		{
 			handler.UpdateValue(nameof(IViewHandler.ContainerView));
 			handler.PlatformView.UpdateOpacity(label);
 			handler.ToPlatform().UpdateOpacity(label);
 		}
 
-		public static void MapText(LabelHandler handler, ILabel label) =>
+		public static void MapText(ILabelHandler handler, ILabel label) =>
 			handler.PlatformView?.UpdateText(label);
 
-		public static void MapTextColor(LabelHandler handler, ILabel label) =>
+		public static void MapTextColor(ILabelHandler handler, ILabel label) =>
 			handler.PlatformView?.UpdateTextColor(label);
 
-		public static void MapCharacterSpacing(LabelHandler handler, ILabel label) =>
+		public static void MapCharacterSpacing(ILabelHandler handler, ILabel label) =>
 			handler.PlatformView?.UpdateCharacterSpacing(label);
 
-		public static void MapFont(LabelHandler handler, ILabel label)
+		public static void MapFont(ILabelHandler handler, ILabel label)
 		{
 			var fontManager = handler.GetRequiredService<IFontManager>();
 
 			handler.PlatformView?.UpdateFont(label, fontManager);
 		}
 
-		public static void MapHorizontalTextAlignment(LabelHandler handler, ILabel label) =>
+		public static void MapHorizontalTextAlignment(ILabelHandler handler, ILabel label) =>
 			handler.PlatformView?.UpdateHorizontalTextAlignment(label);
 
-		public static void MapVerticalTextAlignment(LabelHandler handler, ILabel label) =>
+		public static void MapVerticalTextAlignment(ILabelHandler handler, ILabel label) =>
 			handler.PlatformView?.UpdateVerticalTextAlignment(label);
 
-		public static void MapLineBreakMode(LabelHandler handler, ILabel label) =>
+		public static void MapLineBreakMode(ILabelHandler handler, ILabel label) =>
 			handler.PlatformView?.UpdateLineBreakMode(label);
 
-		public static void MapTextDecorations(LabelHandler handler, ILabel label) =>
+		public static void MapTextDecorations(ILabelHandler handler, ILabel label) =>
 			handler.PlatformView?.UpdateTextDecorations(label);
 
-		public static void MapMaxLines(LabelHandler handler, ILabel label) =>
+		public static void MapMaxLines(ILabelHandler handler, ILabel label) =>
 			handler.PlatformView?.UpdateMaxLines(label);
 
-		public static void MapPadding(LabelHandler handler, ILabel label) =>
+		public static void MapPadding(ILabelHandler handler, ILabel label) =>
 			handler.PlatformView?.UpdatePadding(label);
 
-		public static void MapLineHeight(LabelHandler handler, ILabel label) =>
+		public static void MapLineHeight(ILabelHandler handler, ILabel label) =>
 			handler.PlatformView?.UpdateLineHeight(label);
 	}
 }
diff --git a/src/Core/src/Handlers/Label/LabelHandler.cs b/src/Core/src/Handlers/Label/LabelHandler.cs
@@ -1,9 +1,19 @@
 #nullable enable
+#if __IOS__ || MACCATALYST
+using PlatformView = Microsoft.Maui.Platform.MauiLabel;
+#elif MONOANDROID
+using PlatformView = AndroidX.AppCompat.Widget.AppCompatTextView;
+#elif WINDOWS
+using PlatformView = Microsoft.UI.Xaml.Controls.TextBlock;
+#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID)
+using PlatformView = System.Object;
+#endif
+
 namespace Microsoft.Maui.Handlers
 {
-	public partial class LabelHandler
+	public partial class LabelHandler : ILabelHandler
 	{
-		public static IPropertyMapper<ILabel, LabelHandler> LabelMapper = new PropertyMapper<ILabel, LabelHandler>(ViewHandler.ViewMapper)
+		public static IPropertyMapper<ILabel, ILabelHandler> Mapper = new PropertyMapper<ILabel, ILabelHandler>(ViewHandler.ViewMapper)
 		{
 #if WINDOWS || __IOS__
 			[nameof(ILabel.Background)] = MapBackground,
@@ -22,21 +32,27 @@ public partial class LabelHandler
 			[nameof(ILabel.TextDecorations)] = MapTextDecorations,
 		};
 
+		public static CommandMapper<IActivityIndicator, ILabelHandler> CommandMapper = new(ViewCommandMapper)
+		{
+		};
+
 		static LabelHandler()
 		{
 #if __IOS__
-			LabelMapper.PrependToMapping(nameof(IView.FlowDirection), (h, __) => h.UpdateValue(nameof(ITextAlignment.HorizontalTextAlignment)));
+			Mapper.PrependToMapping(nameof(IView.FlowDirection), (h, __) => h.UpdateValue(nameof(ITextAlignment.HorizontalTextAlignment)));
 #endif
 		}
 
-		public LabelHandler() : base(LabelMapper)
+		public LabelHandler() : base(Mapper)
 		{
-
 		}
 
-		public LabelHandler(IPropertyMapper? mapper = null) : base(mapper ?? LabelMapper)
+		public LabelHandler(IPropertyMapper? mapper = null) : base(mapper ?? Mapper)
 		{
-
 		}
+
+		ILabel ILabelHandler.VirtualView => VirtualView;
+
+		PlatformView ILabelHandler.PlatformView => PlatformView;
 	}
 }
diff --git a/src/Core/src/Handlers/Label/LabelHandler.iOS.cs b/src/Core/src/Handlers/Label/LabelHandler.iOS.cs
@@ -8,72 +8,72 @@ public partial class LabelHandler : ViewHandler<ILabel, MauiLabel>
 			VirtualView?.Background != null ||
 			base.NeedsContainer;
 
-		public static void MapBackground(LabelHandler handler, ILabel label)
+		public static void MapBackground(ILabelHandler handler, ILabel label)
 		{
 			handler.UpdateValue(nameof(IViewHandler.ContainerView));
 
 			handler.ToPlatform().UpdateBackground(label);
 		}
 
-		public static void MapText(LabelHandler handler, ILabel label)
+		public static void MapText(ILabelHandler handler, ILabel label)
 		{
 			handler.PlatformView?.UpdateTextPlainText(label);
 
 			// Any text update requires that we update any attributed string formatting
 			MapFormatting(handler, label);
 		}
 
-		public static void MapTextColor(LabelHandler handler, ILabel label)
+		public static void MapTextColor(ILabelHandler handler, ILabel label)
 		{
 			handler.PlatformView?.UpdateTextColor(label);
 		}
 
-		public static void MapCharacterSpacing(LabelHandler handler, ILabel label)
+		public static void MapCharacterSpacing(ILabelHandler handler, ILabel label)
 		{
 			handler.PlatformView?.UpdateCharacterSpacing(label);
 		}
 
-		public static void MapHorizontalTextAlignment(LabelHandler handler, ILabel label)
+		public static void MapHorizontalTextAlignment(ILabelHandler handler, ILabel label)
 		{
 			handler.PlatformView?.UpdateHorizontalTextAlignment(label);
 		}
 
 		[MissingMapper]
-		public static void MapVerticalTextAlignment(LabelHandler handler, ILabel label) { }
+		public static void MapVerticalTextAlignment(ILabelHandler handler, ILabel label) { }
 
-		public static void MapLineBreakMode(LabelHandler handler, ILabel label)
+		public static void MapLineBreakMode(ILabelHandler handler, ILabel label)
 		{
 			handler.PlatformView?.UpdateLineBreakMode(label);
 		}
 
-		public static void MapMaxLines(LabelHandler handler, ILabel label)
+		public static void MapMaxLines(ILabelHandler handler, ILabel label)
 		{
 			handler.PlatformView?.UpdateMaxLines(label);
 		}
 
-		public static void MapPadding(LabelHandler handler, ILabel label)
+		public static void MapPadding(ILabelHandler handler, ILabel label)
 		{
 			handler.PlatformView?.UpdatePadding(label);
 		}
 
-		public static void MapTextDecorations(LabelHandler handler, ILabel label)
+		public static void MapTextDecorations(ILabelHandler handler, ILabel label)
 		{
 			handler.PlatformView?.UpdateTextDecorations(label);
 		}
 
-		public static void MapFont(LabelHandler handler, ILabel label)
+		public static void MapFont(ILabelHandler handler, ILabel label)
 		{
 			var fontManager = handler.GetRequiredService<IFontManager>();
 
 			handler.PlatformView?.UpdateFont(label, fontManager);
 		}
 
-		public static void MapLineHeight(LabelHandler handler, ILabel label)
+		public static void MapLineHeight(ILabelHandler handler, ILabel label)
 		{
 			handler.PlatformView?.UpdateLineHeight(label);
 		}
 
-		public static void MapFormatting(LabelHandler handler, ILabel label)
+		public static void MapFormatting(ILabelHandler handler, ILabel label)
 		{
 			// Update all of the attributed text formatting properties
 			handler.PlatformView?.UpdateLineHeight(label);

diff --git a/src/Core/src/Handlers/NavigationPage/INavigationViewHandler.cs b/src/Core/src/Handlers/NavigationPage/INavigationViewHandler.cs
@@ -0,0 +1,18 @@
+#if __IOS__ || MACCATALYST
+using PlatformView = UIKit.UIView;
+#elif MONOANDROID
+using PlatformView = Android.Views.View;
+#elif WINDOWS
+using PlatformView = Microsoft.UI.Xaml.Controls.Frame;
+#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID)
+using PlatformView = System.Object;
+#endif
+
+namespace Microsoft.Maui.Handlers
+{
+	public partial interface INavigationViewHandler : IViewHandler
+	{
+		new IStackNavigationView VirtualView { get; }
+		new PlatformView PlatformView { get; }
+	}
+}