Fix up repo for newer versions

drasticactions · Feb 6, 2022 · 22cad7c · 22cad7c
1 parent 2bcf050
commit 22cad7c
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 30 deletions.
diff --git a/DrasticMaui.DragAndDropOverlay/DragAndDropOverlay.Android.cs b/DrasticMaui.DragAndDropOverlay/DragAndDropOverlay.Android.cs
@@ -37,7 +37,7 @@ public override bool Initialize()
                 return false;
             }
 
-            var nativeWindow = this.Window?.Content?.ToNative(handler.MauiContext);
+            var nativeWindow = this.Window?.Content?.ToPlatform(handler.MauiContext);
             if (nativeWindow is null)
             {
                 return false;

diff --git a/DrasticMaui.DragAndDropOverlay/DragAndDropOverlay.Windows.cs b/DrasticMaui.DragAndDropOverlay/DragAndDropOverlay.Windows.cs
@@ -30,7 +30,7 @@ public override bool Initialize()
                 return false;
             }
 
-            var nativeElement = this.Window.Content.ToNative(this.Window.Handler.MauiContext);
+            var nativeElement = this.Window.Content.ToPlatform(this.Window.Handler.MauiContext);
             if (nativeElement == null)
             {
                 return false;

diff --git a/DrasticMaui.DragAndDropOverlay/DragAndDropOverlay.iOS.cs b/DrasticMaui.DragAndDropOverlay/DragAndDropOverlay.iOS.cs
@@ -31,7 +31,7 @@ public override bool Initialize()
                 return false;
             }
 
-            var nativeLayer = this.Window.ToNative(this.Window.Handler.MauiContext);
+            var nativeLayer = this.Window.ToPlatform(this.Window.Handler.MauiContext);
             if (nativeLayer is not UIWindow nativeWindow)
             {
                 return false;

diff --git a/DrasticMaui.PageOverlay/PageOverlay.Android.cs b/DrasticMaui.PageOverlay/PageOverlay.Android.cs
@@ -37,7 +37,7 @@ public override bool Initialize()
                 return false;
             }
 
-            var nativeWindow = this.Window?.Content?.ToNative(this.Window.Handler.MauiContext);
+            var nativeWindow = this.Window?.Content?.ToPlatform(this.Window.Handler.MauiContext);
             if (nativeWindow == null)
             {
                 return false;

diff --git a/DrasticMaui.PageOverlay/PageOverlay.Windows.cs b/DrasticMaui.PageOverlay/PageOverlay.Windows.cs
@@ -38,7 +38,7 @@ public override bool Initialize()
 
             this.context = handler.MauiContext;
 
-            var nativeElement = this.Window.Content.ToNative(this.context);
+            var nativeElement = this.Window.Content.ToPlatform(this.context);
             if (nativeElement is null)
             {
                 return false;
@@ -82,7 +82,7 @@ internal void AddNativeElements(Microsoft.Maui.Controls.Page page)
                 return;
             }
 
-            var element = page.ToNative(this.context);
+            var element = page.ToPlatform(this.context);
 
             var zindex = 100 + this.Views.Count();
             if (element is null)
@@ -110,7 +110,7 @@ internal void RemoveNativeElements(Microsoft.Maui.Controls.Page page)
                 return;
             }
 
-            var element = page.ToNative(this.context);
+            var element = page.ToPlatform(this.context);
             if (element is null)
             {
                 return;
@@ -139,7 +139,7 @@ private void Panel_PointerMoved(object sender, Microsoft.UI.Xaml.Input.PointerRo
 
             foreach (var view in this.Views)
             {
-                var nativeView = (view as Microsoft.Maui.Controls.Page)?.ToNative(this.context);
+                var nativeView = (view as Microsoft.Maui.Controls.Page)?.ToPlatform(this.context);
                 var hitTests = view.HitTestViews.Any(n => n.GetBoundingBox(this.context).Contains(new Microsoft.Maui.Graphics.Point(pointerPoint.Position.X, pointerPoint.Position.Y)));
                 if (nativeView is not null)
                 {

diff --git a/DrasticMaui.PageOverlay/PageOverlay.cs b/DrasticMaui.PageOverlay/PageOverlay.cs
@@ -2,14 +2,6 @@
 // Copyright (c) Drastic Actions. All rights reserved.
 // </copyright>
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using DrasticMaui.Tools;
-using Microsoft.Maui.Platform;
-
 namespace DrasticMaui.Overlays
 {
     /// <summary>
@@ -67,7 +59,7 @@ public bool AddView(Page view)
                 this.hitTestElements.Add(hitTestView, hittestView.HitTestViews);
             }
 
-            Microsoft.Maui.Controls.Xaml.Diagnostics.VisualDiagnostics.OnChildAdded(this, view, 0);
+            VisualDiagnostics.OnChildAdded(this, view, 0);
             return true;
         }
 
@@ -94,7 +86,7 @@ public bool RemoveView(Page view)
             this.RemoveNativeElements(view);
 #endif
 
-            Microsoft.Maui.Controls.Xaml.Diagnostics.VisualDiagnostics.OnChildRemoved(this, view, 0);
+            VisualDiagnostics.OnChildRemoved(this, view, 0);
             return this.hitTestElements.Remove(hitTestView);
         }
 

diff --git a/DrasticMaui.PageOverlay/PageOverlay.iOS.cs b/DrasticMaui.PageOverlay/PageOverlay.iOS.cs
@@ -39,7 +39,7 @@ public override bool Initialize()
                 return false;
             }
 
-            var nativeLayer = this.Window?.ToNative(this.context);
+            var nativeLayer = this.Window?.ToPlatform(this.context);
             if (nativeLayer is not UIWindow nativeWindow)
             {
                 return false;

diff --git a/DrasticMaui.SidebarNavigationWindow/DrasticSideBarNavigationWindow.Windows.cs b/DrasticMaui.SidebarNavigationWindow/DrasticSideBarNavigationWindow.Windows.cs
@@ -11,7 +11,7 @@ public partial class DrasticSideBarNavigationWindow
     {
         private Microsoft.UI.Xaml.FrameworkElement? page;
         private MauiNavigationView? navigationView;
-        private NavigationRootView? navigationRootView;
+        private WindowRootView? navigationRootView;
         private Page? selectedPage;
         private IMauiContext? context;
 
@@ -53,7 +53,7 @@ public async void SetupNavigationView()
                 return;
             }
 
-            if (panel.Children[0] is not NavigationRootView rootView)
+            if (panel.Children[0] is not WindowRootView rootView)
             {
                 return;
             }
@@ -64,7 +64,7 @@ public async void SetupNavigationView()
 
         private void NavigationRootView_Loaded(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
         {
-            if (sender is not NavigationRootView view)
+            if (sender is not WindowRootView view)
             {
                 return;
             }
@@ -139,7 +139,7 @@ private void NavigationView_SelectionChanged(Microsoft.UI.Xaml.Controls.Navigati
                 }
 
                 var testing = selectedItem.Page.ToHandler(this.Handler.MauiContext);
-                var page = testing.GetWrappedNativeView();
+                var page = testing.ContainerView;
 
                 bool addNavigationHandlers = false;
                 if (page != this.page)

diff --git a/DrasticMaui/Tools/PlatformExtensions.Android.cs b/DrasticMaui/Tools/PlatformExtensions.Android.cs
@@ -47,7 +47,7 @@ public static List<T> GetChildView<T>(this Android.Views.ViewGroup view)
         /// <param name="view">MAUI IView.</param>
         /// <returns>Rectangle.</returns>
         public static Microsoft.Maui.Graphics.Rectangle GetBoundingBox(this IView view, IMauiContext context)
-            => view.ToNative(context).GetBoundingBox();
+            => view.ToPlatform(context).GetBoundingBox();
 
         /// <summary>
         /// Get the bounding box for an Android View.

diff --git a/DrasticMaui/Tools/PlatformExtensions.Windows.cs b/DrasticMaui/Tools/PlatformExtensions.Windows.cs
@@ -43,7 +43,7 @@ private static AppWindow GetAppWindowFromWindowHandle(IntPtr windowHandle)
         }
 
         public static Microsoft.Maui.Graphics.Rectangle GetBoundingBox(this IView view, IMauiContext context)
-            => view.ToNative(context).GetBoundingBox();
+            => view.ToPlatform(context).GetBoundingBox();
 
         public static Microsoft.Maui.Graphics.Rectangle GetBoundingBox(this FrameworkElement? nativeView)
         {

diff --git a/DrasticMaui/Tools/PlatformExtensions.iOS.cs b/DrasticMaui/Tools/PlatformExtensions.iOS.cs
@@ -25,7 +25,7 @@ public static class PlatformExtensions
         /// <returns>Matrix4x4.</returns>
         public static System.Numerics.Matrix4x4 GetViewTransform(this IView view, IMauiContext context)
         {
-            var nativeView = view?.ToNative(context);
+            var nativeView = view?.ToPlatform(context);
             if (nativeView == null)
             {
                 return default(System.Numerics.Matrix4x4);
@@ -48,7 +48,7 @@ public static System.Numerics.Matrix4x4 GetViewTransform(this UIView view)
         /// <param name="view">IView.</param>
         /// <returns>Rectangle.</returns>
         public static Microsoft.Maui.Graphics.Rectangle GetBoundingBox(this IView view, IMauiContext context)
-            => view.ToNative(context).GetBoundingBox();
+            => view.ToPlatform(context).GetBoundingBox();
 
         /// <summary>
         /// Get Bounding Box.
@@ -85,7 +85,7 @@ public static double ExtractAngleInRadians(this System.Numerics.Matrix4x4 matrix
         /// <returns>Rectangle.</returns>
         public static Rectangle GetNativeViewBounds(this IView view, IMauiContext context)
         {
-            var nativeView = view?.ToNative(context);
+            var nativeView = view?.ToPlatform(context);
             if (nativeView == null)
             {
                 return default(Rectangle);
@@ -311,8 +311,6 @@ public static async Task SetFrameForUIWindow(this UIWindow window, CGRect rect)
                 return;
             }
 
-            var testFrame = window.GetFrame();
-
             var attachedWindow = nsWindow.ValueForKey(new NSString("attachedWindow"));
 
             if (attachedWindow is null)