Fixes #353, #354

MauiMaps/MainPage.xaml

@@ -5,7 +5,8 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:mauiMaps="clr-namespace:MauiMaps"
     xmlns:models="clr-namespace:MauiMaps.Models"
-    x:DataType="mauiMaps:MainPageViewModel">
+    x:DataType="mauiMaps:MainPageViewModel"
+    Shell.NavBarIsVisible="False">
 
 	<Grid>
 		<Map

MauiMaps/Platforms/Android/CustomInfoWindowClickListener.cs

@@ -13,7 +13,7 @@ public CustomInfoWindowClickListener(CustomMapHandler mapHandler)
 
 	public void OnInfoWindowClick(Android.Gms.Maps.Model.Marker marker)
 	{
-		var pin = mapHandler.Markers.FirstOrDefault(x => x.Value.Id == marker.Id);
-		pin.Key?.SendInfoWindowClick();
+		var pin = mapHandler.Markers.FirstOrDefault(x => x.marker.Id == marker.Id);
+		pin.pin?.SendInfoWindowClick();
 	}
 }

MauiMaps/Platforms/Android/CustomMapHandler.cs

@@ -25,7 +25,7 @@ public CustomMapHandler(IPropertyMapper? mapper = null, CommandMapper? commandMa
 	{
 	}
 
-	public Dictionary<IMapPin, Marker> Markers { get; } = new();
+	public List<(IMapPin pin, Marker marker)> Markers { get; } = new();
 
 	protected override void ConnectHandler(MapView platformView)
 	{
@@ -40,7 +40,7 @@ protected override void ConnectHandler(MapView platformView)
 		{
 			foreach (var marker in mapHandler.Markers)
 			{
-				marker.Value.Remove();
+				marker.marker.Remove();
 			}
 
 			mapHandler.Markers.Clear();
@@ -65,7 +65,7 @@ private void AddPins(IEnumerable<IMapPin> mapPins)
 				{
 					cp.ImageSource.LoadImage(MauiContext, result =>
 					{
-						if (result?.Value is BitmapDrawable bitmapDrawable && bitmapDrawable.Bitmap is not null)
+						if (result?.Value is BitmapDrawable { Bitmap: not null } bitmapDrawable)
 						{
 							markerOption.SetIcon(BitmapDescriptorFactory.FromBitmap(GetMaximumBitmap(bitmapDrawable.Bitmap, 100, 100)));
 						}
@@ -85,7 +85,7 @@ private void AddMarker(GoogleMap map, IMapPin pin, MarkerOptions markerOption)
 	{
 		var marker = map.AddMarker(markerOption);
 		pin.MarkerId = marker.Id;
-		Markers.Add(pin, marker);
+		Markers.Add((pin, marker));
 	}
 
 	private static Bitmap GetMaximumBitmap(in Bitmap sourceImage, in float maxWidth, in float maxHeight)

MauiMaps/Platforms/Android/CustomMarkerClickListener.cs

@@ -13,8 +13,8 @@ public CustomMarkerClickListener(CustomMapHandler mapHandler)
 
 	public bool OnMarkerClick(Android.Gms.Maps.Model.Marker marker)
 	{
-		var pin = mapHandler.Markers.FirstOrDefault(x => x.Value.Id == marker.Id);
-		pin.Key?.SendMarkerClick();
+		var pin = mapHandler.Markers.FirstOrDefault(x => x.marker.Id == marker.Id);
+		pin.pin?.SendMarkerClick();
 		marker.ShowInfoWindow();
 		return true;
 	}

MauiMarkdown/MauiMarkdown.csproj

@@ -32,7 +32,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="$(NetVersion) != 'net7.0'">
-		<PackageReference Include="Microsoft.Maui.Graphics.Text.Markdig" Version="8.0.0-preview.6.8686" />
+		<PackageReference Include="Microsoft.Maui.Graphics.Text.Markdig" Version="8.0.0-preview.7.8842" />
 	</ItemGroup>
 	<ItemGroup Condition="$(NetVersion) == 'net7.0'">
 		<PackageReference Include="Microsoft.Maui.Graphics.Text.Markdig" Version="7.0.92" />

MauiPaint/Platforms/Windows/DragDropHelper.cs

@@ -9,28 +9,35 @@ namespace MauiPaint;
 using System.Diagnostics;
 using System.Text;
 using Windows.Foundation;
-using Windows.Storage.Streams;
+using DragStartingEventArgs = Microsoft.UI.Xaml.DragStartingEventArgs;
 
 public static class DragDropHelper
 {
+	private static readonly Dictionary<UIElement, TypedEventHandler<UIElement, DragStartingEventArgs>> DragStartingEventHandlers = new();
+	private static readonly Dictionary<UIElement, DragEventHandler> DragEventHandlers = new();
+
 	public static void RegisterDrag(UIElement element, Func<CancellationToken, Task<Stream>> content)
 	{
 		element.CanDrag = true;
-		element.DragStarting += async (s, e) =>
+
+		async void DragStartingHandler(UIElement s, DragStartingEventArgs e)
 		{
 			var stream = await content.Invoke(CancellationToken.None);
 			var storageFile = await CreateStorageFile(stream);
 			e.Data.SetStorageItems(new List<IStorageItem>()
 			{
 				storageFile
 			});
-		};
+		}
+
+		DragStartingEventHandlers[element] = DragStartingHandler;
+		element.DragStarting += DragStartingHandler;
 	}
 
 	public static void RegisterDrop(UIElement element, Func<Stream, Task>? content)
 	{
 		element.AllowDrop = true;
-		element.Drop += async (s, e) =>
+		async void DropHandler(object s, DragEventArgs e)
 		{
 			if (e.DataView.Contains(StandardDataFormats.StorageItems))
 			{
@@ -48,18 +55,32 @@ public static void RegisterDrop(UIElement element, Func<Stream, Task>? content)
 					}
 				}
 			}
-		};
+		}
+
+		element.Drop += DropHandler;
+		DragEventHandlers[element] = DropHandler;
 		element.DragOver += OnDragOver;
 	}
 
 	public static void UnRegisterDrag(UIElement element)
 	{
 		element.CanDrag = false;
+		if (DragStartingEventHandlers.TryGetValue(element, out var dragStartingEventHandler))
+		{
+			element.DragStarting -= dragStartingEventHandler;
+			DragStartingEventHandlers.Remove(element);
+		}
 	}
 
 	public static void UnRegisterDrop(UIElement element)
 	{
 		element.AllowDrop = false;
+		if (DragEventHandlers.TryGetValue(element, out var dragEventHandler))
+		{
+			element.Drop -= dragEventHandler;
+			DragEventHandlers.Remove(element);
+		}
+
 		element.DragOver -= OnDragOver;
 	}
 

md/thankyou.mdpp

@@ -1,3 +1,3 @@
 ## Thank You
 
-Special thanks to my friends and sponsors: @PeterFucci, Gerald Versluis (jfversluis), @renatolopes, Glen Herman, Olexii, Brady, Yury Michurin, VToegel, Aleksander Rokic, Jeffrey Williams, TimKyn.
+Special thanks to my friends and sponsors: @PeterFucci, Gerald Versluis (jfversluis), @renatolopes, Glen Herman, Olexii, Brady, Yury Michurin, VToegel, Aleksander Rokic, Jeffrey Williams, TimKyn, Standa Mike�, Aaron Schaefer.