Bump to latest

rookiejava · rookiejava · commit 27f2879a2876 · 2021-09-01T20:22:01.000+09:00
- Modal Navigation Manager (dotnet#1563) - Implement the basic WindowHandler (dotnet#1468) - Don't extract native defaults, meaning users can no longer reset a color back to a platform theme (dotnet#1485) - Implement Alerts (Alert, Prompt and ActionSheet) (dotnet#1328) - And so on.
diff --git a/src/Compatibility/Core/src/Tizen/Forms.cs b/src/Compatibility/Core/src/Tizen/Forms.cs
@@ -484,6 +484,9 @@ static void SetupInit(IMauiContext context, InitializationOptions options = null
 			Device.Info = new Forms.TizenDeviceInfo();
 			Device.SetFlags(s_flags);
 
+			if (options?.Flags.HasFlag(InitializationFlags.SkipRenderers) != true)
+				RegisterCompatRenderers(options);
+
 			string profile = ((TizenDeviceInfo)Device.Info).Profile;
 			if (profile == "mobile")
 			{
@@ -523,6 +526,50 @@ static void SetupInit(IMauiContext context, InitializationOptions options = null
 			IsInitialized = true;
 		}
 
+		internal static void RegisterCompatRenderers(InitializationOptions maybeOptions = null)
+		{
+			if (!IsInitializedRenderers)
+			{
+				IsInitializedRenderers = true;
+				if (maybeOptions != null)
+				{
+					var options = maybeOptions;
+					var handlers = options.Handlers;
+					var flags = options.Flags;
+					var effectScopes = options.EffectScopes;
+
+					//TODO: ExportCell?
+					//TODO: ExportFont
+
+					// renderers
+					Registrar.RegisterRenderers(handlers);
+
+					// effects
+					if (effectScopes != null)
+					{
+						for (var i = 0; i < effectScopes.Length; i++)
+						{
+							var effectScope = effectScopes[0];
+							Registrar.RegisterEffects(effectScope.Name, effectScope.Effects);
+						}
+					}
+
+					// css
+					Registrar.RegisterStylesheets(flags);
+				}
+				else
+				{
+					// Only need to do this once
+					Registrar.RegisterAll(new[] {
+						typeof(ExportRendererAttribute),
+						typeof(ExportCellAttribute),
+						typeof(ExportImageSourceHandlerAttribute),
+						typeof(ExportFontAttribute)
+					});
+				}
+			}
+		}
+
 		static void RegisterSkiaSharpRenderers()
 		{
 			// Register all skiasharp-based rednerers here.
diff --git a/src/Compatibility/Core/src/Tizen/HandlerToRendererShim.cs b/src/Compatibility/Core/src/Tizen/HandlerToRendererShim.cs
@@ -123,13 +123,14 @@ public MockParentHandler(VisualElement parent)
 
 			public IMauiContext MauiContext => null;
 
-			object IViewHandler.NativeView => NativeView;
+			object IElementHandler.NativeView => NativeView;
 
 			object IViewHandler.ContainerView => NativeView;
 
-			bool HasContainer { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 			bool IViewHandler.HasContainer { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 
+			Maui.IElement IElementHandler.VirtualView => throw new NotImplementedException();
+
 			public void DisconnectHandler() { }
 
 			public void Dispose()
@@ -170,6 +171,11 @@ public void UpdateValue(string property)
 			{
 				throw new NotImplementedException();
 			}
+
+			public void SetVirtualView(Maui.IElement view)
+			{
+				throw new NotImplementedException();
+			}
 		}
 
 	}
diff --git a/src/Compatibility/Core/src/Tizen/Platform.cs b/src/Compatibility/Core/src/Tizen/Platform.cs
@@ -53,7 +53,7 @@ internal static IVisualElementRenderer CreateRenderer(VisualElement element)
 				//TODO: Handle this with AppBuilderHost
 				try
 				{
-					handler = Forms.MauiContext.Handlers.GetHandler(element.GetType());
+					handler = Forms.MauiContext.Handlers.GetHandler(element.GetType()) as IViewHandler;
 					handler.SetMauiContext(Forms.MauiContext);
 				}
 				catch
diff --git a/src/Controls/src/Core/HandlerImpl/Window.Tizen.cs b/src/Controls/src/Core/HandlerImpl/Window.Tizen.cs
@@ -0,0 +1,12 @@
+﻿#nullable enable
+using System;
+using EWindow = ElmSharp.Window;
+
+namespace Microsoft.Maui.Controls
+{
+	public partial class Window
+	{
+		internal EWindow NativeWindow =>
+			(Handler?.NativeView as EWindow) ?? throw new InvalidOperationException("Window should have a ElmSharp.Window set.");
+	}
+}
diff --git a/src/Controls/src/Core/Platform/AlertManager/AlertManager.Tizen.cs b/src/Controls/src/Core/Platform/AlertManager/AlertManager.Tizen.cs
@@ -0,0 +1,19 @@
+﻿using System;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	internal partial class AlertManager
+	{
+		internal static void Subscribe(Window window)
+		{
+			//TODO: Need to implementation
+			//throw new NotImplementedException();
+		}
+
+		internal static void Unsubscribe(Window window)
+		{
+			//TODO: Need to implementation
+			//throw new NotImplementedException();
+		}
+	}
+}
diff --git a/src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.Tizen.cs b/src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.Tizen.cs
@@ -4,7 +4,7 @@
 
 namespace Microsoft.Maui.Controls.Platform
 {
-	internal partial class ModalNavigationService
+	internal partial class ModalNavigationManager
 	{
 		ModalStack _modalStack => MauiContext.Context!.ModalStack;
 		IPageController CurrentPageController => _navModel.CurrentPage;
diff --git a/src/Core/src/Handlers/Label/LabelHandler.Tizen.cs b/src/Core/src/Handlers/Label/LabelHandler.Tizen.cs
@@ -24,6 +24,11 @@ public static void MapHorizontalTextAlignment(LabelHandler handler, ILabel label
 			handler.NativeView?.UpdateHorizontalTextAlignment(label);
 		}
 
+		public static void MapVerticalTextAlignment(LabelHandler handler, ILabel label)
+		{
+			handler.NativeView?.UpdateVerticalTextAlignment(label);
+		}
+
 		public static void MapLineBreakMode(LabelHandler handler, ILabel label)
 		{
 			handler.NativeView?.UpdateLineBreakMode(label);
diff --git a/src/Core/src/Handlers/ProgressBar/ProgressBarHandler.Tizen.cs b/src/Core/src/Handlers/ProgressBar/ProgressBarHandler.Tizen.cs
@@ -15,7 +15,7 @@ protected override EProgressBar CreateNativeView()
 			return progressBar;
 		}
 
-		protected override void SetupDefaults(EProgressBar nativeView)
+		void SetupDefaults(EProgressBar nativeView)
 		{
 			nativeView.Color = ThemeConstants.ProgressBar.ColorClass.Default;
 		}
diff --git a/src/Core/src/Handlers/Slider/SliderHandler.Tizen.cs b/src/Core/src/Handlers/Slider/SliderHandler.Tizen.cs
@@ -27,7 +27,7 @@ protected override void DisconnectHandler(ESlider nativeView)
 			nativeView!.DragStopped -= OnDragStopped;
 		}
 
-		protected override void SetupDefaults(ESlider nativeView)
+		void SetupDefaults(ESlider nativeView)
 		{
 			DefaultMinTrackColor = nativeView.GetBarColor();
 			DefaultMaxTrackColor = nativeView.GetBackgroundColor();
diff --git a/src/Core/src/Handlers/View/ViewHandlerOfT.Tizen.cs b/src/Core/src/Handlers/View/ViewHandlerOfT.Tizen.cs
@@ -193,10 +193,10 @@ protected virtual void Dispose(bool disposing)
 				if (disposing)
 				{
 					// Dispose managed state (managed objects)
-					if (WrappedNativeView != null)
+					if (WrappedNativeView is TNativeView wrapped)
 					{
-						DisconnectHandler(WrappedNativeView);
-						WrappedNativeView.Unrealize();
+						DisconnectHandler(wrapped);
+						wrapped.Unrealize();
 					}
 				}
 
diff --git a/src/Core/src/Handlers/Window/WindowHandler.Tizen.cs b/src/Core/src/Handlers/Window/WindowHandler.Tizen.cs
@@ -0,0 +1,19 @@
+using System;
+using ElmSharp;
+
+namespace Microsoft.Maui.Handlers
+{
+	public partial class WindowHandler : ElementHandler<IWindow, Window>
+	{
+		public static void MapTitle(WindowHandler handler, IWindow window) { }
+
+		public static void MapContent(WindowHandler handler, IWindow window)
+		{
+			_ = handler.MauiContext ?? throw new InvalidOperationException($"{nameof(MauiContext)} should have been set by base class.");
+			_ = handler.MauiContext.Context ?? throw new InvalidOperationException($"{nameof(CoreUIAppContext)} should have been set by base class.");
+
+			var nativeContent = window.Content.ToNative(handler.MauiContext);
+			handler.MauiContext.Context.SetContent(nativeContent);
+		}
+	}
+}
diff --git a/src/Core/src/Handlers/Window/WindowHandler.cs b/src/Core/src/Handlers/Window/WindowHandler.cs
@@ -5,6 +5,8 @@
 using NativeView = Android.App.Activity;
 #elif WINDOWS
 using NativeView = Microsoft.UI.Xaml.Window;
+#elif TIZEN
+using NativeView = ElmSharp.Window;
 #endif
 
 namespace Microsoft.Maui.Handlers
diff --git a/src/Core/src/LifecycleEvents/Tizen/TizenLifecycle.cs b/src/Core/src/LifecycleEvents/Tizen/TizenLifecycle.cs
@@ -19,5 +19,7 @@ public static class TizenLifecycle
 		public delegate void OnRegionFormatChanged(CoreUIApplication application, RegionFormatChangedEventArgs e);
 		public delegate void OnTerminate(CoreUIApplication application);
 
+		// Internal events
+		internal delegate void OnMauiContextCreated(IMauiContext mauiContext);
 	}
 }
diff --git a/src/Core/src/LifecycleEvents/Tizen/TizenLifecycleBuilderExtensions.cs b/src/Core/src/LifecycleEvents/Tizen/TizenLifecycleBuilderExtensions.cs
@@ -13,5 +13,7 @@ public static class TizenLifecycleBuilderExtensions
 		public static ITizenLifecycleBuilder OnLowMemory(this ITizenLifecycleBuilder lifecycle, TizenLifecycle.OnLowMemory del) => lifecycle.OnEvent(del);
 		public static ITizenLifecycleBuilder OnRegionFormatChanged(this ITizenLifecycleBuilder lifecycle, TizenLifecycle.OnRegionFormatChanged del) => lifecycle.OnEvent(del);
 		public static ITizenLifecycleBuilder OnTerminate(this ITizenLifecycleBuilder lifecycle, TizenLifecycle.OnTerminate del) => lifecycle.OnEvent(del);
+
+		internal static ITizenLifecycleBuilder OnMauiContextCreated(this ITizenLifecycleBuilder lifecycle, TizenLifecycle.OnMauiContextCreated del) => lifecycle.OnEvent(del);
 	}
 }
diff --git a/src/Core/src/Platform/IMauiContext.cs b/src/Core/src/Platform/IMauiContext.cs
@@ -17,6 +17,7 @@ public interface IMauiContext
 		UI.Xaml.Window? Window { get; }
 #elif TIZEN
 		CoreUIAppContext? Context { get; }
+		ElmSharp.Window? Window { get; }
 #endif
 	}
 
diff --git a/src/Core/src/Platform/MauiContext.Tizen.cs b/src/Core/src/Platform/MauiContext.Tizen.cs
@@ -1,4 +1,5 @@
 using System;
+using ElmSharp;
 
 namespace Microsoft.Maui
 {
@@ -33,5 +34,6 @@ public CoreUIAppContext? Context
 			}
 		}
 
+		public Window? Window => Context?.MainWindow;
 	}
 }
diff --git a/src/Core/src/Platform/Tizen/CoreUIAppContext.cs b/src/Core/src/Platform/Tizen/CoreUIAppContext.cs
@@ -25,7 +25,6 @@ public static CoreUIAppContext GetInstance(CoreApplication application, Window?
 			if (IsInitialized)
 				return _instance!;
 
-
 			_instance = (window == null) ? new CoreUIAppContext(application) : new CoreUIAppContext(application, window);
 			return _instance;
 		}
diff --git a/src/Core/src/Platform/Tizen/HandlerExtensions.cs b/src/Core/src/Platform/Tizen/HandlerExtensions.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using Tizen.Applications;
 using ElmSharp;
 
 namespace Microsoft.Maui
@@ -15,34 +16,47 @@ public static EvasObject ToNative(this IView view, IMauiContext context)
 				view = ir.ReplacedView;
 
 			var handler = view.Handler;
-
-			if (handler?.MauiContext != null &&
-				handler.MauiContext != context)
-			{
+			if (handler?.MauiContext != null && handler.MauiContext != context)
 				handler = null;
-			}
 
 			if (handler == null)
-			{
-				handler = context.Handlers.GetHandler(view.GetType());
+				handler = context.Handlers.GetHandler(view.GetType()) as IViewHandler;
+
+			if (handler == null)
+				throw new Exception($"Handler not found for view {view} or was not {nameof(IViewHandler)}.");
 
-				if (handler == null)
-					throw new Exception($"Handler not found for view {view}");
+			handler.SetMauiContext(context);
 
-				handler.SetMauiContext(context);
-				view.Handler = handler;
-			}
+			view.Handler = handler;
 
 			if (handler.VirtualView != view)
 				handler.SetVirtualView(view);
 
-
 			if (((INativeViewHandler)handler).NativeView is not EvasObject result)
-			{
 				throw new InvalidOperationException($"Unable to convert {view} to {typeof(EvasObject)}");
-			}
 
 			return result;
 		}
+
+		public static void SetWindow(this Window nativeWindow, IWindow window, IMauiContext mauiContext)
+		{
+			_ = nativeWindow ?? throw new ArgumentNullException(nameof(nativeWindow));
+			_ = window ?? throw new ArgumentNullException(nameof(window));
+			_ = mauiContext ?? throw new ArgumentNullException(nameof(mauiContext));
+
+			var handler = window.Handler as IWindowHandler;
+			if (handler == null)
+				handler = mauiContext.Handlers.GetHandler(window.GetType()) as IWindowHandler;
+
+			if (handler == null)
+				throw new Exception($"Handler not found for view {window} or was not {nameof(IWindowHandler)}'");
+
+			handler.SetMauiContext(mauiContext);
+
+			window.Handler = handler;
+
+			if (handler.VirtualView != window)
+				handler.SetVirtualView(window);
+		}
 	}
 }
diff --git a/src/Core/src/Platform/Tizen/LabelExtensions.cs b/src/Core/src/Platform/Tizen/LabelExtensions.cs
@@ -31,6 +31,11 @@ public static void UpdateHorizontalTextAlignment(this Label nativeLabel, ILabel
 			nativeLabel.HorizontalTextAlignment = label.HorizontalTextAlignment.ToNative();
 		}
 
+		public static void UpdateVerticalTextAlignment(this Label nativeLabel, ILabel label)
+		{
+			nativeLabel.VerticalTextAlignment = label.VerticalTextAlignment.ToNative();
+		}
+
 		public static void UpdateLineBreakMode(this Label nativeLabel, ILabel label)
 		{
 			nativeLabel.LineBreakMode = label.LineBreakMode.ToNative();
diff --git a/src/Core/src/Platform/Tizen/MauiApplication.cs b/src/Core/src/Platform/Tizen/MauiApplication.cs
diff --git a/src/Core/src/Platform/Tizen/ViewExtensions.cs b/src/Core/src/Platform/Tizen/ViewExtensions.cs

Original file line number	Diff line number	Diff line change
`@@ -123,13 +123,14 @@ public MockParentHandler(VisualElement parent)`
`123`	`123`
`124`	`124`	`public IMauiContext MauiContext => null;`
`125`	`125`
`126`		`- object IViewHandler.NativeView => NativeView;`
	`126`	`+ object IElementHandler.NativeView => NativeView;`
`127`	`127`
`128`	`128`	`object IViewHandler.ContainerView => NativeView;`
`129`	`129`
`130`		`- bool HasContainer { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }`
`131`	`130`	`bool IViewHandler.HasContainer { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }`
`132`	`131`
	`132`	`+ Maui.IElement IElementHandler.VirtualView => throw new NotImplementedException();`
	`133`	`+`
`133`	`134`	`public void DisconnectHandler() { }`
`134`	`135`
`135`	`136`	`public void Dispose()`
`@@ -170,6 +171,11 @@ public void UpdateValue(string property)`
`170`	`171`	`{`
`171`	`172`	`throw new NotImplementedException();`
`172`	`173`	`}`
	`174`	`+`
	`175`	`+ public void SetVirtualView(Maui.IElement view)`
	`176`	`+ {`
	`177`	`+ throw new NotImplementedException();`
	`178`	`+ }`
`173`	`179`	`}`
`174`	`180`
`175`	`181`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ internal static IVisualElementRenderer CreateRenderer(VisualElement element)`
`53`	`53`	`//TODO: Handle this with AppBuilderHost`
`54`	`54`	`try`
`55`	`55`	`{`
`56`		`- handler = Forms.MauiContext.Handlers.GetHandler(element.GetType());`
	`56`	`+ handler = Forms.MauiContext.Handlers.GetHandler(element.GetType()) as IViewHandler;`
`57`	`57`	`handler.SetMauiContext(Forms.MauiContext);`
`58`	`58`	`}`
`59`	`59`	`catch`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Microsoft.Maui.Controls.Platform`
`6`	`6`	`{`
`7`		`- internal partial class ModalNavigationService`
	`7`	`+ internal partial class ModalNavigationManager`
`8`	`8`	`{`
`9`	`9`	`ModalStack _modalStack => MauiContext.Context!.ModalStack;`
`10`	`10`	`IPageController CurrentPageController => _navModel.CurrentPage;`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,11 @@ public static void MapHorizontalTextAlignment(LabelHandler handler, ILabel label`
`24`	`24`	`handler.NativeView?.UpdateHorizontalTextAlignment(label);`
`25`	`25`	`}`
`26`	`26`
	`27`	`+ public static void MapVerticalTextAlignment(LabelHandler handler, ILabel label)`
	`28`	`+ {`
	`29`	`+ handler.NativeView?.UpdateVerticalTextAlignment(label);`
	`30`	`+ }`
	`31`	`+`
`27`	`32`	`public static void MapLineBreakMode(LabelHandler handler, ILabel label)`
`28`	`33`	`{`
`29`	`34`	`handler.NativeView?.UpdateLineBreakMode(label);`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ protected override EProgressBar CreateNativeView()`
`15`	`15`	`return progressBar;`
`16`	`16`	`}`
`17`	`17`
`18`		`- protected override void SetupDefaults(EProgressBar nativeView)`
	`18`	`+ void SetupDefaults(EProgressBar nativeView)`
`19`	`19`	`{`
`20`	`20`	`nativeView.Color = ThemeConstants.ProgressBar.ColorClass.Default;`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ protected override void DisconnectHandler(ESlider nativeView)`
`27`	`27`	`nativeView!.DragStopped -= OnDragStopped;`
`28`	`28`	`}`
`29`	`29`
`30`		`- protected override void SetupDefaults(ESlider nativeView)`
	`30`	`+ void SetupDefaults(ESlider nativeView)`
`31`	`31`	`{`
`32`	`32`	`DefaultMinTrackColor = nativeView.GetBarColor();`
`33`	`33`	`DefaultMaxTrackColor = nativeView.GetBackgroundColor();`
Original file line number	Diff line number	Diff line change
`@@ -193,10 +193,10 @@ protected virtual void Dispose(bool disposing)`
`193`	`193`	`if (disposing)`
`194`	`194`	`{`
`195`	`195`	`// Dispose managed state (managed objects)`
`196`		`- if (WrappedNativeView != null)`
	`196`	`+ if (WrappedNativeView is TNativeView wrapped)`
`197`	`197`	`{`
`198`		`- DisconnectHandler(WrappedNativeView);`
`199`		`- WrappedNativeView.Unrealize();`
	`198`	`+ DisconnectHandler(wrapped);`
	`199`	`+ wrapped.Unrealize();`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`