[Tizen] Adds ApplicationHandler

src/Compatibility/Core/src/Tizen/Forms.cs

@@ -401,8 +401,6 @@ public static TOut GetHandlerForObject<TOut>(object obj, params object[] args) w
 
  public static void Init(IActivationState activationState, InitializationOptions options) => Init(activationState.Context, options);
 
- public static void Init(CoreApplication application) => Init(new MauiContext(CoreUIAppContext.GetInstance(application)));
-
  public static void Init(IMauiContext context, InitializationOptions options = null)
  {
  if (options != null && options.DisplayResolutionUnit != null)
@@ -412,29 +410,6 @@ public static void Init(IMauiContext context, InitializationOptions options = nu
  SetupInit(context, options);
  }
 
- public static void Init(CoreApplication application, bool useDeviceIndependentPixel)
- {
- DisplayResolutionUnit = DisplayResolutionUnit.FromInit(useDeviceIndependentPixel);
- SetupInit(new MauiContext(CoreUIAppContext.GetInstance(application)));
- }
-
- public static void Init(CoreApplication application, DisplayResolutionUnit unit)
- {
- DisplayResolutionUnit = unit ?? DisplayResolutionUnit.Pixel();
- SetupInit(new MauiContext(CoreUIAppContext.GetInstance(application)));
- }
-
- public static void Init(InitializationOptions options)
- {
- if (options == null)
- {
- throw new ArgumentException("Must be set options", nameof(options));
- }
-
- DisplayResolutionUnit = options.DisplayResolutionUnit ?? DisplayResolutionUnit.FromInit(options.UseDeviceIndependentPixel);
- SetupInit(new MauiContext(CoreUIAppContext.GetInstance(options.Context)), options);
- }
-
  static void SetupInit(IMauiContext context, InitializationOptions options = null)
  {
  Context = context.Context.CurrentApplication;

src/Controls/src/Core/Platform/AlertManager/AlertManager.Tizen.cs

@@ -23,7 +23,7 @@ internal partial class AlertManager
  internal void Subscribe(Window window)
  {
  IMauiContext mauiContext = window?.MauiContext;
- EWindow nativeWindow = mauiContext?.Window;
+ EWindow nativeWindow = mauiContext.Context?.MainWindow;
 
  if (mauiContext == null || nativeWindow == null)
  return;
@@ -39,7 +39,7 @@ internal void Subscribe(Window window)
  internal void Unsubscribe(Window window)
  {
  IMauiContext mauiContext = window?.MauiContext;
- EWindow nativeWindow = mauiContext?.Window;
+ EWindow nativeWindow = mauiContext.Context?.MainWindow;
 
  var toRemove = Subscriptions.Where(s => s.Window == nativeWindow).ToList();
 

src/Core/src/Handlers/Application/ApplicationHandler.Tizen.cs

@@ -0,0 +1,12 @@
+using Tizen.Applications;
+
+namespace Microsoft.Maui.Handlers
+{
+ public partial class ApplicationHandler : ElementHandler<IApplication, CoreUIApplication>
+ {
+ public static void MapTerminate(ApplicationHandler handler, IApplication application, object? args)
+ {
+ handler.NativeView.Exit();
+ }
+ }
+}

src/Core/src/Handlers/Application/ApplicationHandler.cs

@@ -7,6 +7,8 @@
 using NativeView = Android.App.Application;
 #elif WINDOWS
 using NativeView = Microsoft.UI.Xaml.Application;
+#elif TIZEN
+using NativeView = Tizen.Applications.CoreUIApplication;
 #endif
 
 namespace Microsoft.Maui.Handlers

src/Core/src/Platform/IMauiContext.cs

@@ -12,7 +12,6 @@ public interface IMauiContext
  Android.Content.Context? Context { get; }
 #elif TIZEN
  CoreUIAppContext? Context { get; }
- ElmSharp.Window? Window { get; }
 #endif
  }
 }

src/Core/src/Platform/MauiContext.cs

@@ -34,6 +34,19 @@ public MauiContext(IServiceProvider services, UI.Xaml.Application application, I
  {
  AddSpecific(application);
  }
+#elif TIZEN
+ public MauiContext(IServiceProvider services, Tizen.Applications.CoreUIApplication application, CoreUIAppContext context, IMauiContext? parent = null)
+ : this(services, parent)
+ {
+ AddSpecific(application);
+ AddWeakSpecific(context.MainWindow);
+ }
+
+ public MauiContext(IServiceProvider services, CoreUIAppContext context, IMauiContext? parent = null)
+ : this(services, parent)
+ {
+ AddWeakSpecific(context);
+ }
 #endif
 
  public MauiContext(IMauiContext parent)
@@ -59,6 +72,9 @@ public MauiContext(IServiceProvider services, IMauiContext? parent = null)
 #if __ANDROID__
  public Android.Content.Context? Context =>
  Services.GetService<Android.Content.Context>();
+#elif TIZEN
+ public CoreUIAppContext? Context =>
+ Services.GetService<CoreUIAppContext>();
 #endif
 
  internal void AddSpecific<TService>(TService instance)

src/Core/src/Platform/Tizen/ContentCanvas.cs

@@ -32,9 +32,9 @@ protected void OnLayoutUpdated(object? sender, LayoutEventArgs e)
  var nativeGeometry = Geometry.ToDP();
 
  var measured = CrossPlatformMeasure!(nativeGeometry.Width, nativeGeometry.Height);
- if (measured != _measureCache)
+ if (measured != _measureCache && _virtualView?.Parent is IView parentView)
  {
- _virtualView?.Parent?.InvalidateMeasure();
+ parentView?.InvalidateMeasure();
  }
  _measureCache = measured;
 

src/Core/src/Platform/Tizen/HandlerExtensions.cs

@@ -38,25 +38,36 @@ public static EvasObject ToNative(this IElement view, IMauiContext context)
  return result;
  }
 
- public static void SetWindow(this Window nativeWindow, IWindow window, IMauiContext mauiContext)
+ public static void SetApplicationHandler(this CoreUIApplication nativeApplication, IApplication application, IMauiContext context)
+ {
+ _ = nativeApplication ?? throw new ArgumentNullException(nameof(nativeApplication));
+ SetHandler(application, context);
+ }
+
+ public static void SetWindowHandler(this Window nativeWindow, IWindow window, IMauiContext context)
  {
  _ = nativeWindow ?? throw new ArgumentNullException(nameof(nativeWindow));
- _ = window ?? throw new ArgumentNullException(nameof(window));
-  _ = mauiContext ?? throw new ArgumentNullException(nameof(mauiContext));
+ SetHandler(window, context);
+ }
 
- var handler = window.Handler;
+ static void SetHandler(IElement element, IMauiContext context)
+ {
+ _ = element ?? throw new ArgumentNullException(nameof(element));
+ _ = context ?? throw new ArgumentNullException(nameof(context));
+
+ var handler = element.Handler;
  if (handler == null)
- handler = mauiContext.Handlers.GetHandler(window.GetType());
+ handler = context.Handlers.GetHandler(element.GetType());
 
  if (handler == null)
- throw new Exception($"Handler not found for view {window}.");
+ throw new Exception($"Handler not found for view {element}.");
 
- handler.SetMauiContext(mauiContext);
+ handler.SetMauiContext(context);
 
- window.Handler = handler;
+ element.Handler = handler;
 
- if (handler.VirtualView != window)
- handler.SetVirtualView(window);
+ if (handler.VirtualView != element)
+ handler.SetVirtualView(element);
  }
  }
 }

src/Core/src/Platform/Tizen/LayoutCanvas.cs

@@ -32,9 +32,9 @@ protected void OnLayoutUpdated(object? sender, LayoutEventArgs e)
  var nativeGeometry = Geometry.ToDP();
 
  var measured = CrossPlatformMeasure!(nativeGeometry.Width, nativeGeometry.Height);
- if (measured != _measureCache)
+ if (measured != _measureCache && _virtualView?.Parent is IView parentView)
  {
- _virtualView?.Parent?.InvalidateMeasure();
+ parentView?.InvalidateMeasure();
  }
  _measureCache = measured;
 

src/Core/src/Platform/Tizen/MauiApplication.cs

@@ -34,6 +34,8 @@ protected override void OnPreCreate()
 
  var mauiApp = CreateMauiApp();
 
+ MauiApplicationContext = new MauiContext(mauiApp.Services, this, CoreUIAppContext.GetInstance(this));
+
  Services = mauiApp.Services;
 
  Current.Services?.InvokeLifecycleEvents<TizenLifecycle.OnPreCreate>(del => del(this));
@@ -48,6 +50,8 @@ protected override void OnCreate()
  if (Application == null)
  throw new InvalidOperationException($"The {nameof(IApplication)} instance was not found.");
 
+ this.SetApplicationHandler(Application, MauiApplicationContext);
+
  MainWindow = CreateNativeWindow();
  MainWindow.Show();
 
@@ -57,11 +61,11 @@ protected override void OnCreate()
  Window CreateNativeWindow()
  {
  var context = CoreUIAppContext.GetInstance(this);
- var mauiContext = new MauiContext(Services, context);
+ var mauiContext = MauiApplicationContext.MakeScoped(context);
 
  Services.InvokeLifecycleEvents<TizenLifecycle.OnMauiContextCreated>(del => del(mauiContext));
 
- var tizenWindow = mauiContext.Window;
+ var tizenWindow = mauiContext.Context?.MainWindow;
 
  if (tizenWindow == null)
  throw new InvalidOperationException($"The {nameof(tizenWindow)} instance was not found.");
@@ -70,7 +74,7 @@ Window CreateNativeWindow()
  var window = Application.CreateWindow(activationState);
 
  _virtualWindow = new WeakReference<IWindow>(window);
- tizenWindow.SetWindow(window, mauiContext);
+ tizenWindow.SetWindowHandler(window, mauiContext);
 
  return tizenWindow;
  }
@@ -131,6 +135,8 @@ protected override void OnTerminate()
 
  public static new MauiApplication Current { get; private set; } = null!;
 
+ internal IMauiContext MauiApplicationContext { get; private set; } = null!;
+
  public Window MainWindow { get; protected set; } = null!;
 
  public IServiceProvider Services { get; protected set; } = null!;

src/Core/src/Platform/Tizen/MauiContextExtensions.cs

@@ -0,0 +1,26 @@
+using Microsoft.Extensions.DependencyInjection;
+using ElmSharp;
+
+namespace Microsoft.Maui
+{
+ internal static partial class MauiContextExtensions
+ {
+
+ public static Window GetNativeWindow(this IMauiContext mauiContext) =>
+ mauiContext.Services.GetRequiredService<Window>();
+
+ public static IMauiContext MakeScoped(this IMauiContext mauiContext, Window nativeWindow)
+ {
+ var scopedContext = new MauiContext(mauiContext);
+ scopedContext.AddSpecific(nativeWindow);
+ return scopedContext;
+ }
+
+ public static IMauiContext MakeScoped(this IMauiContext mauiContext, CoreUIAppContext context)
+ {
+ var scopedContext = new MauiContext(mauiContext.Services, context, mauiContext);
+ scopedContext.AddSpecific(context);
+ return scopedContext;
+ }
+ }
+}