More Cleanup

DrasticMaui/DrasticSplitViewWindow.Windows.cs

@@ -2,19 +2,25 @@
 // Copyright (c) Drastic Actions. All rights reserved.
 // </copyright>
 
-using DrasticMaui.Tools;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using DrasticMaui.Tools;
 
 namespace DrasticMaui
 {
+    /// <summary>
+    /// Drastic Split View Window.
+    /// </summary>
     public partial class DrasticSplitViewWindow
     {
         private Microsoft.UI.Xaml.Controls.SplitView? splitView;
 
+        /// <summary>
+        /// Setup Split View Window.
+        /// </summary>
         public void SetupSplitView()
         {
             if (this.Page == null)
@@ -44,16 +50,12 @@ public void SetupSplitView()
             this.splitView.DisplayMode = Microsoft.UI.Xaml.Controls.SplitViewDisplayMode.Inline;
             this.splitView.Content = this.Page.GetNative(true);
 
+            // TODO: Keep existing overlays.
             panel.Children.Clear();
             panel.Children.Add(this.splitView);
 
             window.ExtendsContentIntoTitleBar = false;
             this.splitView.IsPaneOpen = true;
         }
     }
-
-    public class TestPanel : Microsoft.UI.Xaml.Controls.Panel
-    {
-
-    }
 }

DrasticMaui/DrasticSplitViewWindow.cs

@@ -14,21 +14,27 @@ public partial class DrasticSplitViewWindow : DrasticMauiWindow
         private Page menu;
         private bool isInitialized;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DrasticSplitViewWindow"/> class.
+        /// </summary>
+        /// <param name="menu">Pane Content.</param>
+        /// <param name="content">Main Content.</param>
         public DrasticSplitViewWindow(Page menu, Page content)
         {
             this.Page = content;
             this.menu = menu;
         }
 
-        protected override void OnHandlerChanged()
+#if !__MACCATALYST__ && !__IOS__ && !WINDOWS
+        /// <summary>
+        /// Setup Split View.
+        /// </summary>
+        public void SetupSplitView()
         {
-            base.OnHandlerChanged();
-            if (!this.isInitialized)
-            {
-                this.SetupSplitView();
-            }
         }
+#endif
 
+        /// <inheritdoc/>
         internal override void AddVisualChildren(List<IVisualTreeElement> elements)
         {
             if (this.menu is not null && this.menu is IVisualTreeElement element)
@@ -37,10 +43,14 @@ internal override void AddVisualChildren(List<IVisualTreeElement> elements)
             }
         }
 
-#if !__MACCATALYST__ && !__IOS__ && !WINDOWS
-        public void SetupSplitView()
+        /// <inheritdoc/>
+        protected override void OnHandlerChanged()
         {
+            base.OnHandlerChanged();
+            if (!this.isInitialized)
+            {
+                this.SetupSplitView();
+            }
         }
-#endif
     }
 }

DrasticMaui/DrasticSplitViewWindow.iOS.cs

@@ -16,6 +16,9 @@ public partial class DrasticSplitViewWindow
     {
         private UISplitViewController? splitView;
 
+        /// <summary>
+        /// Setup Split View.
+        /// </summary>
         public void SetupSplitView()
         {
             if (this.Page == null)
@@ -35,6 +38,10 @@ public void SetupSplitView()
                 return;
             }
 
+            // Create a split view controller.
+            // Take the existing content and put it into the main panel.
+            // Put the side panel content into the pane.
+
             this.splitView = new UISplitViewController();
             this.splitView.PrimaryBackgroundStyle = UISplitViewControllerBackgroundStyle.Sidebar;
             var a = this.menu.ToUIViewController(context);

DrasticMaui/DrasticTrayWindow.cs

@@ -61,10 +61,6 @@ private void Icon_LeftClicked(object? sender, EventArgs e)
 
 #if !WINDOWS && !MACCATALYST
 
-        private void SetupWindow()
-        {
-        }
-
         private void ShowWindow()
         {
         }

DrasticMaui/Tray/DrasticTrayIcon.MacCatalyst.cs

@@ -55,9 +55,9 @@ private void SetupStatusBarButton()
 
             var statusBarButton = Runtime.GetNSObject(PlatformExtensions.IntPtr_objc_msgSend(this.statusBarItem.Handle, Selector.GetHandle("button")));
 
-            if (statusBarButton is not null && statusBarImage is not null)
+            if (statusBarButton is not null && this.statusBarImage is not null)
             {
-                PlatformExtensions.void_objc_msgSend_IntPtr(statusBarButton.Handle, Selector.GetHandle("setImage:"), statusBarImage.Handle);
+                PlatformExtensions.void_objc_msgSend_IntPtr(statusBarButton.Handle, Selector.GetHandle("setImage:"), this.statusBarImage.Handle);
                 PlatformExtensions.void_objc_msgSend_bool(this.statusBarImage.Handle, Selector.GetHandle("setTemplate:"), true);
                 this.statusBarImage.Size = new CoreGraphics.CGSize(32, 32);
             }
@@ -87,32 +87,6 @@ private void SetupStatusBarImage()
             PlatformExtensions.IntPtr_objc_msgSend_IntPtr(this.statusBarImage.Handle, Selector.GetHandle("initWithData:"), imageStream.Handle);
         }
 
-        private void SetupButtonFrames()
-        {
-            if (this.statusBarItem is null)
-            {
-                return;
-            }
-
-            var statusBarButton = Runtime.GetNSObject(PlatformExtensions.IntPtr_objc_msgSend(this.statusBarItem.Handle, Selector.GetHandle("button")));
-            if (statusBarButton is null)
-            {
-                return;
-            }
-
-            var nsButtonWindow = Runtime.GetNSObject(PlatformExtensions.IntPtr_objc_msgSend(statusBarButton.Handle, Selector.GetHandle("window")));
-            if (nsButtonWindow is null)
-            {
-                return;
-            }
-
-            var windowFrame = (NSValue)nsButtonWindow.ValueForKey(new NSString("frame"));
-            var buttonFrame = (NSValue)statusBarButton.ValueForKey(new NSString("frame"));
-
-            var what  = windowFrame.CGRectValue;
-            //this.setupFrames = true;
-        }
-
         [Export("handleButtonClick:")]
         private void HandleClick(NSObject senderStatusBarButton)
         {
@@ -126,6 +100,8 @@ private void SetupStatusBarMenu()
 
         private void NativeElementDispose()
         {
+            this.statusBarImage?.Dispose();
+            this.statusBarItem?.Dispose();
         }
     }
 }

DrasticMaui/Tray/DrasticTrayIcon.cs

@@ -8,6 +8,9 @@
 
 namespace DrasticMaui
 {
+    /// <summary>
+    /// Drastic Tray Icon.
+    /// </summary>
     public partial class DrasticTrayIcon : IDisposable
     {
         private Stream? iconStream;
@@ -16,7 +19,13 @@ public partial class DrasticTrayIcon : IDisposable
         private bool holdsWindowInTray;
         private bool disposedValue;
 
-        public DrasticTrayIcon(string name, Stream stream, List<DrasticTrayMenuItem>? menuItems = null)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DrasticTrayIcon"/> class.
+        /// </summary>
+        /// <param name="name">Name of the icon.</param>
+        /// <param name="stream">Icon Image Stream. Optional.</param>
+        /// <param name="menuItems">Items to populate context menu. Optional.</param>
+        public DrasticTrayIcon(string name, Stream? stream = null, List<DrasticTrayMenuItem>? menuItems = null)
         {
             this.menuItems = menuItems ?? new List<DrasticTrayMenuItem>();
             this.iconName = name;
@@ -26,30 +35,32 @@ public DrasticTrayIcon(string name, Stream stream, List<DrasticTrayMenuItem>? me
             this.SetupStatusBarMenu();
         }
 
+        /// <summary>
+        /// Left Clicked Event.
+        /// </summary>
         public event EventHandler<EventArgs>? LeftClicked;
 
+        /// <summary>
+        /// Right Clicked Event.
+        /// </summary>
         public event EventHandler<EventArgs>? RightClicked;
 
+        /// <summary>
+        /// Menu Item Clicked.
+        /// </summary>
         public event EventHandler<DrasticTrayMenuClickedEventArgs>? MenuClicked;
 
-#if !__MACCATALYST__ && !WINDOWS
-        private void SetupStatusBarButton()
-        {
-        }
-
-        private void SetupStatusBarImage()
-        {
-        }
-
-        private void SetupStatusBarMenu()
-        {
-        }
-
-        private void NativeElementDispose()
+        /// <inheritdoc/>
+        public void Dispose()
         {
+            this.Dispose(disposing: true);
+            GC.SuppressFinalize(this);
         }
-#endif
 
+        /// <summary>
+        /// Dispose.
+        /// </summary>
+        /// <param name="disposing">Is Disposing.</param>
         protected virtual void Dispose(bool disposing)
         {
             if (!this.disposedValue)
@@ -63,10 +74,22 @@ protected virtual void Dispose(bool disposing)
             }
         }
 
-        public void Dispose()
+#if !__MACCATALYST__ && !WINDOWS
+        private void SetupStatusBarButton()
+        {
+        }
+
+        private void SetupStatusBarImage()
         {
-            this.Dispose(disposing: true);
-            GC.SuppressFinalize(this);
         }
+
+        private void SetupStatusBarMenu()
+        {
+        }
+
+        private void NativeElementDispose()
+        {
+        }
+#endif
     }
 }