Merge branch 'main' into deepsource-transform-ac240766

VladislavAntonyuk · Aug 20, 2023 · 50b8922 · 50b8922
2 parents fd28243 + b2e5fb5
commit 50b8922
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -6,6 +6,10 @@ on:
   pull_request:
     branches: [ main ]
 
+concurrency:
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+    cancel-in-progress: true
+
 jobs:
   build:
 

diff --git a/Auth/MauiAuthBlazor/MauiProgram.cs b/Auth/MauiAuthBlazor/MauiProgram.cs
@@ -12,7 +12,7 @@ public static MauiApp CreateMauiApp()
 		builder.Services.RegisterServices();
 		builder.UseMauiCommunityToolkit();
 #if DEBUG
-        builder.Services.AddBlazorWebViewDeveloperTools();
+		builder.Services.AddBlazorWebViewDeveloperTools();
 #endif
 		return builder.Build();
 	}

diff --git a/BottomSheet/MainPage.xaml.cs b/BottomSheet/MainPage.xaml.cs
@@ -1,7 +1,7 @@
 namespace BottomSheet;
 
 #if ANDROID
-using BottomSheetView =  Google.Android.Material.BottomSheet.BottomSheetDialog;
+using BottomSheetView = Google.Android.Material.BottomSheet.BottomSheetDialog;
 #elif IOS || MACCATALYST
 using BottomSheetView = UIKit.UIViewController;
 #elif TIZEN

diff --git a/MauiMaps/Platforms/Android/CustomMapHandler.cs b/MauiMaps/Platforms/Android/CustomMapHandler.cs
@@ -1,5 +1,6 @@
 namespace MauiMaps;
 
+using System.Linq;
 using Android.Gms.Maps;
 using Android.Gms.Maps.Model;
 using Android.Graphics;
@@ -38,13 +39,15 @@ protected override void ConnectHandler(MapView platformView)
 	{
 		if (handler is CustomMapHandler mapHandler)
 		{
-			foreach (var marker in mapHandler.Markers)
+			var pinsToAdd = map.Pins.Where(x => x.MarkerId == null).ToList();
+			var pinsToRemove = mapHandler.Markers.Where(x => !map.Pins.Contains(x.pin)).ToList();
+			foreach (var marker in pinsToRemove)
 			{
 				marker.marker.Remove();
+				mapHandler.Markers.Remove(marker);
 			}
 
-			mapHandler.Markers.Clear();
-			mapHandler.AddPins(map.Pins);
+			mapHandler.AddPins(pinsToAdd);
 		}
 	}
 

diff --git a/Sqlite/MauiSqliteBlazor/MauiProgram.cs b/Sqlite/MauiSqliteBlazor/MauiProgram.cs
@@ -11,7 +11,7 @@ public static MauiApp CreateMauiApp()
 		builder.Services.AddMauiBlazorWebView();
 		builder.Services.AddSingleton(new AccountRepository("accounts-blazor.db"));
 #if DEBUG
-        builder.Services.AddBlazorWebViewDeveloperTools();
+		builder.Services.AddBlazorWebViewDeveloperTools();
 #endif
 		return builder.Build();
 	}