From c7fae3996a9a2fe55277516983bcd96c2a4a7665 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Mon, 3 Apr 2023 23:54:47 +0300
Subject: [PATCH 01/34] BadgeCounter #807

---
 .../AppShell.xaml.cs                          |  1 +
 .../MauiProgram.cs                            |  3 ++
 .../Pages/Essentials/BadgeCounterPage.xaml    | 43 +++++++++++++++++++
 .../Pages/Essentials/BadgeCounterPage.xaml.cs | 11 +++++
 .../Platforms/Android/AndroidManifest.xml     | 34 +++++++++++++++
 .../Essentials/BadgeCounterViewModel.cs       | 32 ++++++++++++++
 .../Essentials/EssentialsGalleryViewModel.cs  |  1 +
 .../CommunityToolkit.Maui.Core.csproj         |  4 ++
 .../BadgeCounter/BadgeCounter.shared.cs       | 20 +++++++++
 .../BadgeCounterImplementation.android.cs     | 29 +++++++++++++
 .../BadgeCounterImplementation.macios.cs      | 17 ++++++++
 .../BadgeCounterImplementation.net.cs         | 11 +++++
 .../BadgeCounterImplementation.tizen.cs       | 31 +++++++++++++
 .../BadgeCounterImplementation.windows.cs     | 28 ++++++++++++
 .../BadgeCounter/IBadgeCounter.shared.cs      | 13 ++++++
 .../Essentials/BadgeCounterTests.cs           | 24 +++++++++++
 .../Mocks/BadgeCounterImplementationMock.cs   | 11 +++++
 17 files changed, 313 insertions(+)
 create mode 100644 samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgeCounterPage.xaml
 create mode 100644 samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgeCounterPage.xaml.cs
 create mode 100644 samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeCounterViewModel.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounter.shared.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.android.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.macios.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.net.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.tizen.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.windows.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/IBadgeCounter.shared.cs
 create mode 100644 src/CommunityToolkit.Maui.UnitTests/Essentials/BadgeCounterTests.cs
 create mode 100644 src/CommunityToolkit.Maui.UnitTests/Mocks/BadgeCounterImplementationMock.cs

diff --git a/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs b/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs
index 55a555c9b..1659b4547 100644
--- a/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs
@@ -82,6 +82,7 @@ public partial class AppShell : Shell
 		CreateViewModelMapping<VariableMultiValueConverterPage, VariableMultiValueConverterViewModel, ConvertersGalleryPage, ConvertersGalleryViewModel>(),
 
 		// Add Essentials View Models
+		CreateViewModelMapping<BadgeCounterPage, BadgeCounterViewModel, EssentialsGalleryPage, EssentialsGalleryViewModel>(),
 		CreateViewModelMapping<FileSaverPage, FileSaverViewModel, EssentialsGalleryPage, EssentialsGalleryViewModel>(),
 		CreateViewModelMapping<FolderPickerPage, FolderPickerViewModel, EssentialsGalleryPage, EssentialsGalleryViewModel>(),
 
diff --git a/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs b/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
index 2bce37b94..1b432977f 100644
--- a/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
+++ b/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
@@ -1,3 +1,4 @@
+using CommunityToolkit.Maui.BadgeCounter;
 using CommunityToolkit.Maui.Markup;
 using CommunityToolkit.Maui.Sample.Models;
 using CommunityToolkit.Maui.Sample.Pages;
@@ -151,6 +152,7 @@ static void RegisterViewsAndViewModels(in IServiceCollection services)
 		services.AddTransientWithShellRoute<VariableMultiValueConverterPage, VariableMultiValueConverterViewModel>();
 
 		// Add Essentials Pages + ViewModels
+		services.AddTransientWithShellRoute<BadgeCounterPage, BadgeCounterViewModel>();
 		services.AddTransientWithShellRoute<FileSaverPage, FileSaverViewModel>();
 		services.AddTransientWithShellRoute<FolderPickerPage, FolderPickerViewModel>();
 
@@ -187,6 +189,7 @@ static void RegisterEssentials(in IServiceCollection services)
 		services.AddSingleton<IDeviceDisplay>(DeviceDisplay.Current);
 		services.AddSingleton<IFileSaver>(FileSaver.Default);
 		services.AddSingleton<IFolderPicker>(FolderPicker.Default);
+		services.AddSingleton<IBadgeCounter>(BadgeCounter.BadgeCounter.Default);
 	}
 
 	static IServiceCollection AddTransientWithShellRoute<TPage, TViewModel>(this IServiceCollection services) where TPage : BasePage<TViewModel>
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgeCounterPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgeCounterPage.xaml
new file mode 100644
index 000000000..e88b274c0
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgeCounterPage.xaml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<pages:BasePage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+                xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                xmlns:pages="clr-namespace:CommunityToolkit.Maui.Sample.Pages"
+                x:Class="CommunityToolkit.Maui.Sample.Pages.Essentials.BadgeCounterPage"
+                xmlns:vm="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Essentials"
+                x:TypeArguments="vm:BadgeCounterViewModel"
+                x:DataType="vm:BadgeCounterViewModel"
+                Title="BadgeCounter">
+    
+    <Grid
+        RowDefinitions="*, *"
+        ColumnDefinitions="*, *"
+        VerticalOptions="Center">
+
+        <Label
+            Grid.ColumnSpan="2"
+            Text="Badge Counter"
+            FontSize="18"
+            VerticalOptions="End"
+            HorizontalOptions="Center" />
+
+        <Button
+            Text="+"
+            Grid.Column="0"
+            Grid.Row="1"
+            SemanticProperties.Hint="Increments AppIcon badge"
+            Command="{Binding IncrementCommand}"
+            VerticalOptions="Start"
+            HorizontalOptions="End" />
+
+        <Button
+            Text="-"
+            Grid.Column="1"
+            Grid.Row="1"
+            SemanticProperties.Hint="Decrements AppIcon badge"
+            Command="{Binding DecrementCommand}"
+            VerticalOptions="Start"
+            HorizontalOptions="Start" />
+
+    </Grid>
+    
+</pages:BasePage>
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgeCounterPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgeCounterPage.xaml.cs
new file mode 100644
index 000000000..b9aec3e0d
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgeCounterPage.xaml.cs
@@ -0,0 +1,11 @@
+using CommunityToolkit.Maui.Sample.ViewModels.Essentials;
+
+namespace CommunityToolkit.Maui.Sample.Pages.Essentials;
+
+public partial class BadgeCounterPage : BasePage<BadgeCounterViewModel>
+{
+	public BadgeCounterPage(BadgeCounterViewModel viewModel) : base(viewModel)
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/AndroidManifest.xml b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/AndroidManifest.xml
index ed8c57ccd..cfbfca8e0 100644
--- a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/AndroidManifest.xml
+++ b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/AndroidManifest.xml
@@ -4,4 +4,38 @@
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+  <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+
+  <uses-permission android:name="com.sonymobile.home.permission.PROVIDER_INSERT_BADGE" />
+  <uses-permission android:name="com.majeur.launcher.permission.UPDATE_BADGE" />
+  <uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE" />
+  <uses-permission android:name="com.huawei.android.launcher.permission.READ_SETTINGS" />
+  <uses-permission android:name="com.huawei.android.launcher.permission.WRITE_SETTINGS" />
+  <uses-permission android:name="android.permission.READ_APP_BADGE" />
+  <uses-permission android:name="com.oppo.launcher.permission.READ_SETTINGS" />
+  <uses-permission android:name="com.oppo.launcher.permission.WRITE_SETTINGS" />
+  <uses-permission android:name="me.everything.badger.permission.BADGE_COUNT_READ" />
+  <uses-permission android:name="me.everything.badger.permission.BADGE_COUNT_WRITE" />
+
+  <!-- Apex -->
+  <uses-permission android:name="com.anddoes.launcher.permission.UPDATE_COUNT"/>
+
+  <!-- Default -->
+  <uses-permission android:name="com.android.launcher.permission.READ_SETTINGS"/>
+  <uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS"/>
+  <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+  <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
+
+  <!-- HTC -->
+  <uses-permission android:name="com.htc.launcher.permission.READ_SETTINGS" />
+  <uses-permission android:name="com.htc.launcher.permission.UPDATE_SHORTCUT" />
+
+  <!-- Samsung -->
+  <uses-permission android:name="com.sec.android.provider.badge.permission.READ" />
+  <uses-permission android:name="com.sec.android.provider.badge.permission.WRITE" />
+
+  <!-- Sony -->
+  <uses-permission android:name="com.sonyericsson.home.permission.BROADCAST_BADGE" />
+  <uses-permission android:name="com.sonymobile.home.permission.PROVIDER_INSERT_BADGE" />
 </manifest>
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeCounterViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeCounterViewModel.cs
new file mode 100644
index 000000000..2a1685e45
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeCounterViewModel.cs
@@ -0,0 +1,32 @@
+using CommunityToolkit.Maui.BadgeCounter;
+using CommunityToolkit.Mvvm.Input;
+
+namespace CommunityToolkit.Maui.Sample.ViewModels.Essentials;
+
+public partial class BadgeCounterViewModel : BaseViewModel
+{
+	int count;
+	readonly IBadgeCounter badgeCounter;
+
+	public BadgeCounterViewModel(IBadgeCounter badgeCounter)
+	{
+		this.badgeCounter = badgeCounter;
+	}
+	
+	[RelayCommand]
+	void Increment()
+	{
+		count++;
+		badgeCounter.SetBadgeCount(count);
+	}
+	
+	[RelayCommand]
+	void Decrement()
+	{
+		if (count > 0)
+		{
+			count--;
+			badgeCounter.SetBadgeCount(count);
+		}
+	}
+}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/EssentialsGalleryViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/EssentialsGalleryViewModel.cs
index 8083895fd..fcda87154 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/EssentialsGalleryViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/EssentialsGalleryViewModel.cs
@@ -7,6 +7,7 @@ public class EssentialsGalleryViewModel : BaseGalleryViewModel
 	public EssentialsGalleryViewModel()
 		: base(new[]
 		{
+			SectionModel.Create<BadgeCounterViewModel>("BadgeCounter", "Allows the user to set badge counter."),
 			SectionModel.Create<FileSaverViewModel>("FileSaver", "Allows the user to save files to the filesystem"),
 			SectionModel.Create<FolderPickerViewModel>("FolderPicker", "Allows picking folders from the file system")
 		})
diff --git a/src/CommunityToolkit.Maui.Core/CommunityToolkit.Maui.Core.csproj b/src/CommunityToolkit.Maui.Core/CommunityToolkit.Maui.Core.csproj
index 9db762fbe..ec097814b 100644
--- a/src/CommunityToolkit.Maui.Core/CommunityToolkit.Maui.Core.csproj
+++ b/src/CommunityToolkit.Maui.Core/CommunityToolkit.Maui.Core.csproj
@@ -56,4 +56,8 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0-android'">
+    <PackageReference Include="Xamarin.Android.ShortcutBadger" Version="1.2.0" />
+  </ItemGroup>
 </Project>
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounter.shared.cs b/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounter.shared.cs
new file mode 100644
index 000000000..e8bc7346b
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounter.shared.cs
@@ -0,0 +1,20 @@
+namespace CommunityToolkit.Maui.BadgeCounter;
+
+/// <inheritdoc cref="IBadgeCounter"/>
+public static class BadgeCounter
+{
+    static IBadgeCounter? defaultImplementation;
+
+    /// <inheritdoc cref="IBadgeCounter.SetBadgeCount" />
+	public static void SetBadgeCount(int count)
+    {
+        Default.SetBadgeCount(count);
+    }
+
+    /// <inheritdoc cref="IBadgeCounter" />
+	public static IBadgeCounter Default =>
+        defaultImplementation ??= new BadgeCounterImplementation();
+
+    internal static void SetDefault(IBadgeCounter implementation) =>
+        defaultImplementation = implementation;
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.android.cs
new file mode 100644
index 000000000..c42b32b84
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.android.cs
@@ -0,0 +1,29 @@
+namespace CommunityToolkit.Maui.BadgeCounter;
+
+using Android.App;
+using AndroidX.Core.App;
+
+//public class BadgeCounterImplementation : IBadgeCounter
+//{
+//	public void SetBadgeCount(int count)
+//	{
+//		var notificationManager = (NotificationManager)Application.Context.GetSystemService(Android.Content.Context.NotificationService);
+//		var channel = new NotificationChannel("default", "Default", NotificationImportance.Default);
+//		notificationManager.CreateNotificationChannel(channel);
+//		var builder = new NotificationCompat.Builder(Application.Context, "default");
+//		builder.SetNumber(count);
+//		notificationManager.Notify(0, builder.Build());
+//	}
+//}
+/// <inheritdoc />
+public class BadgeCounterImplementation : IBadgeCounter
+{
+	/// <inheritdoc />
+	public void SetBadgeCount(int count)
+	{
+		if (ME.Leolin.Shortcutbadger.ShortcutBadger.IsBadgeCounterSupported(Application.Context))
+		{
+			ME.Leolin.Shortcutbadger.ShortcutBadger.ApplyCount(Application.Context, count);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.macios.cs b/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.macios.cs
new file mode 100644
index 000000000..b56128d26
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.macios.cs
@@ -0,0 +1,17 @@
+namespace CommunityToolkit.Maui.BadgeCounter;
+
+using UIKit;
+using UserNotifications;
+
+/// <inheritdoc />
+public class BadgeCounterImplementation : IBadgeCounter
+{
+	/// <inheritdoc />
+	public void SetBadgeCount(int count)
+	{
+		UNUserNotificationCenter.Current.RequestAuthorization(UNAuthorizationOptions.Badge, (r, e) =>
+		{
+		});
+		UIApplication.SharedApplication.ApplicationIconBadgeNumber = count;
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.net.cs b/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.net.cs
new file mode 100644
index 000000000..bcf838493
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.net.cs
@@ -0,0 +1,11 @@
+namespace CommunityToolkit.Maui.BadgeCounter;
+
+/// <inheritdoc />
+public class BadgeCounterImplementation : IBadgeCounter
+{
+	/// <inheritdoc />
+	public void SetBadgeCount(int count)
+	{
+		throw new NotImplementedException();
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.tizen.cs b/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.tizen.cs
new file mode 100644
index 000000000..6a32b2b57
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.tizen.cs
@@ -0,0 +1,31 @@
+namespace CommunityToolkit.Maui.BadgeCounter;
+
+using Tizen.Applications;
+using Tizen.NUI;
+
+/// <inheritdoc />
+public class BadgeCounterImplementation : IBadgeCounter
+{
+	/// <inheritdoc />
+	public void SetBadgeCount(int count)
+	{
+		var appId = Application.Current.ApplicationInfo.ApplicationId;
+		if (count is 0)
+		{
+			BadgeControl.Remove(appId);
+			return;
+		}
+
+		var badge = BadgeControl.Find(appId);
+		if (badge is null)
+		{
+			badge = new Badge(appId, count);
+			BadgeControl.Add(badge);
+		}
+		else
+		{
+			badge.Count = count;
+			BadgeControl.Update(badge);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.windows.cs b/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.windows.cs
new file mode 100644
index 000000000..1419da94a
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.windows.cs
@@ -0,0 +1,28 @@
+namespace CommunityToolkit.Maui.BadgeCounter;
+
+using Windows.Data.Xml.Dom;
+using Windows.UI.Notifications;
+
+/// <inheritdoc />
+public class BadgeCounterImplementation : IBadgeCounter
+{
+	/// <inheritdoc />
+	public void SetBadgeCount(int count)
+	{
+		var badgeUpdater = BadgeUpdateManager.CreateBadgeUpdaterForApplication();
+		if (count <= 0)
+		{
+			badgeUpdater.Clear();
+		}
+		else
+		{
+			var badgeXml = BadgeUpdateManager.GetTemplateContent(BadgeTemplateType.BadgeNumber);
+
+			var badgeElement = badgeXml.SelectSingleNode("/badge") as XmlElement;
+			badgeElement?.SetAttribute("value", count.ToString());
+
+			var badge = new BadgeNotification(badgeXml);
+			badgeUpdater.Update(badge);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/IBadgeCounter.shared.cs b/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/IBadgeCounter.shared.cs
new file mode 100644
index 000000000..c3feca6bf
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/IBadgeCounter.shared.cs
@@ -0,0 +1,13 @@
+namespace CommunityToolkit.Maui.BadgeCounter;
+
+/// <summary>
+/// Badge counter
+/// </summary>
+public interface IBadgeCounter
+{
+	/// <summary>
+	/// Set the badge count
+	/// </summary>
+	/// <param name="count">Badge count</param>
+    void SetBadgeCount(int count);
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/Essentials/BadgeCounterTests.cs b/src/CommunityToolkit.Maui.UnitTests/Essentials/BadgeCounterTests.cs
new file mode 100644
index 000000000..b2838dc8a
--- /dev/null
+++ b/src/CommunityToolkit.Maui.UnitTests/Essentials/BadgeCounterTests.cs
@@ -0,0 +1,24 @@
+using CommunityToolkit.Maui.UnitTests.Mocks;
+using FluentAssertions;
+using Xunit;
+
+namespace CommunityToolkit.Maui.UnitTests.Essentials;
+
+public class BadgeCounterTests
+{
+	[Fact]
+	public void BadgeCounterTestsSetDefaultUpdatesInstance()
+	{
+		var badgeCounterImplementationMock = new BadgeCounterImplementationMock();
+		BadgeCounter.BadgeCounter.SetDefault(badgeCounterImplementationMock);
+		var badgeCounter = BadgeCounter.BadgeCounter.Default;
+		badgeCounter.Should().BeSameAs(badgeCounterImplementationMock);
+	}
+
+	[Fact]
+	public void SetBadgeCountFailsOnNet()
+	{
+		BadgeCounter.BadgeCounter.SetDefault(new BadgeCounter.BadgeCounterImplementation());
+		Assert.Throws<NotImplementedException>(() => BadgeCounter.BadgeCounter.SetBadgeCount(1));
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/Mocks/BadgeCounterImplementationMock.cs b/src/CommunityToolkit.Maui.UnitTests/Mocks/BadgeCounterImplementationMock.cs
new file mode 100644
index 000000000..279bb53ce
--- /dev/null
+++ b/src/CommunityToolkit.Maui.UnitTests/Mocks/BadgeCounterImplementationMock.cs
@@ -0,0 +1,11 @@
+using CommunityToolkit.Maui.BadgeCounter;
+
+namespace CommunityToolkit.Maui.UnitTests.Mocks;
+
+class BadgeCounterImplementationMock : IBadgeCounter
+{
+	public void SetBadgeCount(int count)
+	{
+		throw new NotImplementedException();
+	}
+}
\ No newline at end of file

From 1ba0087c9d5f20823e069ccd97e1144db73be772 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Mon, 29 May 2023 16:39:06 +0300
Subject: [PATCH 02/34] Rename to Badge

---
 .gitignore                                    |  1 +
 .../Essentials/Badge/Badge.shared.cs          | 20 +++++++++++++++++++
 .../BadgeImplementation.android.cs}           | 11 +++++-----
 .../BadgeImplementation.macios.cs}            |  4 ++--
 .../BadgeImplementation.net.cs}               |  4 ++--
 .../BadgeImplementation.tizen.cs}             |  6 +++---
 .../BadgeImplementation.windows.cs}           |  6 +++---
 .../IBadge.shared.cs}                         |  8 ++++----
 .../BadgeCounter/BadgeCounter.shared.cs       | 20 -------------------
 9 files changed, 41 insertions(+), 39 deletions(-)
 create mode 100644 src/CommunityToolkit.Maui.Core/Essentials/Badge/Badge.shared.cs
 rename src/CommunityToolkit.Maui.Core/Essentials/{BadgeCounter/BadgeCounterImplementation.android.cs => Badge/BadgeImplementation.android.cs} (75%)
 rename src/CommunityToolkit.Maui.Core/Essentials/{BadgeCounter/BadgeCounterImplementation.macios.cs => Badge/BadgeImplementation.macios.cs} (74%)
 rename src/CommunityToolkit.Maui.Core/Essentials/{BadgeCounter/BadgeCounterImplementation.net.cs => Badge/BadgeImplementation.net.cs} (55%)
 rename src/CommunityToolkit.Maui.Core/Essentials/{BadgeCounter/BadgeCounterImplementation.tizen.cs => Badge/BadgeImplementation.tizen.cs} (75%)
 rename src/CommunityToolkit.Maui.Core/Essentials/{BadgeCounter/BadgeCounterImplementation.windows.cs => Badge/BadgeImplementation.windows.cs} (79%)
 rename src/CommunityToolkit.Maui.Core/Essentials/{BadgeCounter/IBadgeCounter.shared.cs => Badge/IBadge.shared.cs} (50%)
 delete mode 100644 src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounter.shared.cs

diff --git a/.gitignore b/.gitignore
index 4740b3fbf..de8ab5cf3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -263,3 +263,4 @@ paket-files/
 
 # Visual Studio Code
 .vscode
+/samples/workload-install.ps1
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Badge.shared.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Badge.shared.cs
new file mode 100644
index 000000000..caf8f6c01
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Badge.shared.cs
@@ -0,0 +1,20 @@
+namespace CommunityToolkit.Maui.ApplicationModel;
+
+/// <inheritdoc cref="IBadge"/>
+public static class Badge
+{
+    static IBadge? defaultImplementation;
+
+    /// <inheritdoc cref="IBadge.SetCount" />
+	public static void SetCount(int count)
+    {
+        Default.SetCount(count);
+    }
+
+    /// <inheritdoc cref="IBadge" />
+	public static IBadge Default =>
+        defaultImplementation ??= new BadgeImplementation();
+
+    internal static void SetDefault(IBadge implementation) =>
+        defaultImplementation = implementation;
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.android.cs
similarity index 75%
rename from src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.android.cs
rename to src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.android.cs
index c42b32b84..04afa3b69 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.android.cs
@@ -1,11 +1,11 @@
-namespace CommunityToolkit.Maui.BadgeCounter;
+namespace CommunityToolkit.Maui.ApplicationModel;
 
 using Android.App;
 using AndroidX.Core.App;
 
-//public class BadgeCounterImplementation : IBadgeCounter
+//public class BadgeImplementation : IBadge
 //{
-//	public void SetBadgeCount(int count)
+//	public void SetCount(int count)
 //	{
 //		var notificationManager = (NotificationManager)Application.Context.GetSystemService(Android.Content.Context.NotificationService);
 //		var channel = new NotificationChannel("default", "Default", NotificationImportance.Default);
@@ -15,11 +15,12 @@
 //		notificationManager.Notify(0, builder.Build());
 //	}
 //}
+
 /// <inheritdoc />
-public class BadgeCounterImplementation : IBadgeCounter
+public class BadgeImplementation : IBadge
 {
 	/// <inheritdoc />
-	public void SetBadgeCount(int count)
+	public void SetCount(int count)
 	{
 		if (ME.Leolin.Shortcutbadger.ShortcutBadger.IsBadgeCounterSupported(Application.Context))
 		{
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.macios.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.macios.cs
similarity index 74%
rename from src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.macios.cs
rename to src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.macios.cs
index b56128d26..d7849d16c 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.macios.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.macios.cs
@@ -1,10 +1,10 @@
-namespace CommunityToolkit.Maui.BadgeCounter;
+namespace CommunityToolkit.Maui.ApplicationModel;
 
 using UIKit;
 using UserNotifications;
 
 /// <inheritdoc />
-public class BadgeCounterImplementation : IBadgeCounter
+public class BadgeImplementation : IBadge
 {
 	/// <inheritdoc />
 	public void SetBadgeCount(int count)
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.net.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.net.cs
similarity index 55%
rename from src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.net.cs
rename to src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.net.cs
index bcf838493..d32e98f0b 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.net.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.net.cs
@@ -1,7 +1,7 @@
-namespace CommunityToolkit.Maui.BadgeCounter;
+namespace CommunityToolkit.Maui.ApplicationModel;
 
 /// <inheritdoc />
-public class BadgeCounterImplementation : IBadgeCounter
+public class BadgeImplementation : IBadge
 {
 	/// <inheritdoc />
 	public void SetBadgeCount(int count)
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.tizen.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs
similarity index 75%
rename from src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.tizen.cs
rename to src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs
index 6a32b2b57..0d5386b4a 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.tizen.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs
@@ -1,13 +1,13 @@
-namespace CommunityToolkit.Maui.BadgeCounter;
+namespace CommunityToolkit.Maui.ApplicationModel;
 
 using Tizen.Applications;
 using Tizen.NUI;
 
 /// <inheritdoc />
-public class BadgeCounterImplementation : IBadgeCounter
+public class BadgeImplementation : IBadge
 {
 	/// <inheritdoc />
-	public void SetBadgeCount(int count)
+	public void SetCount(int count)
 	{
 		var appId = Application.Current.ApplicationInfo.ApplicationId;
 		if (count is 0)
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.windows.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.windows.cs
similarity index 79%
rename from src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.windows.cs
rename to src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.windows.cs
index 1419da94a..51eebade1 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounterImplementation.windows.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.windows.cs
@@ -1,13 +1,13 @@
-namespace CommunityToolkit.Maui.BadgeCounter;
+namespace CommunityToolkit.Maui.ApplicationModel;
 
 using Windows.Data.Xml.Dom;
 using Windows.UI.Notifications;
 
 /// <inheritdoc />
-public class BadgeCounterImplementation : IBadgeCounter
+public class BadgeImplementation : IBadge
 {
 	/// <inheritdoc />
-	public void SetBadgeCount(int count)
+	public void SetCount(int count)
 	{
 		var badgeUpdater = BadgeUpdateManager.CreateBadgeUpdaterForApplication();
 		if (count <= 0)
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/IBadgeCounter.shared.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/IBadge.shared.cs
similarity index 50%
rename from src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/IBadgeCounter.shared.cs
rename to src/CommunityToolkit.Maui.Core/Essentials/Badge/IBadge.shared.cs
index c3feca6bf..206b55090 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/IBadgeCounter.shared.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/IBadge.shared.cs
@@ -1,13 +1,13 @@
-namespace CommunityToolkit.Maui.BadgeCounter;
+namespace CommunityToolkit.Maui.ApplicationModel;
 
 /// <summary>
-/// Badge counter
+/// Badge
 /// </summary>
-public interface IBadgeCounter
+public interface IBadge
 {
 	/// <summary>
 	/// Set the badge count
 	/// </summary>
 	/// <param name="count">Badge count</param>
-    void SetBadgeCount(int count);
+    void SetCount(int count);
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounter.shared.cs b/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounter.shared.cs
deleted file mode 100644
index e8bc7346b..000000000
--- a/src/CommunityToolkit.Maui.Core/Essentials/BadgeCounter/BadgeCounter.shared.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace CommunityToolkit.Maui.BadgeCounter;
-
-/// <inheritdoc cref="IBadgeCounter"/>
-public static class BadgeCounter
-{
-    static IBadgeCounter? defaultImplementation;
-
-    /// <inheritdoc cref="IBadgeCounter.SetBadgeCount" />
-	public static void SetBadgeCount(int count)
-    {
-        Default.SetBadgeCount(count);
-    }
-
-    /// <inheritdoc cref="IBadgeCounter" />
-	public static IBadgeCounter Default =>
-        defaultImplementation ??= new BadgeCounterImplementation();
-
-    internal static void SetDefault(IBadgeCounter implementation) =>
-        defaultImplementation = implementation;
-}
\ No newline at end of file

From 24fd11f5f25be040589ef5767ef040db16f88b75 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Mon, 29 May 2023 17:11:13 +0300
Subject: [PATCH 03/34] Update tests

---
 .../AppShell.xaml.cs                          |  2 +-
 .../CommunityToolkit.Maui.Sample.csproj       |  6 ++++
 .../MauiProgram.cs                            |  6 ++--
 .../{BadgeCounterPage.xaml => BadgePage.xaml} | 10 +++---
 ...eCounterPage.xaml.cs => BadgePage.xaml.cs} |  4 +--
 .../Essentials/BadgeCounterViewModel.cs       | 32 -------------------
 .../ViewModels/Essentials/BadgeViewModel.cs   | 32 +++++++++++++++++++
 .../Essentials/EssentialsGalleryViewModel.cs  |  2 +-
 .../Badge/BadgeImplementation.macios.cs       |  2 +-
 .../Badge/BadgeImplementation.net.cs          |  2 +-
 .../Essentials/BadgeCounterTests.cs           | 24 --------------
 .../Essentials/BadgeTests.cs                  | 25 +++++++++++++++
 .../Mocks/BadgeCounterImplementationMock.cs   | 11 -------
 .../Mocks/BadgeImplementationMock.cs          | 11 +++++++
 14 files changed, 88 insertions(+), 81 deletions(-)
 rename samples/CommunityToolkit.Maui.Sample/Pages/Essentials/{BadgeCounterPage.xaml => BadgePage.xaml} (85%)
 rename samples/CommunityToolkit.Maui.Sample/Pages/Essentials/{BadgeCounterPage.xaml.cs => BadgePage.xaml.cs} (50%)
 delete mode 100644 samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeCounterViewModel.cs
 create mode 100644 samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs
 delete mode 100644 src/CommunityToolkit.Maui.UnitTests/Essentials/BadgeCounterTests.cs
 create mode 100644 src/CommunityToolkit.Maui.UnitTests/Essentials/BadgeTests.cs
 delete mode 100644 src/CommunityToolkit.Maui.UnitTests/Mocks/BadgeCounterImplementationMock.cs
 create mode 100644 src/CommunityToolkit.Maui.UnitTests/Mocks/BadgeImplementationMock.cs

diff --git a/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs b/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs
index c77318095..79d6f0262 100644
--- a/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs
@@ -83,7 +83,7 @@ public partial class AppShell : Shell
 		CreateViewModelMapping<VariableMultiValueConverterPage, VariableMultiValueConverterViewModel, ConvertersGalleryPage, ConvertersGalleryViewModel>(),
 
 		// Add Essentials View Models
-		CreateViewModelMapping<BadgeCounterPage, BadgeCounterViewModel, EssentialsGalleryPage, EssentialsGalleryViewModel>(),
+		CreateViewModelMapping<BadgePage, BadgeViewModel, EssentialsGalleryPage, EssentialsGalleryViewModel>(),
 		CreateViewModelMapping<FileSaverPage, FileSaverViewModel, EssentialsGalleryPage, EssentialsGalleryViewModel>(),
 		CreateViewModelMapping<FolderPickerPage, FolderPickerViewModel, EssentialsGalleryPage, EssentialsGalleryViewModel>(),
 		CreateViewModelMapping<SpeechToTextPage, SpeechToTextViewModel, EssentialsGalleryPage, EssentialsGalleryViewModel>(),
diff --git a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
index 87871f8ce..ed379a5b5 100644
--- a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
+++ b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
@@ -71,6 +71,12 @@
     <ProjectReference Include="..\..\src\CommunityToolkit.Maui\CommunityToolkit.Maui.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="Pages\Essentials\BadgePage.xaml.cs">
+      <DependentUpon>BadgePage.xaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
   <PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))=='android'">
     <RuntimeIdentifiers>android-arm;android-arm64;android-x86;android-x64</RuntimeIdentifiers>
   </PropertyGroup>
diff --git a/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs b/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
index 86e1c8a1b..bc77a82bf 100644
--- a/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
+++ b/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
@@ -1,4 +1,4 @@
-using CommunityToolkit.Maui.BadgeCounter;
+using CommunityToolkit.Maui.ApplicationModel;
 using CommunityToolkit.Maui.Markup;
 using CommunityToolkit.Maui.Media;
 using CommunityToolkit.Maui.Sample.Models;
@@ -154,7 +154,7 @@ static void RegisterViewsAndViewModels(in IServiceCollection services)
 		services.AddTransientWithShellRoute<VariableMultiValueConverterPage, VariableMultiValueConverterViewModel>();
 
 		// Add Essentials Pages + ViewModels
-		services.AddTransientWithShellRoute<BadgeCounterPage, BadgeCounterViewModel>();
+		services.AddTransientWithShellRoute<BadgePage, BadgeViewModel>();
 		services.AddTransientWithShellRoute<FileSaverPage, FileSaverViewModel>();
 		services.AddTransientWithShellRoute<FolderPickerPage, FolderPickerViewModel>();
 		services.AddTransientWithShellRoute<SpeechToTextPage, SpeechToTextViewModel>();
@@ -193,7 +193,7 @@ static void RegisterEssentials(in IServiceCollection services)
 		services.AddSingleton<IDeviceInfo>(DeviceInfo.Current);
 		services.AddSingleton<IFileSaver>(FileSaver.Default);
 		services.AddSingleton<IFolderPicker>(FolderPicker.Default);
-		services.AddSingleton<IBadgeCounter>(BadgeCounter.BadgeCounter.Default);
+		services.AddSingleton<IBadge>(Badge.Default);
 		services.AddSingleton<ISpeechToText>(SpeechToText.Default);
 		services.AddSingleton<ITextToSpeech>(TextToSpeech.Default);
 	}
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgeCounterPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgePage.xaml
similarity index 85%
rename from samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgeCounterPage.xaml
rename to samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgePage.xaml
index e88b274c0..c04957720 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgeCounterPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgePage.xaml
@@ -2,11 +2,11 @@
 <pages:BasePage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
                 xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                 xmlns:pages="clr-namespace:CommunityToolkit.Maui.Sample.Pages"
-                x:Class="CommunityToolkit.Maui.Sample.Pages.Essentials.BadgeCounterPage"
+                x:Class="CommunityToolkit.Maui.Sample.Pages.Essentials.BadgePage"
                 xmlns:vm="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Essentials"
-                x:TypeArguments="vm:BadgeCounterViewModel"
-                x:DataType="vm:BadgeCounterViewModel"
-                Title="BadgeCounter">
+                x:TypeArguments="vm:BadgeViewModel"
+                x:DataType="vm:BadgeViewModel"
+                Title="Badge">
     
     <Grid
         RowDefinitions="*, *"
@@ -15,7 +15,7 @@
 
         <Label
             Grid.ColumnSpan="2"
-            Text="Badge Counter"
+            Text="Badge"
             FontSize="18"
             VerticalOptions="End"
             HorizontalOptions="Center" />
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgeCounterPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgePage.xaml.cs
similarity index 50%
rename from samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgeCounterPage.xaml.cs
rename to samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgePage.xaml.cs
index b9aec3e0d..685dc4425 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgeCounterPage.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgePage.xaml.cs
@@ -2,9 +2,9 @@
 
 namespace CommunityToolkit.Maui.Sample.Pages.Essentials;
 
-public partial class BadgeCounterPage : BasePage<BadgeCounterViewModel>
+public partial class BadgePage : BasePage<BadgeViewModel>
 {
-	public BadgeCounterPage(BadgeCounterViewModel viewModel) : base(viewModel)
+	public BadgePage(BadgeViewModel viewModel) : base(viewModel)
 	{
 		InitializeComponent();
 	}
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeCounterViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeCounterViewModel.cs
deleted file mode 100644
index 2a1685e45..000000000
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeCounterViewModel.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using CommunityToolkit.Maui.BadgeCounter;
-using CommunityToolkit.Mvvm.Input;
-
-namespace CommunityToolkit.Maui.Sample.ViewModels.Essentials;
-
-public partial class BadgeCounterViewModel : BaseViewModel
-{
-	int count;
-	readonly IBadgeCounter badgeCounter;
-
-	public BadgeCounterViewModel(IBadgeCounter badgeCounter)
-	{
-		this.badgeCounter = badgeCounter;
-	}
-	
-	[RelayCommand]
-	void Increment()
-	{
-		count++;
-		badgeCounter.SetBadgeCount(count);
-	}
-	
-	[RelayCommand]
-	void Decrement()
-	{
-		if (count > 0)
-		{
-			count--;
-			badgeCounter.SetBadgeCount(count);
-		}
-	}
-}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs
new file mode 100644
index 000000000..9ea35b0b3
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs
@@ -0,0 +1,32 @@
+using CommunityToolkit.Maui.ApplicationModel;
+using CommunityToolkit.Mvvm.Input;
+
+namespace CommunityToolkit.Maui.Sample.ViewModels.Essentials;
+
+public partial class BadgeViewModel : BaseViewModel
+{
+	int count;
+	readonly IBadge badge;
+
+	public BadgeViewModel(IBadge badge)
+	{
+		this.badge = badge;
+	}
+	
+	[RelayCommand]
+	void Increment()
+	{
+		count++;
+		badge.SetCount(count);
+	}
+	
+	[RelayCommand]
+	void Decrement()
+	{
+		if (count > 0)
+		{
+			count--;
+			badge.SetCount(count);
+		}
+	}
+}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/EssentialsGalleryViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/EssentialsGalleryViewModel.cs
index ef21453bf..2c1368088 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/EssentialsGalleryViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/EssentialsGalleryViewModel.cs
@@ -7,7 +7,7 @@ public class EssentialsGalleryViewModel : BaseGalleryViewModel
 	public EssentialsGalleryViewModel()
 		: base(new[]
 		{
-			SectionModel.Create<BadgeCounterViewModel>("BadgeCounter", "Allows the user to set badge counter."),
+			SectionModel.Create<BadgeViewModel>("Badge", "Allows the user to set badge counter."),
 			SectionModel.Create<FileSaverViewModel>("FileSaver", "Allows the user to save files to the filesystem"),
 			SectionModel.Create<FolderPickerViewModel>("FolderPicker", "Allows picking folders from the file system"),
 			SectionModel.Create<SpeechToTextViewModel>("SpeechToText", "Converts speech to text"),
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.macios.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.macios.cs
index d7849d16c..5ebbf3d9f 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.macios.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.macios.cs
@@ -7,7 +7,7 @@
 public class BadgeImplementation : IBadge
 {
 	/// <inheritdoc />
-	public void SetBadgeCount(int count)
+	public void SetCount(int count)
 	{
 		UNUserNotificationCenter.Current.RequestAuthorization(UNAuthorizationOptions.Badge, (r, e) =>
 		{
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.net.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.net.cs
index d32e98f0b..3495c9d48 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.net.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.net.cs
@@ -4,7 +4,7 @@ namespace CommunityToolkit.Maui.ApplicationModel;
 public class BadgeImplementation : IBadge
 {
 	/// <inheritdoc />
-	public void SetBadgeCount(int count)
+	public void SetCount(int count)
 	{
 		throw new NotImplementedException();
 	}
diff --git a/src/CommunityToolkit.Maui.UnitTests/Essentials/BadgeCounterTests.cs b/src/CommunityToolkit.Maui.UnitTests/Essentials/BadgeCounterTests.cs
deleted file mode 100644
index b2838dc8a..000000000
--- a/src/CommunityToolkit.Maui.UnitTests/Essentials/BadgeCounterTests.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using CommunityToolkit.Maui.UnitTests.Mocks;
-using FluentAssertions;
-using Xunit;
-
-namespace CommunityToolkit.Maui.UnitTests.Essentials;
-
-public class BadgeCounterTests
-{
-	[Fact]
-	public void BadgeCounterTestsSetDefaultUpdatesInstance()
-	{
-		var badgeCounterImplementationMock = new BadgeCounterImplementationMock();
-		BadgeCounter.BadgeCounter.SetDefault(badgeCounterImplementationMock);
-		var badgeCounter = BadgeCounter.BadgeCounter.Default;
-		badgeCounter.Should().BeSameAs(badgeCounterImplementationMock);
-	}
-
-	[Fact]
-	public void SetBadgeCountFailsOnNet()
-	{
-		BadgeCounter.BadgeCounter.SetDefault(new BadgeCounter.BadgeCounterImplementation());
-		Assert.Throws<NotImplementedException>(() => BadgeCounter.BadgeCounter.SetBadgeCount(1));
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/Essentials/BadgeTests.cs b/src/CommunityToolkit.Maui.UnitTests/Essentials/BadgeTests.cs
new file mode 100644
index 000000000..f01a690f3
--- /dev/null
+++ b/src/CommunityToolkit.Maui.UnitTests/Essentials/BadgeTests.cs
@@ -0,0 +1,25 @@
+using CommunityToolkit.Maui.ApplicationModel;
+using CommunityToolkit.Maui.UnitTests.Mocks;
+using FluentAssertions;
+using Xunit;
+
+namespace CommunityToolkit.Maui.UnitTests.Essentials;
+
+public class BadgeTests
+{
+	[Fact]
+	public void BadgeTestsSetDefaultUpdatesInstance()
+	{
+		var badgeImplementationMock = new BadgeImplementationMock();
+		Badge.SetDefault(badgeImplementationMock);
+		var badge = Badge.Default;
+		badge.Should().BeSameAs(badgeImplementationMock);
+	}
+
+	[Fact]
+	public void SetBadgeFailsOnNet()
+	{
+		Badge.SetDefault(new BadgeImplementation());
+		Assert.Throws<NotImplementedException>(() => Badge.SetCount(1));
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/Mocks/BadgeCounterImplementationMock.cs b/src/CommunityToolkit.Maui.UnitTests/Mocks/BadgeCounterImplementationMock.cs
deleted file mode 100644
index 279bb53ce..000000000
--- a/src/CommunityToolkit.Maui.UnitTests/Mocks/BadgeCounterImplementationMock.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using CommunityToolkit.Maui.BadgeCounter;
-
-namespace CommunityToolkit.Maui.UnitTests.Mocks;
-
-class BadgeCounterImplementationMock : IBadgeCounter
-{
-	public void SetBadgeCount(int count)
-	{
-		throw new NotImplementedException();
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/Mocks/BadgeImplementationMock.cs b/src/CommunityToolkit.Maui.UnitTests/Mocks/BadgeImplementationMock.cs
new file mode 100644
index 000000000..9563abfaf
--- /dev/null
+++ b/src/CommunityToolkit.Maui.UnitTests/Mocks/BadgeImplementationMock.cs
@@ -0,0 +1,11 @@
+using CommunityToolkit.Maui.ApplicationModel;
+
+namespace CommunityToolkit.Maui.UnitTests.Mocks;
+
+class BadgeImplementationMock : IBadge
+{
+	public void SetCount(int count)
+	{
+		throw new NotImplementedException();
+	}
+}
\ No newline at end of file

From a942925fefbd9392ed32ba1a2fc3929d2a7b9d55 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Tue, 30 May 2023 21:58:13 +0300
Subject: [PATCH 04/34] Remove Xamarin.Android.ShortcutBadger dependency

---
 .../CommunityToolkit.Maui.Sample.csproj       | 10 +--
 .../Platforms/Android/AndroidManifest.xml     | 30 -------
 .../Platforms/Android/MainApplication.cs      |  4 +
 .../Platforms/Android/SamsungBadgeProvider.cs | 81 +++++++++++++++++++
 .../CommunityToolkit.Maui.Core.csproj         |  3 -
 .../Badge/Android/BadgeFactory.android.cs     | 54 +++++++++++++
 .../Android/BadgeImplementation.android.cs    | 12 +++
 .../Badge/Android/IBadgeProvider.android.cs   | 12 +++
 .../Badge/BadgeImplementation.android.cs      | 30 -------
 9 files changed, 167 insertions(+), 69 deletions(-)
 create mode 100644 samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeImplementation.android.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/IBadgeProvider.android.cs
 delete mode 100644 src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.android.cs

diff --git a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
index ed379a5b5..2a37c6285 100644
--- a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
+++ b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
@@ -28,6 +28,9 @@
     -->
     <!--<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
     <CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>-->
+
+    <!-- Uncomment these line if installation fails -->
+    <!--<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>-->
   </PropertyGroup>
 
   <ItemGroup>
@@ -71,12 +74,6 @@
     <ProjectReference Include="..\..\src\CommunityToolkit.Maui\CommunityToolkit.Maui.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Pages\Essentials\BadgePage.xaml.cs">
-      <DependentUpon>BadgePage.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
   <PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))=='android'">
     <RuntimeIdentifiers>android-arm;android-arm64;android-x86;android-x64</RuntimeIdentifiers>
   </PropertyGroup>
@@ -84,4 +81,5 @@
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('windows'))=='false' and $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))=='maccatalyst' and $(Configuration) == 'Debug'">
     <RuntimeIdentifiers>maccatalyst-arm64;maccatalyst-x64</RuntimeIdentifiers>
   </PropertyGroup>
+
 </Project>
diff --git a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/AndroidManifest.xml b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/AndroidManifest.xml
index 610f395c0..37acba4a2 100644
--- a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/AndroidManifest.xml
+++ b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/AndroidManifest.xml
@@ -5,40 +5,10 @@
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
-  <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
-
-  <uses-permission android:name="com.sonymobile.home.permission.PROVIDER_INSERT_BADGE" />
-  <uses-permission android:name="com.majeur.launcher.permission.UPDATE_BADGE" />
-  <uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE" />
-  <uses-permission android:name="com.huawei.android.launcher.permission.READ_SETTINGS" />
-  <uses-permission android:name="com.huawei.android.launcher.permission.WRITE_SETTINGS" />
-  <uses-permission android:name="android.permission.READ_APP_BADGE" />
-  <uses-permission android:name="com.oppo.launcher.permission.READ_SETTINGS" />
-  <uses-permission android:name="com.oppo.launcher.permission.WRITE_SETTINGS" />
-  <uses-permission android:name="me.everything.badger.permission.BADGE_COUNT_READ" />
-  <uses-permission android:name="me.everything.badger.permission.BADGE_COUNT_WRITE" />
-
-  <!-- Apex -->
-  <uses-permission android:name="com.anddoes.launcher.permission.UPDATE_COUNT"/>
-
-  <!-- Default -->
-  <uses-permission android:name="com.android.launcher.permission.READ_SETTINGS"/>
-  <uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS"/>
-  <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-  <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
-
-  <!-- HTC -->
-  <uses-permission android:name="com.htc.launcher.permission.READ_SETTINGS" />
-  <uses-permission android:name="com.htc.launcher.permission.UPDATE_SHORTCUT" />
-
   <!-- Samsung -->
   <uses-permission android:name="com.sec.android.provider.badge.permission.READ" />
   <uses-permission android:name="com.sec.android.provider.badge.permission.WRITE" />
 
-  <!-- Sony -->
-  <uses-permission android:name="com.sonyericsson.home.permission.BROADCAST_BADGE" />
-  <uses-permission android:name="com.sonymobile.home.permission.PROVIDER_INSERT_BADGE" />
-
 	<uses-permission android:name="android.permission.RECORD_AUDIO" />
 	<queries>
 		<intent>
diff --git a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs
index 0a7cca1ef..16ba139ed 100644
--- a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs
@@ -1,5 +1,7 @@
 using Android.App;
+using Android.OS;
 using Android.Runtime;
+using CommunityToolkit.Maui.ApplicationModel;
 
 namespace CommunityToolkit.Maui.Sample;
 
@@ -9,6 +11,8 @@ public class MainApplication : MauiApplication
 	public MainApplication(IntPtr handle, JniHandleOwnership ownership)
 		: base(handle, ownership)
 	{
+		BadgeFactory.AddProvider("com.sec.android.app.launcher", new SamsungBadgeProvider());
+		BadgeFactory.AddProvider("com.sec.android.app.twlauncher", new SamsungBadgeProvider());
 	}
 
 	protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
diff --git a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
new file mode 100644
index 000000000..0deb9c8c4
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
@@ -0,0 +1,81 @@
+using Android.Content;
+using Android.Database;
+using CommunityToolkit.Maui.ApplicationModel;
+using Application = Android.App.Application;
+
+namespace CommunityToolkit.Maui.Sample;
+
+class SamsungBadgeProvider : IBadgeProvider
+{
+	const string contentStringUri = "content://com.sec.badge/apps?notify=true";
+	static readonly string[] contentProjection = { "_id", "class" };
+
+	public void SetCount(int count)
+	{
+		var contentUri = Android.Net.Uri.Parse(contentStringUri);
+		if (contentUri is null)
+		{
+			return;
+		}
+
+		var packageName = Application.Context.PackageName;
+		if (packageName is null)
+		{
+			return;
+		}
+
+		var componentName = Application.Context.PackageManager?.GetLaunchIntentForPackage(packageName)?.Component;
+		if (componentName is null)
+		{
+			return;
+		}
+
+
+		var contentResolver = Application.Context.ContentResolver;
+		ICursor? cursor = null;
+		try
+		{
+			cursor = contentResolver?.Query(contentUri, contentProjection, "package=?", new[] { packageName }, null);
+			if (cursor != null)
+			{
+				bool entryActivityExist = false;
+				while (cursor.MoveToNext())
+				{
+					var id = cursor.GetInt(0);
+					var contentValues = GetContentValues(componentName, count, false);
+					contentResolver?.Update(contentUri, contentValues, "_id=?", new[] { id.ToString() });
+					if (componentName.ClassName.Equals(cursor.GetString(cursor.GetColumnIndex("class"))))
+					{
+						entryActivityExist = true;
+					}
+				}
+
+				if (!entryActivityExist)
+				{
+					var contentValues = GetContentValues(componentName, count, true);
+					contentResolver?.Insert(contentUri, contentValues);
+				}
+			}
+		}
+		finally
+		{
+			if (cursor is { IsClosed: false })
+			{
+				cursor.Close();
+			}
+		}
+	}
+
+
+	private ContentValues GetContentValues(ComponentName componentName, int badgeCount, bool isInsert)
+	{
+		var contentValues = new ContentValues();
+		if (isInsert)
+		{
+			contentValues.Put("package", componentName.PackageName);
+			contentValues.Put("class", componentName.ClassName);
+		}
+		contentValues.Put("badgecount", badgeCount);
+		return contentValues;
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/CommunityToolkit.Maui.Core.csproj b/src/CommunityToolkit.Maui.Core/CommunityToolkit.Maui.Core.csproj
index 42479bbce..9f43d320f 100644
--- a/src/CommunityToolkit.Maui.Core/CommunityToolkit.Maui.Core.csproj
+++ b/src/CommunityToolkit.Maui.Core/CommunityToolkit.Maui.Core.csproj
@@ -59,7 +59,4 @@
     <PackageReference Include="System.Speech" Version="7.0.0" Condition="'$(TargetFramework)' == 'net7.0-windows10.0.19041.0'" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0-android'">
-    <PackageReference Include="Xamarin.Android.ShortcutBadger" Version="1.2.0" />
-  </ItemGroup>
 </Project>
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs
new file mode 100644
index 000000000..5ba54fc0d
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs
@@ -0,0 +1,54 @@
+using Android.Content;
+using Android.Content.PM;
+
+namespace CommunityToolkit.Maui.ApplicationModel;
+
+/// <summary>
+/// Factory for <see cref="IBadge"/>
+/// </summary>
+public static class BadgeFactory
+{
+	private static readonly Dictionary<string, IBadgeProvider> providers = new();
+
+	/// <summary>
+	/// Register provider for launcher type
+	/// </summary>
+	/// <param name="launcherType">Launcher type</param>
+	/// <param name="provider">Provider implementation</param>
+	public static void AddProvider(string launcherType, IBadgeProvider provider)
+	{
+		providers.TryAdd(launcherType, provider);
+	}
+	
+	/// <summary>
+	/// Get badge provider for current launcher
+	/// </summary>
+	/// <returns>Provider implementation</returns>
+	public static IBadgeProvider? GetBadgeProvider()
+	{
+		var launcherType = GetLauncherType();
+		if (launcherType is null)
+		{
+			return null;
+		}
+
+		providers.TryGetValue(launcherType, out var provider);
+		return provider;
+	}
+
+	private static string? GetLauncherType()
+	{
+		var intent = new Intent(Intent.ActionMain);
+		intent.AddCategory(Intent.CategoryHome);
+		using var resolveInfo = OperatingSystem.IsAndroidVersionAtLeast(33) ? 
+			Application.Context.PackageManager?.ResolveActivity(intent, PackageManager.ResolveInfoFlags.Of(0)) :
+			Application.Context.PackageManager?.ResolveActivity(intent, PackageInfoFlags.MatchDefaultOnly);
+
+		if (resolveInfo is { ActivityInfo.PackageName: not null })
+		{
+			return resolveInfo.ActivityInfo.PackageName;
+		}
+
+		return Application.Context.PackageName;
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeImplementation.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeImplementation.android.cs
new file mode 100644
index 000000000..54a9f019d
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeImplementation.android.cs
@@ -0,0 +1,12 @@
+namespace CommunityToolkit.Maui.ApplicationModel;
+
+/// <inheritdoc />
+public class BadgeImplementation : IBadge
+{
+	/// <inheritdoc />
+	public void SetCount(int count)
+	{
+		var badgeProvider = BadgeFactory.GetBadgeProvider();
+		badgeProvider?.SetCount(count);
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/IBadgeProvider.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/IBadgeProvider.android.cs
new file mode 100644
index 000000000..d75ad85e4
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/IBadgeProvider.android.cs
@@ -0,0 +1,12 @@
+namespace CommunityToolkit.Maui.ApplicationModel;
+
+/// <summary>
+/// Android badge provider
+/// </summary>
+public interface IBadgeProvider
+{
+	/// <summary>
+	/// Set count for badge
+	/// </summary>
+	void SetCount(int count);
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.android.cs
deleted file mode 100644
index 04afa3b69..000000000
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.android.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-namespace CommunityToolkit.Maui.ApplicationModel;
-
-using Android.App;
-using AndroidX.Core.App;
-
-//public class BadgeImplementation : IBadge
-//{
-//	public void SetCount(int count)
-//	{
-//		var notificationManager = (NotificationManager)Application.Context.GetSystemService(Android.Content.Context.NotificationService);
-//		var channel = new NotificationChannel("default", "Default", NotificationImportance.Default);
-//		notificationManager.CreateNotificationChannel(channel);
-//		var builder = new NotificationCompat.Builder(Application.Context, "default");
-//		builder.SetNumber(count);
-//		notificationManager.Notify(0, builder.Build());
-//	}
-//}
-
-/// <inheritdoc />
-public class BadgeImplementation : IBadge
-{
-	/// <inheritdoc />
-	public void SetCount(int count)
-	{
-		if (ME.Leolin.Shortcutbadger.ShortcutBadger.IsBadgeCounterSupported(Application.Context))
-		{
-			ME.Leolin.Shortcutbadger.ShortcutBadger.ApplyCount(Application.Context, count);
-		}
-	}
-}
\ No newline at end of file

From e511bfd275fba67d9eb8fe67c1c75af8e60e5f81 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Tue, 30 May 2023 22:28:28 +0300
Subject: [PATCH 05/34] Fix Tizen build

---
 .../Essentials/Badge/BadgeImplementation.tizen.cs               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs
index 0d5386b4a..c2ff41bab 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs
@@ -19,7 +19,7 @@ public void SetCount(int count)
 		var badge = BadgeControl.Find(appId);
 		if (badge is null)
 		{
-			badge = new Badge(appId, count);
+			badge = new Tizen.Applications.Badge(appId, count);
 			BadgeControl.Add(badge);
 		}
 		else

From 56d1aa9b782df14be7fbeae107690b08e52e25ff Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Fri, 16 Jun 2023 23:40:45 +0300
Subject: [PATCH 06/34] Add default badge provider, add nova

---
 ...sungBadgeProvider.cs => BadgeProviders.cs} | 48 ++++++++++++++-
 .../Platforms/Android/MainApplication.cs      |  1 +
 .../Badge/Android/BadgeFactory.android.cs     |  6 +-
 .../Android/DefaultBadgeProvider.android.cs   | 59 +++++++++++++++++++
 4 files changed, 108 insertions(+), 6 deletions(-)
 rename samples/CommunityToolkit.Maui.Sample/Platforms/Android/{SamsungBadgeProvider.cs => BadgeProviders.cs} (65%)
 create mode 100644 src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs

diff --git a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/BadgeProviders.cs
similarity index 65%
rename from samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
rename to samples/CommunityToolkit.Maui.Sample/Platforms/Android/BadgeProviders.cs
index 0deb9c8c4..77cceb53b 100644
--- a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/BadgeProviders.cs
@@ -1,10 +1,53 @@
-using Android.Content;
+using System.Diagnostics;
+using Android.Content;
 using Android.Database;
 using CommunityToolkit.Maui.ApplicationModel;
 using Application = Android.App.Application;
 
 namespace CommunityToolkit.Maui.Sample;
 
+class NovaBadgeProvider : IBadgeProvider
+{
+
+	public void SetCount(int count)
+	{
+		if (count < 0)
+		{
+			return;
+		}
+
+		var contentUri = Android.Net.Uri.Parse("content://com.teslacoilsw.notifier/unread_count");
+		if (contentUri is null)
+		{
+			return;
+		}
+
+		var packageName = Application.Context.PackageName;
+		if (packageName is null)
+		{
+			return;
+		}
+
+		var componentName = Application.Context.PackageManager?.GetLaunchIntentForPackage(packageName)?.Component;
+		if (componentName is null)
+		{
+			return;
+		}
+
+		try
+		{
+			var contentValues = new ContentValues();
+			contentValues.Put("tag", packageName + "/" + componentName.ClassName);
+			contentValues.Put("count", count);
+			Application.Context.ContentResolver?.Insert(contentUri, contentValues);
+		}
+		catch (Exception ex)
+		{
+			Debug.WriteLine("(NOVA) unable to set badge: " + ex.Message);
+		}
+	}
+}
+
 class SamsungBadgeProvider : IBadgeProvider
 {
 	const string contentStringUri = "content://com.sec.badge/apps?notify=true";
@@ -30,7 +73,6 @@ public void SetCount(int count)
 			return;
 		}
 
-
 		var contentResolver = Application.Context.ContentResolver;
 		ICursor? cursor = null;
 		try
@@ -67,7 +109,7 @@ public void SetCount(int count)
 	}
 
 
-	private ContentValues GetContentValues(ComponentName componentName, int badgeCount, bool isInsert)
+	ContentValues GetContentValues(ComponentName componentName, int badgeCount, bool isInsert)
 	{
 		var contentValues = new ContentValues();
 		if (isInsert)
diff --git a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs
index 16ba139ed..afe1ed5fe 100644
--- a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs
@@ -13,6 +13,7 @@ public MainApplication(IntPtr handle, JniHandleOwnership ownership)
 	{
 		BadgeFactory.AddProvider("com.sec.android.app.launcher", new SamsungBadgeProvider());
 		BadgeFactory.AddProvider("com.sec.android.app.twlauncher", new SamsungBadgeProvider());
+		BadgeFactory.AddProvider("com.teslacoilsw.launcher", new NovaBadgeProvider());
 	}
 
 	protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs
index 5ba54fc0d..a8aa5ff58 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs
@@ -8,7 +8,7 @@ namespace CommunityToolkit.Maui.ApplicationModel;
 /// </summary>
 public static class BadgeFactory
 {
-	private static readonly Dictionary<string, IBadgeProvider> providers = new();
+	static readonly Dictionary<string, IBadgeProvider> providers = new();
 
 	/// <summary>
 	/// Register provider for launcher type
@@ -33,10 +33,10 @@ public static void AddProvider(string launcherType, IBadgeProvider provider)
 		}
 
 		providers.TryGetValue(launcherType, out var provider);
-		return provider;
+		return provider ?? new DefaultBadgeProvider();
 	}
 
-	private static string? GetLauncherType()
+	static string? GetLauncherType()
 	{
 		var intent = new Intent(Intent.ActionMain);
 		intent.AddCategory(Intent.CategoryHome);
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
new file mode 100644
index 000000000..edd89da6a
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
@@ -0,0 +1,59 @@
+using System.Diagnostics;
+using Android.Content;
+using Android.Content.PM;
+
+namespace CommunityToolkit.Maui.ApplicationModel;
+
+class DefaultBadgeProvider : IBadgeProvider
+{
+	const string intentAction = "android.intent.action.BADGE_COUNT_UPDATE";
+
+	public void SetCount(int count)
+	{
+		if (count < 0)
+		{
+			return;
+		}
+
+		var packageName = Application.Context.PackageName;
+		if (packageName is null)
+		{
+			return;
+		}
+
+		var component = Application.Context.PackageManager?.GetLaunchIntentForPackage(packageName)?.Component;
+		if (component is null)
+		{
+			return;
+		}
+
+		if (!IsSupported())
+		{
+			return;
+		}
+
+		try
+		{
+			var intent = new Intent(intentAction);
+			intent.PutExtra("badge_count_package_name", packageName);
+			intent.PutExtra("badge_count_class_name", component.ClassName);
+			intent.PutExtra("badge_count", count);
+			Application.Context.SendBroadcast(intent);
+		}
+		catch (Exception ex)
+		{
+			Debug.WriteLine("(DEFAULT) unable to set badge: " + ex.Message);
+		}
+	}
+	
+
+	bool IsSupported()
+	{
+		var intent = new Intent(intentAction);
+		var packageManager = Application.Context.PackageManager;
+		var receivers = OperatingSystem.IsAndroidVersionAtLeast(33) ?
+			packageManager?.QueryBroadcastReceivers(intent, PackageManager.ResolveInfoFlags.Of(0)) :
+			packageManager?.QueryBroadcastReceivers(intent, 0);
+		return receivers is { Count: > 0 };
+	}
+}
\ No newline at end of file

From 55e549d528f003feae2c41186c4fa71de0563762 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Sat, 17 Jun 2023 00:11:44 +0300
Subject: [PATCH 07/34] Fix SamsungBadgeProvider

---
 .../Platforms/Android/MainApplication.cs      |  1 -
 ...geProviders.cs => SamsungBadgeProvider.cs} | 46 +------------------
 2 files changed, 2 insertions(+), 45 deletions(-)
 rename samples/CommunityToolkit.Maui.Sample/Platforms/Android/{BadgeProviders.cs => SamsungBadgeProvider.cs} (68%)

diff --git a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs
index afe1ed5fe..16ba139ed 100644
--- a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs
@@ -13,7 +13,6 @@ public MainApplication(IntPtr handle, JniHandleOwnership ownership)
 	{
 		BadgeFactory.AddProvider("com.sec.android.app.launcher", new SamsungBadgeProvider());
 		BadgeFactory.AddProvider("com.sec.android.app.twlauncher", new SamsungBadgeProvider());
-		BadgeFactory.AddProvider("com.teslacoilsw.launcher", new NovaBadgeProvider());
 	}
 
 	protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
diff --git a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/BadgeProviders.cs b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
similarity index 68%
rename from samples/CommunityToolkit.Maui.Sample/Platforms/Android/BadgeProviders.cs
rename to samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
index 77cceb53b..74a24e93c 100644
--- a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/BadgeProviders.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
@@ -1,53 +1,10 @@
-using System.Diagnostics;
-using Android.Content;
+using Android.Content;
 using Android.Database;
 using CommunityToolkit.Maui.ApplicationModel;
 using Application = Android.App.Application;
 
 namespace CommunityToolkit.Maui.Sample;
 
-class NovaBadgeProvider : IBadgeProvider
-{
-
-	public void SetCount(int count)
-	{
-		if (count < 0)
-		{
-			return;
-		}
-
-		var contentUri = Android.Net.Uri.Parse("content://com.teslacoilsw.notifier/unread_count");
-		if (contentUri is null)
-		{
-			return;
-		}
-
-		var packageName = Application.Context.PackageName;
-		if (packageName is null)
-		{
-			return;
-		}
-
-		var componentName = Application.Context.PackageManager?.GetLaunchIntentForPackage(packageName)?.Component;
-		if (componentName is null)
-		{
-			return;
-		}
-
-		try
-		{
-			var contentValues = new ContentValues();
-			contentValues.Put("tag", packageName + "/" + componentName.ClassName);
-			contentValues.Put("count", count);
-			Application.Context.ContentResolver?.Insert(contentUri, contentValues);
-		}
-		catch (Exception ex)
-		{
-			Debug.WriteLine("(NOVA) unable to set badge: " + ex.Message);
-		}
-	}
-}
-
 class SamsungBadgeProvider : IBadgeProvider
 {
 	const string contentStringUri = "content://com.sec.badge/apps?notify=true";
@@ -117,6 +74,7 @@ ContentValues GetContentValues(ComponentName componentName, int badgeCount, bool
 			contentValues.Put("package", componentName.PackageName);
 			contentValues.Put("class", componentName.ClassName);
 		}
+
 		contentValues.Put("badgecount", badgeCount);
 		return contentValues;
 	}

From cd36f81cc728a939b2b4c86f39b68726d2059e53 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Mon, 19 Jun 2023 15:00:35 +0300
Subject: [PATCH 08/34] SetProvider

---
 .../Platforms/Android/MainApplication.cs                   | 5 +++--
 .../Platforms/Android/SamsungBadgeProvider.cs              | 2 +-
 .../Essentials/Badge/Android/BadgeFactory.android.cs       | 7 ++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs
index 16ba139ed..58079f15e 100644
--- a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs
@@ -11,8 +11,9 @@ public class MainApplication : MauiApplication
 	public MainApplication(IntPtr handle, JniHandleOwnership ownership)
 		: base(handle, ownership)
 	{
-		BadgeFactory.AddProvider("com.sec.android.app.launcher", new SamsungBadgeProvider());
-		BadgeFactory.AddProvider("com.sec.android.app.twlauncher", new SamsungBadgeProvider());
+		var samsungProvider = new SamsungBadgeProvider();
+		BadgeFactory.SetProvider("com.sec.android.app.launcher", samsungProvider);
+		BadgeFactory.SetProvider("com.sec.android.app.twlauncher", samsungProvider);
 	}
 
 	protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
diff --git a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
index 74a24e93c..cebbb6b2e 100644
--- a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
@@ -35,7 +35,7 @@ public void SetCount(int count)
 		try
 		{
 			cursor = contentResolver?.Query(contentUri, contentProjection, "package=?", new[] { packageName }, null);
-			if (cursor != null)
+			if (cursor is not null)
 			{
 				bool entryActivityExist = false;
 				while (cursor.MoveToNext())
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs
index a8aa5ff58..24af4cce0 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs
@@ -9,15 +9,16 @@ namespace CommunityToolkit.Maui.ApplicationModel;
 public static class BadgeFactory
 {
 	static readonly Dictionary<string, IBadgeProvider> providers = new();
+	static readonly DefaultBadgeProvider defaultBadgeProvider = new();
 
 	/// <summary>
 	/// Register provider for launcher type
 	/// </summary>
 	/// <param name="launcherType">Launcher type</param>
 	/// <param name="provider">Provider implementation</param>
-	public static void AddProvider(string launcherType, IBadgeProvider provider)
+	public static void SetProvider(string launcherType, IBadgeProvider provider)
 	{
-		providers.TryAdd(launcherType, provider);
+		providers[launcherType] = provider;
 	}
 	
 	/// <summary>
@@ -33,7 +34,7 @@ public static void AddProvider(string launcherType, IBadgeProvider provider)
 		}
 
 		providers.TryGetValue(launcherType, out var provider);
-		return provider ?? new DefaultBadgeProvider();
+		return provider ?? defaultBadgeProvider;
 	}
 
 	static string? GetLauncherType()

From 5117d72eb7e15cb2f6544f4fc2ff230365a20a52 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Mon, 19 Jun 2023 17:19:52 +0300
Subject: [PATCH 09/34] Initialize array only once

---
 .../Platforms/Android/SamsungBadgeProvider.cs            | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
index cebbb6b2e..480e3a1c4 100644
--- a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
@@ -37,12 +37,14 @@ public void SetCount(int count)
 			cursor = contentResolver?.Query(contentUri, contentProjection, "package=?", new[] { packageName }, null);
 			if (cursor is not null)
 			{
-				bool entryActivityExist = false;
+				var entryActivityExist = false;
+				var selectionArgs = new string[1];
 				while (cursor.MoveToNext())
 				{
 					var id = cursor.GetInt(0);
+					selectionArgs[0] = id.ToString();
 					var contentValues = GetContentValues(componentName, count, false);
-					contentResolver?.Update(contentUri, contentValues, "_id=?", new[] { id.ToString() });
+					contentResolver?.Update(contentUri, contentValues, "_id=?", selectionArgs);
 					if (componentName.ClassName.Equals(cursor.GetString(cursor.GetColumnIndex("class"))))
 					{
 						entryActivityExist = true;
@@ -65,8 +67,7 @@ public void SetCount(int count)
 		}
 	}
 
-
-	ContentValues GetContentValues(ComponentName componentName, int badgeCount, bool isInsert)
+	static ContentValues GetContentValues(ComponentName componentName, int badgeCount, bool isInsert)
 	{
 		var contentValues = new ContentValues();
 		if (isInsert)

From 8a0f544c2be94c2750b5ef6c18aadd201b26c863 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 6 Jul 2023 10:36:16 -0700
Subject: [PATCH 10/34] `dotnet format`

---
 .../ViewModels/Essentials/BadgeViewModel.cs    |  4 ++--
 .../Badge/Android/BadgeFactory.android.cs      |  4 ++--
 .../Android/DefaultBadgeProvider.android.cs    |  2 +-
 .../Essentials/Badge/Badge.shared.cs           | 18 +++++++++---------
 .../Essentials/Badge/IBadge.shared.cs          |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs
index 9ea35b0b3..6a94f9a5c 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs
@@ -12,14 +12,14 @@ public BadgeViewModel(IBadge badge)
 	{
 		this.badge = badge;
 	}
-	
+
 	[RelayCommand]
 	void Increment()
 	{
 		count++;
 		badge.SetCount(count);
 	}
-	
+
 	[RelayCommand]
 	void Decrement()
 	{
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs
index 24af4cce0..c245cf414 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs
@@ -20,7 +20,7 @@ public static void SetProvider(string launcherType, IBadgeProvider provider)
 	{
 		providers[launcherType] = provider;
 	}
-	
+
 	/// <summary>
 	/// Get badge provider for current launcher
 	/// </summary>
@@ -41,7 +41,7 @@ public static void SetProvider(string launcherType, IBadgeProvider provider)
 	{
 		var intent = new Intent(Intent.ActionMain);
 		intent.AddCategory(Intent.CategoryHome);
-		using var resolveInfo = OperatingSystem.IsAndroidVersionAtLeast(33) ? 
+		using var resolveInfo = OperatingSystem.IsAndroidVersionAtLeast(33) ?
 			Application.Context.PackageManager?.ResolveActivity(intent, PackageManager.ResolveInfoFlags.Of(0)) :
 			Application.Context.PackageManager?.ResolveActivity(intent, PackageInfoFlags.MatchDefaultOnly);
 
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
index edd89da6a..fb2c054ca 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
@@ -45,7 +45,7 @@ public void SetCount(int count)
 			Debug.WriteLine("(DEFAULT) unable to set badge: " + ex.Message);
 		}
 	}
-	
+
 
 	bool IsSupported()
 	{
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Badge.shared.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Badge.shared.cs
index caf8f6c01..53c06f915 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Badge.shared.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Badge.shared.cs
@@ -3,18 +3,18 @@
 /// <inheritdoc cref="IBadge"/>
 public static class Badge
 {
-    static IBadge? defaultImplementation;
+	static IBadge? defaultImplementation;
 
-    /// <inheritdoc cref="IBadge.SetCount" />
+	/// <inheritdoc cref="IBadge.SetCount" />
 	public static void SetCount(int count)
-    {
-        Default.SetCount(count);
-    }
+	{
+		Default.SetCount(count);
+	}
 
-    /// <inheritdoc cref="IBadge" />
+	/// <inheritdoc cref="IBadge" />
 	public static IBadge Default =>
-        defaultImplementation ??= new BadgeImplementation();
+		defaultImplementation ??= new BadgeImplementation();
 
-    internal static void SetDefault(IBadge implementation) =>
-        defaultImplementation = implementation;
+	internal static void SetDefault(IBadge implementation) =>
+		defaultImplementation = implementation;
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/IBadge.shared.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/IBadge.shared.cs
index 206b55090..f6ef9a294 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/IBadge.shared.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/IBadge.shared.cs
@@ -9,5 +9,5 @@ public interface IBadge
 	/// Set the badge count
 	/// </summary>
 	/// <param name="count">Badge count</param>
-    void SetCount(int count);
+	void SetCount(int count);
 }
\ No newline at end of file

From 197f0ead7fbdc3a9f22ee24b30a8ea732a7d08e2 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 6 Jul 2023 10:42:32 -0700
Subject: [PATCH 11/34] Update SamsungBadgeProvider.cs

---
 .../Platforms/Android/SamsungBadgeProvider.cs                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
index 480e3a1c4..25fe89840 100644
--- a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
@@ -60,7 +60,7 @@ public void SetCount(int count)
 		}
 		finally
 		{
-			if (cursor is { IsClosed: false })
+			if (cursor?.IsClosed is false)
 			{
 				cursor.Close();
 			}

From d697dac6d761ad3aa8d97c3a9f6cf9b2f22131a1 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 6 Jul 2023 10:49:55 -0700
Subject: [PATCH 12/34] Update BadgeViewModel.cs

---
 .../ViewModels/Essentials/BadgeViewModel.cs                    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs
index 6a94f9a5c..ab0190539 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs
@@ -5,9 +5,10 @@ namespace CommunityToolkit.Maui.Sample.ViewModels.Essentials;
 
 public partial class BadgeViewModel : BaseViewModel
 {
-	int count;
 	readonly IBadge badge;
 
+	int count;
+
 	public BadgeViewModel(IBadge badge)
 	{
 		this.badge = badge;

From d0333d7f3357086506dc5e773617138a40bf9583 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 6 Jul 2023 10:50:01 -0700
Subject: [PATCH 13/34] Update DefaultBadgeProvider.android.cs

---
 .../Badge/Android/DefaultBadgeProvider.android.cs    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
index fb2c054ca..f12dda0f9 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
@@ -46,14 +46,14 @@ public void SetCount(int count)
 		}
 	}
 
-
-	bool IsSupported()
+	static bool IsSupported()
 	{
 		var intent = new Intent(intentAction);
 		var packageManager = Application.Context.PackageManager;
-		var receivers = OperatingSystem.IsAndroidVersionAtLeast(33) ?
-			packageManager?.QueryBroadcastReceivers(intent, PackageManager.ResolveInfoFlags.Of(0)) :
-			packageManager?.QueryBroadcastReceivers(intent, 0);
-		return receivers is { Count: > 0 };
+		var receivers = OperatingSystem.IsAndroidVersionAtLeast(33)
+						? packageManager?.QueryBroadcastReceivers(intent, PackageManager.ResolveInfoFlags.Of(0))
+						: packageManager?.QueryBroadcastReceivers(intent, 0);
+
+		return receivers?.Count > 0 ;
 	}
 }
\ No newline at end of file

From 3443d8f8773e42d27a8c762863ca188b92d76684 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 6 Jul 2023 10:52:12 -0700
Subject: [PATCH 14/34] Use `Lazy<T>` to ensure thread safety

---
 .../Essentials/Badge/Badge.shared.cs                  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Badge.shared.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Badge.shared.cs
index 53c06f915..22645f4fc 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Badge.shared.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Badge.shared.cs
@@ -3,7 +3,10 @@
 /// <inheritdoc cref="IBadge"/>
 public static class Badge
 {
-	static IBadge? defaultImplementation;
+	static Lazy<IBadge> defaultImplementationHolder = new(() => new BadgeImplementation());
+
+	/// <inheritdoc cref="IBadge" />
+	public static IBadge Default => defaultImplementationHolder.Value;
 
 	/// <inheritdoc cref="IBadge.SetCount" />
 	public static void SetCount(int count)
@@ -11,10 +14,6 @@ public static void SetCount(int count)
 		Default.SetCount(count);
 	}
 
-	/// <inheritdoc cref="IBadge" />
-	public static IBadge Default =>
-		defaultImplementation ??= new BadgeImplementation();
-
 	internal static void SetDefault(IBadge implementation) =>
-		defaultImplementation = implementation;
+		defaultImplementationHolder = new(implementation);
 }
\ No newline at end of file

From d7f8429e655b5c132459a499591ebc4d808f902f Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Fri, 7 Jul 2023 22:58:24 +0300
Subject: [PATCH 15/34] GetCount

- Uncommented lines in the csproj file to address Android App installation failure.

Toggle Home Screen Icon Badge Count

- Added column and row spacing to improve layout in the BadgePage.xaml file.

SetBadgeProvider method update

- Renamed SetProvider method to SetBadgeProvider in the BadgeFactory.android.cs file.

GetCount method implementation

- Implemented GetCount method in the BadgeImplementation.android.cs, DefaultBadgeProvider.android.cs, BadgeImplementation.macios.cs, and BadgeImplementation.tizen.cs files.

Added GetCount method to IBadge interface

- Added GetCount method to the IBadge.shared.cs file.
---
 .../CommunityToolkit.Maui.Sample.csproj       |  2 +-
 .../Pages/Essentials/BadgePage.xaml           |  4 +++-
 .../Platforms/Android/MainApplication.cs      |  4 ++--
 .../ViewModels/Essentials/BadgeViewModel.cs   |  1 +
 .../Badge/Android/BadgeFactory.android.cs     |  6 ++---
 .../Android/BadgeImplementation.android.cs    |  9 +++++++-
 .../Android/DefaultBadgeProvider.android.cs   |  5 ++++
 .../Badge/Android/IBadgeProvider.android.cs   |  5 ++++
 .../Essentials/Badge/Badge.shared.cs          |  6 +++++
 .../Badge/BadgeImplementation.macios.cs       |  9 ++++++++
 .../Badge/BadgeImplementation.net.cs          |  8 ++++++-
 .../Badge/BadgeImplementation.tizen.cs        | 23 +++++++++++++++----
 .../Badge/BadgeImplementation.windows.cs      |  7 ++++++
 .../Essentials/Badge/IBadge.shared.cs         |  5 ++++
 14 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
index b5b42e4df..dad3e4aac 100644
--- a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
+++ b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
@@ -29,7 +29,7 @@
     <!--<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
     <CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>-->
 
-    <!-- Uncomment these line if installation fails -->
+    <!-- Uncomment these lines if Android App installation fails -->
     <!--<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>-->
   </PropertyGroup>
 
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgePage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgePage.xaml
index c04957720..2b873a1e2 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgePage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgePage.xaml
@@ -11,11 +11,13 @@
     <Grid
         RowDefinitions="*, *"
         ColumnDefinitions="*, *"
+        ColumnSpacing="12"
+        RowSpacing="12"
         VerticalOptions="Center">
 
         <Label
             Grid.ColumnSpan="2"
-            Text="Badge"
+            Text="Toggle Home Screen Icon Badge Count"
             FontSize="18"
             VerticalOptions="End"
             HorizontalOptions="Center" />
diff --git a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs
index 58079f15e..89578d100 100644
--- a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs
@@ -12,8 +12,8 @@ public MainApplication(IntPtr handle, JniHandleOwnership ownership)
 		: base(handle, ownership)
 	{
 		var samsungProvider = new SamsungBadgeProvider();
-		BadgeFactory.SetProvider("com.sec.android.app.launcher", samsungProvider);
-		BadgeFactory.SetProvider("com.sec.android.app.twlauncher", samsungProvider);
+		BadgeFactory.SetBadgeProvider("com.sec.android.app.launcher", samsungProvider);
+		BadgeFactory.SetBadgeProvider("com.sec.android.app.twlauncher", samsungProvider);
 	}
 
 	protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs
index 6a94f9a5c..c0fe1f380 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs
@@ -11,6 +11,7 @@ public partial class BadgeViewModel : BaseViewModel
 	public BadgeViewModel(IBadge badge)
 	{
 		this.badge = badge;
+		count = badge.GetCount();
 	}
 
 	[RelayCommand]
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs
index c245cf414..28b65eaa0 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs
@@ -16,7 +16,7 @@ public static class BadgeFactory
 	/// </summary>
 	/// <param name="launcherType">Launcher type</param>
 	/// <param name="provider">Provider implementation</param>
-	public static void SetProvider(string launcherType, IBadgeProvider provider)
+	public static void SetBadgeProvider(string launcherType, IBadgeProvider provider)
 	{
 		providers[launcherType] = provider;
 	}
@@ -25,12 +25,12 @@ public static void SetProvider(string launcherType, IBadgeProvider provider)
 	/// Get badge provider for current launcher
 	/// </summary>
 	/// <returns>Provider implementation</returns>
-	public static IBadgeProvider? GetBadgeProvider()
+	public static IBadgeProvider GetBadgeProvider()
 	{
 		var launcherType = GetLauncherType();
 		if (launcherType is null)
 		{
-			return null;
+			return defaultBadgeProvider;
 		}
 
 		providers.TryGetValue(launcherType, out var provider);
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeImplementation.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeImplementation.android.cs
index 54a9f019d..89c29a8cb 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeImplementation.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeImplementation.android.cs
@@ -7,6 +7,13 @@ public class BadgeImplementation : IBadge
 	public void SetCount(int count)
 	{
 		var badgeProvider = BadgeFactory.GetBadgeProvider();
-		badgeProvider?.SetCount(count);
+		badgeProvider.SetCount(count);
+	}
+
+	/// <inheritdoc />
+	public int GetCount()
+	{
+		var badgeProvider = BadgeFactory.GetBadgeProvider();
+		return badgeProvider.GetCount();
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
index fb2c054ca..8a44d5146 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
@@ -8,6 +8,11 @@ class DefaultBadgeProvider : IBadgeProvider
 {
 	const string intentAction = "android.intent.action.BADGE_COUNT_UPDATE";
 
+	public int GetCount()
+	{
+		return 0;
+	}
+
 	public void SetCount(int count)
 	{
 		if (count < 0)
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/IBadgeProvider.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/IBadgeProvider.android.cs
index d75ad85e4..645eefbf2 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/IBadgeProvider.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/IBadgeProvider.android.cs
@@ -5,6 +5,11 @@
 /// </summary>
 public interface IBadgeProvider
 {
+	/// <summary>
+	/// Get count for badge
+	/// </summary>
+	int GetCount();
+
 	/// <summary>
 	/// Set count for badge
 	/// </summary>
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Badge.shared.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Badge.shared.cs
index 53c06f915..7ef1259b1 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Badge.shared.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Badge.shared.cs
@@ -5,6 +5,12 @@ public static class Badge
 {
 	static IBadge? defaultImplementation;
 
+	/// <inheritdoc cref="IBadge.GetCount" />
+	public static int GetCount()
+	{
+		return Default.GetCount();
+	}
+
 	/// <inheritdoc cref="IBadge.SetCount" />
 	public static void SetCount(int count)
 	{
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.macios.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.macios.cs
index 5ebbf3d9f..817d9d37d 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.macios.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.macios.cs
@@ -14,4 +14,13 @@ public void SetCount(int count)
 		});
 		UIApplication.SharedApplication.ApplicationIconBadgeNumber = count;
 	}
+
+	/// <inheritdoc />
+	public int GetCount()
+	{
+		UNUserNotificationCenter.Current.RequestAuthorization(UNAuthorizationOptions.Badge, (r, e) =>
+		{
+		});
+		return (int)UIApplication.SharedApplication.ApplicationIconBadgeNumber;
+	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.net.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.net.cs
index 3495c9d48..e3b0e375f 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.net.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.net.cs
@@ -6,6 +6,12 @@ public class BadgeImplementation : IBadge
 	/// <inheritdoc />
 	public void SetCount(int count)
 	{
-		throw new NotImplementedException();
+		throw new NotSupportedException($"{nameof(IBadge)} requires a platform-specific implementation of .NET");
+	}
+
+	/// <inheritdoc />
+	public int GetCount()
+	{
+		throw new NotSupportedException($"{nameof(IBadge)} requires a platform-specific implementation of .NET");
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs
index c2ff41bab..f417b14bf 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs
@@ -1,8 +1,8 @@
-namespace CommunityToolkit.Maui.ApplicationModel;
-
-using Tizen.Applications;
+using Tizen.Applications;
 using Tizen.NUI;
 
+namespace CommunityToolkit.Maui.ApplicationModel;
+
 /// <inheritdoc />
 public class BadgeImplementation : IBadge
 {
@@ -10,7 +10,7 @@ public class BadgeImplementation : IBadge
 	public void SetCount(int count)
 	{
 		var appId = Application.Current.ApplicationInfo.ApplicationId;
-		if (count is 0)
+		if (count <= 0)
 		{
 			BadgeControl.Remove(appId);
 			return;
@@ -28,4 +28,19 @@ public void SetCount(int count)
 			BadgeControl.Update(badge);
 		}
 	}
+
+	/// <inheritdoc />
+	public int GetCount()
+	{
+		var appId = Application.Current.ApplicationInfo.ApplicationId;
+		var badge = BadgeControl.Find(appId);
+		if (badge is null)
+		{
+			return 0;
+		}
+		else
+		{
+			return badge.Count;
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.windows.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.windows.cs
index 51eebade1..7c776b524 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.windows.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.windows.cs
@@ -25,4 +25,11 @@ public void SetCount(int count)
 			badgeUpdater.Update(badge);
 		}
 	}
+
+	/// <inheritdoc />
+	public int GetCount()
+	{
+		var badgeUpdater = BadgeUpdateManager.CreateBadgeUpdaterForApplication();
+		return 0;
+	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/IBadge.shared.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/IBadge.shared.cs
index f6ef9a294..7282650a7 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/IBadge.shared.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/IBadge.shared.cs
@@ -10,4 +10,9 @@ public interface IBadge
 	/// </summary>
 	/// <param name="count">Badge count</param>
 	void SetCount(int count);
+
+	/// <summary>
+	/// Get the badge count
+	/// </summary>
+	int GetCount();
 }
\ No newline at end of file

From e0ac0ba30bc334e1b2f54bf07ce1bbc3a3fb9462 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Fri, 7 Jul 2023 23:04:12 +0300
Subject: [PATCH 16/34] feat: Add support for Samsung badge provider

This commit adds support for the Samsung badge provider in the Android platform. It includes changes to the `SamsungBadgeProvider` class and the `DefaultBadgeProvider.android.cs` file.

- Added a new static readonly string array `packageNameArray` in the `SamsungBadgeProvider` class.
- Modified the `SetCount` method in the `SamsungBadgeProvider` class to use `packageNameArray` instead of directly passing a string array.
- Added a new method `GetCount()` in the `SamsungBadgeProvider` class.
- Renamed the method `IsSupported()` to `CanSetBadgeCounter()` in the `DefaultBadgeProvider.android.cs` file.
- Added debug log statements for error handling scenarios in both classes.
---
 .../Platforms/Android/SamsungBadgeProvider.cs            | 9 ++++++++-
 .../Badge/Android/DefaultBadgeProvider.android.cs        | 8 +++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
index 480e3a1c4..5889b1aec 100644
--- a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
@@ -9,6 +9,7 @@ class SamsungBadgeProvider : IBadgeProvider
 {
 	const string contentStringUri = "content://com.sec.badge/apps?notify=true";
 	static readonly string[] contentProjection = { "_id", "class" };
+	static readonly string[] packageNameArray = new[1];
 
 	public void SetCount(int count)
 	{
@@ -34,7 +35,8 @@ public void SetCount(int count)
 		ICursor? cursor = null;
 		try
 		{
-			cursor = contentResolver?.Query(contentUri, contentProjection, "package=?", new[] { packageName }, null);
+			packageNameArray[0] = packageName;
+			cursor = contentResolver?.Query(contentUri, contentProjection, "package=?", packageNameArray, null);
 			if (cursor is not null)
 			{
 				var entryActivityExist = false;
@@ -79,4 +81,9 @@ static ContentValues GetContentValues(ComponentName componentName, int badgeCoun
 		contentValues.Put("badgecount", badgeCount);
 		return contentValues;
 	}
+
+	public int GetCount()
+	{
+		return 0;
+	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
index 8a44d5146..7d0d56b05 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
@@ -23,17 +23,20 @@ public void SetCount(int count)
 		var packageName = Application.Context.PackageName;
 		if (packageName is null)
 		{
+			Debug.WriteLine("Unable to get package name");
 			return;
 		}
 
 		var component = Application.Context.PackageManager?.GetLaunchIntentForPackage(packageName)?.Component;
 		if (component is null)
 		{
+			Debug.WriteLine($"Unable to get launch intent component for package {packageName}");
 			return;
 		}
 
-		if (!IsSupported())
+		if (!CanSetBadgeCounter())
 		{
+			Debug.WriteLine("Current launcher doesn't support badge counter");
 			return;
 		}
 
@@ -51,8 +54,7 @@ public void SetCount(int count)
 		}
 	}
 
-
-	bool IsSupported()
+	static bool CanSetBadgeCounter()
 	{
 		var intent = new Intent(intentAction);
 		var packageManager = Application.Context.PackageManager;

From 9343f67ff90e6e8a495660090d5e7cfba45e9ff5 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Fri, 7 Jul 2023 23:09:05 +0300
Subject: [PATCH 17/34] Fix SamsungBadgeProvider.cs and BadgeTests.cs

- Fix a typo in SamsungBadgeProvider.cs by changing "new[1]" to "new string[1]"
- Add a new test method GetBadgeFailsOnNet() in BadgeTests.cs that tests the behavior of getting badge count on .NET platform
- Modify the existing test method SetBadgeFailsOnNet() in BadgeTests.cs to throw NotSupportedException instead of NotImplementedException
- Add a new method GetCount() in BadgeImplementationMock.cs that throws NotImplementedException
---
 .../Platforms/Android/SamsungBadgeProvider.cs            | 2 +-
 .../Essentials/BadgeTests.cs                             | 9 ++++++++-
 .../Mocks/BadgeImplementationMock.cs                     | 5 +++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
index 5889b1aec..6586a7bf3 100644
--- a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
@@ -9,7 +9,7 @@ class SamsungBadgeProvider : IBadgeProvider
 {
 	const string contentStringUri = "content://com.sec.badge/apps?notify=true";
 	static readonly string[] contentProjection = { "_id", "class" };
-	static readonly string[] packageNameArray = new[1];
+	static readonly string[] packageNameArray = new string[1];
 
 	public void SetCount(int count)
 	{
diff --git a/src/CommunityToolkit.Maui.UnitTests/Essentials/BadgeTests.cs b/src/CommunityToolkit.Maui.UnitTests/Essentials/BadgeTests.cs
index f01a690f3..ab15516bb 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Essentials/BadgeTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Essentials/BadgeTests.cs
@@ -16,10 +16,17 @@ public void BadgeTestsSetDefaultUpdatesInstance()
 		badge.Should().BeSameAs(badgeImplementationMock);
 	}
 
+	[Fact]
+	public void GetBadgeFailsOnNet()
+	{
+		Badge.SetDefault(new BadgeImplementation());
+		Assert.Throws<NotSupportedException>(() => Badge.GetCount());
+	}
+
 	[Fact]
 	public void SetBadgeFailsOnNet()
 	{
 		Badge.SetDefault(new BadgeImplementation());
-		Assert.Throws<NotImplementedException>(() => Badge.SetCount(1));
+		Assert.Throws<NotSupportedException>(() => Badge.SetCount(1));
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/Mocks/BadgeImplementationMock.cs b/src/CommunityToolkit.Maui.UnitTests/Mocks/BadgeImplementationMock.cs
index 9563abfaf..1b4047fbb 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Mocks/BadgeImplementationMock.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Mocks/BadgeImplementationMock.cs
@@ -4,6 +4,11 @@ namespace CommunityToolkit.Maui.UnitTests.Mocks;
 
 class BadgeImplementationMock : IBadge
 {
+	public int GetCount()
+	{
+		throw new NotImplementedException();
+	}
+
 	public void SetCount(int count)
 	{
 		throw new NotImplementedException();

From 4de4dbd9d9cab266f27ed7e872a6c4dea25be129 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Mon, 10 Jul 2023 15:45:50 -0700
Subject: [PATCH 18/34] Fix build error

Sorry Vlad - this was my fault!
---
 .../Essentials/Badge/Android/DefaultBadgeProvider.android.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
index 7a7c3d3aa..8b3ee78c0 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
@@ -54,7 +54,7 @@ public void SetCount(int count)
 		}
 	}
 
-	static bool IsSupported()
+	static bool CanSetBadgeCounter()
 	{
 		var intent = new Intent(intentAction);
 		var packageManager = Application.Context.PackageManager;

From 04fcf44afd61678bd225947c9af12f8a90cc3c70 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 13 Jul 2023 10:53:18 -0700
Subject: [PATCH 19/34] Update CommunityToolkit.Maui.Sample.csproj

---
 .../CommunityToolkit.Maui.Sample.csproj                       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
index 50c5c08a7..12cc434cf 100644
--- a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
+++ b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
@@ -22,14 +22,14 @@
     <ApplicationVersion>1</ApplicationVersion>
 
     <!--
-    Uncomment these lines if you need to debug the SG code
+    Uncomment the line below if you need to debug the SG code
     If you see any LongPath issue on Windows, check this doc
     https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd#enable-long-paths-in-windows-10-version-1607-and-later
     -->
     <!--<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
     <CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>-->
 
-    <!-- Uncomment these lines if Android App installation fails -->
+    <!-- Uncomment the line below if Android App installation fails -->
     <!--<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>-->
   </PropertyGroup>
 

From 1a454ff0f9c24e16b8293d351d45b0b00379570b Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 13 Jul 2023 11:14:48 -0700
Subject: [PATCH 20/34] Update DefaultBadgeProvider.android.cs

---
 .../Essentials/Badge/Android/DefaultBadgeProvider.android.cs  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
index 8b3ee78c0..e012cf013 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
@@ -50,7 +50,7 @@ public void SetCount(int count)
 		}
 		catch (Exception ex)
 		{
-			Debug.WriteLine("(DEFAULT) unable to set badge: " + ex.Message);
+			Debug.WriteLine($"{nameof(DefaultBadgeProvider)} unable to set badge count: " + ex.Message);
 		}
 	}
 
@@ -62,6 +62,6 @@ static bool CanSetBadgeCounter()
 						? packageManager?.QueryBroadcastReceivers(intent, PackageManager.ResolveInfoFlags.Of(0))
 						: packageManager?.QueryBroadcastReceivers(intent, 0);
 
-		return receivers?.Count > 0 ;
+		return receivers?.Count > 0;
 	}
 }
\ No newline at end of file

From 3b0c8511881192613484fba9b8b399d9acd4a492 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 13 Jul 2023 11:16:15 -0700
Subject: [PATCH 21/34] Update BadgeImplementation.macios.cs

---
 .../Essentials/Badge/BadgeImplementation.macios.cs        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.macios.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.macios.cs
index 817d9d37d..9598a63a5 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.macios.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.macios.cs
@@ -1,8 +1,8 @@
-namespace CommunityToolkit.Maui.ApplicationModel;
-
-using UIKit;
+using System.Diagnostics;
 using UserNotifications;
 
+namespace CommunityToolkit.Maui.ApplicationModel;
+
 /// <inheritdoc />
 public class BadgeImplementation : IBadge
 {
@@ -11,6 +11,7 @@ public void SetCount(int count)
 	{
 		UNUserNotificationCenter.Current.RequestAuthorization(UNAuthorizationOptions.Badge, (r, e) =>
 		{
+			Debug.WriteLine($"Error Requesting Authorization to Set Badge Count: {e.Description}");
 		});
 		UIApplication.SharedApplication.ApplicationIconBadgeNumber = count;
 	}
@@ -20,6 +21,7 @@ public int GetCount()
 	{
 		UNUserNotificationCenter.Current.RequestAuthorization(UNAuthorizationOptions.Badge, (r, e) =>
 		{
+			Debug.WriteLine($"Error Requesting Authorization to Get Badge Count: {e.Description}");
 		});
 		return (int)UIApplication.SharedApplication.ApplicationIconBadgeNumber;
 	}

From 426c5f33c47ee9012e6378a5762c1ff263b3c4fb Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 13 Jul 2023 11:16:37 -0700
Subject: [PATCH 22/34] Update EssentialsGalleryViewModel.cs

---
 .../ViewModels/Essentials/EssentialsGalleryViewModel.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/EssentialsGalleryViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/EssentialsGalleryViewModel.cs
index 2c1368088..2962186d8 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/EssentialsGalleryViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/EssentialsGalleryViewModel.cs
@@ -7,7 +7,7 @@ public class EssentialsGalleryViewModel : BaseGalleryViewModel
 	public EssentialsGalleryViewModel()
 		: base(new[]
 		{
-			SectionModel.Create<BadgeViewModel>("Badge", "Allows the user to set badge counter."),
+			SectionModel.Create<BadgeViewModel>("Badge", "Allows the user to set app icon badge count on the home screen"),
 			SectionModel.Create<FileSaverViewModel>("FileSaver", "Allows the user to save files to the filesystem"),
 			SectionModel.Create<FolderPickerViewModel>("FolderPicker", "Allows picking folders from the file system"),
 			SectionModel.Create<SpeechToTextViewModel>("SpeechToText", "Converts speech to text"),

From 35ddaa459ce9ca98fb93fe685ea02368f69a21cc Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 13 Jul 2023 11:18:57 -0700
Subject: [PATCH 23/34] Update BaseGalleryViewModel.cs

---
 .../ViewModels/Base/BaseGalleryViewModel.cs                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Base/BaseGalleryViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Base/BaseGalleryViewModel.cs
index 2f3ac49cf..2c93aad21 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Base/BaseGalleryViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Base/BaseGalleryViewModel.cs
@@ -9,7 +9,7 @@ protected BaseGalleryViewModel(SectionModel[] items)
 	{
 		if (DoesItemsArrayContainDuplicates(items, out var duplicatedSectionModels))
 		{
-			throw new InvalidOperationException($"Duplicate {nameof(SectionModel)}.{nameof(SectionModel.ViewModelType)} found for {duplicatedSectionModels.First().ViewModelType}");
+			throw new InvalidOperationException($"Duplicate {nameof(SectionModel)}.{nameof(SectionModel.ViewModelType)} found for {duplicatedSectionModels[0].ViewModelType}");
 		}
 
 		Items = items.OrderBy(x => x.Title).ToList();

From ad18954a5e29d16e3e419182d19001ca5d06f2b9 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 13 Jul 2023 11:27:15 -0700
Subject: [PATCH 24/34] Update MainApplication.cs

---
 .../Platforms/Android/MainApplication.cs                         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs
index 89578d100..460953418 100644
--- a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/MainApplication.cs
@@ -1,5 +1,4 @@
 using Android.App;
-using Android.OS;
 using Android.Runtime;
 using CommunityToolkit.Maui.ApplicationModel;
 

From c17a568bbd138153795b138f8ca86a22f7ac32b7 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 13 Jul 2023 11:30:49 -0700
Subject: [PATCH 25/34] Add null check

---
 .../Badge/BadgeImplementation.macios.cs          | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.macios.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.macios.cs
index 9598a63a5..c765dd60f 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.macios.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.macios.cs
@@ -9,20 +9,28 @@ public class BadgeImplementation : IBadge
 	/// <inheritdoc />
 	public void SetCount(int count)
 	{
-		UNUserNotificationCenter.Current.RequestAuthorization(UNAuthorizationOptions.Badge, (r, e) =>
+		UNUserNotificationCenter.Current.RequestAuthorization(UNAuthorizationOptions.Badge, (r, error) =>
 		{
-			Debug.WriteLine($"Error Requesting Authorization to Set Badge Count: {e.Description}");
+			if (error is not null)
+			{
+				Debug.WriteLine($"Error Requesting Authorization to Set Badge Count: {error.Description}");
+			}
 		});
+
 		UIApplication.SharedApplication.ApplicationIconBadgeNumber = count;
 	}
 
 	/// <inheritdoc />
 	public int GetCount()
 	{
-		UNUserNotificationCenter.Current.RequestAuthorization(UNAuthorizationOptions.Badge, (r, e) =>
+		UNUserNotificationCenter.Current.RequestAuthorization(UNAuthorizationOptions.Badge, (r, error) =>
 		{
-			Debug.WriteLine($"Error Requesting Authorization to Get Badge Count: {e.Description}");
+			if (error is not null)
+			{
+				Debug.WriteLine($"Error Requesting Authorization to Get Badge Count: {error.Description}");
+			}
 		});
+
 		return (int)UIApplication.SharedApplication.ApplicationIconBadgeNumber;
 	}
 }
\ No newline at end of file

From a758c34d612bc97c9cfaa030f3c236db9c6e54bc Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 13 Jul 2023 11:30:58 -0700
Subject: [PATCH 26/34] Remove `count` field

---
 .../ViewModels/Essentials/BadgeViewModel.cs         | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs
index b2e5ebb6f..826bff12d 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs
@@ -7,28 +7,21 @@ public partial class BadgeViewModel : BaseViewModel
 {
 	readonly IBadge badge;
 
-	int count;
-
 	public BadgeViewModel(IBadge badge)
 	{
 		this.badge = badge;
-		count = badge.GetCount();
 	}
 
 	[RelayCommand]
 	void Increment()
 	{
-		count++;
-		badge.SetCount(count);
+		badge.SetCount(badge.GetCount() + 1);
 	}
 
 	[RelayCommand]
 	void Decrement()
 	{
-		if (count > 0)
-		{
-			count--;
-			badge.SetCount(count);
-		}
+		// Do not allow the badge count to go negative
+		badge.SetCount(Math.Max(badge.GetCount() - 1, 0));
 	}
 }
\ No newline at end of file

From dd41f0135133a786a71e9f133e645919b8fb3ee3 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 13 Jul 2023 11:34:56 -0700
Subject: [PATCH 27/34] Update DefaultBadgeProvider.android.cs

---
 .../Essentials/Badge/Android/DefaultBadgeProvider.android.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
index e012cf013..59de0ab5f 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
@@ -17,7 +17,7 @@ public void SetCount(int count)
 	{
 		if (count < 0)
 		{
-			return;
+			throw new ArgumentOutOfRangeException(nameof(count), $"Badge count cannot be less than 0");
 		}
 
 		var packageName = Application.Context.PackageName;

From 43acf0335920aefa25153f8cadfa9578075d2a69 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 13 Jul 2023 11:41:59 -0700
Subject: [PATCH 28/34] Add additional text explaining Bade

---
 .../Pages/Essentials/BadgePage.xaml           | 45 ++++++++++++++-----
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgePage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgePage.xaml
index 2b873a1e2..24e980bc5 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgePage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/BadgePage.xaml
@@ -9,37 +9,58 @@
                 Title="Badge">
     
     <Grid
-        RowDefinitions="*, *"
-        ColumnDefinitions="*, *"
+        RowDefinitions="40,60,*,*,80"
+        ColumnDefinitions="*,*"
         ColumnSpacing="12"
-        RowSpacing="12"
-        VerticalOptions="Center">
+        RowSpacing="12">
 
         <Label
+            Grid.Row="0"
             Grid.ColumnSpan="2"
-            Text="Toggle Home Screen Icon Badge Count"
-            FontSize="18"
-            VerticalOptions="End"
-            HorizontalOptions="Center" />
+            HorizontalTextAlignment="Center"
+            Text="Badge allows developers to set the app icon badge number on the homescreen" />
+
+        <Label
+            Grid.Row="1"
+            Grid.ColumnSpan="2"
+            HorizontalTextAlignment="Center"
+            Text="Toggle the app icon Badge count using the buttons below, then minimize the application to see its Badge count updated on the home screen" />
 
         <Button
             Text="+"
             Grid.Column="0"
-            Grid.Row="1"
+            Grid.Row="2"
             SemanticProperties.Hint="Increments AppIcon badge"
             Command="{Binding IncrementCommand}"
-            VerticalOptions="Start"
+            VerticalOptions="End"
             HorizontalOptions="End" />
 
         <Button
             Text="-"
             Grid.Column="1"
-            Grid.Row="1"
+            Grid.Row="2"
             SemanticProperties.Hint="Decrements AppIcon badge"
             Command="{Binding DecrementCommand}"
-            VerticalOptions="Start"
+            VerticalOptions="End"
             HorizontalOptions="Start" />
 
+        <Label
+            Grid.Row="3"
+            Grid.ColumnSpan="2"
+            VerticalOptions="Start"
+            VerticalTextAlignment="Start"
+            Text="Toggle Home Screen Icon Badge Count"
+            FontSize="18"
+            HorizontalOptions="Center" />
+
+        <Label
+            BackgroundColor="LightYellow"
+            Grid.Row="4"
+            Grid.ColumnSpan="2"
+            HorizontalTextAlignment="Center"
+            FontAttributes="Bold"
+            Text="Note: Android requires device-specific implementation to support app icon badge counts. See the .NET MAUI Community Toolkit documentation for more information" />
+
     </Grid>
     
 </pages:BasePage>
\ No newline at end of file

From 82b07d7570983cf2f2728dc687e17602e6aff50e Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Fri, 14 Jul 2023 14:59:09 +0300
Subject: [PATCH 29/34] Remove GetCount, use uint instead of int

---
 .../Platforms/Android/SamsungBadgeProvider.cs  |  9 ++-------
 .../ViewModels/Essentials/BadgeViewModel.cs    | 12 +++++++++---
 .../Android/BadgeImplementation.android.cs     |  9 +--------
 .../Android/DefaultBadgeProvider.android.cs    | 14 ++------------
 .../Badge/Android/IBadgeProvider.android.cs    |  7 +------
 .../Essentials/Badge/Badge.shared.cs           |  8 +-------
 .../Badge/BadgeImplementation.macios.cs        | 18 ++----------------
 .../Badge/BadgeImplementation.net.cs           |  8 +-------
 .../Badge/BadgeImplementation.tizen.cs         | 17 +----------------
 .../Badge/BadgeImplementation.windows.cs       |  9 +--------
 .../Essentials/Badge/IBadge.shared.cs          |  7 +------
 .../Essentials/BadgeTests.cs                   |  7 -------
 .../Mocks/BadgeImplementationMock.cs           |  7 +------
 13 files changed, 23 insertions(+), 109 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
index ad8cd1079..659c689cb 100644
--- a/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Platforms/Android/SamsungBadgeProvider.cs
@@ -11,7 +11,7 @@ class SamsungBadgeProvider : IBadgeProvider
 	static readonly string[] contentProjection = { "_id", "class" };
 	static readonly string[] packageNameArray = new string[1];
 
-	public void SetCount(int count)
+	public void SetCount(uint count)
 	{
 		var contentUri = Android.Net.Uri.Parse(contentStringUri);
 		if (contentUri is null)
@@ -69,7 +69,7 @@ public void SetCount(int count)
 		}
 	}
 
-	static ContentValues GetContentValues(ComponentName componentName, int badgeCount, bool isInsert)
+	static ContentValues GetContentValues(ComponentName componentName, uint badgeCount, bool isInsert)
 	{
 		var contentValues = new ContentValues();
 		if (isInsert)
@@ -81,9 +81,4 @@ static ContentValues GetContentValues(ComponentName componentName, int badgeCoun
 		contentValues.Put("badgecount", badgeCount);
 		return contentValues;
 	}
-
-	public int GetCount()
-	{
-		return 0;
-	}
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs
index 826bff12d..558f28c12 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/BadgeViewModel.cs
@@ -7,6 +7,8 @@ public partial class BadgeViewModel : BaseViewModel
 {
 	readonly IBadge badge;
 
+	uint count;
+
 	public BadgeViewModel(IBadge badge)
 	{
 		this.badge = badge;
@@ -15,13 +17,17 @@ public BadgeViewModel(IBadge badge)
 	[RelayCommand]
 	void Increment()
 	{
-		badge.SetCount(badge.GetCount() + 1);
+		count++;
+		badge.SetCount(count);
 	}
 
 	[RelayCommand]
 	void Decrement()
 	{
-		// Do not allow the badge count to go negative
-		badge.SetCount(Math.Max(badge.GetCount() - 1, 0));
+		if (count > 0)
+		{
+			count--;
+			badge.SetCount(count);
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeImplementation.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeImplementation.android.cs
index 89c29a8cb..e6d1d9444 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeImplementation.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeImplementation.android.cs
@@ -4,16 +4,9 @@
 public class BadgeImplementation : IBadge
 {
 	/// <inheritdoc />
-	public void SetCount(int count)
+	public void SetCount(uint count)
 	{
 		var badgeProvider = BadgeFactory.GetBadgeProvider();
 		badgeProvider.SetCount(count);
 	}
-
-	/// <inheritdoc />
-	public int GetCount()
-	{
-		var badgeProvider = BadgeFactory.GetBadgeProvider();
-		return badgeProvider.GetCount();
-	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
index 59de0ab5f..332be640c 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
@@ -7,19 +7,9 @@ namespace CommunityToolkit.Maui.ApplicationModel;
 class DefaultBadgeProvider : IBadgeProvider
 {
 	const string intentAction = "android.intent.action.BADGE_COUNT_UPDATE";
-
-	public int GetCount()
-	{
-		return 0;
-	}
-
-	public void SetCount(int count)
+	
+	public void SetCount(uint count)
 	{
-		if (count < 0)
-		{
-			throw new ArgumentOutOfRangeException(nameof(count), $"Badge count cannot be less than 0");
-		}
-
 		var packageName = Application.Context.PackageName;
 		if (packageName is null)
 		{
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/IBadgeProvider.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/IBadgeProvider.android.cs
index 645eefbf2..659b033a6 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/IBadgeProvider.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/IBadgeProvider.android.cs
@@ -5,13 +5,8 @@
 /// </summary>
 public interface IBadgeProvider
 {
-	/// <summary>
-	/// Get count for badge
-	/// </summary>
-	int GetCount();
-
 	/// <summary>
 	/// Set count for badge
 	/// </summary>
-	void SetCount(int count);
+	void SetCount(uint count);
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Badge.shared.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Badge.shared.cs
index f47344d07..f71c94e43 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Badge.shared.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Badge.shared.cs
@@ -8,14 +8,8 @@ public static class Badge
 	/// <inheritdoc cref="IBadge" />
 	public static IBadge Default => defaultImplementationHolder.Value;
 
-	/// <inheritdoc cref="IBadge.GetCount" />
-	public static int GetCount()
-	{
-		return Default.GetCount();
-	}
-
 	/// <inheritdoc cref="IBadge.SetCount" />
-	public static void SetCount(int count)
+	public static void SetCount(uint count)
 	{
 		Default.SetCount(count);
 	}
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.macios.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.macios.cs
index c765dd60f..837b8991c 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.macios.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.macios.cs
@@ -7,7 +7,7 @@ namespace CommunityToolkit.Maui.ApplicationModel;
 public class BadgeImplementation : IBadge
 {
 	/// <inheritdoc />
-	public void SetCount(int count)
+	public void SetCount(uint count)
 	{
 		UNUserNotificationCenter.Current.RequestAuthorization(UNAuthorizationOptions.Badge, (r, error) =>
 		{
@@ -17,20 +17,6 @@ public void SetCount(int count)
 			}
 		});
 
-		UIApplication.SharedApplication.ApplicationIconBadgeNumber = count;
-	}
-
-	/// <inheritdoc />
-	public int GetCount()
-	{
-		UNUserNotificationCenter.Current.RequestAuthorization(UNAuthorizationOptions.Badge, (r, error) =>
-		{
-			if (error is not null)
-			{
-				Debug.WriteLine($"Error Requesting Authorization to Get Badge Count: {error.Description}");
-			}
-		});
-
-		return (int)UIApplication.SharedApplication.ApplicationIconBadgeNumber;
+		UIApplication.SharedApplication.ApplicationIconBadgeNumber = (int)count;
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.net.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.net.cs
index e3b0e375f..4b6cbd1e0 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.net.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.net.cs
@@ -4,13 +4,7 @@ namespace CommunityToolkit.Maui.ApplicationModel;
 public class BadgeImplementation : IBadge
 {
 	/// <inheritdoc />
-	public void SetCount(int count)
-	{
-		throw new NotSupportedException($"{nameof(IBadge)} requires a platform-specific implementation of .NET");
-	}
-
-	/// <inheritdoc />
-	public int GetCount()
+	public void SetCount(uint count)
 	{
 		throw new NotSupportedException($"{nameof(IBadge)} requires a platform-specific implementation of .NET");
 	}
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs
index f417b14bf..6ebf37a2d 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs
@@ -7,7 +7,7 @@ namespace CommunityToolkit.Maui.ApplicationModel;
 public class BadgeImplementation : IBadge
 {
 	/// <inheritdoc />
-	public void SetCount(int count)
+	public void SetCount(uint count)
 	{
 		var appId = Application.Current.ApplicationInfo.ApplicationId;
 		if (count <= 0)
@@ -28,19 +28,4 @@ public void SetCount(int count)
 			BadgeControl.Update(badge);
 		}
 	}
-
-	/// <inheritdoc />
-	public int GetCount()
-	{
-		var appId = Application.Current.ApplicationInfo.ApplicationId;
-		var badge = BadgeControl.Find(appId);
-		if (badge is null)
-		{
-			return 0;
-		}
-		else
-		{
-			return badge.Count;
-		}
-	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.windows.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.windows.cs
index 7c776b524..c42c55ae8 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.windows.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.windows.cs
@@ -7,7 +7,7 @@
 public class BadgeImplementation : IBadge
 {
 	/// <inheritdoc />
-	public void SetCount(int count)
+	public void SetCount(uint count)
 	{
 		var badgeUpdater = BadgeUpdateManager.CreateBadgeUpdaterForApplication();
 		if (count <= 0)
@@ -25,11 +25,4 @@ public void SetCount(int count)
 			badgeUpdater.Update(badge);
 		}
 	}
-
-	/// <inheritdoc />
-	public int GetCount()
-	{
-		var badgeUpdater = BadgeUpdateManager.CreateBadgeUpdaterForApplication();
-		return 0;
-	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/IBadge.shared.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/IBadge.shared.cs
index 7282650a7..5c42ac96d 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/IBadge.shared.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/IBadge.shared.cs
@@ -9,10 +9,5 @@ public interface IBadge
 	/// Set the badge count
 	/// </summary>
 	/// <param name="count">Badge count</param>
-	void SetCount(int count);
-
-	/// <summary>
-	/// Get the badge count
-	/// </summary>
-	int GetCount();
+	void SetCount(uint count);
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/Essentials/BadgeTests.cs b/src/CommunityToolkit.Maui.UnitTests/Essentials/BadgeTests.cs
index ab15516bb..ae1b7bdd9 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Essentials/BadgeTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Essentials/BadgeTests.cs
@@ -16,13 +16,6 @@ public void BadgeTestsSetDefaultUpdatesInstance()
 		badge.Should().BeSameAs(badgeImplementationMock);
 	}
 
-	[Fact]
-	public void GetBadgeFailsOnNet()
-	{
-		Badge.SetDefault(new BadgeImplementation());
-		Assert.Throws<NotSupportedException>(() => Badge.GetCount());
-	}
-
 	[Fact]
 	public void SetBadgeFailsOnNet()
 	{
diff --git a/src/CommunityToolkit.Maui.UnitTests/Mocks/BadgeImplementationMock.cs b/src/CommunityToolkit.Maui.UnitTests/Mocks/BadgeImplementationMock.cs
index 1b4047fbb..88959b8aa 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Mocks/BadgeImplementationMock.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Mocks/BadgeImplementationMock.cs
@@ -4,12 +4,7 @@ namespace CommunityToolkit.Maui.UnitTests.Mocks;
 
 class BadgeImplementationMock : IBadge
 {
-	public int GetCount()
-	{
-		throw new NotImplementedException();
-	}
-
-	public void SetCount(int count)
+	public void SetCount(uint count)
 	{
 		throw new NotImplementedException();
 	}

From 5a46c0d63609f0286c437adf5a4505a3f9eab802 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Fri, 14 Jul 2023 15:38:42 +0300
Subject: [PATCH 30/34] fix tizen build

---
 .../Essentials/Badge/BadgeImplementation.tizen.cs             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs
index 6ebf37a2d..cc2ec63b4 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs
@@ -19,12 +19,12 @@ public void SetCount(uint count)
 		var badge = BadgeControl.Find(appId);
 		if (badge is null)
 		{
-			badge = new Tizen.Applications.Badge(appId, count);
+			badge = new Tizen.Applications.Badge(appId, (int)count);
 			BadgeControl.Add(badge);
 		}
 		else
 		{
-			badge.Count = count;
+			badge.Count = (int)count;
 			BadgeControl.Update(badge);
 		}
 	}

From 0e311d60b446ec49927a42530577dc1b65809dc7 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <33021114+VladislavAntonyuk@users.noreply.github.com>
Date: Fri, 14 Jul 2023 18:44:17 +0300
Subject: [PATCH 31/34] Update
 src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.windows.cs

Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com>
---
 .../Essentials/Badge/BadgeImplementation.windows.cs             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.windows.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.windows.cs
index c42c55ae8..dcef53119 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.windows.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.windows.cs
@@ -10,7 +10,7 @@ public class BadgeImplementation : IBadge
 	public void SetCount(uint count)
 	{
 		var badgeUpdater = BadgeUpdateManager.CreateBadgeUpdaterForApplication();
-		if (count <= 0)
+		if (count is 0)
 		{
 			badgeUpdater.Clear();
 		}

From 1a1743f68ffb75b5cee80f14479f0ba51059a2b6 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <33021114+VladislavAntonyuk@users.noreply.github.com>
Date: Fri, 14 Jul 2023 18:44:25 +0300
Subject: [PATCH 32/34] Update
 src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs

Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com>
---
 .../Essentials/Badge/BadgeImplementation.tizen.cs               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs
index cc2ec63b4..5e46057ad 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/BadgeImplementation.tizen.cs
@@ -10,7 +10,7 @@ public class BadgeImplementation : IBadge
 	public void SetCount(uint count)
 	{
 		var appId = Application.Current.ApplicationInfo.ApplicationId;
-		if (count <= 0)
+		if (count is 0)
 		{
 			BadgeControl.Remove(appId);
 			return;

From 4c0baeae88cb4b621299963ca286e2822b362565 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <33021114+VladislavAntonyuk@users.noreply.github.com>
Date: Fri, 14 Jul 2023 18:45:02 +0300
Subject: [PATCH 33/34] Update
 src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs

Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com>
---
 .../Essentials/Badge/Android/BadgeFactory.android.cs            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs
index 28b65eaa0..cd8f50826 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/BadgeFactory.android.cs
@@ -39,7 +39,7 @@ public static IBadgeProvider GetBadgeProvider()
 
 	static string? GetLauncherType()
 	{
-		var intent = new Intent(Intent.ActionMain);
+		using var intent = new Intent(Intent.ActionMain);
 		intent.AddCategory(Intent.CategoryHome);
 		using var resolveInfo = OperatingSystem.IsAndroidVersionAtLeast(33) ?
 			Application.Context.PackageManager?.ResolveActivity(intent, PackageManager.ResolveInfoFlags.Of(0)) :

From 01b0bd0cda0fe57684b93baf0e4883682c8be416 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <33021114+VladislavAntonyuk@users.noreply.github.com>
Date: Fri, 14 Jul 2023 18:45:09 +0300
Subject: [PATCH 34/34] Update
 src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs

Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com>
---
 .../Essentials/Badge/Android/DefaultBadgeProvider.android.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
index 332be640c..b8885d0ad 100644
--- a/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Essentials/Badge/Android/DefaultBadgeProvider.android.cs
@@ -46,7 +46,7 @@ public void SetCount(uint count)
 
 	static bool CanSetBadgeCounter()
 	{
-		var intent = new Intent(intentAction);
+		using var intent = new Intent(intentAction);
 		var packageManager = Application.Context.PackageManager;
 		var receivers = OperatingSystem.IsAndroidVersionAtLeast(33)
 						? packageManager?.QueryBroadcastReceivers(intent, PackageManager.ResolveInfoFlags.Of(0))