From 8624ef8ebee7a548674b441eccffb4737b737bc7 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Mon, 9 Mar 2026 10:42:06 -0700
Subject: [PATCH 1/5] format cs using csharpier

---
 ...gnalSDK.DotNet.Android.Core.Binding.csproj |   6 +-
 .../Transforms/EnumFields.xml                 |   2 +-
 .../Transforms/EnumMethods.xml                |   2 +-
 .../Transforms/Metadata.xml                   |  65 ++-
 ...otNet.Android.InAppMessages.Binding.csproj |   6 +-
 .../Transforms/EnumFields.xml                 |   2 +-
 .../Transforms/EnumMethods.xml                |   2 +-
 .../Transforms/Metadata.xml                   |   4 +-
 ...SDK.DotNet.Android.Location.Binding.csproj |   6 +-
 .../Transforms/EnumFields.xml                 |   2 +-
 .../Transforms/EnumMethods.xml                |   2 +-
 .../Transforms/Metadata.xml                   |   4 +-
 ...otNet.Android.Notifications.Binding.csproj |   6 +-
 .../Transforms/EnumFields.xml                 |   2 +-
 .../Transforms/EnumMethods.xml                |   2 +-
 .../Transforms/Metadata.xml                   |   4 +-
 .../AndroidDebugManager.cs                    |  15 +-
 .../AndroidInAppMessagesManager.cs            |  50 +-
 .../AndroidLiveActivitiesManager.cs           |  11 +-
 .../AndroidLocationManager.cs                 |   1 -
 .../AndroidNotificationsManager.cs            | 105 +++--
 .../AndroidOneSignal.cs                       |  14 +-
 .../AndroidSessionManager.cs                  |   6 +-
 .../AndroidUserManager.cs                     |  69 ++-
 .../OneSignalSDK.DotNet.Android.csproj        |   5 +-
 .../Utilities/AndroidConsumer.cs              |   8 +-
 .../Utilities/FromNativeConversion.cs         |  55 ++-
 .../Utilities/ToNativeConversion.cs           |   4 +-
 .../Debug/IDebugManager.cs                    |   3 +-
 OneSignalSDK.DotNet.Core/Debug/LogLevel.cs    |  13 +-
 OneSignalSDK.DotNet.Core/IOneSignal.cs        |   4 +-
 .../InAppMessages/IInAppMessagesManager.cs    |   2 +-
 .../InAppMessages/InAppMessage.cs             |   2 +-
 .../InAppMessages/InAppMessageClickResult.cs  |  11 +-
 .../InAppMessageLifecycleEventArgs.cs         |   2 +-
 .../Internal/Utilities/Json.cs                |  36 +-
 .../Internal/Utilities/WrapperSDK.cs          |   3 +-
 .../LiveActivities/ILiveActivities.cs         |  47 +-
 .../Location/ILocationManager.cs              |   8 +-
 .../Notifications/DisplayableNotification.cs  |  14 +-
 .../Notifications/INotificationsManager.cs    |   8 +-
 .../Notifications/Notification.cs             |  68 +--
 .../NotificationClickedEventArgs.cs           |   7 +-
 .../Notifications/NotificationPermission.cs   |  10 +-
 .../NotificationPermissionChangedEventArgs.cs |   2 +-
 .../NotificationWillDisplayEventArgs.cs       |   2 +-
 .../OneSignalSDK.DotNet.Core.csproj           |   1 -
 .../Session/ISessionManager.cs                |   2 +-
 OneSignalSDK.DotNet.Core/User/IUserManager.cs |   2 +-
 OneSignalSDK.DotNet.Core/User/IUserState.cs   |   7 +-
 .../PushSubscriptionChangedEventArgs.cs       |   5 +-
 .../User/UserStateChangedEventArgs.cs         |   9 +-
 .../ApiDefinitions.cs                         | 433 ++++++++++--------
 .../OneSignalSDK.DotNet.iOS.Binding.csproj    |   2 +-
 .../OneSignalSDK.dotnet.targets               | 128 +++---
 .../StructsAndEnums.cs                        |  12 +-
 .../NotificationServiceExtension.cs           |  30 +-
 .../OneSignalSDK.DotNet.iOS.csproj            |   2 +-
 .../Utilities/CallbackProxy.cs                |   4 +-
 .../Utilities/FromNativeConversion.cs         |  37 +-
 .../Utilities/ToNativeConversion.cs           |   2 +-
 OneSignalSDK.DotNet.iOS/iOSDebugManager.cs    |   8 +-
 .../iOSInAppMessagesManager.cs                | 251 +++++-----
 .../iOSLiveActivitiesManager.cs               |  53 ++-
 OneSignalSDK.DotNet.iOS/iOSLocationManager.cs |   1 -
 .../iOSNotificationsManager.cs                |  97 ++--
 OneSignalSDK.DotNet.iOS/iOSOneSignal.cs       |   7 +-
 OneSignalSDK.DotNet.iOS/iOSSessionManager.cs  |   6 +-
 OneSignalSDK.DotNet.iOS/iOSUserManager.cs     |  68 ++-
 OneSignalSDK.DotNet/OneSignal.cs              |  36 +-
 .../OneSignalSDK.DotNet.csproj                |  12 +-
 examples/demo/App.xaml                        |  24 +-
 examples/demo/App.xaml.cs                     |  10 +-
 examples/demo/Controls/DialogInputHelper.cs   |  69 ++-
 examples/demo/Controls/LoadingOverlay.xaml    |  40 +-
 examples/demo/Controls/LogView.xaml           | 142 +++---
 examples/demo/Controls/LogView.xaml.cs        |   8 +-
 .../demo/Controls/MultiPairDialogHelper.cs    |  22 +-
 .../Controls/Sections/AliasesSection.xaml     |  71 ++-
 .../Controls/Sections/AliasesSection.xaml.cs  |  72 +--
 .../demo/Controls/Sections/AppSection.xaml    | 164 ++++---
 .../demo/Controls/Sections/AppSection.xaml.cs |   6 +-
 .../demo/Controls/Sections/EmailsSection.xaml |  63 ++-
 .../Controls/Sections/EmailsSection.xaml.cs   |  60 ++-
 .../demo/Controls/Sections/InAppSection.xaml  |  66 +--
 .../Controls/Sections/InAppSection.xaml.cs    |   3 +-
 .../Controls/Sections/LocationSection.xaml    |  76 +--
 .../Controls/Sections/LocationSection.xaml.cs |   3 +-
 .../Controls/Sections/OutcomesSection.xaml    |  46 +-
 .../Controls/Sections/OutcomesSection.xaml.cs |  50 +-
 .../demo/Controls/Sections/PushSection.xaml   | 111 +++--
 .../Controls/Sections/PushSection.xaml.cs     |  18 +-
 .../Controls/Sections/SendIamSection.xaml     | 190 +++++---
 .../Controls/Sections/SendIamSection.xaml.cs  |  23 +-
 .../Controls/Sections/SendPushSection.xaml    |  62 ++-
 .../Controls/Sections/SendPushSection.xaml.cs |   6 +-
 .../demo/Controls/Sections/SmsSection.xaml    |  63 ++-
 .../demo/Controls/Sections/SmsSection.xaml.cs |  55 ++-
 .../demo/Controls/Sections/TagsSection.xaml   |  81 ++--
 .../Controls/Sections/TagsSection.xaml.cs     |  79 +++-
 .../Controls/Sections/TrackEventSection.xaml  |  46 +-
 .../Sections/TrackEventSection.xaml.cs        |  26 +-
 .../Controls/Sections/TriggersSection.xaml    |  91 ++--
 .../Controls/Sections/TriggersSection.xaml.cs |  68 ++-
 .../demo/Controls/Sections/UserSection.xaml   |  99 ++--
 examples/demo/Controls/TooltipDialogHelper.cs |  44 +-
 examples/demo/MauiProgram.cs                  |  22 +-
 examples/demo/Models/InAppMessageType.cs      |  36 +-
 examples/demo/Models/NotificationType.cs      |   2 +-
 examples/demo/Models/UserData.cs              |  32 +-
 .../NotificationService.cs                    |  21 +-
 examples/demo/Pages/MainPage.xaml             | 109 ++---
 examples/demo/Pages/MainPage.xaml.cs          |  14 +-
 examples/demo/Pages/SecondaryPage.xaml        |  30 +-
 .../Platforms/Android/AndroidManifest.xml     |  27 +-
 .../demo/Platforms/Android/MainActivity.cs    |  17 +-
 .../demo/Platforms/Android/MainApplication.cs |   4 +-
 .../demo/Repositories/OneSignalRepository.cs  |  46 +-
 examples/demo/Resources/Styles/Colors.xaml    |  55 ++-
 examples/demo/Resources/Styles/Styles.xaml    | 133 +++---
 examples/demo/Services/LogManager.cs          |   3 +
 examples/demo/Services/OneSignalApiService.cs |  38 +-
 examples/demo/Services/PreferencesService.cs  |   6 +-
 examples/demo/Services/TooltipHelper.cs       |  13 +-
 examples/demo/ViewModels/AppViewModel.cs      | 124 +++--
 examples/demo/demo.csproj                     |  18 +-
 126 files changed, 2930 insertions(+), 1794 deletions(-)

diff --git a/OneSignalSDK.DotNet.Android.Core.Binding/OneSignalSDK.DotNet.Android.Core.Binding.csproj b/OneSignalSDK.DotNet.Android.Core.Binding/OneSignalSDK.DotNet.Android.Core.Binding.csproj
index df2cc30f..e0272fee 100644
--- a/OneSignalSDK.DotNet.Android.Core.Binding/OneSignalSDK.DotNet.Android.Core.Binding.csproj
+++ b/OneSignalSDK.DotNet.Android.Core.Binding/OneSignalSDK.DotNet.Android.Core.Binding.csproj
@@ -11,7 +11,9 @@
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AssemblyName>OneSignalSDK.DotNet.Android.Core.Binding</AssemblyName>
-    <AndroidSdkBuildToolsVersion Condition="'$(AndroidSdkBuildToolsVersion)' == ''">28.0.3</AndroidSdkBuildToolsVersion>
+    <AndroidSdkBuildToolsVersion Condition="'$(AndroidSdkBuildToolsVersion)' == ''"
+      >28.0.3</AndroidSdkBuildToolsVersion
+    >
     <AndroidTlsProvider></AndroidTlsProvider>
     <AndroidClassParser>class-parse</AndroidClassParser>
   </PropertyGroup>
@@ -57,4 +59,4 @@
   <ItemGroup>
     <PackageReference Include="Xamarin.Kotlin.StdLib.Jdk8" Version="1.8.0.1" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/OneSignalSDK.DotNet.Android.Core.Binding/Transforms/EnumFields.xml b/OneSignalSDK.DotNet.Android.Core.Binding/Transforms/EnumFields.xml
index e9af0eeb..e5ec0a0c 100755
--- a/OneSignalSDK.DotNet.Android.Core.Binding/Transforms/EnumFields.xml
+++ b/OneSignalSDK.DotNet.Android.Core.Binding/Transforms/EnumFields.xml
@@ -1,5 +1,5 @@
 <enum-field-mappings>
-	<!--
+  <!--
   This example converts the constants Fragment_id, Fragment_name,
   and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
   to an enum called Android.Support.V4.App.FragmentTagType with values
diff --git a/OneSignalSDK.DotNet.Android.Core.Binding/Transforms/EnumMethods.xml b/OneSignalSDK.DotNet.Android.Core.Binding/Transforms/EnumMethods.xml
index 2efa8146..f3238939 100755
--- a/OneSignalSDK.DotNet.Android.Core.Binding/Transforms/EnumMethods.xml
+++ b/OneSignalSDK.DotNet.Android.Core.Binding/Transforms/EnumMethods.xml
@@ -1,5 +1,5 @@
 <enum-method-mappings>
-	<!--
+  <!--
   This example changes the Java method:
     android.support.v4.app.Fragment.SavedState.writeToParcel (int flags)
   to be:
diff --git a/OneSignalSDK.DotNet.Android.Core.Binding/Transforms/Metadata.xml b/OneSignalSDK.DotNet.Android.Core.Binding/Transforms/Metadata.xml
index 162a33e7..6a264d7a 100644
--- a/OneSignalSDK.DotNet.Android.Core.Binding/Transforms/Metadata.xml
+++ b/OneSignalSDK.DotNet.Android.Core.Binding/Transforms/Metadata.xml
@@ -1,27 +1,44 @@
 <metadata>
-	<attr path="/api/package[@name='com.onesignal']" name="managedName">Com.OneSignal.Android</attr>
-	<attr path="/api/package[@name='com.onesignal.common']" name="managedName">Com.OneSignal.Android.Common</attr>
-	<attr path="/api/package[@name='com.onesignal.debug']" name="managedName">Com.OneSignal.Android.Debug</attr>
-	<attr path="/api/package[@name='com.onesignal.inAppMessages']" name="managedName">Com.OneSignal.Android.InAppMessages</attr>
-	<attr path="/api/package[@name='com.onesignal.location']" name="managedName">Com.OneSignal.Android.Location</attr>
-	<attr path="/api/package[@name='com.onesignal.notifications']" name="managedName">Com.OneSignal.Android.Notifications</attr>
-	<attr path="/api/package[@name='com.onesignal.session']" name="managedName">Com.OneSignal.Android.Session</attr>
-	<attr path="/api/package[@name='com.onesignal.user']" name="managedName">Com.OneSignal.Android.User</attr>
-	<attr path="/api/package[@name='com.onesignal.user.subscriptions']" name="managedName">Com.OneSignal.Android.User.Subscriptions</attr>
-	<attr path="/api/package[@name='com.onesignal.user.state']" name="managedName">Com.OneSignal.Android.User.State</attr>
+  <attr path="/api/package[@name='com.onesignal']" name="managedName">Com.OneSignal.Android</attr>
+  <attr path="/api/package[@name='com.onesignal.common']" name="managedName"
+    >Com.OneSignal.Android.Common</attr
+  >
+  <attr path="/api/package[@name='com.onesignal.debug']" name="managedName"
+    >Com.OneSignal.Android.Debug</attr
+  >
+  <attr path="/api/package[@name='com.onesignal.inAppMessages']" name="managedName"
+    >Com.OneSignal.Android.InAppMessages</attr
+  >
+  <attr path="/api/package[@name='com.onesignal.location']" name="managedName"
+    >Com.OneSignal.Android.Location</attr
+  >
+  <attr path="/api/package[@name='com.onesignal.notifications']" name="managedName"
+    >Com.OneSignal.Android.Notifications</attr
+  >
+  <attr path="/api/package[@name='com.onesignal.session']" name="managedName"
+    >Com.OneSignal.Android.Session</attr
+  >
+  <attr path="/api/package[@name='com.onesignal.user']" name="managedName"
+    >Com.OneSignal.Android.User</attr>
+  <attr path="/api/package[@name='com.onesignal.user.subscriptions']" name="managedName"
+    >Com.OneSignal.Android.User.Subscriptions</attr
+  >
+  <attr path="/api/package[@name='com.onesignal.user.state']" name="managedName"
+    >Com.OneSignal.Android.User.State</attr
+  >
 
-	<remove-node path="/api/package[starts-with(@name, 'com.onesignal.common.events')]" />
-	<remove-node path="/api/package[starts-with(@name, 'com.onesignal.common.exceptions')]" />
-	<remove-node path="/api/package[starts-with(@name, 'com.onesignal.common.modeling')]" />
-	<remove-node path="/api/package[starts-with(@name, 'com.onesignal.common.modules')]" />
-	<remove-node path="/api/package[starts-with(@name, 'com.onesignal.common.services')]" />
-	<remove-node path="/api/package[starts-with(@name, 'com.onesignal.common.threading')]" />
-	<remove-node path="/api/package[starts-with(@name, 'com.onesignal.internal')]" />
-	<remove-node path="/api/package[starts-with(@name, 'com.onesignal.core')]" />
-	<remove-node path="/api/package[starts-with(@name, 'com.onesignal.debug.internal')]" />
-	<remove-node path="/api/package[starts-with(@name, 'com.onesignal.inAppMessages.internal')]" />
-	<remove-node path="/api/package[starts-with(@name, 'com.onesignal.location.internal')]" />
-	<remove-node path="/api/package[starts-with(@name, 'com.onesignal.notifications.internal')]" />
-	<remove-node path="/api/package[starts-with(@name, 'com.onesignal.session.internal')]" />
-	<remove-node path="/api/package[starts-with(@name, 'com.onesignal.user.internal')]" />
+  <remove-node path="/api/package[starts-with(@name, 'com.onesignal.common.events')]" />
+  <remove-node path="/api/package[starts-with(@name, 'com.onesignal.common.exceptions')]" />
+  <remove-node path="/api/package[starts-with(@name, 'com.onesignal.common.modeling')]" />
+  <remove-node path="/api/package[starts-with(@name, 'com.onesignal.common.modules')]" />
+  <remove-node path="/api/package[starts-with(@name, 'com.onesignal.common.services')]" />
+  <remove-node path="/api/package[starts-with(@name, 'com.onesignal.common.threading')]" />
+  <remove-node path="/api/package[starts-with(@name, 'com.onesignal.internal')]" />
+  <remove-node path="/api/package[starts-with(@name, 'com.onesignal.core')]" />
+  <remove-node path="/api/package[starts-with(@name, 'com.onesignal.debug.internal')]" />
+  <remove-node path="/api/package[starts-with(@name, 'com.onesignal.inAppMessages.internal')]" />
+  <remove-node path="/api/package[starts-with(@name, 'com.onesignal.location.internal')]" />
+  <remove-node path="/api/package[starts-with(@name, 'com.onesignal.notifications.internal')]" />
+  <remove-node path="/api/package[starts-with(@name, 'com.onesignal.session.internal')]" />
+  <remove-node path="/api/package[starts-with(@name, 'com.onesignal.user.internal')]" />
 </metadata>
diff --git a/OneSignalSDK.DotNet.Android.InAppMessages.Binding/OneSignalSDK.DotNet.Android.InAppMessages.Binding.csproj b/OneSignalSDK.DotNet.Android.InAppMessages.Binding/OneSignalSDK.DotNet.Android.InAppMessages.Binding.csproj
index ac052792..b94c400a 100644
--- a/OneSignalSDK.DotNet.Android.InAppMessages.Binding/OneSignalSDK.DotNet.Android.InAppMessages.Binding.csproj
+++ b/OneSignalSDK.DotNet.Android.InAppMessages.Binding/OneSignalSDK.DotNet.Android.InAppMessages.Binding.csproj
@@ -11,7 +11,9 @@
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AssemblyName>OneSignalSDK.DotNet.Android.InAppMessages.Binding</AssemblyName>
-    <AndroidSdkBuildToolsVersion Condition="'$(AndroidSdkBuildToolsVersion)' == ''">28.0.3</AndroidSdkBuildToolsVersion>
+    <AndroidSdkBuildToolsVersion Condition="'$(AndroidSdkBuildToolsVersion)' == ''"
+      >28.0.3</AndroidSdkBuildToolsVersion
+    >
     <AndroidTlsProvider></AndroidTlsProvider>
     <AndroidClassParser>class-parse</AndroidClassParser>
   </PropertyGroup>
@@ -57,4 +59,4 @@
   <ItemGroup>
     <PackageReference Include="Xamarin.Kotlin.StdLib.Jdk8" Version="1.8.0.1" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/OneSignalSDK.DotNet.Android.InAppMessages.Binding/Transforms/EnumFields.xml b/OneSignalSDK.DotNet.Android.InAppMessages.Binding/Transforms/EnumFields.xml
index e9af0eeb..e5ec0a0c 100755
--- a/OneSignalSDK.DotNet.Android.InAppMessages.Binding/Transforms/EnumFields.xml
+++ b/OneSignalSDK.DotNet.Android.InAppMessages.Binding/Transforms/EnumFields.xml
@@ -1,5 +1,5 @@
 <enum-field-mappings>
-	<!--
+  <!--
   This example converts the constants Fragment_id, Fragment_name,
   and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
   to an enum called Android.Support.V4.App.FragmentTagType with values
diff --git a/OneSignalSDK.DotNet.Android.InAppMessages.Binding/Transforms/EnumMethods.xml b/OneSignalSDK.DotNet.Android.InAppMessages.Binding/Transforms/EnumMethods.xml
index 2efa8146..f3238939 100755
--- a/OneSignalSDK.DotNet.Android.InAppMessages.Binding/Transforms/EnumMethods.xml
+++ b/OneSignalSDK.DotNet.Android.InAppMessages.Binding/Transforms/EnumMethods.xml
@@ -1,5 +1,5 @@
 <enum-method-mappings>
-	<!--
+  <!--
   This example changes the Java method:
     android.support.v4.app.Fragment.SavedState.writeToParcel (int flags)
   to be:
diff --git a/OneSignalSDK.DotNet.Android.InAppMessages.Binding/Transforms/Metadata.xml b/OneSignalSDK.DotNet.Android.InAppMessages.Binding/Transforms/Metadata.xml
index c4343d31..f5a49370 100644
--- a/OneSignalSDK.DotNet.Android.InAppMessages.Binding/Transforms/Metadata.xml
+++ b/OneSignalSDK.DotNet.Android.InAppMessages.Binding/Transforms/Metadata.xml
@@ -1,3 +1,5 @@
 <metadata>
-	<attr path="/api/package[@name='com.onesignal.inAppMessages']" name="managedName">Com.OneSignal.Android.InAppMessages</attr>
+  <attr path="/api/package[@name='com.onesignal.inAppMessages']" name="managedName"
+    >Com.OneSignal.Android.InAppMessages</attr
+  >
 </metadata>
diff --git a/OneSignalSDK.DotNet.Android.Location.Binding/OneSignalSDK.DotNet.Android.Location.Binding.csproj b/OneSignalSDK.DotNet.Android.Location.Binding/OneSignalSDK.DotNet.Android.Location.Binding.csproj
index d5dbf017..76be8aea 100644
--- a/OneSignalSDK.DotNet.Android.Location.Binding/OneSignalSDK.DotNet.Android.Location.Binding.csproj
+++ b/OneSignalSDK.DotNet.Android.Location.Binding/OneSignalSDK.DotNet.Android.Location.Binding.csproj
@@ -11,7 +11,9 @@
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AssemblyName>OneSignalSDK.DotNet.Android.Location.Binding</AssemblyName>
-    <AndroidSdkBuildToolsVersion Condition="'$(AndroidSdkBuildToolsVersion)' == ''">28.0.3</AndroidSdkBuildToolsVersion>
+    <AndroidSdkBuildToolsVersion Condition="'$(AndroidSdkBuildToolsVersion)' == ''"
+      >28.0.3</AndroidSdkBuildToolsVersion
+    >
     <AndroidTlsProvider></AndroidTlsProvider>
     <AndroidClassParser>class-parse</AndroidClassParser>
   </PropertyGroup>
@@ -57,4 +59,4 @@
   <ItemGroup>
     <PackageReference Include="Xamarin.Kotlin.StdLib.Jdk8" Version="1.8.0.1" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/OneSignalSDK.DotNet.Android.Location.Binding/Transforms/EnumFields.xml b/OneSignalSDK.DotNet.Android.Location.Binding/Transforms/EnumFields.xml
index e9af0eeb..e5ec0a0c 100755
--- a/OneSignalSDK.DotNet.Android.Location.Binding/Transforms/EnumFields.xml
+++ b/OneSignalSDK.DotNet.Android.Location.Binding/Transforms/EnumFields.xml
@@ -1,5 +1,5 @@
 <enum-field-mappings>
-	<!--
+  <!--
   This example converts the constants Fragment_id, Fragment_name,
   and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
   to an enum called Android.Support.V4.App.FragmentTagType with values
diff --git a/OneSignalSDK.DotNet.Android.Location.Binding/Transforms/EnumMethods.xml b/OneSignalSDK.DotNet.Android.Location.Binding/Transforms/EnumMethods.xml
index 2efa8146..f3238939 100755
--- a/OneSignalSDK.DotNet.Android.Location.Binding/Transforms/EnumMethods.xml
+++ b/OneSignalSDK.DotNet.Android.Location.Binding/Transforms/EnumMethods.xml
@@ -1,5 +1,5 @@
 <enum-method-mappings>
-	<!--
+  <!--
   This example changes the Java method:
     android.support.v4.app.Fragment.SavedState.writeToParcel (int flags)
   to be:
diff --git a/OneSignalSDK.DotNet.Android.Location.Binding/Transforms/Metadata.xml b/OneSignalSDK.DotNet.Android.Location.Binding/Transforms/Metadata.xml
index 36b63bef..52850241 100644
--- a/OneSignalSDK.DotNet.Android.Location.Binding/Transforms/Metadata.xml
+++ b/OneSignalSDK.DotNet.Android.Location.Binding/Transforms/Metadata.xml
@@ -1,3 +1,5 @@
 <metadata>
-	<attr path="/api/package[@name='com.onesignal.location']" name="managedName">Com.OneSignal.Android.Location</attr>
+  <attr path="/api/package[@name='com.onesignal.location']" name="managedName"
+    >Com.OneSignal.Android.Location</attr
+  >
 </metadata>
diff --git a/OneSignalSDK.DotNet.Android.Notifications.Binding/OneSignalSDK.DotNet.Android.Notifications.Binding.csproj b/OneSignalSDK.DotNet.Android.Notifications.Binding/OneSignalSDK.DotNet.Android.Notifications.Binding.csproj
index b8d8086f..a5788d2a 100644
--- a/OneSignalSDK.DotNet.Android.Notifications.Binding/OneSignalSDK.DotNet.Android.Notifications.Binding.csproj
+++ b/OneSignalSDK.DotNet.Android.Notifications.Binding/OneSignalSDK.DotNet.Android.Notifications.Binding.csproj
@@ -11,7 +11,9 @@
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AssemblyName>OneSignalSDK.DotNet.Android.Notifications.Binding</AssemblyName>
-    <AndroidSdkBuildToolsVersion Condition="'$(AndroidSdkBuildToolsVersion)' == ''">28.0.3</AndroidSdkBuildToolsVersion>
+    <AndroidSdkBuildToolsVersion Condition="'$(AndroidSdkBuildToolsVersion)' == ''"
+      >28.0.3</AndroidSdkBuildToolsVersion
+    >
     <AndroidTlsProvider></AndroidTlsProvider>
     <AndroidClassParser>class-parse</AndroidClassParser>
   </PropertyGroup>
@@ -57,4 +59,4 @@
   <ItemGroup>
     <PackageReference Include="Xamarin.Kotlin.StdLib.Jdk8" Version="1.8.0.1" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/OneSignalSDK.DotNet.Android.Notifications.Binding/Transforms/EnumFields.xml b/OneSignalSDK.DotNet.Android.Notifications.Binding/Transforms/EnumFields.xml
index e9af0eeb..e5ec0a0c 100755
--- a/OneSignalSDK.DotNet.Android.Notifications.Binding/Transforms/EnumFields.xml
+++ b/OneSignalSDK.DotNet.Android.Notifications.Binding/Transforms/EnumFields.xml
@@ -1,5 +1,5 @@
 <enum-field-mappings>
-	<!--
+  <!--
   This example converts the constants Fragment_id, Fragment_name,
   and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
   to an enum called Android.Support.V4.App.FragmentTagType with values
diff --git a/OneSignalSDK.DotNet.Android.Notifications.Binding/Transforms/EnumMethods.xml b/OneSignalSDK.DotNet.Android.Notifications.Binding/Transforms/EnumMethods.xml
index 2efa8146..f3238939 100755
--- a/OneSignalSDK.DotNet.Android.Notifications.Binding/Transforms/EnumMethods.xml
+++ b/OneSignalSDK.DotNet.Android.Notifications.Binding/Transforms/EnumMethods.xml
@@ -1,5 +1,5 @@
 <enum-method-mappings>
-	<!--
+  <!--
   This example changes the Java method:
     android.support.v4.app.Fragment.SavedState.writeToParcel (int flags)
   to be:
diff --git a/OneSignalSDK.DotNet.Android.Notifications.Binding/Transforms/Metadata.xml b/OneSignalSDK.DotNet.Android.Notifications.Binding/Transforms/Metadata.xml
index 56769350..9b55a2ad 100644
--- a/OneSignalSDK.DotNet.Android.Notifications.Binding/Transforms/Metadata.xml
+++ b/OneSignalSDK.DotNet.Android.Notifications.Binding/Transforms/Metadata.xml
@@ -1,3 +1,5 @@
 <metadata>
-	<attr path="/api/package[@name='com.onesignal.notifications']" name="managedName">Com.OneSignal.Android.Notifications</attr>
+  <attr path="/api/package[@name='com.onesignal.notifications']" name="managedName"
+    >Com.OneSignal.Android.Notifications</attr
+  >
 </metadata>
diff --git a/OneSignalSDK.DotNet.Android/AndroidDebugManager.cs b/OneSignalSDK.DotNet.Android/AndroidDebugManager.cs
index 80151a60..7b5e6e12 100644
--- a/OneSignalSDK.DotNet.Android/AndroidDebugManager.cs
+++ b/OneSignalSDK.DotNet.Android/AndroidDebugManager.cs
@@ -1,15 +1,24 @@
 using OneSignalSDK.DotNet.Android.Utilities;
 using OneSignalSDK.DotNet.Core;
 using OneSignalSDK.DotNet.Core.Debug;
-
 using OneSignalNative = Com.OneSignal.Android.OneSignal;
 
 namespace OneSignalSDK.DotNet.Android;
 
 public class AndroidDebugManager : IDebugManager
 {
-    private OneSignalSDK.DotNet.Core.Debug.LogLevel _logLevel = OneSignalSDK.DotNet.Core.Debug.LogLevel.WARN;
-    private OneSignalSDK.DotNet.Core.Debug.LogLevel _alertLevel = OneSignalSDK.DotNet.Core.Debug.LogLevel.NONE;
+    private OneSignalSDK.DotNet.Core.Debug.LogLevel _logLevel = OneSignalSDK
+        .DotNet
+        .Core
+        .Debug
+        .LogLevel
+        .WARN;
+    private OneSignalSDK.DotNet.Core.Debug.LogLevel _alertLevel = OneSignalSDK
+        .DotNet
+        .Core
+        .Debug
+        .LogLevel
+        .NONE;
 
     public OneSignalSDK.DotNet.Core.Debug.LogLevel LogLevel
     {
diff --git a/OneSignalSDK.DotNet.Android/AndroidInAppMessagesManager.cs b/OneSignalSDK.DotNet.Android/AndroidInAppMessagesManager.cs
index a1ee7113..a9a04894 100644
--- a/OneSignalSDK.DotNet.Android/AndroidInAppMessagesManager.cs
+++ b/OneSignalSDK.DotNet.Android/AndroidInAppMessagesManager.cs
@@ -2,12 +2,12 @@
 using OneSignalSDK.DotNet.Android.Utilities;
 using OneSignalSDK.DotNet.Core;
 using OneSignalSDK.DotNet.Core.InAppMessages;
-
 using OneSignalNative = Com.OneSignal.Android.OneSignal;
 
 namespace OneSignalSDK.DotNet.Android;
 
-public class AndroidInAppMessagesManager : OneSignalSDK.DotNet.Core.InAppMessages.IInAppMessagesManager
+public class AndroidInAppMessagesManager
+    : OneSignalSDK.DotNet.Core.InAppMessages.IInAppMessagesManager
 {
     public event EventHandler<InAppMessageWillDisplayEventArgs>? WillDisplay;
     public event EventHandler<InAppMessageDidDisplayEventArgs>? DidDisplay;
@@ -61,11 +61,13 @@ public void RemoveTriggers(params string[] keys)
         OneSignalNative.InAppMessages.RemoveTriggers(keys);
     }
 
-    private class InternalInAppMessageEventsHandler : Java.Lang.Object,
-        Com.OneSignal.Android.InAppMessages.IInAppMessageClickListener,
-        Com.OneSignal.Android.InAppMessages.IInAppMessageLifecycleListener
+    private class InternalInAppMessageEventsHandler
+        : Java.Lang.Object,
+            Com.OneSignal.Android.InAppMessages.IInAppMessageClickListener,
+            Com.OneSignal.Android.InAppMessages.IInAppMessageLifecycleListener
     {
         private AndroidInAppMessagesManager _manager;
+
         public InternalInAppMessageEventsHandler(AndroidInAppMessagesManager manager)
         {
             _manager = manager;
@@ -73,11 +75,13 @@ public InternalInAppMessageEventsHandler(AndroidInAppMessagesManager manager)
 
         public void OnClick(IInAppMessageClickEvent clickEvent)
         {
-            var args = new InAppMessageClickedEventArgs(FromNativeConversion.ToInAppMessage(clickEvent.Message), FromNativeConversion.ToInAppMessageClickResult(clickEvent.Result));
+            var args = new InAppMessageClickedEventArgs(
+                FromNativeConversion.ToInAppMessage(clickEvent.Message),
+                FromNativeConversion.ToInAppMessageClickResult(clickEvent.Result)
+            );
             _manager.Clicked?.Invoke(_manager, args);
         }
 
-
         public void OnWillDisplay(IInAppMessageWillDisplayEvent willDisplayEvent)
         {
             _manager.WillDisplay?.Invoke(_manager, GetWillDisplayEventArgs(willDisplayEvent));
@@ -98,24 +102,40 @@ public void OnDidDismiss(IInAppMessageDidDismissEvent didDismissEvent)
             _manager.DidDismiss?.Invoke(_manager, GetDidDismissEventArgs(didDismissEvent));
         }
 
-        private InAppMessageWillDisplayEventArgs GetWillDisplayEventArgs(Com.OneSignal.Android.InAppMessages.IInAppMessageWillDisplayEvent willDisplayEvent)
+        private InAppMessageWillDisplayEventArgs GetWillDisplayEventArgs(
+            Com.OneSignal.Android.InAppMessages.IInAppMessageWillDisplayEvent willDisplayEvent
+        )
         {
-            return new InAppMessageWillDisplayEventArgs(FromNativeConversion.ToInAppMessage(willDisplayEvent.Message));
+            return new InAppMessageWillDisplayEventArgs(
+                FromNativeConversion.ToInAppMessage(willDisplayEvent.Message)
+            );
         }
 
-        private InAppMessageDidDisplayEventArgs GetDidDisplayEventArgs(Com.OneSignal.Android.InAppMessages.IInAppMessageDidDisplayEvent didDisplayEvent)
+        private InAppMessageDidDisplayEventArgs GetDidDisplayEventArgs(
+            Com.OneSignal.Android.InAppMessages.IInAppMessageDidDisplayEvent didDisplayEvent
+        )
         {
-            return new InAppMessageDidDisplayEventArgs(FromNativeConversion.ToInAppMessage(didDisplayEvent.Message));
+            return new InAppMessageDidDisplayEventArgs(
+                FromNativeConversion.ToInAppMessage(didDisplayEvent.Message)
+            );
         }
 
-        private InAppMessageWillDismissEventArgs GetWillDismissEventArgs(Com.OneSignal.Android.InAppMessages.IInAppMessageWillDismissEvent willDismissEvent)
+        private InAppMessageWillDismissEventArgs GetWillDismissEventArgs(
+            Com.OneSignal.Android.InAppMessages.IInAppMessageWillDismissEvent willDismissEvent
+        )
         {
-            return new InAppMessageWillDismissEventArgs(FromNativeConversion.ToInAppMessage(willDismissEvent.Message));
+            return new InAppMessageWillDismissEventArgs(
+                FromNativeConversion.ToInAppMessage(willDismissEvent.Message)
+            );
         }
 
-        private InAppMessageDidDismissEventArgs GetDidDismissEventArgs(Com.OneSignal.Android.InAppMessages.IInAppMessageDidDismissEvent didDismissEvent)
+        private InAppMessageDidDismissEventArgs GetDidDismissEventArgs(
+            Com.OneSignal.Android.InAppMessages.IInAppMessageDidDismissEvent didDismissEvent
+        )
         {
-            return new InAppMessageDidDismissEventArgs(FromNativeConversion.ToInAppMessage(didDismissEvent.Message));
+            return new InAppMessageDidDismissEventArgs(
+                FromNativeConversion.ToInAppMessage(didDismissEvent.Message)
+            );
         }
     }
 }
diff --git a/OneSignalSDK.DotNet.Android/AndroidLiveActivitiesManager.cs b/OneSignalSDK.DotNet.Android/AndroidLiveActivitiesManager.cs
index 7a3ed231..b63a9506 100644
--- a/OneSignalSDK.DotNet.Android/AndroidLiveActivitiesManager.cs
+++ b/OneSignalSDK.DotNet.Android/AndroidLiveActivitiesManager.cs
@@ -1,11 +1,12 @@
 using System;
+
 namespace OneSignalSDK.DotNet.Android;
 
 using System.Threading.Tasks;
 using OneSignalSDK.DotNet.Core;
 using OneSignalSDK.DotNet.Core.LiveActivities;
 
-public class AndroidLiveActivitiesManager: ILiveActivitiesManager
+public class AndroidLiveActivitiesManager : ILiveActivitiesManager
 {
     public Task<bool> Enter(string activityId, string token)
     {
@@ -34,8 +35,12 @@ public void SetupDefault(LiveActivitySetupOptions options = null)
         Console.WriteLine("OneSignal: SetupDefault is available on iOS only");
     }
 
-    public void StartDefault(string activityId, IDictionary<string, object> attributes, IDictionary<string, object> content)
+    public void StartDefault(
+        string activityId,
+        IDictionary<string, object> attributes,
+        IDictionary<string, object> content
+    )
     {
         Console.WriteLine("OneSignal: StartDefault is available on iOS only");
     }
-}
\ No newline at end of file
+}
diff --git a/OneSignalSDK.DotNet.Android/AndroidLocationManager.cs b/OneSignalSDK.DotNet.Android/AndroidLocationManager.cs
index 14ce5872..cedb882b 100644
--- a/OneSignalSDK.DotNet.Android/AndroidLocationManager.cs
+++ b/OneSignalSDK.DotNet.Android/AndroidLocationManager.cs
@@ -1,6 +1,5 @@
 using OneSignalSDK.DotNet.Core;
 using OneSignalSDK.DotNet.Core.Location;
-
 using OneSignalNative = Com.OneSignal.Android.OneSignal;
 
 namespace OneSignalSDK.DotNet.Android;
diff --git a/OneSignalSDK.DotNet.Android/AndroidNotificationsManager.cs b/OneSignalSDK.DotNet.Android/AndroidNotificationsManager.cs
index 68086e8d..e7f9611f 100644
--- a/OneSignalSDK.DotNet.Android/AndroidNotificationsManager.cs
+++ b/OneSignalSDK.DotNet.Android/AndroidNotificationsManager.cs
@@ -2,7 +2,6 @@
 using OneSignalSDK.DotNet.Core;
 using OneSignalSDK.DotNet.Core.Internal.Utilities;
 using OneSignalSDK.DotNet.Core.Notifications;
-
 using OneSignalNative = Com.OneSignal.Android.OneSignal;
 
 namespace OneSignalSDK.DotNet.Android;
@@ -16,6 +15,7 @@ public class AndroidNotificationsManager : INotificationsManager
     public bool Permission => OneSignalNative.Notifications.Permission;
 
     private InternalNotificationsEventsHandler? _notificationsEventsHandler;
+
     public void Initialize()
     {
         _notificationsEventsHandler = new InternalNotificationsEventsHandler(this);
@@ -27,22 +27,27 @@ public void Initialize()
 
     public NotificationPermission PermissionNative()
     {
-       return this.Permission ? NotificationPermission.Authorized : NotificationPermission.Denied;
+        return this.Permission ? NotificationPermission.Authorized : NotificationPermission.Denied;
     }
 
     public async Task<bool> RequestPermissionAsync(bool fallbackToSettings)
     {
         var consumer = new AndroidBoolConsumer();
-        OneSignalNative.Notifications.RequestPermission(fallbackToSettings, Com.OneSignal.Android.Continue.With(consumer));
+        OneSignalNative.Notifications.RequestPermission(
+            fallbackToSettings,
+            Com.OneSignal.Android.Continue.With(consumer)
+        );
         return await consumer;
     }
 
-    private class InternalNotificationsEventsHandler : Java.Lang.Object,
-        Com.OneSignal.Android.Notifications.IPermissionObserver,
-        Com.OneSignal.Android.Notifications.INotificationLifecycleListener,
-        Com.OneSignal.Android.Notifications.INotificationClickListener
+    private class InternalNotificationsEventsHandler
+        : Java.Lang.Object,
+            Com.OneSignal.Android.Notifications.IPermissionObserver,
+            Com.OneSignal.Android.Notifications.INotificationLifecycleListener,
+            Com.OneSignal.Android.Notifications.INotificationClickListener
     {
         private AndroidNotificationsManager _manager;
+
         public InternalNotificationsEventsHandler(AndroidNotificationsManager manager)
         {
             _manager = manager;
@@ -50,12 +55,19 @@ public InternalNotificationsEventsHandler(AndroidNotificationsManager manager)
 
         public void OnNotificationPermissionChange(bool permission)
         {
-            _manager.PermissionChanged?.Invoke(_manager, new NotificationPermissionChangedEventArgs(permission));
+            _manager.PermissionChanged?.Invoke(
+                _manager,
+                new NotificationPermissionChangedEventArgs(permission)
+            );
         }
 
-        public void OnWillDisplay(Com.OneSignal.Android.Notifications.INotificationWillDisplayEvent willDisplayEvent)
+        public void OnWillDisplay(
+            Com.OneSignal.Android.Notifications.INotificationWillDisplayEvent willDisplayEvent
+        )
         {
-            var notification = AndroidDisplayableNotification.ToDisplayableNotification(willDisplayEvent.Notification);
+            var notification = AndroidDisplayableNotification.ToDisplayableNotification(
+                willDisplayEvent.Notification
+            );
             var args = new AndroidNotificationWillDisplayEventArgs(willDisplayEvent, notification);
 
             _manager.WillDisplay?.Invoke(_manager, args);
@@ -65,17 +77,24 @@ public void OnClick(Com.OneSignal.Android.Notifications.INotificationClickEvent
         {
             var notification = FromNativeConversion.ToNotification(clickEvent.Notification);
             var result = FromNativeConversion.ToNotificationClickResult(clickEvent.Result);
-            var args = new OneSignalSDK.DotNet.Core.Notifications.NotificationClickedEventArgs(notification, result);
+            var args = new OneSignalSDK.DotNet.Core.Notifications.NotificationClickedEventArgs(
+                notification,
+                result
+            );
             _manager.Clicked?.Invoke(_manager, args);
         }
     }
 
-    private sealed class AndroidNotificationWillDisplayEventArgs : OneSignalSDK.DotNet.Core.Notifications.NotificationWillDisplayEventArgs
+    private sealed class AndroidNotificationWillDisplayEventArgs
+        : OneSignalSDK.DotNet.Core.Notifications.NotificationWillDisplayEventArgs
     {
         private Com.OneSignal.Android.Notifications.INotificationWillDisplayEvent _willDisplayEvent;
 
-        public AndroidNotificationWillDisplayEventArgs(Com.OneSignal.Android.Notifications.INotificationWillDisplayEvent willDisplayEvent,
-                                                   DisplayableNotification notification) : base(notification)
+        public AndroidNotificationWillDisplayEventArgs(
+            Com.OneSignal.Android.Notifications.INotificationWillDisplayEvent willDisplayEvent,
+            DisplayableNotification notification
+        )
+            : base(notification)
         {
             _willDisplayEvent = willDisplayEvent;
         }
@@ -86,41 +105,54 @@ public override void PreventDefault()
         }
     }
 
-    private sealed class AndroidDisplayableNotification : OneSignalSDK.DotNet.Core.Notifications.DisplayableNotification
+    private sealed class AndroidDisplayableNotification
+        : OneSignalSDK.DotNet.Core.Notifications.DisplayableNotification
     {
-        public static AndroidDisplayableNotification ToDisplayableNotification(Com.OneSignal.Android.Notifications.IDisplayableNotification notification)
+        public static AndroidDisplayableNotification ToDisplayableNotification(
+            Com.OneSignal.Android.Notifications.IDisplayableNotification notification
+        )
         {
             IDictionary<string, object> additionalData = new Dictionary<string, object>();
             if (notification.AdditionalData != null)
-                additionalData = Json.Deserialize(notification.AdditionalData.ToString()) as IDictionary<string, object> ?? new Dictionary<string, object>();
+                additionalData =
+                    Json.Deserialize(notification.AdditionalData.ToString())
+                        as IDictionary<string, object>
+                    ?? new Dictionary<string, object>();
 
             IList<OneSignalSDK.DotNet.Core.Notifications.Notification>? groupedNotifications = null;
             if (notification.GroupedNotifications != null)
             {
-                groupedNotifications = new List<OneSignalSDK.DotNet.Core.Notifications.Notification>();
+                groupedNotifications =
+                    new List<OneSignalSDK.DotNet.Core.Notifications.Notification>();
                 foreach (var individualNotification in notification.GroupedNotifications)
-                    groupedNotifications.Add(FromNativeConversion.ToNotification(individualNotification));
+                    groupedNotifications.Add(
+                        FromNativeConversion.ToNotification(individualNotification)
+                    );
             }
 
             var actionButtons = new List<OneSignalSDK.DotNet.Core.Notifications.ActionButton>();
             if (notification.ActionButtons != null)
             {
                 foreach (var actionButton in notification.ActionButtons)
-                    actionButtons.Add(new OneSignalSDK.DotNet.Core.Notifications.ActionButton(
-                        id: actionButton.Id,
-                        text: actionButton.Text,
-                        icon: actionButton.Icon
-                    ));
+                    actionButtons.Add(
+                        new OneSignalSDK.DotNet.Core.Notifications.ActionButton(
+                            id: actionButton.Id,
+                            text: actionButton.Text,
+                            icon: actionButton.Icon
+                        )
+                    );
             }
 
-            OneSignalSDK.DotNet.Core.Notifications.BackgroundImageLayout? backgroundImageLayout = null;
+            OneSignalSDK.DotNet.Core.Notifications.BackgroundImageLayout? backgroundImageLayout =
+                null;
             if (notification.BackgroundImageLayout != null)
             {
-                backgroundImageLayout = new OneSignalSDK.DotNet.Core.Notifications.BackgroundImageLayout(
-                    image: notification.BackgroundImageLayout.Image,
-                    titleTextColor: notification.BackgroundImageLayout.TitleTextColor,
-                    bodyTextColor: notification.BackgroundImageLayout.BodyTextColor
-                );
+                backgroundImageLayout =
+                    new OneSignalSDK.DotNet.Core.Notifications.BackgroundImageLayout(
+                        image: notification.BackgroundImageLayout.Image,
+                        titleTextColor: notification.BackgroundImageLayout.TitleTextColor,
+                        bodyTextColor: notification.BackgroundImageLayout.BodyTextColor
+                    );
             }
 
             return new AndroidDisplayableNotification(
@@ -148,7 +180,7 @@ public static AndroidDisplayableNotification ToDisplayableNotification(Com.OneSi
                 androidNotificationId: notification.AndroidNotificationId
             );
         }
-            
+
         private Com.OneSignal.Android.Notifications.IDisplayableNotification _displayableNotification;
 
         public AndroidDisplayableNotification(
@@ -176,15 +208,17 @@ public AndroidDisplayableNotification(
             string smallIconAccentColor = null,
             int? lockScreenVisibility = null,
             int? androidNotificationId = null,
-            int? badge = null, int?
-            badgeIncrement = null,
+            int? badge = null,
+            int? badgeIncrement = null,
             string category = null,
             string threadId = null,
             string subtitle = null,
             float? relevanceScore = null,
             bool? mutableContent = null,
             bool? contentAvailable = null,
-            string interruptionLevel = null) : base(
+            string interruptionLevel = null
+        )
+            : base(
                 title,
                 body,
                 sound,
@@ -216,7 +250,8 @@ public AndroidDisplayableNotification(
                 relevanceScore,
                 mutableContent,
                 contentAvailable,
-                interruptionLevel)
+                interruptionLevel
+            )
         {
             _displayableNotification = displayableNotification;
         }
diff --git a/OneSignalSDK.DotNet.Android/AndroidOneSignal.cs b/OneSignalSDK.DotNet.Android/AndroidOneSignal.cs
index 33cb9017..78d46486 100644
--- a/OneSignalSDK.DotNet.Android/AndroidOneSignal.cs
+++ b/OneSignalSDK.DotNet.Android/AndroidOneSignal.cs
@@ -1,16 +1,15 @@
-using Android.Content;
+using Android.App;
+using Android.Content;
 using OneSignalSDK.DotNet.Core;
 using OneSignalSDK.DotNet.Core.Debug;
 using OneSignalSDK.DotNet.Core.InAppMessages;
+using OneSignalSDK.DotNet.Core.Internal.Utilities;
+using OneSignalSDK.DotNet.Core.LiveActivities;
 using OneSignalSDK.DotNet.Core.Location;
 using OneSignalSDK.DotNet.Core.Notifications;
 using OneSignalSDK.DotNet.Core.Session;
 using OneSignalSDK.DotNet.Core.User;
-using OneSignalSDK.DotNet.Core.Internal.Utilities;
-
-using Android.App;
 using OneSignalNative = Com.OneSignal.Android.OneSignal;
-using OneSignalSDK.DotNet.Core.LiveActivities;
 
 namespace OneSignalSDK.DotNet.Android;
 
@@ -20,7 +19,7 @@ public class AndroidOneSignal : IOneSignal
      *  in the binding projects that are otherwised not referenced. If we did *not*, then
      *  the binding DLLs will not be included in the output bin directory.
      */
-    
+
     private static Com.OneSignal.Android.InAppMessages.IInAppMessagesManager InAppMessagesBuildConfig;
     private static Com.OneSignal.Android.Notifications.INotificationsManager NotificationsBuildConfig;
     private static Com.OneSignal.Android.Location.ILocationManager LocationBuildConfig;
@@ -56,7 +55,8 @@ public void Initialize(string appId)
         Com.OneSignal.Android.Common.OneSignalWrapper.SdkType = WrapperSDK.Type;
 
         var version = WrapperSDK.Version;
-        if (version != null) {
+        if (version != null)
+        {
             Com.OneSignal.Android.Common.OneSignalWrapper.SdkVersion = version;
         }
 
diff --git a/OneSignalSDK.DotNet.Android/AndroidSessionManager.cs b/OneSignalSDK.DotNet.Android/AndroidSessionManager.cs
index 4916c45f..310c51e1 100644
--- a/OneSignalSDK.DotNet.Android/AndroidSessionManager.cs
+++ b/OneSignalSDK.DotNet.Android/AndroidSessionManager.cs
@@ -1,6 +1,5 @@
 using OneSignalSDK.DotNet.Core;
 using OneSignalSDK.DotNet.Core.Session;
-
 using OneSignalNative = Com.OneSignal.Android.OneSignal;
 
 namespace OneSignalSDK.DotNet.Android;
@@ -8,6 +7,9 @@ namespace OneSignalSDK.DotNet.Android;
 public class AndroidSessionManager : ISessionManager
 {
     public void AddOutcome(string name) => OneSignalNative.Session.AddOutcome(name);
+
     public void AddUniqueOutcome(string name) => OneSignalNative.Session.AddUniqueOutcome(name);
-    public void AddOutcomeWithValue(string name, float value) => OneSignalNative.Session.AddOutcomeWithValue(name, value);
+
+    public void AddOutcomeWithValue(string name, float value) =>
+        OneSignalNative.Session.AddOutcomeWithValue(name, value);
 }
diff --git a/OneSignalSDK.DotNet.Android/AndroidUserManager.cs b/OneSignalSDK.DotNet.Android/AndroidUserManager.cs
index 56f4e2e2..93e27649 100644
--- a/OneSignalSDK.DotNet.Android/AndroidUserManager.cs
+++ b/OneSignalSDK.DotNet.Android/AndroidUserManager.cs
@@ -1,8 +1,8 @@
 using System.Reflection.Emit;
+using OneSignalSDK.DotNet.Android.Utilities;
 using OneSignalSDK.DotNet.Core;
 using OneSignalSDK.DotNet.Core.User;
 using OneSignalSDK.DotNet.Core.User.Subscriptions;
-using OneSignalSDK.DotNet.Android.Utilities;
 using OneSignalNative = Com.OneSignal.Android.OneSignal;
 
 namespace OneSignalSDK.DotNet.Android
@@ -25,39 +25,52 @@ public void Initialize()
             ((AndroidPushSubscription)PushSubscription).Initialize();
         }
 
-        public string OneSignalId 
+        public string OneSignalId
         {
-            get {
+            get
+            {
                 string id = OneSignalNative.User.OnesignalId;
-                return string.IsNullOrEmpty(id)? null : id;
+                return string.IsNullOrEmpty(id) ? null : id;
             }
         }
 
-        public string ExternalId 
+        public string ExternalId
         {
-            get {
+            get
+            {
                 string id = OneSignalNative.User.ExternalId;
-                return string.IsNullOrEmpty(id)? null : id;
+                return string.IsNullOrEmpty(id) ? null : id;
             }
         }
 
         public event EventHandler<UserStateChangedEventArgs> Changed;
 
         public void AddAlias(string label, string id) => OneSignalNative.User.AddAlias(label, id);
-        public void AddAliases(IDictionary<string, string> aliases) => OneSignalNative.User.AddAliases(aliases);
+
+        public void AddAliases(IDictionary<string, string> aliases) =>
+            OneSignalNative.User.AddAliases(aliases);
+
         public void RemoveAlias(string label) => OneSignalNative.User.RemoveAlias(label);
-        public void RemoveAliases(params string[] labels) => OneSignalNative.User.RemoveAliases(labels);
+
+        public void RemoveAliases(params string[] labels) =>
+            OneSignalNative.User.RemoveAliases(labels);
 
         public void AddEmail(string email) => OneSignalNative.User.AddEmail(email);
+
         public void RemoveEmail(string email) => OneSignalNative.User.RemoveEmail(email);
 
         public void AddSms(string sms) => OneSignalNative.User.AddSms(sms);
+
         public void RemoveSms(string sms) => OneSignalNative.User.RemoveSms(sms);
 
         public void AddTag(string key, string value) => OneSignalNative.User.AddTag(key, value);
+
         public void AddTags(IDictionary<string, string> tags) => OneSignalNative.User.AddTags(tags);
+
         public void RemoveTag(string key) => OneSignalNative.User.RemoveTag(key);
+
         public void RemoveTags(params string[] keys) => OneSignalNative.User.RemoveTags(keys);
+
         public IDictionary<string, string> GetTags() => OneSignalNative.User.Tags;
 
         public void TrackEvent(string name, IDictionary<string, object>? properties = null)
@@ -78,9 +91,12 @@ public InternalUserState(string onesignalId, string externalId)
             }
         }
 
-        private class InternalUserChangedHandler : Java.Lang.Object, Com.OneSignal.Android.User.State.IUserStateObserver
+        private class InternalUserChangedHandler
+            : Java.Lang.Object,
+                Com.OneSignal.Android.User.State.IUserStateObserver
         {
             private AndroidUserManager _manager;
+
             public InternalUserChangedHandler(AndroidUserManager manager)
             {
                 _manager = manager;
@@ -88,7 +104,10 @@ public InternalUserChangedHandler(AndroidUserManager manager)
 
             public void OnUserStateChange(Com.OneSignal.Android.User.State.UserChangedState state)
             {
-                var current = new InternalUserState(state.Current.OnesignalId, state.Current.ExternalId);
+                var current = new InternalUserState(
+                    state.Current.OnesignalId,
+                    state.Current.ExternalId
+                );
                 var userChangedState = new UserChangedState(current);
                 _manager.Changed?.Invoke(_manager, new UserStateChangedEventArgs(userChangedState));
             }
@@ -131,7 +150,6 @@ private sealed class InternalPushSubscriptionState : IPushSubscriptionState
 
             public bool OptedIn { get; }
 
-
             public InternalPushSubscriptionState(string token, bool optedIn, string id)
             {
                 Token = token;
@@ -140,22 +158,37 @@ public InternalPushSubscriptionState(string token, bool optedIn, string id)
             }
         }
 
-        private class InternalSubscriptionChangedHandler : Java.Lang.Object, Com.OneSignal.Android.User.Subscriptions.IPushSubscriptionObserver
+        private class InternalSubscriptionChangedHandler
+            : Java.Lang.Object,
+                Com.OneSignal.Android.User.Subscriptions.IPushSubscriptionObserver
         {
             private AndroidPushSubscription _manager;
+
             public InternalSubscriptionChangedHandler(AndroidPushSubscription manager)
             {
                 _manager = manager;
             }
 
-            public void OnPushSubscriptionChange(Com.OneSignal.Android.User.Subscriptions.PushSubscriptionChangedState state)
+            public void OnPushSubscriptionChange(
+                Com.OneSignal.Android.User.Subscriptions.PushSubscriptionChangedState state
+            )
             {
-                var previous = new InternalPushSubscriptionState(state.Previous.Token, state.Previous.OptedIn, state.Previous.Id);
-                var current = new InternalPushSubscriptionState(state.Current.Token, state.Current.OptedIn, state.Current.Id);
+                var previous = new InternalPushSubscriptionState(
+                    state.Previous.Token,
+                    state.Previous.OptedIn,
+                    state.Previous.Id
+                );
+                var current = new InternalPushSubscriptionState(
+                    state.Current.Token,
+                    state.Current.OptedIn,
+                    state.Current.Id
+                );
                 var changedState = new PushSubscriptionChangedState(previous, current);
-                _manager.Changed?.Invoke(_manager, new PushSubscriptionChangedEventArgs(changedState));
+                _manager.Changed?.Invoke(
+                    _manager,
+                    new PushSubscriptionChangedEventArgs(changedState)
+                );
             }
         }
-
     }
 }
diff --git a/OneSignalSDK.DotNet.Android/OneSignalSDK.DotNet.Android.csproj b/OneSignalSDK.DotNet.Android/OneSignalSDK.DotNet.Android.csproj
index f67eec0e..b21928cf 100644
--- a/OneSignalSDK.DotNet.Android/OneSignalSDK.DotNet.Android.csproj
+++ b/OneSignalSDK.DotNet.Android/OneSignalSDK.DotNet.Android.csproj
@@ -12,8 +12,7 @@
     <AssemblyName>OneSignalSDK.DotNet.Android</AssemblyName>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AndroidTlsProvider>
-    </AndroidTlsProvider>
+    <AndroidTlsProvider></AndroidTlsProvider>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,4 +66,4 @@
     <PackageReference Include="Xamarin.GooglePlayServices.Base" Version="118.1.0" />
     <PackageReference Include="Xamarin.AndroidX.Work.Work.Runtime.Ktx" Version="2.7.1.5" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/OneSignalSDK.DotNet.Android/Utilities/AndroidConsumer.cs b/OneSignalSDK.DotNet.Android/Utilities/AndroidConsumer.cs
index 0bd2cad2..b19d3af0 100644
--- a/OneSignalSDK.DotNet.Android/Utilities/AndroidConsumer.cs
+++ b/OneSignalSDK.DotNet.Android/Utilities/AndroidConsumer.cs
@@ -29,14 +29,16 @@ public void Accept(Java.Lang.Object? t)
             {
                 _completionSource.TrySetResult(Complete(result.Data));
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 _completionSource.TrySetException(e);
             }
         }
         else
         {
-            _completionSource.TrySetException(result?.Throwable ?? new Exception("Error with async method"));
+            _completionSource.TrySetException(
+                result?.Throwable ?? new Exception("Error with async method")
+            );
         }
     }
 
@@ -73,7 +75,7 @@ public class AndroidBoolConsumer : AndroidConsumer<bool>, IConsumer
 {
     protected override bool Complete(Java.Lang.Object? data)
     {
-        if(data != null && (data is Java.Lang.Boolean))
+        if (data != null && (data is Java.Lang.Boolean))
         {
             return ((Java.Lang.Boolean)data!).BooleanValue();
         }
diff --git a/OneSignalSDK.DotNet.Android/Utilities/FromNativeConversion.cs b/OneSignalSDK.DotNet.Android/Utilities/FromNativeConversion.cs
index d3a03e0d..054e69c5 100644
--- a/OneSignalSDK.DotNet.Android/Utilities/FromNativeConversion.cs
+++ b/OneSignalSDK.DotNet.Android/Utilities/FromNativeConversion.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using OneSignalSDK.DotNet.Core.Debug;
 using OneSignalSDK.DotNet.Core.InAppMessages;
-using OneSignalSDK.DotNet.Core.Notifications;
 using OneSignalSDK.DotNet.Core.Internal.Utilities;
+using OneSignalSDK.DotNet.Core.Notifications;
 
 namespace OneSignalSDK.DotNet.Android.Utilities;
 
@@ -12,11 +12,16 @@ namespace OneSignalSDK.DotNet.Android.Utilities;
 /// </summary>
 public static class FromNativeConversion
 {
-    public static OneSignalSDK.DotNet.Core.Notifications.Notification ToNotification(Com.OneSignal.Android.Notifications.INotification notification)
+    public static OneSignalSDK.DotNet.Core.Notifications.Notification ToNotification(
+        Com.OneSignal.Android.Notifications.INotification notification
+    )
     {
         IDictionary<string, object> additionalData = new Dictionary<string, object>();
         if (notification.AdditionalData != null)
-            additionalData = Json.Deserialize(notification.AdditionalData.ToString()) as IDictionary<string, object> ?? new Dictionary<string, object>();
+            additionalData =
+                Json.Deserialize(notification.AdditionalData.ToString())
+                    as IDictionary<string, object>
+                ?? new Dictionary<string, object>();
 
         IList<OneSignalSDK.DotNet.Core.Notifications.Notification>? groupedNotifications = null;
         if (notification.GroupedNotifications != null)
@@ -30,21 +35,24 @@ public static OneSignalSDK.DotNet.Core.Notifications.Notification ToNotification
         if (notification.ActionButtons != null)
         {
             foreach (var actionButton in notification.ActionButtons)
-                actionButtons.Add(new OneSignalSDK.DotNet.Core.Notifications.ActionButton(
-                    id: actionButton.Id,
-                    text: actionButton.Text,
-                    icon: actionButton.Icon
-                ));
+                actionButtons.Add(
+                    new OneSignalSDK.DotNet.Core.Notifications.ActionButton(
+                        id: actionButton.Id,
+                        text: actionButton.Text,
+                        icon: actionButton.Icon
+                    )
+                );
         }
 
         OneSignalSDK.DotNet.Core.Notifications.BackgroundImageLayout? backgroundImageLayout = null;
         if (notification.BackgroundImageLayout != null)
         {
-            backgroundImageLayout = new OneSignalSDK.DotNet.Core.Notifications.BackgroundImageLayout(
-                image: notification.BackgroundImageLayout.Image,
-                titleTextColor: notification.BackgroundImageLayout.TitleTextColor,
-                bodyTextColor: notification.BackgroundImageLayout.BodyTextColor
-            );
+            backgroundImageLayout =
+                new OneSignalSDK.DotNet.Core.Notifications.BackgroundImageLayout(
+                    image: notification.BackgroundImageLayout.Image,
+                    titleTextColor: notification.BackgroundImageLayout.TitleTextColor,
+                    bodyTextColor: notification.BackgroundImageLayout.BodyTextColor
+                );
         }
 
         return new OneSignalSDK.DotNet.Core.Notifications.Notification(
@@ -72,22 +80,23 @@ public static OneSignalSDK.DotNet.Core.Notifications.Notification ToNotification
         );
     }
 
-    public static OneSignalSDK.DotNet.Core.Notifications.NotificationClickResult ToNotificationClickResult(Com.OneSignal.Android.Notifications.INotificationClickResult result)
+    public static OneSignalSDK.DotNet.Core.Notifications.NotificationClickResult ToNotificationClickResult(
+        Com.OneSignal.Android.Notifications.INotificationClickResult result
+    )
     {
-        return new NotificationClickResult(
-            actionId: result.ActionId,
-            url: result.Url
-        );
+        return new NotificationClickResult(actionId: result.ActionId, url: result.Url);
     }
 
-    public static InAppMessage ToInAppMessage(Com.OneSignal.Android.InAppMessages.IInAppMessage inAppMessage)
+    public static InAppMessage ToInAppMessage(
+        Com.OneSignal.Android.InAppMessages.IInAppMessage inAppMessage
+    )
     {
-        return new InAppMessage(
-           messageId: inAppMessage.MessageId
-        );
+        return new InAppMessage(messageId: inAppMessage.MessageId);
     }
 
-    public static InAppMessageClickResult ToInAppMessageClickResult(Com.OneSignal.Android.InAppMessages.IInAppMessageClickResult clickResult)
+    public static InAppMessageClickResult ToInAppMessageClickResult(
+        Com.OneSignal.Android.InAppMessages.IInAppMessageClickResult clickResult
+    )
     {
         return new InAppMessageClickResult(
             actionId: clickResult.ActionId,
diff --git a/OneSignalSDK.DotNet.Android/Utilities/ToNativeConversion.cs b/OneSignalSDK.DotNet.Android/Utilities/ToNativeConversion.cs
index 1c448e57..92594daf 100644
--- a/OneSignalSDK.DotNet.Android/Utilities/ToNativeConversion.cs
+++ b/OneSignalSDK.DotNet.Android/Utilities/ToNativeConversion.cs
@@ -92,7 +92,9 @@ public static Com.OneSignal.Android.Debug.LogLevel ToLogLevel(LogLevel logLevel)
         return null;
     }
 
-    public static IDictionary<string, Java.Lang.Object>? DictToJavaMap(IDictionary<string, object>? dict)
+    public static IDictionary<string, Java.Lang.Object>? DictToJavaMap(
+        IDictionary<string, object>? dict
+    )
     {
         if (dict == null)
             return null;
diff --git a/OneSignalSDK.DotNet.Core/Debug/IDebugManager.cs b/OneSignalSDK.DotNet.Core/Debug/IDebugManager.cs
index 1d94b97c..4558ef3d 100644
--- a/OneSignalSDK.DotNet.Core/Debug/IDebugManager.cs
+++ b/OneSignalSDK.DotNet.Core/Debug/IDebugManager.cs
@@ -1,6 +1,5 @@
 namespace OneSignalSDK.DotNet.Core.Debug
 {
-
     /// <summary>
     /// Access to debug the SDK in the event additional information is required to diagnose any
     /// SDK-related issues.
@@ -17,4 +16,4 @@ public interface IDebugManager
         /// </summary>
         LogLevel AlertLevel { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/OneSignalSDK.DotNet.Core/Debug/LogLevel.cs b/OneSignalSDK.DotNet.Core/Debug/LogLevel.cs
index 8e85af7b..f08e4b97 100644
--- a/OneSignalSDK.DotNet.Core/Debug/LogLevel.cs
+++ b/OneSignalSDK.DotNet.Core/Debug/LogLevel.cs
@@ -1,4 +1,13 @@
 namespace OneSignalSDK.DotNet.Core.Debug
 {
-    public enum LogLevel { NONE, FATAL, ERROR, WARN, INFO, DEBUG, VERBOSE }
-}
\ No newline at end of file
+    public enum LogLevel
+    {
+        NONE,
+        FATAL,
+        ERROR,
+        WARN,
+        INFO,
+        DEBUG,
+        VERBOSE,
+    }
+}
diff --git a/OneSignalSDK.DotNet.Core/IOneSignal.cs b/OneSignalSDK.DotNet.Core/IOneSignal.cs
index 51b3d28b..5929f8fb 100644
--- a/OneSignalSDK.DotNet.Core/IOneSignal.cs
+++ b/OneSignalSDK.DotNet.Core/IOneSignal.cs
@@ -2,11 +2,11 @@
 using System.Threading.Tasks;
 using OneSignalSDK.DotNet.Core.Debug;
 using OneSignalSDK.DotNet.Core.InAppMessages;
+using OneSignalSDK.DotNet.Core.LiveActivities;
 using OneSignalSDK.DotNet.Core.Location;
 using OneSignalSDK.DotNet.Core.Notifications;
 using OneSignalSDK.DotNet.Core.Session;
 using OneSignalSDK.DotNet.Core.User;
-using OneSignalSDK.DotNet.Core.LiveActivities;
 
 namespace OneSignalSDK.DotNet.Core
 {
@@ -112,4 +112,4 @@ public interface IOneSignal
         /// </summary>
         void Logout();
     }
-}
\ No newline at end of file
+}
diff --git a/OneSignalSDK.DotNet.Core/InAppMessages/IInAppMessagesManager.cs b/OneSignalSDK.DotNet.Core/InAppMessages/IInAppMessagesManager.cs
index b7d2d8e7..b75eddce 100644
--- a/OneSignalSDK.DotNet.Core/InAppMessages/IInAppMessagesManager.cs
+++ b/OneSignalSDK.DotNet.Core/InAppMessages/IInAppMessagesManager.cs
@@ -88,4 +88,4 @@ public interface IInAppMessagesManager
         /// </summary>
         void ClearTriggers();
     }
-}
\ No newline at end of file
+}
diff --git a/OneSignalSDK.DotNet.Core/InAppMessages/InAppMessage.cs b/OneSignalSDK.DotNet.Core/InAppMessages/InAppMessage.cs
index 87985e4c..e7cf045a 100644
--- a/OneSignalSDK.DotNet.Core/InAppMessages/InAppMessage.cs
+++ b/OneSignalSDK.DotNet.Core/InAppMessages/InAppMessage.cs
@@ -14,4 +14,4 @@ public InAppMessage(string messageId)
             MessageId = messageId;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OneSignalSDK.DotNet.Core/InAppMessages/InAppMessageClickResult.cs b/OneSignalSDK.DotNet.Core/InAppMessages/InAppMessageClickResult.cs
index ac5473a3..721cae73 100644
--- a/OneSignalSDK.DotNet.Core/InAppMessages/InAppMessageClickResult.cs
+++ b/OneSignalSDK.DotNet.Core/InAppMessages/InAppMessageClickResult.cs
@@ -29,7 +29,12 @@ public class InAppMessageClickResult
         /// </summary>
         public bool ClosingMessage { get; }
 
-        public InAppMessageClickResult(string actionId, string url, InAppMessageActionUrlType urlTarget, bool closingMessage)
+        public InAppMessageClickResult(
+            string actionId,
+            string url,
+            InAppMessageActionUrlType urlTarget,
+            bool closingMessage
+        )
         {
             ActionId = actionId;
             Url = url;
@@ -42,6 +47,6 @@ public enum InAppMessageActionUrlType
     {
         Browser,
         InAppWebview,
-        ReplaceContent
+        ReplaceContent,
     }
-}
\ No newline at end of file
+}
diff --git a/OneSignalSDK.DotNet.Core/InAppMessages/InAppMessageLifecycleEventArgs.cs b/OneSignalSDK.DotNet.Core/InAppMessages/InAppMessageLifecycleEventArgs.cs
index e3eb8fa1..059e0515 100644
--- a/OneSignalSDK.DotNet.Core/InAppMessages/InAppMessageLifecycleEventArgs.cs
+++ b/OneSignalSDK.DotNet.Core/InAppMessages/InAppMessageLifecycleEventArgs.cs
@@ -69,4 +69,4 @@ public InAppMessageDidDismissEventArgs(InAppMessage message)
             Message = message;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OneSignalSDK.DotNet.Core/Internal/Utilities/Json.cs b/OneSignalSDK.DotNet.Core/Internal/Utilities/Json.cs
index bbdc3f36..59d548d2 100644
--- a/OneSignalSDK.DotNet.Core/Internal/Utilities/Json.cs
+++ b/OneSignalSDK.DotNet.Core/Internal/Utilities/Json.cs
@@ -44,7 +44,7 @@ enum TOKEN
                 NUMBER,
                 TRUE,
                 FALSE,
-                NULL
+                NULL,
             };
 
             StringReader json;
@@ -182,7 +182,6 @@ string ParseString()
                 bool parsing = true;
                 while (parsing)
                 {
-
                     if (json.Peek() == -1)
                     {
                         parsing = false;
@@ -277,18 +276,12 @@ void EatWhitespace()
 
             char PeekChar
             {
-                get
-                {
-                    return Convert.ToChar(json.Peek());
-                }
+                get { return Convert.ToChar(json.Peek()); }
             }
 
             char NextChar
             {
-                get
-                {
-                    return Convert.ToChar(json.Read());
-                }
+                get { return Convert.ToChar(json.Read()); }
             }
 
             string NextWord
@@ -536,19 +529,20 @@ void SerializeOther(object value)
                 {
                     builder.Append(((float)value).ToString("R"));
                 }
-                else if (value is int
-                  || value is uint
-                  || value is long
-                  || value is sbyte
-                  || value is byte
-                  || value is short
-                  || value is ushort
-                  || value is ulong)
+                else if (
+                    value is int
+                    || value is uint
+                    || value is long
+                    || value is sbyte
+                    || value is byte
+                    || value is short
+                    || value is ushort
+                    || value is ulong
+                )
                 {
                     builder.Append(value);
                 }
-                else if (value is double
-                  || value is decimal)
+                else if (value is double || value is decimal)
                 {
                     builder.Append(Convert.ToDouble(value).ToString("R"));
                 }
@@ -559,4 +553,4 @@ void SerializeOther(object value)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OneSignalSDK.DotNet.Core/Internal/Utilities/WrapperSDK.cs b/OneSignalSDK.DotNet.Core/Internal/Utilities/WrapperSDK.cs
index 24ed4639..4c808f0d 100644
--- a/OneSignalSDK.DotNet.Core/Internal/Utilities/WrapperSDK.cs
+++ b/OneSignalSDK.DotNet.Core/Internal/Utilities/WrapperSDK.cs
@@ -6,7 +6,6 @@ namespace OneSignalSDK.DotNet.Core.Internal.Utilities
 {
     public static class WrapperSDK
     {
-
         public static string Type = "dotnet";
 
         public static string Version
@@ -21,4 +20,4 @@ public static string Version
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OneSignalSDK.DotNet.Core/LiveActivities/ILiveActivities.cs b/OneSignalSDK.DotNet.Core/LiveActivities/ILiveActivities.cs
index c534bd02..089ada29 100644
--- a/OneSignalSDK.DotNet.Core/LiveActivities/ILiveActivities.cs
+++ b/OneSignalSDK.DotNet.Core/LiveActivities/ILiveActivities.cs
@@ -4,8 +4,8 @@
 
 namespace OneSignalSDK.DotNet.Core.LiveActivities
 {
-	public interface ILiveActivitiesManager
-	{
+    public interface ILiveActivitiesManager
+    {
         /// <summary>
         /// Register this device with OneSignal indicating that the device has entered a live activity.
         /// </summary>
@@ -30,7 +30,7 @@ public interface ILiveActivitiesManager
         /// `DefaultLiveActivityAttributes`. This is most useful for users that (1) only have one Live
         /// Activity widget and (2) are using a cross-platform framework and do not want to create the
         /// cross-platform <-> iOS native bindings to manage ActivityKit.
-        /// 
+        ///
         /// Only applies to iOS.
         /// </summary>
         /// <param name="options">An optional structure to provide for more granular setup options.</param>
@@ -40,20 +40,24 @@ public interface ILiveActivitiesManager
         /// Start a new LiveActivity that is modelled by the default`DefaultLiveActivityAttributes`
         /// structure. The `DefaultLiveActivityAttributes` is initialized with the dynamic `attributes`
         /// and `content` passed in.
-        /// 
+        ///
         /// Only applies to iOS.
         /// </summary>
         /// <param name="activityId">The activity identifier the live activity on this device will be started
         /// and eligible to receive updates for.</param>
         /// <param name="attributes">A dynamic type containing the static attributes passed into `DefaultLiveActivityAttributes`.</param>
         /// <param name="content">A dynamic type containing the content attributes passed into `DefaultLiveActivityAttributes`.</param>
-        void StartDefault(string activityId, IDictionary<string, object> attributes, IDictionary<string, object> content);
+        void StartDefault(
+            string activityId,
+            IDictionary<string, object> attributes,
+            IDictionary<string, object> content
+        );
 
         /// <summary>
         /// Indicate this device is capable of receiving pushToStart live activities for the `activityType`.
         /// The `activityType` **must** be the name of the struct conforming to `ActivityAttributes` that will be used
         /// to start the live activity.
-        /// 
+        ///
         /// Only applies to iOS.
         /// </summary>
         /// <param name="activityType">The name of the specific `ActivityAttributes` structure tied to the live activity.</param>
@@ -64,28 +68,27 @@ public interface ILiveActivitiesManager
         /// Indicate this device is no longer capable of receiving pushToStart live activities for the `activityType`.
         /// The `activityType` **must** be the name of the struct conforming to `ActivityAttributes` that will be used
         /// to start the live activity.
-        /// 
+        ///
         /// Only applies to iOS.
         /// </summary>
         /// <param name="activityType">The name of the specific `ActivityAttributes` structure tied to the live activity.</param>
         void RemovePushToStartToken(string activityType);
-	}
+    }
 
+    /// <summary>
+    /// The setup options for <see cref="ILiveActivitiesManager.SetupDefault"/>.
+    /// </summary>
+    public class LiveActivitySetupOptions
+    {
         /// <summary>
-        /// The setup options for <see cref="ILiveActivitiesManager.SetupDefault"/>.
+        /// When true, OneSignal will listen for pushToStart tokens for the `OneSignalLiveActivityAttributes` structure.
         /// </summary>
-        public class LiveActivitySetupOptions
-        {
-                /// <summary>
-                /// When true, OneSignal will listen for pushToStart tokens for the `OneSignalLiveActivityAttributes` structure.
-                /// </summary>
-                public bool EnablePushToStart { get; set; }
+        public bool EnablePushToStart { get; set; }
 
-                /// <summary>
-                /// When true, OneSignal will listen for pushToUpdate  tokens for each start live activity that uses the
-                /// `OneSignalLiveActivityAttributes` structure.
-                /// </summary>
-                public bool EnablePushToUpdate { get; set; }
-        }
+        /// <summary>
+        /// When true, OneSignal will listen for pushToUpdate  tokens for each start live activity that uses the
+        /// `OneSignalLiveActivityAttributes` structure.
+        /// </summary>
+        public bool EnablePushToUpdate { get; set; }
+    }
 }
-
diff --git a/OneSignalSDK.DotNet.Core/Location/ILocationManager.cs b/OneSignalSDK.DotNet.Core/Location/ILocationManager.cs
index a93280ca..0f020373 100644
--- a/OneSignalSDK.DotNet.Core/Location/ILocationManager.cs
+++ b/OneSignalSDK.DotNet.Core/Location/ILocationManager.cs
@@ -1,7 +1,7 @@
-using static System.Net.WebRequestMethods;
-using System.Security;
-using System.Xml.Linq;
+using System.Security;
 using System.Threading.Tasks;
+using System.Xml.Linq;
+using static System.Net.WebRequestMethods;
 
 namespace OneSignalSDK.DotNet.Core.Location
 {
@@ -36,4 +36,4 @@ public interface ILocationManager
         /// </returns>
         void RequestPermission();
     }
-}
\ No newline at end of file
+}
diff --git a/OneSignalSDK.DotNet.Core/Notifications/DisplayableNotification.cs b/OneSignalSDK.DotNet.Core/Notifications/DisplayableNotification.cs
index 9a6793de..f0b49579 100644
--- a/OneSignalSDK.DotNet.Core/Notifications/DisplayableNotification.cs
+++ b/OneSignalSDK.DotNet.Core/Notifications/DisplayableNotification.cs
@@ -32,15 +32,17 @@ public DisplayableNotification(
             string smallIconAccentColor = null,
             int? lockScreenVisibility = null,
             int? androidNotificationId = null,
-            int? badge = null, int?
-            badgeIncrement = null,
+            int? badge = null,
+            int? badgeIncrement = null,
             string category = null,
             string threadId = null,
             string subtitle = null,
             float? relevanceScore = null,
             bool? mutableContent = null,
             bool? contentAvailable = null,
-            string interruptionLevel = null) : base(
+            string interruptionLevel = null
+        )
+            : base(
                 title,
                 body,
                 sound,
@@ -72,11 +74,9 @@ public DisplayableNotification(
                 relevanceScore,
                 mutableContent,
                 contentAvailable,
-                interruptionLevel)
-        {
-        }
+                interruptionLevel
+            ) { }
 
         public abstract void display();
     }
-
 }
diff --git a/OneSignalSDK.DotNet.Core/Notifications/INotificationsManager.cs b/OneSignalSDK.DotNet.Core/Notifications/INotificationsManager.cs
index 3f48039a..1b3057ba 100644
--- a/OneSignalSDK.DotNet.Core/Notifications/INotificationsManager.cs
+++ b/OneSignalSDK.DotNet.Core/Notifications/INotificationsManager.cs
@@ -1,8 +1,8 @@
-using static System.Net.WebRequestMethods;
+using System;
 using System.Security;
-using System.Xml.Linq;
-using System;
 using System.Threading.Tasks;
+using System.Xml.Linq;
+using static System.Net.WebRequestMethods;
 
 namespace OneSignalSDK.DotNet.Core.Notifications
 {
@@ -66,4 +66,4 @@ public interface INotificationsManager
         /// </returns>
         Task<bool> RequestPermissionAsync(bool fallbackToSettings);
     }
-}
\ No newline at end of file
+}
diff --git a/OneSignalSDK.DotNet.Core/Notifications/Notification.cs b/OneSignalSDK.DotNet.Core/Notifications/Notification.cs
index c93ea9f0..95df1d29 100644
--- a/OneSignalSDK.DotNet.Core/Notifications/Notification.cs
+++ b/OneSignalSDK.DotNet.Core/Notifications/Notification.cs
@@ -36,7 +36,8 @@ public class Notification
         /// <summary>
         /// The key/value custom additional data specified when creating the notification.
         /// </summary>
-        public IDictionary<string, object> AdditionalData { get; } = new Dictionary<string, object>();
+        public IDictionary<string, object> AdditionalData { get; } =
+            new Dictionary<string, object>();
 
         /// <summary>
         /// The OneSignal notification id.
@@ -176,38 +177,39 @@ public class Notification
         #endregion iOS
 
         public Notification(
-           string title,
-           string body,
-           string sound,
-           string launchUrl,
-           IList<ActionButton> actionButtons,
-           IDictionary<string, object> additionalData,
-           string notificationId,
-           IList<Notification> groupedNotifications = null,
-           BackgroundImageLayout backgroundImageLayout = null,
-           string templateId = null,
-           string templateName = null,
-           string groupKey = null,
-           string groupMessage = null,
-           string ledColor = null,
-           Nullable<int> priority = null,
-           string smallIcon = null,
-           string largeIcon = null,
-           string bigPicture = null,
-           string collapseId = null,
-           string fromProjectNumber = null,
-           string smallIconAccentColor = null,
-           Nullable<int> lockScreenVisibility = null,
-           Nullable<int> androidNotificationId = null,
-           Nullable<int> badge = null,
-           Nullable<int> badgeIncrement = null,
-           string category = null,
-           string threadId = null,
-           string subtitle = null,
-           Nullable<float> relevanceScore = null,
-           Nullable<bool> mutableContent = null,
-           Nullable<bool> contentAvailable = null,
-           string interruptionLevel = null)
+            string title,
+            string body,
+            string sound,
+            string launchUrl,
+            IList<ActionButton> actionButtons,
+            IDictionary<string, object> additionalData,
+            string notificationId,
+            IList<Notification> groupedNotifications = null,
+            BackgroundImageLayout backgroundImageLayout = null,
+            string templateId = null,
+            string templateName = null,
+            string groupKey = null,
+            string groupMessage = null,
+            string ledColor = null,
+            Nullable<int> priority = null,
+            string smallIcon = null,
+            string largeIcon = null,
+            string bigPicture = null,
+            string collapseId = null,
+            string fromProjectNumber = null,
+            string smallIconAccentColor = null,
+            Nullable<int> lockScreenVisibility = null,
+            Nullable<int> androidNotificationId = null,
+            Nullable<int> badge = null,
+            Nullable<int> badgeIncrement = null,
+            string category = null,
+            string threadId = null,
+            string subtitle = null,
+            Nullable<float> relevanceScore = null,
+            Nullable<bool> mutableContent = null,
+            Nullable<bool> contentAvailable = null,
+            string interruptionLevel = null
+        )
         {
             Title = title;
             Body = body;
diff --git a/OneSignalSDK.DotNet.Core/Notifications/NotificationClickedEventArgs.cs b/OneSignalSDK.DotNet.Core/Notifications/NotificationClickedEventArgs.cs
index b12e733e..5ec1c4f3 100644
--- a/OneSignalSDK.DotNet.Core/Notifications/NotificationClickedEventArgs.cs
+++ b/OneSignalSDK.DotNet.Core/Notifications/NotificationClickedEventArgs.cs
@@ -17,10 +17,13 @@ public sealed class NotificationClickedEventArgs : EventArgs
         /// </summary>
         public NotificationClickResult Result { get; }
 
-        public NotificationClickedEventArgs(Notification notification, NotificationClickResult result)
+        public NotificationClickedEventArgs(
+            Notification notification,
+            NotificationClickResult result
+        )
         {
             Notification = notification;
             Result = result;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OneSignalSDK.DotNet.Core/Notifications/NotificationPermission.cs b/OneSignalSDK.DotNet.Core/Notifications/NotificationPermission.cs
index 9b716fcb..81078ba1 100644
--- a/OneSignalSDK.DotNet.Core/Notifications/NotificationPermission.cs
+++ b/OneSignalSDK.DotNet.Core/Notifications/NotificationPermission.cs
@@ -1,13 +1,13 @@
 using System;
+
 namespace OneSignalSDK.DotNet.Core.Notifications
 {
-	public enum NotificationPermission
-	{
+    public enum NotificationPermission
+    {
         NotDetermined = 0,
         Denied,
         Authorized,
         Provisional, // only available in iOS 12
-        Ephemeral // only available in iOS 14 
-	}
+        Ephemeral, // only available in iOS 14
+    }
 }
-
diff --git a/OneSignalSDK.DotNet.Core/Notifications/NotificationPermissionChangedEventArgs.cs b/OneSignalSDK.DotNet.Core/Notifications/NotificationPermissionChangedEventArgs.cs
index 64fff011..a5cfee2c 100644
--- a/OneSignalSDK.DotNet.Core/Notifications/NotificationPermissionChangedEventArgs.cs
+++ b/OneSignalSDK.DotNet.Core/Notifications/NotificationPermissionChangedEventArgs.cs
@@ -17,4 +17,4 @@ public NotificationPermissionChangedEventArgs(bool permission)
             Permission = permission;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OneSignalSDK.DotNet.Core/Notifications/NotificationWillDisplayEventArgs.cs b/OneSignalSDK.DotNet.Core/Notifications/NotificationWillDisplayEventArgs.cs
index ba6971bb..805428a6 100644
--- a/OneSignalSDK.DotNet.Core/Notifications/NotificationWillDisplayEventArgs.cs
+++ b/OneSignalSDK.DotNet.Core/Notifications/NotificationWillDisplayEventArgs.cs
@@ -20,4 +20,4 @@ public NotificationWillDisplayEventArgs(DisplayableNotification notification)
 
         public abstract void PreventDefault();
     }
-}
\ No newline at end of file
+}
diff --git a/OneSignalSDK.DotNet.Core/OneSignalSDK.DotNet.Core.csproj b/OneSignalSDK.DotNet.Core/OneSignalSDK.DotNet.Core.csproj
index 9400d29d..9dc3c795 100644
--- a/OneSignalSDK.DotNet.Core/OneSignalSDK.DotNet.Core.csproj
+++ b/OneSignalSDK.DotNet.Core/OneSignalSDK.DotNet.Core.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <OutputType>Library</OutputType>
diff --git a/OneSignalSDK.DotNet.Core/Session/ISessionManager.cs b/OneSignalSDK.DotNet.Core/Session/ISessionManager.cs
index a62d1fef..1e5a24cc 100644
--- a/OneSignalSDK.DotNet.Core/Session/ISessionManager.cs
+++ b/OneSignalSDK.DotNet.Core/Session/ISessionManager.cs
@@ -32,4 +32,4 @@ public interface ISessionManager
         /// <param name="value">The value tied to the outcome.</param>
         void AddOutcomeWithValue(string name, float value);
     }
-}
\ No newline at end of file
+}
diff --git a/OneSignalSDK.DotNet.Core/User/IUserManager.cs b/OneSignalSDK.DotNet.Core/User/IUserManager.cs
index 7e54cc8f..3edd5512 100644
--- a/OneSignalSDK.DotNet.Core/User/IUserManager.cs
+++ b/OneSignalSDK.DotNet.Core/User/IUserManager.cs
@@ -157,4 +157,4 @@ public interface IUserManager
         /// <param name="properties">Optional properties to associate with the event.</param>
         void TrackEvent(string name, IDictionary<string, object>? properties = null);
     }
-}
\ No newline at end of file
+}
diff --git a/OneSignalSDK.DotNet.Core/User/IUserState.cs b/OneSignalSDK.DotNet.Core/User/IUserState.cs
index efce1a92..8d8852b3 100644
--- a/OneSignalSDK.DotNet.Core/User/IUserState.cs
+++ b/OneSignalSDK.DotNet.Core/User/IUserState.cs
@@ -1,8 +1,9 @@
 using System;
 
-namespace OneSignalSDK.DotNet.Core.User 
+namespace OneSignalSDK.DotNet.Core.User
 {
-    public interface IUserState {
+    public interface IUserState
+    {
         /// <summary>
         /// The unique identifier for your OneSignal account. This will be an empty string until the
         /// user has been successfully logged in on the backend and assigned an ID.
@@ -17,4 +18,4 @@ public interface IUserState {
         /// </summary>
         string ExternalId { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/OneSignalSDK.DotNet.Core/User/Subscriptions/PushSubscriptionChangedEventArgs.cs b/OneSignalSDK.DotNet.Core/User/Subscriptions/PushSubscriptionChangedEventArgs.cs
index 7d78fb64..5bcbb7f6 100644
--- a/OneSignalSDK.DotNet.Core/User/Subscriptions/PushSubscriptionChangedEventArgs.cs
+++ b/OneSignalSDK.DotNet.Core/User/Subscriptions/PushSubscriptionChangedEventArgs.cs
@@ -30,7 +30,10 @@ public sealed class PushSubscriptionChangedState
         /// </summary>
         public IPushSubscriptionState Current { get; }
 
-        public PushSubscriptionChangedState(IPushSubscriptionState previous, IPushSubscriptionState current)
+        public PushSubscriptionChangedState(
+            IPushSubscriptionState previous,
+            IPushSubscriptionState current
+        )
         {
             Previous = previous;
             Current = current;
diff --git a/OneSignalSDK.DotNet.Core/User/UserStateChangedEventArgs.cs b/OneSignalSDK.DotNet.Core/User/UserStateChangedEventArgs.cs
index 8d903d56..52af80fe 100644
--- a/OneSignalSDK.DotNet.Core/User/UserStateChangedEventArgs.cs
+++ b/OneSignalSDK.DotNet.Core/User/UserStateChangedEventArgs.cs
@@ -9,15 +9,18 @@ public class UserStateChangedEventArgs : EventArgs
     {
         public UserChangedState State { get; }
 
-        public UserStateChangedEventArgs(UserChangedState state) {
+        public UserStateChangedEventArgs(UserChangedState state)
+        {
             State = state;
         }
     }
 
-    public sealed class UserChangedState {
+    public sealed class UserChangedState
+    {
         public IUserState Current { get; }
 
-        public UserChangedState(IUserState state) {
+        public UserChangedState(IUserState state)
+        {
             Current = state;
         }
     }
diff --git a/OneSignalSDK.DotNet.iOS.Binding/ApiDefinitions.cs b/OneSignalSDK.DotNet.iOS.Binding/ApiDefinitions.cs
index 08480042..8e7da62e 100644
--- a/OneSignalSDK.DotNet.iOS.Binding/ApiDefinitions.cs
+++ b/OneSignalSDK.DotNet.iOS.Binding/ApiDefinitions.cs
@@ -6,109 +6,114 @@
 using UserNotifications;
 using WebKit;
 
-namespace Com.OneSignal.iOS {
+namespace Com.OneSignal.iOS
+{
     // @interface OSNotification : NSObject
     [BaseType(typeof(NSObject))]
     interface OSNotification
     {
         // @property (readonly) NSString * _Nullable notificationId;
-        [NullAllowed, Export ("notificationId")]
+        [NullAllowed, Export("notificationId")]
         string NotificationId { get; }
 
         // @property (readonly) NSString * _Nullable templateId;
-        [NullAllowed, Export ("templateId")]
+        [NullAllowed, Export("templateId")]
         string TemplateId { get; }
 
         // @property (readonly) NSString * _Nullable templateName;
-        [NullAllowed, Export ("templateName")]
+        [NullAllowed, Export("templateName")]
         string TemplateName { get; }
 
         // @property (readonly) BOOL contentAvailable;
-        [Export ("contentAvailable")]
+        [Export("contentAvailable")]
         bool ContentAvailable { get; }
 
         // @property (readonly, getter = hasMutableContent) BOOL mutableContent;
-        [Export ("mutableContent")]
-        bool MutableContent { [Bind("hasMutableContent")] get; }
+        [Export("mutableContent")]
+        bool MutableContent
+        {
+            [Bind("hasMutableContent")]
+            get;
+        }
 
         // @property (readonly) NSString * _Nullable category;
-        [NullAllowed, Export ("category")]
+        [NullAllowed, Export("category")]
         string Category { get; }
 
         // @property (readonly) NSInteger badge;
-        [Export ("badge")]
+        [Export("badge")]
         nint Badge { get; }
 
         // @property (readonly) NSInteger badgeIncrement;
-        [Export ("badgeIncrement")]
+        [Export("badgeIncrement")]
         nint BadgeIncrement { get; }
 
         // @property (readonly) NSString * _Nullable sound;
-        [NullAllowed, Export ("sound")]
+        [NullAllowed, Export("sound")]
         string Sound { get; }
 
         // @property (readonly) NSString * _Nullable title;
-        [NullAllowed, Export ("title")]
+        [NullAllowed, Export("title")]
         string Title { get; }
 
         // @property (readonly) NSString * _Nullable subtitle;
-        [NullAllowed, Export ("subtitle")]
+        [NullAllowed, Export("subtitle")]
         string Subtitle { get; }
 
         // @property (readonly) NSString * _Nullable body;
-        [NullAllowed, Export ("body")]
+        [NullAllowed, Export("body")]
         string Body { get; }
 
         // @property (readonly) NSString * _Nullable launchURL;
-        [NullAllowed, Export ("launchURL")]
+        [NullAllowed, Export("launchURL")]
         string LaunchURL { get; }
 
         // @property (readonly) NSDictionary * _Nullable additionalData;
-        [NullAllowed, Export ("additionalData")]
+        [NullAllowed, Export("additionalData")]
         NSDictionary AdditionalData { get; }
 
         // @property (readonly) NSDictionary * _Nullable attachments;
-        [NullAllowed, Export ("attachments")]
+        [NullAllowed, Export("attachments")]
         NSDictionary Attachments { get; }
 
         // @property (readonly) NSArray * _Nullable actionButtons;
-        [NullAllowed, Export ("actionButtons")]
+        [NullAllowed, Export("actionButtons")]
         //[Verify(StronglyTypedNSArray)]
         NSObject[] ActionButtons { get; }
 
         // @property (readonly) NSDictionary * _Nonnull rawPayload;
-        [Export ("rawPayload")]
+        [Export("rawPayload")]
         NSDictionary RawPayload { get; }
 
         // @property (readonly) NSString * _Nullable threadId;
-        [NullAllowed, Export ("threadId")]
+        [NullAllowed, Export("threadId")]
         string ThreadId { get; }
 
         // @property (readonly) NSNumber * _Nullable relevanceScore;
-        [NullAllowed, Export ("relevanceScore")]
+        [NullAllowed, Export("relevanceScore")]
         NSNumber RelevanceScore { get; }
 
         // @property (readonly) NSString * _Nullable interruptionLevel;
-        [NullAllowed, Export ("interruptionLevel")]
+        [NullAllowed, Export("interruptionLevel")]
         string InterruptionLevel { get; }
 
         // @property (readonly) NSString * _Nullable collapseId;
-        [NullAllowed, Export ("collapseId")]
+        [NullAllowed, Export("collapseId")]
         string CollapseId { get; }
 
         // +(instancetype _Nullable)parseWithApns:(NSDictionary * _Nonnull)message;
         [Static]
-        [Export ("parseWithApns:")]
+        [Export("parseWithApns:")]
         [return: NullAllowed]
         OSNotification ParseWithApns(NSDictionary message);
 
         // -(NSDictionary * _Nonnull)jsonRepresentation;
-        [Export ("jsonRepresentation")]
+        [Export("jsonRepresentation")]
         //[Verify(MethodToProperty)]
         NSDictionary JsonRepresentation { get; }
 
         // -(NSString * _Nonnull)stringify;
-        [Export ("stringify")]
+        [Export("stringify")]
         //[Verify(MethodToProperty)]
         string Stringify { get; }
     }
@@ -121,11 +126,11 @@ interface OSNotification
     interface OSNotificationClickResult
     {
         // @property (readonly) NSString * _Nullable actionId;
-        [NullAllowed, Export ("actionId")]
+        [NullAllowed, Export("actionId")]
         string ActionId { get; }
 
         // @property (readonly) NSString * _Nullable url;
-        [NullAllowed, Export ("url")]
+        [NullAllowed, Export("url")]
         string Url { get; }
     }
 
@@ -134,20 +139,20 @@ interface OSNotificationClickResult
     interface OSNotificationClickEvent
     {
         // @property (readonly) OSNotification * _Nonnull notification;
-        [Export ("notification")]
+        [Export("notification")]
         OSNotification Notification { get; }
 
         // @property (readonly) OSNotificationClickResult * _Nonnull result;
-        [Export ("result")]
+        [Export("result")]
         OSNotificationClickResult Result { get; }
 
         // -(NSString * _Nonnull)stringify;
-        [Export ("stringify")]
+        [Export("stringify")]
         //[Verify(MethodToProperty)]
         string Stringify { get; }
 
         // -(NSDictionary * _Nonnull)jsonRepresentation;
-        [Export ("jsonRepresentation")]
+        [Export("jsonRepresentation")]
         //[Verify(MethodToProperty)]
         NSDictionary JsonRepresentation { get; }
     }
@@ -159,12 +164,12 @@ interface OSDebug
     {
         // @required +(void)setLogLevel:(ONE_S_LOG_LEVEL)logLevel;
         //[Static, Abstract]
-        [Export ("setLogLevel:")]
+        [Export("setLogLevel:")]
         void SetLogLevel(OneSLogLevel logLevel);
 
         // @required +(void)setAlertLevel:(ONE_S_LOG_LEVEL)logLevel __attribute__((swift_private));
         //[Static, Abstract]
-        [Export ("setAlertLevel:")]
+        [Export("setAlertLevel:")]
         void SetAlertLevel(OneSLogLevel logLevel);
     }
 
@@ -174,12 +179,12 @@ interface OneSignalWrapper
     {
         // @property (class) NSString * _Nullable sdkType;
         [Static]
-        [NullAllowed, Export ("sdkType")]
+        [NullAllowed, Export("sdkType")]
         string SdkType { get; set; }
 
         // @property (class) NSString * _Nullable sdkVersion;
         [Static]
-        [NullAllowed, Export ("sdkVersion")]
+        [NullAllowed, Export("sdkVersion")]
         string SdkVersion { get; set; }
     }
 
@@ -190,17 +195,17 @@ interface OSSession
     {
         // @required +(void)addOutcome:(NSString * _Nonnull)name;
         //[Static, Abstract]
-        [Export ("addOutcome:")]
+        [Export("addOutcome:")]
         void AddOutcome(string name);
 
         // @required +(void)addUniqueOutcome:(NSString * _Nonnull)name;
         //[Static, Abstract]
-        [Export ("addUniqueOutcome:")]
+        [Export("addUniqueOutcome:")]
         void AddUniqueOutcome(string name);
 
         // @required +(void)addOutcomeWithValue:(NSString * _Nonnull)name value:(NSNumber * _Nonnull)value __attribute__((swift_private));
         //[Static, Abstract]
-        [Export ("addOutcomeWithValue:value:")]
+        [Export("addOutcomeWithValue:value:")]
         void AddOutcomeWithValue(string name, NSNumber value);
     }
 
@@ -212,17 +217,16 @@ interface OSNotificationPermissionObserver
     {
         // @required -(void)onNotificationPermissionDidChange:(BOOL)permission;
         //[Abstract]
-        [Export ("onNotificationPermissionDidChange:")]
+        [Export("onNotificationPermissionDidChange:")]
         void OnNotificationPermissionDidChange(bool permission);
     }
 
-
     // @interface OSDisplayableNotification : OSNotification
     [BaseType(typeof(OSNotification))]
     interface OSDisplayableNotification
     {
         // -(void)display;
-        [Export ("display")]
+        [Export("display")]
         void Display();
     }
 
@@ -234,7 +238,7 @@ interface OSNotificationClickListener
     {
         // @required -(void)onClickNotification:(OSNotificationClickEvent * _Nonnull)event __attribute__((swift_name("onClick(event:)")));
         //[Abstract]
-        [Export ("onClickNotification:")]
+        [Export("onClickNotification:")]
         void OnClickNotification(OSNotificationClickEvent @event);
     }
 
@@ -243,11 +247,11 @@ interface OSNotificationClickListener
     interface OSNotificationWillDisplayEvent
     {
         // @property (readonly, nonatomic, strong) OSDisplayableNotification * _Nonnull notification;
-        [Export ("notification", ArgumentSemantic.Strong)]
+        [Export("notification", ArgumentSemantic.Strong)]
         OSDisplayableNotification Notification { get; }
 
         // -(void)preventDefault;
-        [Export ("preventDefault")]
+        [Export("preventDefault")]
         void PreventDefault();
     }
 
@@ -259,7 +263,7 @@ interface OSNotificationLifecycleListener
     {
         // @required -(void)onWillDisplayNotification:(OSNotificationWillDisplayEvent * _Nonnull)event __attribute__((swift_name("onWillDisplay(event:)")));
         //[Abstract]
-        [Export ("onWillDisplayNotification:")]
+        [Export("onWillDisplayNotification:")]
         void OnWillDisplayNotification(OSNotificationWillDisplayEvent @event);
     }
 
@@ -273,93 +277,94 @@ interface OSNotifications
     {
         // @required +(BOOL)permission __attribute__((swift_private));
         //[Static, Abstract]
-        [Export ("permission")]
+        [Export("permission")]
         //[Verify(MethodToProperty)]
         bool Permission { get; }
 
         // @required +(BOOL)canRequestPermission __attribute__((swift_private));
         //[Static, Abstract]
-        [Export ("canRequestPermission")]
+        [Export("canRequestPermission")]
         //[Verify(MethodToProperty)]
         bool CanRequestPermission { get; }
 
         // @required +(OSNotificationPermission)permissionNative __attribute__((swift_private));
         //[Static, Abstract]
-        [Export ("permissionNative")]
+        [Export("permissionNative")]
         //[Verify(MethodToProperty)]
         OSNotificationPermission PermissionNative { get; }
 
         // @required +(void)addForegroundLifecycleListener:(NSObject<OSNotificationLifecycleListener> * _Nullable)listener;
         //[Static, Abstract]
-        [Export ("addForegroundLifecycleListener:")]
+        [Export("addForegroundLifecycleListener:")]
         void AddForegroundLifecycleListener([NullAllowed] OSNotificationLifecycleListener listener);
 
         // @required +(void)removeForegroundLifecycleListener:(NSObject<OSNotificationLifecycleListener> * _Nullable)listener;
         //[Static, Abstract]
-        [Export ("removeForegroundLifecycleListener:")]
-        void RemoveForegroundLifecycleListener([NullAllowed] OSNotificationLifecycleListener listener);
+        [Export("removeForegroundLifecycleListener:")]
+        void RemoveForegroundLifecycleListener(
+            [NullAllowed] OSNotificationLifecycleListener listener
+        );
 
         // @required +(void)addClickListener:(NSObject<OSNotificationClickListener> * _Nonnull)listener __attribute__((swift_private));
         //[Static, Abstract]
-        [Export ("addClickListener:")]
+        [Export("addClickListener:")]
         void AddClickListener(OSNotificationClickListener listener);
 
         // @required +(void)removeClickListener:(NSObject<OSNotificationClickListener> * _Nonnull)listener __attribute__((swift_private));
         //[Static, Abstract]
-        [Export ("removeClickListener:")]
+        [Export("removeClickListener:")]
         void RemoveClickListener(OSNotificationClickListener listener);
 
         // @required +(void)requestPermission:(OSUserResponseBlock _Nullable)block;
         //[Static, Abstract]
-        [Export ("requestPermission:")]
+        [Export("requestPermission:")]
         void RequestPermission([NullAllowed] OSUserResponseBlock block);
 
         // @required +(void)requestPermission:(OSUserResponseBlock _Nullable)block fallbackToSettings:(BOOL)fallback;
         //[Static, Abstract]
-        [Export ("requestPermission:fallbackToSettings:")]
+        [Export("requestPermission:fallbackToSettings:")]
         void RequestPermission([NullAllowed] OSUserResponseBlock block, bool fallback);
 
         // @required +(void)registerForProvisionalAuthorization:(OSUserResponseBlock _Nullable)block __attribute__((swift_private));
         //[Static, Abstract]
-        [Export ("registerForProvisionalAuthorization:")]
+        [Export("registerForProvisionalAuthorization:")]
         void RegisterForProvisionalAuthorization([NullAllowed] OSUserResponseBlock block);
 
         // @required +(void)addPermissionObserver:(NSObject<OSNotificationPermissionObserver> * _Nonnull)observer __attribute__((swift_private));
         //[Static, Abstract]
-        [Export ("addPermissionObserver:")]
+        [Export("addPermissionObserver:")]
         void AddPermissionObserver(OSNotificationPermissionObserver observer);
 
         // @required +(void)removePermissionObserver:(NSObject<OSNotificationPermissionObserver> * _Nonnull)observer __attribute__((swift_private));
         //[Static, Abstract]
-        [Export ("removePermissionObserver:")]
+        [Export("removePermissionObserver:")]
         void RemovePermissionObserver(OSNotificationPermissionObserver observer);
 
         // @required +(void)clearAll;
         //[Static, Abstract]
-        [Export ("clearAll")]
+        [Export("clearAll")]
         void ClearAll();
     }
 
-
     // @interface OSPushSubscriptionChangedState : NSObject
     [BaseType(typeof(NSObject), Name = "_TtC13OneSignalUser30OSPushSubscriptionChangedState")]
     [DisableDefaultCtor]
     interface OSPushSubscriptionChangedState
     {
         // @property (readonly, nonatomic, strong) OSPushSubscriptionState * _Nonnull current;
-        [Export ("current", ArgumentSemantic.Strong)]
+        [Export("current", ArgumentSemantic.Strong)]
         OSPushSubscriptionState Current { get; }
 
         // @property (readonly, nonatomic, strong) OSPushSubscriptionState * _Nonnull previous;
-        [Export ("previous", ArgumentSemantic.Strong)]
+        [Export("previous", ArgumentSemantic.Strong)]
         OSPushSubscriptionState Previous { get; }
 
         // @property (readonly, copy, nonatomic) NSString * _Nonnull description;
-        [Export ("description")]
+        [Export("description")]
         string Description { get; }
 
         // -(NSDictionary * _Nonnull)jsonRepresentation __attribute__((warn_unused_result("")));
-        [Export ("jsonRepresentation")]
+        [Export("jsonRepresentation")]
         //[Verify(MethodToProperty)]
         NSDictionary JsonRepresentation { get; }
     }
@@ -372,7 +377,7 @@ interface OSPushSubscriptionObserver
     {
         // @required -(void)onPushSubscriptionDidChangeWithState:(OSPushSubscriptionChangedState * _Nonnull)state;
         //[Abstract]
-        [Export ("onPushSubscriptionDidChangeWithState:")]
+        [Export("onPushSubscriptionDidChangeWithState:")]
         void OnPushSubscriptionDidChangeWithState(OSPushSubscriptionChangedState state);
     }
 
@@ -382,23 +387,23 @@ interface OSPushSubscriptionObserver
     interface OSPushSubscriptionState
     {
         // @property (readonly, copy, nonatomic) NSString * _Nullable id;
-        [NullAllowed, Export ("id")]
+        [NullAllowed, Export("id")]
         string Id { get; }
 
         // @property (readonly, copy, nonatomic) NSString * _Nullable token;
-        [NullAllowed, Export ("token")]
+        [NullAllowed, Export("token")]
         string Token { get; }
 
         // @property (readonly, nonatomic) BOOL optedIn;
-        [Export ("optedIn")]
+        [Export("optedIn")]
         bool OptedIn { get; }
 
         // @property (readonly, copy, nonatomic) NSString * _Nonnull description;
-        [Export ("description")]
+        [Export("description")]
         string Description { get; }
 
         // -(NSDictionary * _Nonnull)jsonRepresentation __attribute__((warn_unused_result("")));
-        [Export ("jsonRepresentation")]
+        [Export("jsonRepresentation")]
         //[Verify(MethodToProperty)]
         NSDictionary JsonRepresentation { get; }
     }
@@ -410,92 +415,92 @@ interface OSPushSubscription
     {
         // @required @property (readonly, copy, nonatomic) NSString * _Nullable id;
         //[Abstract]
-        [NullAllowed, Export ("id")]
+        [NullAllowed, Export("id")]
         string Id { get; }
 
         // @required @property (readonly, copy, nonatomic) NSString * _Nullable token;
         //[Abstract]
-        [NullAllowed, Export ("token")]
+        [NullAllowed, Export("token")]
         string Token { get; }
 
         // @required @property (readonly, nonatomic) BOOL optedIn;
         //[Abstract]
-        [Export ("optedIn")]
+        [Export("optedIn")]
         bool OptedIn { get; }
 
         // @required -(void)optIn;
         //[Abstract]
-        [Export ("optIn")]
+        [Export("optIn")]
         void OptIn();
 
         // @required -(void)optOut;
         //[Abstract]
-        [Export ("optOut")]
+        [Export("optOut")]
         void OptOut();
 
         // @required -(void)addObserver:(id<OSPushSubscriptionObserver> _Nonnull)observer;
         //[Abstract]
-        [Export ("addObserver:")]
+        [Export("addObserver:")]
         void AddObserver(OSPushSubscriptionObserver observer);
 
         // @required -(void)removeObserver:(id<OSPushSubscriptionObserver> _Nonnull)observer;
         //[Abstract]
-        [Export ("removeObserver:")]
+        [Export("removeObserver:")]
         void RemoveObserver(OSPushSubscriptionObserver observer);
     }
 
     // @interface OSUserState : NSObject
-    [BaseType (typeof(NSObject), Name = "_TtC13OneSignalUser11OSUserState")]
+    [BaseType(typeof(NSObject), Name = "_TtC13OneSignalUser11OSUserState")]
     [DisableDefaultCtor]
     interface OSUserState
     {
         // @property (readonly, copy, nonatomic) NSString * _Nullable onesignalId;
-        [NullAllowed, Export ("onesignalId")]
+        [NullAllowed, Export("onesignalId")]
         string OnesignalId { get; }
 
         // @property (readonly, copy, nonatomic) NSString * _Nullable externalId;
-        [NullAllowed, Export ("externalId")]
+        [NullAllowed, Export("externalId")]
         string ExternalId { get; }
 
         // @property (readonly, copy, nonatomic) NSString * _Nonnull description;
-        [Export ("description")]
+        [Export("description")]
         string Description { get; }
 
         // -(NSDictionary * _Nonnull)jsonRepresentation __attribute__((warn_unused_result("")));
-        [Export ("jsonRepresentation")]
+        [Export("jsonRepresentation")]
         //[Verify (MethodToProperty)]
         NSDictionary JsonRepresentation { get; }
     }
 
     // @interface OSUserChangedState : NSObject
-    [BaseType (typeof(NSObject), Name = "_TtC13OneSignalUser18OSUserChangedState")]
+    [BaseType(typeof(NSObject), Name = "_TtC13OneSignalUser18OSUserChangedState")]
     [DisableDefaultCtor]
     interface OSUserChangedState
     {
         // @property (readonly, nonatomic, strong) OSUserState * _Nonnull current;
-        [Export ("current", ArgumentSemantic.Strong)]
+        [Export("current", ArgumentSemantic.Strong)]
         OSUserState Current { get; }
 
         // @property (readonly, copy, nonatomic) NSString * _Nonnull description;
-        [Export ("description")]
+        [Export("description")]
         string Description { get; }
 
         // -(NSDictionary * _Nonnull)jsonRepresentation __attribute__((warn_unused_result("")));
-        [Export ("jsonRepresentation")]
+        [Export("jsonRepresentation")]
         //[Verify (MethodToProperty)]
         NSDictionary JsonRepresentation { get; }
     }
 
     // @protocol OSUserStateObserver
-    [Protocol (Name = "_TtP13OneSignalUser19OSUserStateObserver_")]
+    [Protocol(Name = "_TtP13OneSignalUser19OSUserStateObserver_")]
     [Model]
     [BaseType(typeof(NSObject))]
     interface OSUserStateObserver
     {
         // @required -(void)onUserStateDidChangeWithState:(OSUserChangedState * _Nonnull)state;
         //[Abstract]
-        [Export ("onUserStateDidChangeWithState:")]
-        void OnUserStateDidChangeWithState (OSUserChangedState state);
+        [Export("onUserStateDidChangeWithState:")]
+        void OnUserStateDidChangeWithState(OSUserChangedState state);
     }
 
     // @protocol OSUser
@@ -505,98 +510,98 @@ interface OSUser
     {
         // @required @property (readonly, nonatomic, strong) id<OSPushSubscription> _Nonnull pushSubscription;
         //[Abstract]
-        [Export ("pushSubscription", ArgumentSemantic.Strong)]
+        [Export("pushSubscription", ArgumentSemantic.Strong)]
         OSPushSubscription PushSubscription { get; }
 
         // @required @property (readonly, copy, nonatomic) NSString * _Nullable onesignalId;
         //[Abstract]
-        [NullAllowed, Export ("onesignalId")]
+        [NullAllowed, Export("onesignalId")]
         string OnesignalId { get; }
 
         // @required @property (readonly, copy, nonatomic) NSString * _Nullable externalId;
         //[Abstract]
-        [NullAllowed, Export ("externalId")]
+        [NullAllowed, Export("externalId")]
         string ExternalId { get; }
 
         // @required -(void)addObserver:(id<OSUserStateObserver> _Nonnull)observer;
         //[Abstract]
-        [Export ("addObserver:")]
-        void AddObserver (OSUserStateObserver observer);
+        [Export("addObserver:")]
+        void AddObserver(OSUserStateObserver observer);
 
         // @required -(void)removeObserver:(id<OSUserStateObserver> _Nonnull)observer;
         [Abstract]
-        [Export ("removeObserver:")]
-        void RemoveObserver (OSUserStateObserver observer);
+        [Export("removeObserver:")]
+        void RemoveObserver(OSUserStateObserver observer);
 
         // @required -(void)addAliasWithLabel:(NSString * _Nonnull)label id:(NSString * _Nonnull)id;
         //[Abstract]
-        [Export ("addAliasWithLabel:id:")]
+        [Export("addAliasWithLabel:id:")]
         void AddAliasWithLabel(string label, string id);
 
         // @required -(void)addAliases:(NSDictionary<NSString *,NSString *> * _Nonnull)aliases;
         //[Abstract]
-        [Export ("addAliases:")]
+        [Export("addAliases:")]
         void AddAliases(NSDictionary<NSString, NSString> aliases);
 
         // @required -(void)removeAlias:(NSString * _Nonnull)label;
         //[Abstract]
-        [Export ("removeAlias:")]
+        [Export("removeAlias:")]
         void RemoveAlias(string label);
 
         // @required -(void)removeAliases:(NSArray<NSString *> * _Nonnull)labels;
         //[Abstract]
-        [Export ("removeAliases:")]
+        [Export("removeAliases:")]
         void RemoveAliases(string[] labels);
 
         // @required -(void)addTagWithKey:(NSString * _Nonnull)key value:(NSString * _Nonnull)value;
         //[Abstract]
-        [Export ("addTagWithKey:value:")]
+        [Export("addTagWithKey:value:")]
         void AddTagWithKey(string key, string value);
 
         // @required -(void)addTags:(NSDictionary<NSString *,NSString *> * _Nonnull)tags;
         //[Abstract]
-        [Export ("addTags:")]
+        [Export("addTags:")]
         void AddTags(NSDictionary<NSString, NSString> tags);
 
         // @required -(void)removeTag:(NSString * _Nonnull)tag;
         //[Abstract]
-        [Export ("removeTag:")]
+        [Export("removeTag:")]
         void RemoveTag(string tag);
 
         // @required -(void)removeTags:(NSArray<NSString *> * _Nonnull)tags;
         //[Abstract]
-        [Export ("removeTags:")]
+        [Export("removeTags:")]
         void RemoveTags(string[] tags);
 
         // @required -(NSDictionary<NSString *,NSString *>)getTags;
         //[Abstract]
-        [Export ("getTags")]
+        [Export("getTags")]
         [return: NullAllowed]
         NSDictionary<NSString, NSString> GetTags();
 
         // @required -(void)addEmail:(NSString * _Nonnull)email;
         //[Abstract]
-        [Export ("addEmail:")]
+        [Export("addEmail:")]
         void AddEmail(string email);
 
         // @required -(void)removeEmail:(NSString * _Nonnull)email;
         //[Abstract]
-        [Export ("removeEmail:")]
+        [Export("removeEmail:")]
         void RemoveEmail(string email);
 
         // @required -(void)addSms:(NSString * _Nonnull)number;
         //[Abstract]
-        [Export ("addSms:")]
+        [Export("addSms:")]
         void AddSms(string number);
 
         // @required -(void)removeSms:(NSString * _Nonnull)number;
         //[Abstract]
-        [Export ("removeSms:")]
+        [Export("removeSms:")]
         void RemoveSms(string number);
 
         // @required -(void)setLanguage:(NSString * _Nonnull)language;
         //[Abstract]
-        [Export ("setLanguage:")]
+        [Export("setLanguage:")]
         void SetLanguage(string language);
 
         // @required -(void)onJwtExpiredWithExpiredHandler:(void (^ _Nonnull)(NSString * _Nonnull, __attribute__((noescape)) void (^ _Nonnull)(NSString * _Nonnull)))expiredHandler;
@@ -606,8 +611,11 @@ interface OSUser
 
         // @required -(void)trackEventWithName:(NSString * _Nonnull)name properties:(NSDictionary<NSString *, id> * _Nullable)properties;
         //[Abstract]
-        [Export ("trackEventWithName:properties:")]
-        void TrackEventWithName(string name, [NullAllowed] NSDictionary<NSString, NSObject> properties);
+        [Export("trackEventWithName:properties:")]
+        void TrackEventWithName(
+            string name,
+            [NullAllowed] NSDictionary<NSString, NSObject> properties
+        );
     }
 
     // @interface OSInAppMessage : NSObject
@@ -615,11 +623,11 @@ interface OSUser
     interface OSInAppMessage
     {
         // @property (nonatomic, strong) NSString * _Nonnull messageId;
-        [Export ("messageId", ArgumentSemantic.Strong)]
+        [Export("messageId", ArgumentSemantic.Strong)]
         string MessageId { get; set; }
 
         // -(NSDictionary * _Nonnull)jsonRepresentation;
-        [Export ("jsonRepresentation")]
+        [Export("jsonRepresentation")]
         //[Verify(MethodToProperty)]
         NSDictionary JsonRepresentation { get; }
     }
@@ -629,66 +637,64 @@ interface OSInAppMessage
     interface OSInAppMessageTag
     {
         // @property (nonatomic, strong) NSDictionary * _Nullable tagsToAdd;
-        [NullAllowed, Export ("tagsToAdd", ArgumentSemantic.Strong)]
+        [NullAllowed, Export("tagsToAdd", ArgumentSemantic.Strong)]
         NSDictionary TagsToAdd { get; set; }
 
         // @property (nonatomic, strong) NSArray * _Nullable tagsToRemove;
-        [NullAllowed, Export ("tagsToRemove", ArgumentSemantic.Strong)]
+        [NullAllowed, Export("tagsToRemove", ArgumentSemantic.Strong)]
         //[Verify(StronglyTypedNSArray)]
         NSObject[] TagsToRemove { get; set; }
 
         // -(NSDictionary * _Nonnull)jsonRepresentation;
-        [Export ("jsonRepresentation")]
+        [Export("jsonRepresentation")]
         //[Verify(MethodToProperty)]
         NSDictionary JsonRepresentation { get; }
     }
 
-
     // @interface OSInAppMessageOutcome : NSObject
     [BaseType(typeof(NSObject))]
     interface OSInAppMessageOutcome
     {
         // @property (nonatomic, strong) NSString * _Nonnull name;
-        [Export ("name", ArgumentSemantic.Strong)]
+        [Export("name", ArgumentSemantic.Strong)]
         string Name { get; set; }
 
         // @property (nonatomic, strong) NSNumber * _Nonnull weight;
-        [Export ("weight", ArgumentSemantic.Strong)]
+        [Export("weight", ArgumentSemantic.Strong)]
         NSNumber Weight { get; set; }
 
         // @property (nonatomic) BOOL unique;
-        [Export ("unique")]
+        [Export("unique")]
         bool Unique { get; set; }
 
         // -(NSDictionary * _Nonnull)jsonRepresentation;
-        [Export ("jsonRepresentation")]
+        [Export("jsonRepresentation")]
         //[Verify(MethodToProperty)]
         NSDictionary JsonRepresentation { get; }
     }
 
-
     // @interface OSInAppMessageClickResult : NSObject
     [BaseType(typeof(NSObject))]
     interface OSInAppMessageClickResult
     {
         // @property (nonatomic, strong) NSString * _Nullable actionId;
-        [NullAllowed, Export ("actionId", ArgumentSemantic.Strong)]
+        [NullAllowed, Export("actionId", ArgumentSemantic.Strong)]
         string ActionId { get; set; }
 
         // @property (nonatomic, strong) NSString * _Nullable url;
-        [NullAllowed, Export ("url", ArgumentSemantic.Strong)]
+        [NullAllowed, Export("url", ArgumentSemantic.Strong)]
         string Url { get; set; }
 
         // @property (nonatomic) BOOL closingMessage;
-        [Export ("closingMessage")]
+        [Export("closingMessage")]
         bool ClosingMessage { get; set; }
 
         // @property (nonatomic) OSInAppMessageActionUrlType urlTarget;
-        [Export ("urlTarget", ArgumentSemantic.Assign)]
+        [Export("urlTarget", ArgumentSemantic.Assign)]
         OSInAppMessageActionUrlType UrlTarget { get; set; }
 
         // -(NSDictionary * _Nonnull)jsonRepresentation;
-        [Export ("jsonRepresentation")]
+        [Export("jsonRepresentation")]
         //[Verify(MethodToProperty)]
         NSDictionary JsonRepresentation { get; }
     }
@@ -698,7 +704,7 @@ interface OSInAppMessageClickResult
     interface OSInAppMessageWillDisplayEvent
     {
         // @property (readonly, nonatomic) OSInAppMessage * _Nonnull message;
-        [Export ("message")]
+        [Export("message")]
         OSInAppMessage Message { get; }
     }
 
@@ -707,7 +713,7 @@ interface OSInAppMessageWillDisplayEvent
     interface OSInAppMessageDidDisplayEvent
     {
         // @property (readonly, nonatomic) OSInAppMessage * _Nonnull message;
-        [Export ("message")]
+        [Export("message")]
         OSInAppMessage Message { get; }
     }
 
@@ -716,7 +722,7 @@ interface OSInAppMessageDidDisplayEvent
     interface OSInAppMessageWillDismissEvent
     {
         // @property (readonly, nonatomic) OSInAppMessage * _Nonnull message;
-        [Export ("message")]
+        [Export("message")]
         OSInAppMessage Message { get; }
     }
 
@@ -725,7 +731,7 @@ interface OSInAppMessageWillDismissEvent
     interface OSInAppMessageDidDismissEvent
     {
         // @property (readonly, nonatomic) OSInAppMessage * _Nonnull message;
-        [Export ("message")]
+        [Export("message")]
         OSInAppMessage Message { get; }
     }
 
@@ -736,19 +742,19 @@ interface OSInAppMessageDidDismissEvent
     interface OSInAppMessageLifecycleListener
     {
         // @optional -(void)onWillDisplayInAppMessage:(OSInAppMessageWillDisplayEvent * _Nonnull)event __attribute__((swift_name("onWillDisplay(event:)")));
-        [Export ("onWillDisplayInAppMessage:")]
+        [Export("onWillDisplayInAppMessage:")]
         void OnWillDisplayInAppMessage(OSInAppMessageWillDisplayEvent @event);
 
         // @optional -(void)onDidDisplayInAppMessage:(OSInAppMessageDidDisplayEvent * _Nonnull)event __attribute__((swift_name("onDidDisplay(event:)")));
-        [Export ("onDidDisplayInAppMessage:")]
+        [Export("onDidDisplayInAppMessage:")]
         void OnDidDisplayInAppMessage(OSInAppMessageDidDisplayEvent @event);
 
         // @optional -(void)onWillDismissInAppMessage:(OSInAppMessageWillDismissEvent * _Nonnull)event __attribute__((swift_name("onWillDismiss(event:)")));
-        [Export ("onWillDismissInAppMessage:")]
+        [Export("onWillDismissInAppMessage:")]
         void OnWillDismissInAppMessage(OSInAppMessageWillDismissEvent @event);
 
         // @optional -(void)onDidDismissInAppMessage:(OSInAppMessageDidDismissEvent * _Nonnull)event __attribute__((swift_name("onDidDismiss(event:)")));
-        [Export ("onDidDismissInAppMessage:")]
+        [Export("onDidDismissInAppMessage:")]
         void OnDidDismissInAppMessage(OSInAppMessageDidDismissEvent @event);
     }
 
@@ -757,15 +763,15 @@ interface OSInAppMessageLifecycleListener
     interface OSInAppMessageClickEvent
     {
         // @property (readonly, nonatomic) OSInAppMessage * _Nonnull message;
-        [Export ("message")]
+        [Export("message")]
         OSInAppMessage Message { get; }
 
         // @property (readonly, nonatomic) OSInAppMessageClickResult * _Nonnull result;
-        [Export ("result")]
+        [Export("result")]
         OSInAppMessageClickResult Result { get; }
 
         // -(NSDictionary * _Nonnull)jsonRepresentation;
-        [Export ("jsonRepresentation")]
+        [Export("jsonRepresentation")]
         //[Verify(MethodToProperty)]
         NSDictionary JsonRepresentation { get; }
     }
@@ -778,7 +784,7 @@ interface OSInAppMessageClickListener
     {
         // @required -(void)onClickInAppMessage:(OSInAppMessageClickEvent * _Nonnull)event __attribute__((swift_name("onClick(event:)")));
         ////[Abstract]
-        [Export ("onClickInAppMessage:")]
+        [Export("onClickInAppMessage:")]
         void OnClickInAppMessage(OSInAppMessageClickEvent @event);
     }
 
@@ -789,58 +795,58 @@ interface OSInAppMessages
     {
         // @required +(void)addTrigger:(NSString * _Nonnull)key withValue:(NSString * _Nonnull)value;
         //[Static, Abstract]
-        [Export ("addTrigger:withValue:")]
+        [Export("addTrigger:withValue:")]
         void AddTrigger(string key, string value);
 
         // @required +(void)addTriggers:(NSDictionary<NSString *,NSString *> * _Nonnull)triggers;
         //[Static, Abstract]
-        [Export ("addTriggers:")]
+        [Export("addTriggers:")]
         void AddTriggers(NSDictionary<NSString, NSString> triggers);
 
         // @required +(void)removeTrigger:(NSString * _Nonnull)key;
         //[Static, Abstract]
-        [Export ("removeTrigger:")]
+        [Export("removeTrigger:")]
         void RemoveTrigger(string key);
 
         // @required +(void)removeTriggers:(NSArray<NSString *> * _Nonnull)keys;
         //[Static, Abstract]
-        [Export ("removeTriggers:")]
+        [Export("removeTriggers:")]
         void RemoveTriggers(string[] keys);
 
         // @required +(void)clearTriggers;
         //[Static, Abstract]
-        [Export ("clearTriggers")]
+        [Export("clearTriggers")]
         void ClearTriggers();
 
         // @required +(BOOL)paused __attribute__((swift_private));
         //[Static, Abstract]
-        [Export ("paused")]
+        [Export("paused")]
         //[Verify(MethodToProperty)]
         bool Paused { get; }
 
         // @required +(void)paused:(BOOL)pause __attribute__((swift_private));
         //[Static, Abstract]
-        [Export ("paused:")]
+        [Export("paused:")]
         void SetPaused(bool pause);
 
         // @required +(void)addClickListener:(NSObject<OSInAppMessageClickListener> * _Nullable)listener __attribute__((swift_private));
         //[Static, Abstract]
-        [Export ("addClickListener:")]
+        [Export("addClickListener:")]
         void AddClickListener([NullAllowed] OSInAppMessageClickListener listener);
 
         // @required +(void)removeClickListener:(NSObject<OSInAppMessageClickListener> * _Nullable)listener __attribute__((swift_private));
         //[Static, Abstract]
-        [Export ("removeClickListener:")]
+        [Export("removeClickListener:")]
         void RemoveClickListener([NullAllowed] OSInAppMessageClickListener listener);
 
         // @required +(void)addLifecycleListener:(NSObject<OSInAppMessageLifecycleListener> * _Nullable)listener __attribute__((swift_private));
         //[Static, Abstract]
-        [Export ("addLifecycleListener:")]
+        [Export("addLifecycleListener:")]
         void AddLifecycleListener([NullAllowed] OSInAppMessageLifecycleListener listener);
 
         // @required +(void)removeLifecycleListener:(NSObject<OSInAppMessageLifecycleListener> * _Nullable)listener __attribute__((swift_private));
         //[Static, Abstract]
-        [Export ("removeLifecycleListener:")]
+        [Export("removeLifecycleListener:")]
         void RemoveLifecycleListener([NullAllowed] OSInAppMessageLifecycleListener listener);
     }
 
@@ -851,17 +857,17 @@ interface OSLocation
     {
         // @required +(void)requestPermission;
         //[Static, Abstract]
-        [Export ("requestPermission")]
+        [Export("requestPermission")]
         void RequestPermission();
 
         // @required +(void)setShared:(BOOL)enable __attribute__((swift_private));
         //[Static, Abstract]
-        [Export ("setShared:")]
+        [Export("setShared:")]
         void SetShared(bool enable);
 
         // @required +(BOOL)isShared __attribute__((swift_private));
         //[Static, Abstract]
-        [Export ("isShared")]
+        [Export("isShared")]
         //[Verify(MethodToProperty)]
         bool IsShared { get; }
     }
@@ -881,118 +887,130 @@ interface OneSignal
     {
         // +(NSString *)appId;
         [Static]
-        [Export ("appId")]
+        [Export("appId")]
         //[Verify(MethodToProperty)]
         string AppId { get; }
 
         // +(NSString * _Nonnull)sdkVersionRaw;
         [Static]
-        [Export ("sdkVersionRaw")]
+        [Export("sdkVersionRaw")]
         //[Verify(MethodToProperty)]
         string SdkVersionRaw { get; }
 
         // +(NSString * _Nonnull)sdkSemanticVersion;
         [Static]
-        [Export ("sdkSemanticVersion")]
+        [Export("sdkSemanticVersion")]
         //[Verify(MethodToProperty)]
         string SdkSemanticVersion { get; }
 
         // +(id<OSUser>)User __attribute__((swift_private));
         [Static]
-        [Export ("User")]
+        [Export("User")]
         //[Verify(MethodToProperty)]
         OSUser User { get; }
 
         // +(void)login:(NSString * _Nonnull)externalId;
         [Static]
-        [Export ("login:")]
+        [Export("login:")]
         void Login(string externalId);
 
         // +(void)login:(NSString * _Nonnull)externalId withToken:(NSString * _Nullable)token __attribute__((swift_name("login(externalId:token:)")));
         [Static]
-        [Export ("login:withToken:")]
+        [Export("login:withToken:")]
         void Login(string externalId, [NullAllowed] string token);
 
         // +(void)logout;
         [Static]
-        [Export ("logout")]
+        [Export("logout")]
         void Logout();
 
         // +(Class<OSNotifications>)Notifications __attribute__((swift_private));
         [Static]
-        [Export ("Notifications")]
+        [Export("Notifications")]
         //[Verify(MethodToProperty)]
         OSNotifications Notifications { get; }
 
         // +(void)setLaunchOptions:(NSDictionary * _Nullable)newLaunchOptions;
         [Static]
-        [Export ("setLaunchOptions:")]
+        [Export("setLaunchOptions:")]
         void SetLaunchOptions([NullAllowed] NSDictionary newLaunchOptions);
 
         // +(void)initialize:(NSString * _Nonnull)newAppId withLaunchOptions:(NSDictionary * _Nullable)launchOptions;
         [Static]
-        [Export ("initialize:withLaunchOptions:")]
+        [Export("initialize:withLaunchOptions:")]
         void Initialize(string newAppId, [NullAllowed] NSDictionary launchOptions);
 
         // +(void)setProvidesNotificationSettingsView:(BOOL)providesView;
         [Static]
-        [Export ("setProvidesNotificationSettingsView:")]
+        [Export("setProvidesNotificationSettingsView:")]
         void SetProvidesNotificationSettingsView(bool providesView);
 
         // +(Class<OSLiveActivities>)LiveActivities __attribute__((swift_private));
         [Static]
-        [Export ("LiveActivities")]
+        [Export("LiveActivities")]
         //[Verify(MethodToProperty)]
         OSLiveActivities LiveActivities { get; }
 
         // +(Class<OSDebug>)Debug __attribute__((swift_private));
         [Static]
-        [Export ("Debug")]
+        [Export("Debug")]
         //[Verify(MethodToProperty)]
         OSDebug Debug { get; }
 
         // +(void)setConsentRequired:(BOOL)required;
         [Static]
-        [Export ("setConsentRequired:")]
+        [Export("setConsentRequired:")]
         void SetConsentRequired(bool required);
 
         // +(void)setConsentGiven:(BOOL)granted;
         [Static]
-        [Export ("setConsentGiven:")]
+        [Export("setConsentGiven:")]
         void SetConsentGiven(bool granted);
 
         // +(Class<OSInAppMessages>)InAppMessages __attribute__((swift_private));
         [Static]
-        [Export ("InAppMessages")]
+        [Export("InAppMessages")]
         //[Verify(MethodToProperty)]
         OSInAppMessages InAppMessages { get; }
 
         // +(Class<OSLocation>)Location __attribute__((swift_private));
         [Static]
-        [Export ("Location")]
+        [Export("Location")]
         //[Verify(MethodToProperty)]
         OSLocation Location { get; }
 
         // +(Class<OSSession>)Session __attribute__((swift_private));
         [Static]
-        [Export ("Session")]
+        [Export("Session")]
         //[Verify(MethodToProperty)]
         OSSession Session { get; }
 
         // +(UNMutableNotificationContent *)didReceiveNotificationExtensionRequest:(UNNotificationRequest * _Nonnull)request withMutableNotificationContent:(UNMutableNotificationContent * _Nullable)replacementContent __attribute__((deprecated("Please use didReceiveNotificationExtensionRequest:withMutableNotificationContent:withContentHandler: instead.")));
         [Static]
-        [Export ("didReceiveNotificationExtensionRequest:withMutableNotificationContent:")]
-        UNMutableNotificationContent DidReceiveNotificationExtensionRequest(UNNotificationRequest request, [NullAllowed] UNMutableNotificationContent replacementContent);
+        [Export("didReceiveNotificationExtensionRequest:withMutableNotificationContent:")]
+        UNMutableNotificationContent DidReceiveNotificationExtensionRequest(
+            UNNotificationRequest request,
+            [NullAllowed] UNMutableNotificationContent replacementContent
+        );
 
         // +(UNMutableNotificationContent *)didReceiveNotificationExtensionRequest:(UNNotificationRequest * _Nonnull)request withMutableNotificationContent:(UNMutableNotificationContent * _Nullable)replacementContent withContentHandler:(void (^)(UNNotificationContent * _Nonnull))contentHandler;
         [Static]
-        [Export ("didReceiveNotificationExtensionRequest:withMutableNotificationContent:withContentHandler:")]
-        UNMutableNotificationContent DidReceiveNotificationExtensionRequest(UNNotificationRequest request, [NullAllowed] UNMutableNotificationContent replacementContent, Action<UNNotificationContent> contentHandler);
+        [Export(
+            "didReceiveNotificationExtensionRequest:withMutableNotificationContent:withContentHandler:"
+        )]
+        UNMutableNotificationContent DidReceiveNotificationExtensionRequest(
+            UNNotificationRequest request,
+            [NullAllowed] UNMutableNotificationContent replacementContent,
+            Action<UNNotificationContent> contentHandler
+        );
 
         // +(UNMutableNotificationContent *)serviceExtensionTimeWillExpireRequest:(UNNotificationRequest * _Nonnull)request withMutableNotificationContent:(UNMutableNotificationContent * _Nullable)replacementContent;
         [Static]
-        [Export ("serviceExtensionTimeWillExpireRequest:withMutableNotificationContent:")]
-        UNMutableNotificationContent ServiceExtensionTimeWillExpireRequest(UNNotificationRequest request, [NullAllowed] UNMutableNotificationContent replacementContent);
+        [Export("serviceExtensionTimeWillExpireRequest:withMutableNotificationContent:")]
+        UNMutableNotificationContent ServiceExtensionTimeWillExpireRequest(
+            UNNotificationRequest request,
+            [NullAllowed] UNMutableNotificationContent replacementContent
+        );
     }
 
     // @protocol OSLiveActivities <NSObject>
@@ -1002,65 +1020,82 @@ interface OSLiveActivities
     {
         // @required +(void)enter:(NSString * _Nonnull)activityId withToken:(NSString * _Nonnull)token;
         //[Static, Abstract]
-        [Export ("enter:withToken:")]
+        [Export("enter:withToken:")]
         void Enter(string activityId, string token);
 
         // @required +(void)enter:(NSString * _Nonnull)activityId withToken:(NSString * _Nonnull)token withSuccess:(OSResultSuccessBlock _Nullable)successBlock withFailure:(OSFailureBlock _Nullable)failureBlock;
         //[Static, Abstract]
-        [Export ("enter:withToken:withSuccess:withFailure:")]
-        void Enter(string activityId, string token, [NullAllowed] OSResultSuccessBlock successBlock, [NullAllowed] OSFailureBlock failureBlock);
+        [Export("enter:withToken:withSuccess:withFailure:")]
+        void Enter(
+            string activityId,
+            string token,
+            [NullAllowed] OSResultSuccessBlock successBlock,
+            [NullAllowed] OSFailureBlock failureBlock
+        );
 
         // @required +(void)exit:(NSString * _Nonnull)activityId;
         //[Static, Abstract]
-        [Export ("exit:")]
+        [Export("exit:")]
         void Exit(string activityId);
 
         // @required +(void)exit:(NSString * _Nonnull)activityId withSuccess:(OSResultSuccessBlock _Nullable)successBlock withFailure:(OSFailureBlock _Nullable)failureBlock;
         //[Static, Abstract]
-        [Export ("exit:withSuccess:withFailure:")]
-        void Exit(string activityId, [NullAllowed] OSResultSuccessBlock successBlock, [NullAllowed] OSFailureBlock failureBlock);
+        [Export("exit:withSuccess:withFailure:")]
+        void Exit(
+            string activityId,
+            [NullAllowed] OSResultSuccessBlock successBlock,
+            [NullAllowed] OSFailureBlock failureBlock
+        );
     }
 
-    [BaseType (typeof(NSObject))]
+    [BaseType(typeof(NSObject))]
     interface OneSignalLiveActivitiesManagerImpl
     {
         // +(BOOL)setPushToStartToken:(NSString * _Nonnull)activityType withToken:(NSString * _Nonnull)withToken error:(NSError * _Nullable * _Nullable)error __attribute__((availability(ios, introduced=17.2)));
         [Static]
-        [Export ("setPushToStartToken:withToken:error:")]
-        bool SetPushToStartToken (string activityType, string withToken, [NullAllowed] out NSError error);
+        [Export("setPushToStartToken:withToken:error:")]
+        bool SetPushToStartToken(
+            string activityType,
+            string withToken,
+            [NullAllowed] out NSError error
+        );
 
         // +(BOOL)removePushToStartToken:(NSString * _Nonnull)activityType error:(NSError * _Nullable * _Nullable)error __attribute__((availability(ios, introduced=17.2)));
         [Static]
-        [Export ("removePushToStartToken:error:")]
-        bool RemovePushToStartToken (string activityType, [NullAllowed] out NSError error);
+        [Export("removePushToStartToken:error:")]
+        bool RemovePushToStartToken(string activityType, [NullAllowed] out NSError error);
 
         // +(void)setupDefaultWithOptions:(LiveActivitySetupOptions * _Nullable)options __attribute__((availability(ios, introduced=16.1)));
         [Static]
-        [Export ("setupDefaultWithOptions:")]
-        void SetupDefaultWithOptions ([NullAllowed] LiveActivitySetupOptions options);
+        [Export("setupDefaultWithOptions:")]
+        void SetupDefaultWithOptions([NullAllowed] LiveActivitySetupOptions options);
 
         // +(void)startDefault:(NSString * _Nonnull)activityId attributes:(NSDictionary<NSString *,id> * _Nonnull)attributes content:(NSDictionary<NSString *,id> * _Nonnull)content __attribute__((availability(ios, introduced=16.1)));
         [Static]
-        [Export ("startDefault:attributes:content:")]
-        void StartDefault (string activityId, NSDictionary<NSString, NSObject> attributes, NSDictionary<NSString, NSObject> content);
+        [Export("startDefault:attributes:content:")]
+        void StartDefault(
+            string activityId,
+            NSDictionary<NSString, NSObject> attributes,
+            NSDictionary<NSString, NSObject> content
+        );
     }
 
     // @interface LiveActivitySetupOptions : NSObject
-    [BaseType (typeof(NSObject))]
+    [BaseType(typeof(NSObject))]
     [DisableDefaultCtor]
     interface LiveActivitySetupOptions
     {
         // @property (nonatomic) BOOL enablePushToStart;
-        [Export ("enablePushToStart")]
+        [Export("enablePushToStart")]
         bool EnablePushToStart { get; set; }
 
         // @property (nonatomic) BOOL enablePushToUpdate;
-        [Export ("enablePushToUpdate")]
+        [Export("enablePushToUpdate")]
         bool EnablePushToUpdate { get; set; }
 
         // -(instancetype _Nonnull)initWithEnablePushToStart:(BOOL)enablePushToStart enablePushToUpdate:(BOOL)enablePushToUpdate __attribute__((objc_designated_initializer));
-        [Export ("initWithEnablePushToStart:enablePushToUpdate:")]
+        [Export("initWithEnablePushToStart:enablePushToUpdate:")]
         [DesignatedInitializer]
-        NativeHandle Constructor (bool enablePushToStart, bool enablePushToUpdate);
+        NativeHandle Constructor(bool enablePushToStart, bool enablePushToUpdate);
     }
 }
diff --git a/OneSignalSDK.DotNet.iOS.Binding/OneSignalSDK.DotNet.iOS.Binding.csproj b/OneSignalSDK.DotNet.iOS.Binding/OneSignalSDK.DotNet.iOS.Binding.csproj
index 868a715f..fd6b6acb 100644
--- a/OneSignalSDK.DotNet.iOS.Binding/OneSignalSDK.DotNet.iOS.Binding.csproj
+++ b/OneSignalSDK.DotNet.iOS.Binding/OneSignalSDK.DotNet.iOS.Binding.csproj
@@ -104,4 +104,4 @@
       <Frameworks>OneSignalCore OneSignalNotifications OneSignalOSCore OneSignalUser OneSignalOutcomes UIKit WebKit CoreGraphics</Frameworks>
     </NativeReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/OneSignalSDK.DotNet.iOS.Binding/OneSignalSDK.dotnet.targets b/OneSignalSDK.DotNet.iOS.Binding/OneSignalSDK.dotnet.targets
index d232357e..30e36697 100644
--- a/OneSignalSDK.DotNet.iOS.Binding/OneSignalSDK.dotnet.targets
+++ b/OneSignalSDK.DotNet.iOS.Binding/OneSignalSDK.dotnet.targets
@@ -1,66 +1,66 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Target Name="OneSignalAddOneSignalXCFramework" BeforeTargets="BeforeCompile">
-        <ItemGroup>
-            <NativeReference Include="$(MSBuildThisFileDirectory)../../res/ios/OneSignalFramework.xcframework">
-              <Kind>Framework</Kind>
-              <SmartLink>False</SmartLink>
-              <ForceLoad>True</ForceLoad>
-              <Frameworks>SystemConfiguration UserNotifications WebKit CoreGraphics UIKit OneSignalOutcomes OneSignalCore OneSignalExtension OneSignalNotifications OneSignalOSCore OneSignalUser OneSignalLiveActivities</Frameworks>
-            </NativeReference>
-            <NativeReference Include="$(MSBuildThisFileDirectory)../../res/ios/OneSignalCore.xcframework">
-              <Kind>Framework</Kind>
-              <SmartLink>False</SmartLink>
-              <ForceLoad>True</ForceLoad>
-              <Frameworks>UIKit SystemConfiguration</Frameworks>
-            </NativeReference>
-            <NativeReference Include="$(MSBuildThisFileDirectory)../../res/ios/OneSignalExtension.xcframework">
-              <Kind>Framework</Kind>
-              <SmartLink>False</SmartLink>
-              <ForceLoad>True</ForceLoad>
-              <Frameworks>UserNotifications OneSignalCore OneSignalOutcomes</Frameworks>
-            </NativeReference>
-            <NativeReference Include="$(MSBuildThisFileDirectory)../../res/ios/OneSignalNotifications.xcframework">
-              <Kind>Framework</Kind>
-              <SmartLink>False</SmartLink>
-              <ForceLoad>True</ForceLoad>
-              <Frameworks>OneSignalCore OneSignalExtension OneSignalOutcomes UIKit UserNotifications WebKit</Frameworks>
-            </NativeReference>
-            <NativeReference Include="$(MSBuildThisFileDirectory)../../res/ios/OneSignalOSCore.xcframework">
-              <Kind>Framework</Kind>
-              <SmartLink>False</SmartLink>
-              <ForceLoad>True</ForceLoad>
-              <Frameworks>OneSignalCore</Frameworks>
-            </NativeReference>
-            <NativeReference Include="$(MSBuildThisFileDirectory)../../res/ios/OneSignalOutcomes.xcframework">
-              <Kind>Framework</Kind>
-              <SmartLink>False</SmartLink>
-              <ForceLoad>True</ForceLoad>
-              <Frameworks>OneSignalCore</Frameworks>
-            </NativeReference>
-            <NativeReference Include="$(MSBuildThisFileDirectory)../../res/ios/OneSignalUser.xcframework">
-              <Kind>Framework</Kind>
-              <SmartLink>False</SmartLink>
-              <ForceLoad>True</ForceLoad>
-              <Frameworks>OneSignalCore OneSignalNotifications OneSignalOSCore</Frameworks>
-            </NativeReference>
-            <NativeReference Include="$(MSBuildThisFileDirectory)../../res/ios/OneSignalLocation.xcframework">
-              <Kind>Framework</Kind>
-              <SmartLink>False</SmartLink>
-              <ForceLoad>True</ForceLoad>
-              <Frameworks>OneSignalCore OneSignalNotifications OneSignalOSCore OneSignalUser UIKit</Frameworks>
-            </NativeReference>
-            <NativeReference Include="$(MSBuildThisFileDirectory)../../res/ios/OneSignalLiveActivities.xcframework">
-              <Kind>Framework</Kind>
-              <SmartLink>False</SmartLink>
-              <ForceLoad>True</ForceLoad>
-              <Frameworks>OneSignalCore OneSignalOSCore OneSignalUser</Frameworks>
-            </NativeReference>
-            <NativeReference Include="$(MSBuildThisFileDirectory)../../res/ios/OneSignalInAppMessages.xcframework">
-              <Kind>Framework</Kind>
-              <SmartLink>False</SmartLink>
-              <ForceLoad>True</ForceLoad>
-              <Frameworks>OneSignalCore OneSignalNotifications OneSignalOSCore OneSignalUser OneSignalOutcomes UIKit WebKit CoreGraphics</Frameworks>
-            </NativeReference>
-        </ItemGroup>
-    </Target>
+  <Target Name="OneSignalAddOneSignalXCFramework" BeforeTargets="BeforeCompile">
+    <ItemGroup>
+      <NativeReference Include="$(MSBuildThisFileDirectory)../../res/ios/OneSignalFramework.xcframework">
+        <Kind>Framework</Kind>
+        <SmartLink>False</SmartLink>
+        <ForceLoad>True</ForceLoad>
+        <Frameworks>SystemConfiguration UserNotifications WebKit CoreGraphics UIKit OneSignalOutcomes OneSignalCore OneSignalExtension OneSignalNotifications OneSignalOSCore OneSignalUser OneSignalLiveActivities</Frameworks>
+      </NativeReference>
+      <NativeReference Include="$(MSBuildThisFileDirectory)../../res/ios/OneSignalCore.xcframework">
+        <Kind>Framework</Kind>
+        <SmartLink>False</SmartLink>
+        <ForceLoad>True</ForceLoad>
+        <Frameworks>UIKit SystemConfiguration</Frameworks>
+      </NativeReference>
+      <NativeReference Include="$(MSBuildThisFileDirectory)../../res/ios/OneSignalExtension.xcframework">
+        <Kind>Framework</Kind>
+        <SmartLink>False</SmartLink>
+        <ForceLoad>True</ForceLoad>
+        <Frameworks>UserNotifications OneSignalCore OneSignalOutcomes</Frameworks>
+      </NativeReference>
+      <NativeReference Include="$(MSBuildThisFileDirectory)../../res/ios/OneSignalNotifications.xcframework">
+        <Kind>Framework</Kind>
+        <SmartLink>False</SmartLink>
+        <ForceLoad>True</ForceLoad>
+        <Frameworks>OneSignalCore OneSignalExtension OneSignalOutcomes UIKit UserNotifications WebKit</Frameworks>
+      </NativeReference>
+      <NativeReference Include="$(MSBuildThisFileDirectory)../../res/ios/OneSignalOSCore.xcframework">
+        <Kind>Framework</Kind>
+        <SmartLink>False</SmartLink>
+        <ForceLoad>True</ForceLoad>
+        <Frameworks>OneSignalCore</Frameworks>
+      </NativeReference>
+      <NativeReference Include="$(MSBuildThisFileDirectory)../../res/ios/OneSignalOutcomes.xcframework">
+        <Kind>Framework</Kind>
+        <SmartLink>False</SmartLink>
+        <ForceLoad>True</ForceLoad>
+        <Frameworks>OneSignalCore</Frameworks>
+      </NativeReference>
+      <NativeReference Include="$(MSBuildThisFileDirectory)../../res/ios/OneSignalUser.xcframework">
+        <Kind>Framework</Kind>
+        <SmartLink>False</SmartLink>
+        <ForceLoad>True</ForceLoad>
+        <Frameworks>OneSignalCore OneSignalNotifications OneSignalOSCore</Frameworks>
+      </NativeReference>
+      <NativeReference Include="$(MSBuildThisFileDirectory)../../res/ios/OneSignalLocation.xcframework">
+        <Kind>Framework</Kind>
+        <SmartLink>False</SmartLink>
+        <ForceLoad>True</ForceLoad>
+        <Frameworks>OneSignalCore OneSignalNotifications OneSignalOSCore OneSignalUser UIKit</Frameworks>
+      </NativeReference>
+      <NativeReference Include="$(MSBuildThisFileDirectory)../../res/ios/OneSignalLiveActivities.xcframework">
+        <Kind>Framework</Kind>
+        <SmartLink>False</SmartLink>
+        <ForceLoad>True</ForceLoad>
+        <Frameworks>OneSignalCore OneSignalOSCore OneSignalUser</Frameworks>
+      </NativeReference>
+      <NativeReference Include="$(MSBuildThisFileDirectory)../../res/ios/OneSignalInAppMessages.xcframework">
+        <Kind>Framework</Kind>
+        <SmartLink>False</SmartLink>
+        <ForceLoad>True</ForceLoad>
+        <Frameworks>OneSignalCore OneSignalNotifications OneSignalOSCore OneSignalUser OneSignalOutcomes UIKit WebKit CoreGraphics</Frameworks>
+      </NativeReference>
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/OneSignalSDK.DotNet.iOS.Binding/StructsAndEnums.cs b/OneSignalSDK.DotNet.iOS.Binding/StructsAndEnums.cs
index 156c80bf..c4985721 100644
--- a/OneSignalSDK.DotNet.iOS.Binding/StructsAndEnums.cs
+++ b/OneSignalSDK.DotNet.iOS.Binding/StructsAndEnums.cs
@@ -1,11 +1,13 @@
 using System.Runtime.InteropServices;
 using ObjCRuntime;
-namespace Com.OneSignal.iOS {
+
+namespace Com.OneSignal.iOS
+{
     [Native]
     public enum OSNotificationActionType : ulong
     {
         Opened,
-        ActionTaken
+        ActionTaken,
     }
 
     [Native]
@@ -17,7 +19,7 @@ public enum OneSLogLevel : ulong
         Warn,
         Info,
         Debug,
-        Verbose
+        Verbose,
     }
 
     [Native]
@@ -27,7 +29,7 @@ public enum OSNotificationPermission : long
         Denied,
         Authorized,
         Provisional,
-        Ephemeral
+        Ephemeral,
     }
 
     [Native]
@@ -35,6 +37,6 @@ public enum OSInAppMessageActionUrlType : ulong
     {
         Safari,
         Webview,
-        ReplaceContent
+        ReplaceContent,
     }
 }
diff --git a/OneSignalSDK.DotNet.iOS/NotificationServiceExtension.cs b/OneSignalSDK.DotNet.iOS/NotificationServiceExtension.cs
index d3e86423..4ebc6f62 100644
--- a/OneSignalSDK.DotNet.iOS/NotificationServiceExtension.cs
+++ b/OneSignalSDK.DotNet.iOS/NotificationServiceExtension.cs
@@ -1,6 +1,5 @@
 using System;
 using UserNotifications;
-
 using OneSignalNative = Com.OneSignal.iOS;
 
 namespace OneSignalSDK.DotNet.iOS
@@ -18,17 +17,18 @@ public static class NotificationServiceExtension
         /// <param name="contentHandler">A content handler.</param>
         /// <returns>The notification content.</returns>
         public static UNMutableNotificationContent DidReceiveNotificationExtensionRequest(
-           UNNotificationRequest request,
-           UNMutableNotificationContent replacementContent,
-           Action<UNNotificationContent> contentHandler)
+            UNNotificationRequest request,
+            UNMutableNotificationContent replacementContent,
+            Action<UNNotificationContent> contentHandler
+        )
         {
             return OneSignalNative.OneSignal.DidReceiveNotificationExtensionRequest(
-               request,
-               replacementContent,
-               delegate (UNNotificationContent notificationContent)
-               {
-                   contentHandler.Invoke(notificationContent);
-               }
+                request,
+                replacementContent,
+                delegate(UNNotificationContent notificationContent)
+                {
+                    contentHandler.Invoke(notificationContent);
+                }
             );
         }
 
@@ -38,10 +38,14 @@ public static UNMutableNotificationContent DidReceiveNotificationExtensionReques
         /// <param name="request">The notification request.</param>
         /// <param name="replacementContent">The notification content.</param>
         public static void ServiceExtensionTimeWillExpireRequest(
-           UNNotificationRequest request,
-           UNMutableNotificationContent replacementContent)
+            UNNotificationRequest request,
+            UNMutableNotificationContent replacementContent
+        )
         {
-            OneSignalNative.OneSignal.ServiceExtensionTimeWillExpireRequest(request, replacementContent);
+            OneSignalNative.OneSignal.ServiceExtensionTimeWillExpireRequest(
+                request,
+                replacementContent
+            );
         }
     }
 }
diff --git a/OneSignalSDK.DotNet.iOS/OneSignalSDK.DotNet.iOS.csproj b/OneSignalSDK.DotNet.iOS/OneSignalSDK.DotNet.iOS.csproj
index f10e9716..8c5fbac7 100644
--- a/OneSignalSDK.DotNet.iOS/OneSignalSDK.DotNet.iOS.csproj
+++ b/OneSignalSDK.DotNet.iOS/OneSignalSDK.DotNet.iOS.csproj
@@ -48,4 +48,4 @@
   <ItemGroup>
     <None Include="Info.plist" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/OneSignalSDK.DotNet.iOS/Utilities/CallbackProxy.cs b/OneSignalSDK.DotNet.iOS/Utilities/CallbackProxy.cs
index dbda0859..270c6bc4 100644
--- a/OneSignalSDK.DotNet.iOS/Utilities/CallbackProxy.cs
+++ b/OneSignalSDK.DotNet.iOS/Utilities/CallbackProxy.cs
@@ -28,6 +28,4 @@ public void OnResponse(TReturn response)
 /// <summary>
 /// A boolean callback proxy.
 /// </summary>
-public sealed class BooleanCallbackProxy : CallbackProxy<bool>
-{
-}
+public sealed class BooleanCallbackProxy : CallbackProxy<bool> { }
diff --git a/OneSignalSDK.DotNet.iOS/Utilities/FromNativeConversion.cs b/OneSignalSDK.DotNet.iOS/Utilities/FromNativeConversion.cs
index 211c8bd7..f6e3b385 100644
--- a/OneSignalSDK.DotNet.iOS/Utilities/FromNativeConversion.cs
+++ b/OneSignalSDK.DotNet.iOS/Utilities/FromNativeConversion.cs
@@ -1,11 +1,11 @@
 using System.Collections.Generic;
+using System.Text.Json;
 using Foundation;
 using HomeKit;
-using System.Text.Json;
 using OneSignalSDK.DotNet.Core;
 using OneSignalSDK.DotNet.Core.InAppMessages;
-using OneSignalSDK.DotNet.Core.Notifications;
 using OneSignalSDK.DotNet.Core.Internal.Utilities;
+using OneSignalSDK.DotNet.Core.Notifications;
 using OneSignaliOS = Com.OneSignal.iOS;
 
 namespace OneSignalSDK.DotNet.iOS.Utilities;
@@ -64,11 +64,13 @@ public static Notification ToNotification(OneSignaliOS.OSNotification notificati
                 Dictionary<string, string> actionButtonXam = NSObjectToPureDict(actionButton);
                 if (actionButtonXam != null)
                 {
-                    actionButtonsXam.Add(new ActionButton(
-                        id: actionButtonXam.GetValueOrDefault("id"),
-                        text: actionButtonXam.GetValueOrDefault("text"),
-                        icon: actionButtonXam.GetValueOrDefault("icon")
-                    ));
+                    actionButtonsXam.Add(
+                        new ActionButton(
+                            id: actionButtonXam.GetValueOrDefault("id"),
+                            text: actionButtonXam.GetValueOrDefault("text"),
+                            icon: actionButtonXam.GetValueOrDefault("icon")
+                        )
+                    );
                 }
             }
         }
@@ -82,7 +84,9 @@ public static Notification ToNotification(OneSignaliOS.OSNotification notificati
             additionalData: additionalDataXam,
             launchUrl: notification.LaunchURL,
             sound: notification.Sound,
-            relevanceScore: notification.RelevanceScore != null ? (float)notification.RelevanceScore : 0,
+            relevanceScore: notification.RelevanceScore != null
+                ? (float)notification.RelevanceScore
+                : 0,
             badge: (int)notification.Badge,
             badgeIncrement: (int)notification.BadgeIncrement,
             actionButtons: actionButtonsXam,
@@ -95,15 +99,16 @@ public static Notification ToNotification(OneSignaliOS.OSNotification notificati
         );
     }
 
-    public static NotificationClickResult ToNotificationClickResult(OneSignaliOS.OSNotificationClickResult result)
+    public static NotificationClickResult ToNotificationClickResult(
+        OneSignaliOS.OSNotificationClickResult result
+    )
     {
-        return new NotificationClickResult(
-            actionId: result.ActionId,
-            url: result.Url
-        );
+        return new NotificationClickResult(actionId: result.ActionId, url: result.Url);
     }
 
-    public static InAppMessageClickResult ToInAppMessageClickResult(OneSignaliOS.OSInAppMessageClickResult inAppMessageClickResult)
+    public static InAppMessageClickResult ToInAppMessageClickResult(
+        OneSignaliOS.OSInAppMessageClickResult inAppMessageClickResult
+    )
     {
         long urlTarget = (long)inAppMessageClickResult.UrlTarget;
         return new InAppMessageClickResult(
@@ -116,8 +121,6 @@ public static InAppMessageClickResult ToInAppMessageClickResult(OneSignaliOS.OSI
 
     public static InAppMessage ToInAppMessage(OneSignaliOS.OSInAppMessage inAppMessage)
     {
-        return new InAppMessage(
-            messageId: inAppMessage.MessageId
-        );
+        return new InAppMessage(messageId: inAppMessage.MessageId);
     }
 }
diff --git a/OneSignalSDK.DotNet.iOS/Utilities/ToNativeConversion.cs b/OneSignalSDK.DotNet.iOS/Utilities/ToNativeConversion.cs
index c6fb315b..161a2fa0 100644
--- a/OneSignalSDK.DotNet.iOS/Utilities/ToNativeConversion.cs
+++ b/OneSignalSDK.DotNet.iOS/Utilities/ToNativeConversion.cs
@@ -20,7 +20,7 @@ public static NSDictionary<NSString, NSObject> DictToNSDict(IDictionary<string,
         var values = new NSObject[dict.Count];
         var index = 0;
 
-        foreach(var entry in dict)
+        foreach (var entry in dict)
         {
             keys[index] = NSString.FromData(entry.Key, NSStringEncoding.UTF8);
             values[index] = ObjectToNSObject(entry.Value);
diff --git a/OneSignalSDK.DotNet.iOS/iOSDebugManager.cs b/OneSignalSDK.DotNet.iOS/iOSDebugManager.cs
index a0f52418..a0f7d1b0 100644
--- a/OneSignalSDK.DotNet.iOS/iOSDebugManager.cs
+++ b/OneSignalSDK.DotNet.iOS/iOSDebugManager.cs
@@ -1,8 +1,7 @@
-using CoreFoundation;
+using Com.OneSignal.iOS;
+using CoreFoundation;
 using OneSignalSDK.DotNet.Core;
 using OneSignalSDK.DotNet.Core.Debug;
-
-using Com.OneSignal.iOS;
 using OneSignalNative = Com.OneSignal.iOS.OneSignal;
 
 namespace OneSignalSDK.DotNet.iOS;
@@ -15,7 +14,8 @@ public class iOSDebugManager : IDebugManager
     public Core.Debug.LogLevel LogLevel
     {
         get => _logLevel;
-        set {
+        set
+        {
             _logLevel = value;
             OneSignalNative.Debug.SetLogLevel((OneSLogLevel)_logLevel);
         }
diff --git a/OneSignalSDK.DotNet.iOS/iOSInAppMessagesManager.cs b/OneSignalSDK.DotNet.iOS/iOSInAppMessagesManager.cs
index 03515d9b..d65491bd 100644
--- a/OneSignalSDK.DotNet.iOS/iOSInAppMessagesManager.cs
+++ b/OneSignalSDK.DotNet.iOS/iOSInAppMessagesManager.cs
@@ -1,106 +1,147 @@
 using Com.OneSignal.iOS;
-using Foundation;
-using OneSignalSDK.DotNet.Core;
-using OneSignalSDK.DotNet.Core.InAppMessages;
-using OneSignalSDK.DotNet.iOS.Utilities;
-using OneSignalNative = Com.OneSignal.iOS.OneSignal;
-
-namespace OneSignalSDK.DotNet.iOS;
-
-public class iOSInAppMessagesManager : Core.InAppMessages.IInAppMessagesManager
-{
-    public event EventHandler<InAppMessageWillDisplayEventArgs>? WillDisplay;
-    public event EventHandler<InAppMessageDidDisplayEventArgs>? DidDisplay;
-    public event EventHandler<InAppMessageWillDismissEventArgs>? WillDismiss;
-    public event EventHandler<InAppMessageDidDismissEventArgs>? DidDismiss;
-    public event EventHandler<InAppMessageClickedEventArgs>? Clicked;
-
-    public bool Paused
-    {
-        get => OneSignalNative.InAppMessages.Paused;
-        set => OneSignalNative.InAppMessages.SetPaused(value);
-    }
-
-    private InternalInAppMessageLifeCycleListener? _lifecycleListener;
-
-    private InternalInAppMessageClickListener? _clickListener;
-
-    public void Initialize()
-    {
-        _lifecycleListener = new InternalInAppMessageLifeCycleListener(this);
-        _clickListener = new InternalInAppMessageClickListener(this);
-        OneSignalNative.InAppMessages.AddLifecycleListener(_lifecycleListener);
-        OneSignalNative.InAppMessages.AddClickListener(_clickListener);
-    }
-
-    public void AddTrigger(string key, string value) => OneSignalNative.InAppMessages.AddTrigger(key, value);
-    public void AddTriggers(IDictionary<string, string> triggers) => OneSignalNative.InAppMessages.AddTriggers(NativeConversion.DictToNSDict(triggers));
-    public void ClearTriggers() => OneSignalNative.InAppMessages.ClearTriggers();
-    public void RemoveTrigger(string key) => OneSignalNative.InAppMessages.RemoveTrigger(key);
-    public void RemoveTriggers(params string[] keys) => OneSignalNative.InAppMessages.RemoveTriggers(keys);
-
-
-    private sealed class InternalInAppMessageClickListener : Com.OneSignal.iOS.OSInAppMessageClickListener
-    {
-        private iOSInAppMessagesManager _manager;
-        public InternalInAppMessageClickListener(iOSInAppMessagesManager manager) : base()
-        {
-            _manager = manager;
-        }
-
-        public override void OnClickInAppMessage(Com.OneSignal.iOS.OSInAppMessageClickEvent clickEvent)
-        {
-            var args = new InAppMessageClickedEventArgs(FromNativeConversion.ToInAppMessage(clickEvent.Message), FromNativeConversion.ToInAppMessageClickResult(clickEvent.Result));
-            _manager.Clicked?.Invoke(this, args);
-        }
-    }
-
-    private sealed class InternalInAppMessageLifeCycleListener : Com.OneSignal.iOS.OSInAppMessageLifecycleListener
-    {
-        private iOSInAppMessagesManager _manager;
-        public InternalInAppMessageLifeCycleListener(iOSInAppMessagesManager manager) : base()
-        {
-            _manager = manager;
-        }
-
-        public override void OnWillDisplayInAppMessage(Com.OneSignal.iOS.OSInAppMessageWillDisplayEvent willDisplayEvent)
-        {
-            _manager.WillDisplay?.Invoke(_manager, GetWillDisplayArgs(willDisplayEvent));
-        }
-
-        public override void OnDidDisplayInAppMessage(Com.OneSignal.iOS.OSInAppMessageDidDisplayEvent didDisplayEvent)
-        {
-            _manager.DidDisplay?.Invoke(_manager, GetDidDisplayArgs(didDisplayEvent));
-        }
-
-        public override void OnWillDismissInAppMessage(Com.OneSignal.iOS.OSInAppMessageWillDismissEvent willDismissEvent)
-        {
-            _manager.WillDismiss?.Invoke(_manager, GetWillDismissArgs(willDismissEvent));
-        }
-
-        public override void OnDidDismissInAppMessage(Com.OneSignal.iOS.OSInAppMessageDidDismissEvent didDismissEvent)
-        {
-            _manager.DidDismiss?.Invoke(_manager, GetDidDismissArgs(didDismissEvent));
-        }        
-
-        private InAppMessageWillDisplayEventArgs GetWillDisplayArgs(Com.OneSignal.iOS.OSInAppMessageWillDisplayEvent willDisplayEvent)
-        {
-            return new InAppMessageWillDisplayEventArgs(FromNativeConversion.ToInAppMessage(willDisplayEvent.Message));
-        }
-
-        private InAppMessageDidDisplayEventArgs GetDidDisplayArgs(Com.OneSignal.iOS.OSInAppMessageDidDisplayEvent didDisplayEvent)
-        {
-            return new InAppMessageDidDisplayEventArgs(FromNativeConversion.ToInAppMessage(didDisplayEvent.Message));
-        }
-
-        private InAppMessageWillDismissEventArgs GetWillDismissArgs(Com.OneSignal.iOS.OSInAppMessageWillDismissEvent willDismissEvent)
-        {
-            return new InAppMessageWillDismissEventArgs(FromNativeConversion.ToInAppMessage(willDismissEvent.Message));
-        }
-
-        private InAppMessageDidDismissEventArgs GetDidDismissArgs(Com.OneSignal.iOS.OSInAppMessageDidDismissEvent didDismissEvent)
-        {
-            return new InAppMessageDidDismissEventArgs(FromNativeConversion.ToInAppMessage(didDismissEvent.Message));
-        }
-    }
-}
+using Foundation;
+using OneSignalSDK.DotNet.Core;
+using OneSignalSDK.DotNet.Core.InAppMessages;
+using OneSignalSDK.DotNet.iOS.Utilities;
+using OneSignalNative = Com.OneSignal.iOS.OneSignal;
+
+namespace OneSignalSDK.DotNet.iOS;
+
+public class iOSInAppMessagesManager : Core.InAppMessages.IInAppMessagesManager
+{
+    public event EventHandler<InAppMessageWillDisplayEventArgs>? WillDisplay;
+    public event EventHandler<InAppMessageDidDisplayEventArgs>? DidDisplay;
+    public event EventHandler<InAppMessageWillDismissEventArgs>? WillDismiss;
+    public event EventHandler<InAppMessageDidDismissEventArgs>? DidDismiss;
+    public event EventHandler<InAppMessageClickedEventArgs>? Clicked;
+
+    public bool Paused
+    {
+        get => OneSignalNative.InAppMessages.Paused;
+        set => OneSignalNative.InAppMessages.SetPaused(value);
+    }
+
+    private InternalInAppMessageLifeCycleListener? _lifecycleListener;
+
+    private InternalInAppMessageClickListener? _clickListener;
+
+    public void Initialize()
+    {
+        _lifecycleListener = new InternalInAppMessageLifeCycleListener(this);
+        _clickListener = new InternalInAppMessageClickListener(this);
+        OneSignalNative.InAppMessages.AddLifecycleListener(_lifecycleListener);
+        OneSignalNative.InAppMessages.AddClickListener(_clickListener);
+    }
+
+    public void AddTrigger(string key, string value) =>
+        OneSignalNative.InAppMessages.AddTrigger(key, value);
+
+    public void AddTriggers(IDictionary<string, string> triggers) =>
+        OneSignalNative.InAppMessages.AddTriggers(NativeConversion.DictToNSDict(triggers));
+
+    public void ClearTriggers() => OneSignalNative.InAppMessages.ClearTriggers();
+
+    public void RemoveTrigger(string key) => OneSignalNative.InAppMessages.RemoveTrigger(key);
+
+    public void RemoveTriggers(params string[] keys) =>
+        OneSignalNative.InAppMessages.RemoveTriggers(keys);
+
+    private sealed class InternalInAppMessageClickListener
+        : Com.OneSignal.iOS.OSInAppMessageClickListener
+    {
+        private iOSInAppMessagesManager _manager;
+
+        public InternalInAppMessageClickListener(iOSInAppMessagesManager manager)
+            : base()
+        {
+            _manager = manager;
+        }
+
+        public override void OnClickInAppMessage(
+            Com.OneSignal.iOS.OSInAppMessageClickEvent clickEvent
+        )
+        {
+            var args = new InAppMessageClickedEventArgs(
+                FromNativeConversion.ToInAppMessage(clickEvent.Message),
+                FromNativeConversion.ToInAppMessageClickResult(clickEvent.Result)
+            );
+            _manager.Clicked?.Invoke(this, args);
+        }
+    }
+
+    private sealed class InternalInAppMessageLifeCycleListener
+        : Com.OneSignal.iOS.OSInAppMessageLifecycleListener
+    {
+        private iOSInAppMessagesManager _manager;
+
+        public InternalInAppMessageLifeCycleListener(iOSInAppMessagesManager manager)
+            : base()
+        {
+            _manager = manager;
+        }
+
+        public override void OnWillDisplayInAppMessage(
+            Com.OneSignal.iOS.OSInAppMessageWillDisplayEvent willDisplayEvent
+        )
+        {
+            _manager.WillDisplay?.Invoke(_manager, GetWillDisplayArgs(willDisplayEvent));
+        }
+
+        public override void OnDidDisplayInAppMessage(
+            Com.OneSignal.iOS.OSInAppMessageDidDisplayEvent didDisplayEvent
+        )
+        {
+            _manager.DidDisplay?.Invoke(_manager, GetDidDisplayArgs(didDisplayEvent));
+        }
+
+        public override void OnWillDismissInAppMessage(
+            Com.OneSignal.iOS.OSInAppMessageWillDismissEvent willDismissEvent
+        )
+        {
+            _manager.WillDismiss?.Invoke(_manager, GetWillDismissArgs(willDismissEvent));
+        }
+
+        public override void OnDidDismissInAppMessage(
+            Com.OneSignal.iOS.OSInAppMessageDidDismissEvent didDismissEvent
+        )
+        {
+            _manager.DidDismiss?.Invoke(_manager, GetDidDismissArgs(didDismissEvent));
+        }
+
+        private InAppMessageWillDisplayEventArgs GetWillDisplayArgs(
+            Com.OneSignal.iOS.OSInAppMessageWillDisplayEvent willDisplayEvent
+        )
+        {
+            return new InAppMessageWillDisplayEventArgs(
+                FromNativeConversion.ToInAppMessage(willDisplayEvent.Message)
+            );
+        }
+
+        private InAppMessageDidDisplayEventArgs GetDidDisplayArgs(
+            Com.OneSignal.iOS.OSInAppMessageDidDisplayEvent didDisplayEvent
+        )
+        {
+            return new InAppMessageDidDisplayEventArgs(
+                FromNativeConversion.ToInAppMessage(didDisplayEvent.Message)
+            );
+        }
+
+        private InAppMessageWillDismissEventArgs GetWillDismissArgs(
+            Com.OneSignal.iOS.OSInAppMessageWillDismissEvent willDismissEvent
+        )
+        {
+            return new InAppMessageWillDismissEventArgs(
+                FromNativeConversion.ToInAppMessage(willDismissEvent.Message)
+            );
+        }
+
+        private InAppMessageDidDismissEventArgs GetDidDismissArgs(
+            Com.OneSignal.iOS.OSInAppMessageDidDismissEvent didDismissEvent
+        )
+        {
+            return new InAppMessageDidDismissEventArgs(
+                FromNativeConversion.ToInAppMessage(didDismissEvent.Message)
+            );
+        }
+    }
+}
diff --git a/OneSignalSDK.DotNet.iOS/iOSLiveActivitiesManager.cs b/OneSignalSDK.DotNet.iOS/iOSLiveActivitiesManager.cs
index 5d05e98b..7290cca4 100644
--- a/OneSignalSDK.DotNet.iOS/iOSLiveActivitiesManager.cs
+++ b/OneSignalSDK.DotNet.iOS/iOSLiveActivitiesManager.cs
@@ -2,33 +2,44 @@
 using OneSignalSDK.DotNet.Core;
 using OneSignalSDK.DotNet.Core.LiveActivities;
 using OneSignalSDK.DotNet.iOS.Utilities;
-using OneSignalNative = Com.OneSignal.iOS.OneSignal;
-using OneSignalLiveActivityNative = Com.OneSignal.iOS.OneSignalLiveActivitiesManagerImpl;
 using LiveActivitySetupOptionsNative = Com.OneSignal.iOS.LiveActivitySetupOptions;
+using OneSignalLiveActivityNative = Com.OneSignal.iOS.OneSignalLiveActivitiesManagerImpl;
+using OneSignalNative = Com.OneSignal.iOS.OneSignal;
 
 namespace OneSignalSDK.DotNet.iOS
 {
-	public class iOSLiveActivitiesManager: ILiveActivitiesManager
-	{
+    public class iOSLiveActivitiesManager : ILiveActivitiesManager
+    {
         public async Task<bool> Enter(string activityId, string token)
         {
             BooleanCallbackProxy proxy = new BooleanCallbackProxy();
-            OneSignalNative.LiveActivities.Enter(activityId, token, response => proxy.OnResponse(true), response => proxy.OnResponse(false));
+            OneSignalNative.LiveActivities.Enter(
+                activityId,
+                token,
+                response => proxy.OnResponse(true),
+                response => proxy.OnResponse(false)
+            );
             return await proxy;
         }
 
         public async Task<bool> Exit(string activityId)
         {
             BooleanCallbackProxy proxy = new BooleanCallbackProxy();
-            OneSignalNative.LiveActivities.Exit(activityId, response => proxy.OnResponse(true), response => proxy.OnResponse(false));
+            OneSignalNative.LiveActivities.Exit(
+                activityId,
+                response => proxy.OnResponse(true),
+                response => proxy.OnResponse(false)
+            );
             return await proxy;
         }
 
         public void RemovePushToStartToken(string activityType)
         {
-            if (!UIDevice.CurrentDevice.CheckSystemVersion(17,2))
+            if (!UIDevice.CurrentDevice.CheckSystemVersion(17, 2))
             {
-                Console.WriteLine("RemovePushToStartToken is only available on iOS 17.2 and later.");
+                Console.WriteLine(
+                    "RemovePushToStartToken is only available on iOS 17.2 and later."
+                );
                 return;
             }
 
@@ -43,7 +54,7 @@ public void RemovePushToStartToken(string activityType)
 
         public void SetPushToStartToken(string activityType, string token)
         {
-            if (!UIDevice.CurrentDevice.CheckSystemVersion(17,2))
+            if (!UIDevice.CurrentDevice.CheckSystemVersion(17, 2))
             {
                 Console.WriteLine("SetPushToStartToken is only available on iOS 17.2 and later.");
                 return;
@@ -60,7 +71,7 @@ public void SetPushToStartToken(string activityType, string token)
 
         public void SetupDefault(LiveActivitySetupOptions options = null)
         {
-            if (!UIDevice.CurrentDevice.CheckSystemVersion(16,1))
+            if (!UIDevice.CurrentDevice.CheckSystemVersion(16, 1))
             {
                 Console.WriteLine("SetupDefault is only available on iOS 16.1 and later.");
                 return;
@@ -68,24 +79,34 @@ public void SetupDefault(LiveActivitySetupOptions options = null)
 
             LiveActivitySetupOptionsNative nativeOptions = null;
 
-            if(options != null)
+            if (options != null)
             {
-                nativeOptions = new LiveActivitySetupOptionsNative(options.EnablePushToStart, options.EnablePushToUpdate);
+                nativeOptions = new LiveActivitySetupOptionsNative(
+                    options.EnablePushToStart,
+                    options.EnablePushToUpdate
+                );
             }
 
             OneSignalLiveActivityNative.SetupDefaultWithOptions(nativeOptions);
         }
 
-        public void StartDefault(string activityId, IDictionary<string, object> attributes, IDictionary<string, object> content)
+        public void StartDefault(
+            string activityId,
+            IDictionary<string, object> attributes,
+            IDictionary<string, object> content
+        )
         {
-            if (!UIDevice.CurrentDevice.CheckSystemVersion(16,1))
+            if (!UIDevice.CurrentDevice.CheckSystemVersion(16, 1))
             {
                 Console.WriteLine("StartDefault is only available on iOS 16.1 and later.");
                 return;
             }
 
-
-            OneSignalLiveActivityNative.StartDefault(activityId, NativeConversion.DictToNSDict(attributes), NativeConversion.DictToNSDict(content));
+            OneSignalLiveActivityNative.StartDefault(
+                activityId,
+                NativeConversion.DictToNSDict(attributes),
+                NativeConversion.DictToNSDict(content)
+            );
         }
     }
 }
diff --git a/OneSignalSDK.DotNet.iOS/iOSLocationManager.cs b/OneSignalSDK.DotNet.iOS/iOSLocationManager.cs
index 05949577..00fa2983 100644
--- a/OneSignalSDK.DotNet.iOS/iOSLocationManager.cs
+++ b/OneSignalSDK.DotNet.iOS/iOSLocationManager.cs
@@ -1,6 +1,5 @@
 using OneSignalSDK.DotNet.Core;
 using OneSignalSDK.DotNet.Core.Location;
-
 using OneSignalNative = Com.OneSignal.iOS.OneSignal;
 
 namespace OneSignalSDK.DotNet.iOS;
diff --git a/OneSignalSDK.DotNet.iOS/iOSNotificationsManager.cs b/OneSignalSDK.DotNet.iOS/iOSNotificationsManager.cs
index dd8c1f4b..c4315529 100644
--- a/OneSignalSDK.DotNet.iOS/iOSNotificationsManager.cs
+++ b/OneSignalSDK.DotNet.iOS/iOSNotificationsManager.cs
@@ -1,9 +1,9 @@
 using System.Security.Permissions;
 using Com.OneSignal.iOS;
+using Foundation;
 using OneSignalSDK.DotNet.Core;
 using OneSignalSDK.DotNet.Core.Notifications;
 using OneSignalSDK.DotNet.iOS.Utilities;
-using Foundation;
 using OneSignalNative = Com.OneSignal.iOS.OneSignal;
 
 namespace OneSignalSDK.DotNet.iOS;
@@ -26,24 +26,31 @@ public void Initialize()
         var _notificationsClickListener = new InternalNotificationsClickListener(this);
         var _notificationsLifecycleListener = new InternalNotificationsLifecycleListener(this);
 
-
         OneSignalNative.Notifications.AddPermissionObserver(_notificationsPermissionObserver);
-        OneSignalNative.Notifications.AddForegroundLifecycleListener(_notificationsLifecycleListener);
+        OneSignalNative.Notifications.AddForegroundLifecycleListener(
+            _notificationsLifecycleListener
+        );
         OneSignalNative.Notifications.AddClickListener(_notificationsClickListener);
     }
 
-    public NotificationPermission PermissionNative() => (NotificationPermission)OneSignalNative.Notifications.PermissionNative;
+    public NotificationPermission PermissionNative() =>
+        (NotificationPermission)OneSignalNative.Notifications.PermissionNative;
 
     public async Task<bool> RequestPermissionAsync(bool fallbackToSettings)
     {
         var proxy = new BooleanCallbackProxy();
-        OneSignalNative.Notifications.RequestPermission(r => proxy.OnResponse(r), fallbackToSettings);
+        OneSignalNative.Notifications.RequestPermission(
+            r => proxy.OnResponse(r),
+            fallbackToSettings
+        );
         return await proxy;
     }
 
-    private sealed class InternalNotificationsPermissionObserver : Com.OneSignal.iOS.OSNotificationPermissionObserver
+    private sealed class InternalNotificationsPermissionObserver
+        : Com.OneSignal.iOS.OSNotificationPermissionObserver
     {
         private iOSNotificationsManager _manager;
+
         public InternalNotificationsPermissionObserver(iOSNotificationsManager manager)
         {
             _manager = manager;
@@ -51,35 +58,48 @@ public InternalNotificationsPermissionObserver(iOSNotificationsManager manager)
 
         public override void OnNotificationPermissionDidChange(bool permission)
         {
-            _manager.PermissionChanged?.Invoke(_manager, new NotificationPermissionChangedEventArgs(permission));
+            _manager.PermissionChanged?.Invoke(
+                _manager,
+                new NotificationPermissionChangedEventArgs(permission)
+            );
         }
     }
 
-    private sealed class InternalNotificationsLifecycleListener : Com.OneSignal.iOS.OSNotificationLifecycleListener
+    private sealed class InternalNotificationsLifecycleListener
+        : Com.OneSignal.iOS.OSNotificationLifecycleListener
     {
         private iOSNotificationsManager _manager;
+
         public InternalNotificationsLifecycleListener(iOSNotificationsManager manager)
         {
             _manager = manager;
         }
 
-        public override void OnWillDisplayNotification(Com.OneSignal.iOS.OSNotificationWillDisplayEvent willDisplayEvent)
+        public override void OnWillDisplayNotification(
+            Com.OneSignal.iOS.OSNotificationWillDisplayEvent willDisplayEvent
+        )
         {
-            var notification = iOSDisplayableNotification.ToDisplayableNotification(willDisplayEvent.Notification);
+            var notification = iOSDisplayableNotification.ToDisplayableNotification(
+                willDisplayEvent.Notification
+            );
             var args = new iOSNotificationWillDisplayEventArgs(willDisplayEvent, notification);
             _manager.WillDisplay?.Invoke(_manager, args);
         }
     }
 
-    private sealed class InternalNotificationsClickListener : Com.OneSignal.iOS.OSNotificationClickListener
+    private sealed class InternalNotificationsClickListener
+        : Com.OneSignal.iOS.OSNotificationClickListener
     {
         private iOSNotificationsManager _manager;
+
         public InternalNotificationsClickListener(iOSNotificationsManager manager)
         {
             _manager = manager;
         }
 
-        public override void OnClickNotification(Com.OneSignal.iOS.OSNotificationClickEvent clickEvent)
+        public override void OnClickNotification(
+            Com.OneSignal.iOS.OSNotificationClickEvent clickEvent
+        )
         {
             var notification = FromNativeConversion.ToNotification(clickEvent.Notification);
             var result = FromNativeConversion.ToNotificationClickResult(clickEvent.Result);
@@ -88,12 +108,16 @@ public override void OnClickNotification(Com.OneSignal.iOS.OSNotificationClickEv
         }
     }
 
-    private sealed class iOSNotificationWillDisplayEventArgs : OneSignalSDK.DotNet.Core.Notifications.NotificationWillDisplayEventArgs
+    private sealed class iOSNotificationWillDisplayEventArgs
+        : OneSignalSDK.DotNet.Core.Notifications.NotificationWillDisplayEventArgs
     {
         private Com.OneSignal.iOS.OSNotificationWillDisplayEvent _willDisplayEvent;
 
-        public iOSNotificationWillDisplayEventArgs(Com.OneSignal.iOS.OSNotificationWillDisplayEvent willDisplayEvent,
-                                                   DisplayableNotification notification) : base(notification)
+        public iOSNotificationWillDisplayEventArgs(
+            Com.OneSignal.iOS.OSNotificationWillDisplayEvent willDisplayEvent,
+            DisplayableNotification notification
+        )
+            : base(notification)
         {
             _willDisplayEvent = willDisplayEvent;
         }
@@ -104,14 +128,19 @@ public override void PreventDefault()
         }
     }
 
-    private sealed class iOSDisplayableNotification : OneSignalSDK.DotNet.Core.Notifications.DisplayableNotification
+    private sealed class iOSDisplayableNotification
+        : OneSignalSDK.DotNet.Core.Notifications.DisplayableNotification
     {
-        public static iOSDisplayableNotification ToDisplayableNotification(Com.OneSignal.iOS.OSDisplayableNotification notification)
+        public static iOSDisplayableNotification ToDisplayableNotification(
+            Com.OneSignal.iOS.OSDisplayableNotification notification
+        )
         {
             Dictionary<string, object> additionalDataXam = new Dictionary<string, object>();
             if (notification.AdditionalData != null)
             {
-                additionalDataXam = FromNativeConversion.NSDictToPureDict(notification.AdditionalData);
+                additionalDataXam = FromNativeConversion.NSDictToPureDict(
+                    notification.AdditionalData
+                );
             }
 
             List<ActionButton> actionButtonsXam = new List<ActionButton>();
@@ -119,14 +148,17 @@ public static iOSDisplayableNotification ToDisplayableNotification(Com.OneSignal
             {
                 foreach (NSObject actionButton in notification.ActionButtons)
                 {
-                    Dictionary<string, string> actionButtonXam = FromNativeConversion.NSObjectToPureDict(actionButton);
+                    Dictionary<string, string> actionButtonXam =
+                        FromNativeConversion.NSObjectToPureDict(actionButton);
                     if (actionButtonXam != null)
                     {
-                        actionButtonsXam.Add(new ActionButton(
-                            id: actionButtonXam.GetValueOrDefault("id"),
-                            text: actionButtonXam.GetValueOrDefault("text"),
-                            icon: actionButtonXam.GetValueOrDefault("icon")
-                        ));
+                        actionButtonsXam.Add(
+                            new ActionButton(
+                                id: actionButtonXam.GetValueOrDefault("id"),
+                                text: actionButtonXam.GetValueOrDefault("text"),
+                                icon: actionButtonXam.GetValueOrDefault("icon")
+                            )
+                        );
                     }
                 }
             }
@@ -141,7 +173,9 @@ public static iOSDisplayableNotification ToDisplayableNotification(Com.OneSignal
                 additionalData: additionalDataXam,
                 launchUrl: notification.LaunchURL,
                 sound: notification.Sound,
-                relevanceScore: notification.RelevanceScore != null ? (float)notification.RelevanceScore : 0,
+                relevanceScore: notification.RelevanceScore != null
+                    ? (float)notification.RelevanceScore
+                    : 0,
                 badge: (int)notification.Badge,
                 badgeIncrement: (int)notification.BadgeIncrement,
                 actionButtons: actionButtonsXam,
@@ -181,15 +215,17 @@ public iOSDisplayableNotification(
             string smallIconAccentColor = null,
             int? lockScreenVisibility = null,
             int? androidNotificationId = null,
-            int? badge = null, int?
-            badgeIncrement = null,
+            int? badge = null,
+            int? badgeIncrement = null,
             string category = null,
             string threadId = null,
             string subtitle = null,
             float? relevanceScore = null,
             bool? mutableContent = null,
             bool? contentAvailable = null,
-            string interruptionLevel = null) : base(
+            string interruptionLevel = null
+        )
+            : base(
                 title,
                 body,
                 sound,
@@ -221,7 +257,8 @@ public iOSDisplayableNotification(
                 relevanceScore,
                 mutableContent,
                 contentAvailable,
-                interruptionLevel)
+                interruptionLevel
+            )
         {
             _displayableNotification = displayableNotification;
         }
@@ -231,4 +268,4 @@ public override void display()
             _displayableNotification.Display();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OneSignalSDK.DotNet.iOS/iOSOneSignal.cs b/OneSignalSDK.DotNet.iOS/iOSOneSignal.cs
index 22400492..09c36fa6 100644
--- a/OneSignalSDK.DotNet.iOS/iOSOneSignal.cs
+++ b/OneSignalSDK.DotNet.iOS/iOSOneSignal.cs
@@ -2,15 +2,14 @@
 using OneSignalSDK.DotNet.Core;
 using OneSignalSDK.DotNet.Core.Debug;
 using OneSignalSDK.DotNet.Core.InAppMessages;
+using OneSignalSDK.DotNet.Core.Internal.Utilities;
+using OneSignalSDK.DotNet.Core.LiveActivities;
 using OneSignalSDK.DotNet.Core.Location;
 using OneSignalSDK.DotNet.Core.Notifications;
 using OneSignalSDK.DotNet.Core.Session;
 using OneSignalSDK.DotNet.Core.User;
-using OneSignalSDK.DotNet.Core.Internal.Utilities;
-
-using OneSignalNative = Com.OneSignal.iOS.OneSignal;
 using OneSignalSDK.DotNet.iOS.Utilities;
-using OneSignalSDK.DotNet.Core.LiveActivities;
+using OneSignalNative = Com.OneSignal.iOS.OneSignal;
 
 namespace OneSignalSDK.DotNet.iOS;
 
diff --git a/OneSignalSDK.DotNet.iOS/iOSSessionManager.cs b/OneSignalSDK.DotNet.iOS/iOSSessionManager.cs
index 726ab52e..fdefeab8 100644
--- a/OneSignalSDK.DotNet.iOS/iOSSessionManager.cs
+++ b/OneSignalSDK.DotNet.iOS/iOSSessionManager.cs
@@ -1,6 +1,5 @@
 using OneSignalSDK.DotNet.Core;
 using OneSignalSDK.DotNet.Core.Session;
-
 using OneSignalNative = Com.OneSignal.iOS.OneSignal;
 
 namespace OneSignalSDK.DotNet.iOS;
@@ -8,6 +7,9 @@ namespace OneSignalSDK.DotNet.iOS;
 public class iOSSessionManager : ISessionManager
 {
     public void AddOutcome(string name) => OneSignalNative.Session.AddOutcome(name);
+
     public void AddUniqueOutcome(string name) => OneSignalNative.Session.AddUniqueOutcome(name);
-    public void AddOutcomeWithValue(string name, float value) => OneSignalNative.Session.AddOutcomeWithValue(name, value);
+
+    public void AddOutcomeWithValue(string name, float value) =>
+        OneSignalNative.Session.AddOutcomeWithValue(name, value);
 }
diff --git a/OneSignalSDK.DotNet.iOS/iOSUserManager.cs b/OneSignalSDK.DotNet.iOS/iOSUserManager.cs
index 3dcdfa79..35517d14 100644
--- a/OneSignalSDK.DotNet.iOS/iOSUserManager.cs
+++ b/OneSignalSDK.DotNet.iOS/iOSUserManager.cs
@@ -27,37 +27,55 @@ public void Initialize()
             ((iOSPushSubscription)PushSubscription).Initialize();
         }
 
-        public string OneSignalId 
+        public string OneSignalId
         {
             get => OneSignalNative.User.OnesignalId;
         }
 
-        public string ExternalId 
+        public string ExternalId
         {
             get => OneSignalNative.User.ExternalId;
         }
         public event EventHandler<UserStateChangedEventArgs>? Changed;
 
-        public void AddAlias(string label, string id) => OneSignalNative.User.AddAliasWithLabel(label, id);
-        public void AddAliases(IDictionary<string, string> aliases) => OneSignalNative.User.AddAliases(NativeConversion.DictToNSDict(aliases));
+        public void AddAlias(string label, string id) =>
+            OneSignalNative.User.AddAliasWithLabel(label, id);
+
+        public void AddAliases(IDictionary<string, string> aliases) =>
+            OneSignalNative.User.AddAliases(NativeConversion.DictToNSDict(aliases));
+
         public void RemoveAlias(string label) => OneSignalNative.User.RemoveAlias(label);
-        public void RemoveAliases(params string[] labels) => OneSignalNative.User.RemoveAliases(labels);
+
+        public void RemoveAliases(params string[] labels) =>
+            OneSignalNative.User.RemoveAliases(labels);
 
         public void AddEmail(string email) => OneSignalNative.User.AddEmail(email);
+
         public void RemoveEmail(string email) => OneSignalNative.User.RemoveEmail(email);
 
         public void AddSms(string sms) => OneSignalNative.User.AddSms(sms);
+
         public void RemoveSms(string sms) => OneSignalNative.User.RemoveSms(sms);
 
-        public void AddTag(string key, string value) => OneSignalNative.User.AddTagWithKey(key, value);
-        public void AddTags(IDictionary<string, string> tags) => OneSignalNative.User.AddTags(NativeConversion.DictToNSDict(tags));
+        public void AddTag(string key, string value) =>
+            OneSignalNative.User.AddTagWithKey(key, value);
+
+        public void AddTags(IDictionary<string, string> tags) =>
+            OneSignalNative.User.AddTags(NativeConversion.DictToNSDict(tags));
+
         public void RemoveTag(string key) => OneSignalNative.User.RemoveTag(key);
+
         public void RemoveTags(params string[] keys) => OneSignalNative.User.RemoveTags(keys);
-        public IDictionary<string, string> GetTags() => FromNativeConversion.NSDictToPureStringDict(OneSignalNative.User.GetTags());
+
+        public IDictionary<string, string> GetTags() =>
+            FromNativeConversion.NSDictToPureStringDict(OneSignalNative.User.GetTags());
 
         public void TrackEvent(string name, IDictionary<string, object>? properties = null)
         {
-            OneSignalNative.User.TrackEventWithName(name, properties == null ? null : NativeConversion.DictToNSDict(properties));
+            OneSignalNative.User.TrackEventWithName(
+                name,
+                properties == null ? null : NativeConversion.DictToNSDict(properties)
+            );
         }
 
         private sealed class InternalUserState : IUserState
@@ -76,6 +94,7 @@ public InternalUserState(string onesignalId, string externalId)
         private class InternalUserChangedHandler : Com.OneSignal.iOS.OSUserStateObserver
         {
             private iOSUserManager _manager;
+
             public InternalUserChangedHandler(iOSUserManager manager)
             {
                 _manager = manager;
@@ -83,7 +102,10 @@ public InternalUserChangedHandler(iOSUserManager manager)
 
             public override void OnUserStateDidChangeWithState(OSUserChangedState state)
             {
-                var current = new InternalUserState(state.Current.OnesignalId, state.Current.ExternalId);
+                var current = new InternalUserState(
+                    state.Current.OnesignalId,
+                    state.Current.ExternalId
+                );
                 var userChangedState = new UserChangedState(current);
                 _manager.Changed?.Invoke(_manager, new UserStateChangedEventArgs(userChangedState));
             }
@@ -126,7 +148,6 @@ private sealed class InternalPushSubscriptionState : IPushSubscriptionState
 
             public bool OptedIn { get; }
 
-
             public InternalPushSubscriptionState(string token, bool optedIn, string id)
             {
                 Token = token;
@@ -135,20 +156,35 @@ public InternalPushSubscriptionState(string token, bool optedIn, string id)
             }
         }
 
-        private sealed class InternalPushSubscriptionChangedHandler : Com.OneSignal.iOS.OSPushSubscriptionObserver
+        private sealed class InternalPushSubscriptionChangedHandler
+            : Com.OneSignal.iOS.OSPushSubscriptionObserver
         {
             private iOSPushSubscription _manager;
+
             public InternalPushSubscriptionChangedHandler(iOSPushSubscription manager)
             {
                 _manager = manager;
             }
 
-            public override void OnPushSubscriptionDidChangeWithState(OSPushSubscriptionChangedState state)
+            public override void OnPushSubscriptionDidChangeWithState(
+                OSPushSubscriptionChangedState state
+            )
             {
-                var previous = new InternalPushSubscriptionState(state.Previous.Token, state.Previous.OptedIn, state.Previous.Id);
-                var current = new InternalPushSubscriptionState(state.Current.Token, state.Current.OptedIn, state.Current.Id);
+                var previous = new InternalPushSubscriptionState(
+                    state.Previous.Token,
+                    state.Previous.OptedIn,
+                    state.Previous.Id
+                );
+                var current = new InternalPushSubscriptionState(
+                    state.Current.Token,
+                    state.Current.OptedIn,
+                    state.Current.Id
+                );
                 var changedState = new PushSubscriptionChangedState(previous, current);
-                _manager.Changed?.Invoke(_manager, new PushSubscriptionChangedEventArgs(changedState));
+                _manager.Changed?.Invoke(
+                    _manager,
+                    new PushSubscriptionChangedEventArgs(changedState)
+                );
             }
         }
     }
diff --git a/OneSignalSDK.DotNet/OneSignal.cs b/OneSignalSDK.DotNet/OneSignal.cs
index 764c77d2..3ca3580e 100644
--- a/OneSignalSDK.DotNet/OneSignal.cs
+++ b/OneSignalSDK.DotNet/OneSignal.cs
@@ -3,9 +3,9 @@
 using System.Diagnostics;
 using System.Dynamic;
 using OneSignalSDK.DotNet.Core;
-using OneSignalSDK.DotNet.Core.LiveActivities;
 using OneSignalSDK.DotNet.Core.Debug;
 using OneSignalSDK.DotNet.Core.InAppMessages;
+using OneSignalSDK.DotNet.Core.LiveActivities;
 using OneSignalSDK.DotNet.Core.Location;
 using OneSignalSDK.DotNet.Core.Notifications;
 using OneSignalSDK.DotNet.Core.Session;
@@ -20,7 +20,9 @@ namespace OneSignalSDK.DotNet
     /// </summary>
     public class OneSignal
     {
-        private static readonly Lazy<IOneSignal> Implementation = new Lazy<IOneSignal>(CreateOneSignal);
+        private static readonly Lazy<IOneSignal> Implementation = new Lazy<IOneSignal>(
+            CreateOneSignal
+        );
 
         /// <summary>
         /// The user manager for accessing user-scoped management.
@@ -35,7 +37,8 @@ public class OneSignal
         /// <summary>
         /// The notification manager for accessing device-scoped notification management.
         /// </summary>
-        public static INotificationsManager Notifications { get; } = OneSignal.Default.Notifications;
+        public static INotificationsManager Notifications { get; } =
+            OneSignal.Default.Notifications;
 
         /// <summary>
         /// The location manager for accessing device-scoped location management.
@@ -45,7 +48,8 @@ public class OneSignal
         /// <summary>
         /// The In App Messaging manager for accessing device-scoped IAP management.
         /// </summary>
-        public static IInAppMessagesManager InAppMessages { get; } = OneSignal.Default.InAppMessages;
+        public static IInAppMessagesManager InAppMessages { get; } =
+            OneSignal.Default.InAppMessages;
 
         /// <summary>
         /// Access to debug the SDK in the event additional information is required to diagnose any
@@ -59,20 +63,27 @@ public class OneSignal
         /// <summary>
         /// The LiveActivities manager for accessing iOS Live Activity management.
         /// </summary>
-        public static ILiveActivitiesManager LiveActivities { get; } = OneSignal.Default.LiveActivities;
+        public static ILiveActivitiesManager LiveActivities { get; } =
+            OneSignal.Default.LiveActivities;
 
         /// <summary>
         /// Determines whether a user must consent to privacy prior to their user data being sent
         /// up to OneSignal.This should be set to <code>true</code> prior to the invocation of
         /// <see cref="Initialize(string)"/>to ensure compliance.
         /// </summary>
-        public static bool ConsentRequired { set => OneSignal.Default.ConsentRequired = value; }
+        public static bool ConsentRequired
+        {
+            set => OneSignal.Default.ConsentRequired = value;
+        }
 
         /// <summary>
         /// Indicates whether privacy consent has been granted. This field is only relevant when
         /// the application has opted into data privacy protections. <see cref="ConsentRequired"/>.
         /// </summary>
-        public static bool ConsentGiven { set => OneSignal.Default.ConsentGiven = value; }
+        public static bool ConsentGiven
+        {
+            set => OneSignal.Default.ConsentGiven = value;
+        }
 
         /// <summary>
         /// Initialze the OneSignal SDK.  This should be called during startup of the application.
@@ -145,19 +156,20 @@ private static IOneSignal Default
         private static IOneSignal CreateOneSignal()
         {
 #if __IOS__
-        return new OneSignalSDK.DotNet.iOS.iOSOneSignal();
+            return new OneSignalSDK.DotNet.iOS.iOSOneSignal();
 #elif __ANDROID__
-        return new OneSignalSDK.DotNet.Android.AndroidOneSignal();
+            return new OneSignalSDK.DotNet.Android.AndroidOneSignal();
 #else
             System.Diagnostics.Debug.WriteLine("PORTABLE Reached");
             return null;
 #endif
-
         }
 
         private static Exception NotImplementedInReferenceAssembly()
         {
-            return new NotImplementedException("This functionality is not implemented in the portable version of this assembly.  You should reference the NuGet package from your main application project in order to reference the platform-specific implementation.");
+            return new NotImplementedException(
+                "This functionality is not implemented in the portable version of this assembly.  You should reference the NuGet package from your main application project in order to reference the platform-specific implementation."
+            );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OneSignalSDK.DotNet/OneSignalSDK.DotNet.csproj b/OneSignalSDK.DotNet/OneSignalSDK.DotNet.csproj
index 204fab36..0f925fe6 100644
--- a/OneSignalSDK.DotNet/OneSignalSDK.DotNet.csproj
+++ b/OneSignalSDK.DotNet/OneSignalSDK.DotNet.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFrameworks>net10.0;net10.0-android;net10.0-ios;netstandard2.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -8,8 +7,13 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\OneSignalSDK.DotNet.Core\OneSignalSDK.DotNet.Core.csproj" />
-    <ProjectReference Include="..\OneSignalSDK.DotNet.Android\OneSignalSDK.DotNet.Android.csproj" Condition=" $(TargetFramework.Contains('-android')) " />
-    <ProjectReference Include="..\OneSignalSDK.DotNet.iOS\OneSignalSDK.DotNet.iOS.csproj" Condition=" $(TargetFramework.Contains('-ios')) " />
+    <ProjectReference
+      Include="..\OneSignalSDK.DotNet.Android\OneSignalSDK.DotNet.Android.csproj"
+      Condition=" $(TargetFramework.Contains('-android')) "
+    />
+    <ProjectReference
+      Include="..\OneSignalSDK.DotNet.iOS\OneSignalSDK.DotNet.iOS.csproj"
+      Condition=" $(TargetFramework.Contains('-ios')) "
+    />
   </ItemGroup>
-
 </Project>
diff --git a/examples/demo/App.xaml b/examples/demo/App.xaml
index 349bf6d2..06ceee95 100644
--- a/examples/demo/App.xaml
+++ b/examples/demo/App.xaml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <Application
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="OneSignalDemo.App">
-
-    <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="Resources/Styles/Colors.xaml" />
-                <ResourceDictionary Source="Resources/Styles/Styles.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Application.Resources>
+  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  x:Class="OneSignalDemo.App"
+>
+  <Application.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Resources/Styles/Colors.xaml" />
+        <ResourceDictionary Source="Resources/Styles/Styles.xaml" />
+      </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary>
+  </Application.Resources>
 </Application>
diff --git a/examples/demo/App.xaml.cs b/examples/demo/App.xaml.cs
index fb86ca46..0b689c9e 100644
--- a/examples/demo/App.xaml.cs
+++ b/examples/demo/App.xaml.cs
@@ -20,7 +20,7 @@ protected override Window CreateWindow(IActivationState? activationState)
         var navPage = new NavigationPage(mainPage)
         {
             BarBackgroundColor = osPrimary,
-            BarTextColor = Colors.White
+            BarTextColor = Colors.White,
         };
 
         NavigationPage.SetTitleView(mainPage, CreateTitleView());
@@ -41,16 +41,16 @@ private static View CreateTitleView()
                 {
                     Source = "onesignal_logo",
                     HeightRequest = 22,
-                    VerticalOptions = LayoutOptions.Center
+                    VerticalOptions = LayoutOptions.Center,
                 },
                 new Label
                 {
                     Text = "DotNet",
                     TextColor = Colors.White,
                     FontSize = 14,
-                    VerticalOptions = LayoutOptions.Center
-                }
-            }
+                    VerticalOptions = LayoutOptions.Center,
+                },
+            },
         };
     }
 }
diff --git a/examples/demo/Controls/DialogInputHelper.cs b/examples/demo/Controls/DialogInputHelper.cs
index 32b8f9bb..8ec211e2 100644
--- a/examples/demo/Controls/DialogInputHelper.cs
+++ b/examples/demo/Controls/DialogInputHelper.cs
@@ -19,7 +19,12 @@ public static class DialogInputHelper
     {
         CanBeDismissedByTappingOutsideOfPopup = true,
         PageOverlayColor = Colors.Black.WithAlpha(0.54f),
-        Shape = new RoundRectangle { CornerRadius = 28, StrokeThickness = 0, Stroke = new SolidColorBrush(Colors.Transparent) },
+        Shape = new RoundRectangle
+        {
+            CornerRadius = 28,
+            StrokeThickness = 0,
+            Stroke = new SolidColorBrush(Colors.Transparent),
+        },
         Shadow = new Shadow
         {
             Brush = new SolidColorBrush(Colors.Black),
@@ -83,12 +88,19 @@ public static class DialogInputHelper
         Grid.SetColumn(secondEntry, 1);
         row.Children.Add(secondEntry);
 
-        return ShowPopupAsync(parentPage, title, row, confirmText, confirmAutomationId, () =>
-            new Dictionary<string, string>(StringComparer.Ordinal)
-            {
-                [firstField.Key] = firstEntry.Text?.Trim() ?? string.Empty,
-                [secondField.Key] = secondEntry.Text?.Trim() ?? string.Empty,
-            });
+        return ShowPopupAsync(
+            parentPage,
+            title,
+            row,
+            confirmText,
+            confirmAutomationId,
+            () =>
+                new Dictionary<string, string>(StringComparer.Ordinal)
+                {
+                    [firstField.Key] = firstEntry.Text?.Trim() ?? string.Empty,
+                    [secondField.Key] = secondEntry.Text?.Trim() ?? string.Empty,
+                }
+        );
     }
 
     public static Task<Dictionary<string, string>?> ShowForm(
@@ -112,8 +124,19 @@ public static class DialogInputHelper
             contentStack.Children.Add(entry);
         }
 
-        return ShowPopupAsync(parentPage, title, contentStack, confirmText, confirmAutomationId, () =>
-            entries.ToDictionary(kvp => kvp.Key, kvp => kvp.Value.Text?.Trim() ?? string.Empty, StringComparer.Ordinal));
+        return ShowPopupAsync(
+            parentPage,
+            title,
+            contentStack,
+            confirmText,
+            confirmAutomationId,
+            () =>
+                entries.ToDictionary(
+                    kvp => kvp.Key,
+                    kvp => kvp.Value.Text?.Trim() ?? string.Empty,
+                    StringComparer.Ordinal
+                )
+        );
     }
 
     private static async Task<Dictionary<string, string>?> ShowPopupAsync(
@@ -151,16 +174,20 @@ Func<Dictionary<string, string>> getResult
             },
         };
 
-        var result = await parentPage.ShowPopupAsync<Dictionary<string, string>>(card, DefaultOptions);
+        var result = await parentPage.ShowPopupAsync<Dictionary<string, string>>(
+            card,
+            DefaultOptions
+        );
         return result?.Result;
     }
 
-    private static Entry BuildEntry(DialogInputField field) => new()
-    {
-        Placeholder = field.Placeholder,
-        AutomationId = field.AutomationId ?? string.Empty,
-        Keyboard = field.Keyboard,
-    };
+    private static Entry BuildEntry(DialogInputField field) =>
+        new()
+        {
+            Placeholder = field.Placeholder,
+            AutomationId = field.AutomationId ?? string.Empty,
+            Keyboard = field.Keyboard,
+        };
 
     internal static Button ActionButton(string text, string? automationId = null) =>
         new()
@@ -188,14 +215,16 @@ internal static Button ActionButtonDisabled(string text, string? automationId =
     internal static void SetActionButtonEnabled(Button btn, bool enabled)
     {
         btn.IsEnabled = enabled;
-        btn.TextColor = enabled
-            ? Color.FromArgb("#E54B4D")
-            : Color.FromArgb("#9E9E9E");
+        btn.TextColor = enabled ? Color.FromArgb("#E54B4D") : Color.FromArgb("#9E9E9E");
     }
 
     internal static double PopupContentWidth(Page page)
     {
-        var width = page.Width > 0 ? page.Width : DeviceDisplay.Current.MainDisplayInfo.Width / DeviceDisplay.Current.MainDisplayInfo.Density;
+        var width =
+            page.Width > 0
+                ? page.Width
+                : DeviceDisplay.Current.MainDisplayInfo.Width
+                    / DeviceDisplay.Current.MainDisplayInfo.Density;
         return Math.Max(240, width - 32);
     }
 
diff --git a/examples/demo/Controls/LoadingOverlay.xaml b/examples/demo/Controls/LoadingOverlay.xaml
index ac474437..6c9770fc 100644
--- a/examples/demo/Controls/LoadingOverlay.xaml
+++ b/examples/demo/Controls/LoadingOverlay.xaml
@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="OneSignalDemo.Controls.LoadingOverlay"
-    IsVisible="False">
-
-    <AbsoluteLayout>
-        <BoxView
-            AbsoluteLayout.LayoutFlags="All"
-            AbsoluteLayout.LayoutBounds="0,0,1,1"
-            Color="Black"
-            Opacity="0.54" />
-        <ActivityIndicator
-            AbsoluteLayout.LayoutFlags="PositionProportional"
-            AbsoluteLayout.LayoutBounds="0.5,0.5,-1,-1"
-            IsRunning="True"
-            Color="White"
-            WidthRequest="50"
-            HeightRequest="50" />
-    </AbsoluteLayout>
+  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  x:Class="OneSignalDemo.Controls.LoadingOverlay"
+  IsVisible="False"
+>
+  <AbsoluteLayout>
+    <BoxView
+      AbsoluteLayout.LayoutFlags="All"
+      AbsoluteLayout.LayoutBounds="0,0,1,1"
+      Color="Black"
+      Opacity="0.54"
+    />
+    <ActivityIndicator
+      AbsoluteLayout.LayoutFlags="PositionProportional"
+      AbsoluteLayout.LayoutBounds="0.5,0.5,-1,-1"
+      IsRunning="True"
+      Color="White"
+      WidthRequest="50"
+      HeightRequest="50"
+    />
+  </AbsoluteLayout>
 </ContentView>
diff --git a/examples/demo/Controls/LogView.xaml b/examples/demo/Controls/LogView.xaml
index 5ce3141e..cb99c885 100644
--- a/examples/demo/Controls/LogView.xaml
+++ b/examples/demo/Controls/LogView.xaml
@@ -1,68 +1,92 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:services="clr-namespace:OneSignalDemo.Services"
-    xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
-    x:Class="OneSignalDemo.Controls.LogView"
-    x:Name="root">
+  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  xmlns:services="clr-namespace:OneSignalDemo.Services"
+  xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
+  x:Class="OneSignalDemo.Controls.LogView"
+  x:Name="root"
+>
+  <Grid AutomationId="log_view_container">
+    <Grid.RowDefinitions>
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
+    </Grid.RowDefinitions>
 
-    <Grid AutomationId="log_view_container">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
+    <!-- Header -->
+    <Grid
+      Grid.Row="0"
+      BackgroundColor="{StaticResource OsLogBackground}"
+      Padding="16,12"
+      AutomationId="log_view_header"
+    >
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="Auto" />
+        <ColumnDefinition Width="Auto" />
+        <ColumnDefinition Width="*" />
+        <ColumnDefinition Width="Auto" />
+        <ColumnDefinition Width="Auto" />
+      </Grid.ColumnDefinitions>
 
-        <!-- Header -->
-        <Grid Grid.Row="0" BackgroundColor="{StaticResource OsLogBackground}" Padding="16,12" AutomationId="log_view_header">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
+      <Grid.GestureRecognizers>
+        <TapGestureRecognizer Tapped="OnHeaderTapped" />
+      </Grid.GestureRecognizers>
 
-            <Grid.GestureRecognizers>
-                <TapGestureRecognizer Tapped="OnHeaderTapped" />
-            </Grid.GestureRecognizers>
+      <Label
+        Grid.Column="0"
+        Text="LOGS"
+        TextColor="White"
+        FontAttributes="Bold"
+        FontSize="11"
+        VerticalOptions="Center"
+      />
+      <Label
+        Grid.Column="1"
+        x:Name="LogCountLabel"
+        TextColor="{StaticResource OsGrey500}"
+        FontSize="11"
+        VerticalOptions="Center"
+        Margin="8,0,0,0"
+        AutomationId="log_view_count"
+      />
 
-            <Label Grid.Column="0" Text="LOGS" TextColor="White" FontAttributes="Bold" FontSize="11"
-                   VerticalOptions="Center" />
-            <Label Grid.Column="1" x:Name="LogCountLabel" TextColor="{StaticResource OsGrey500}" FontSize="11"
-                   VerticalOptions="Center" Margin="8,0,0,0" AutomationId="log_view_count" />
+      <mi:MauiIcon
+        Grid.Column="3"
+        x:Name="ClearIcon"
+        Icon="{mi:Material Icon=Delete}"
+        IconColor="{StaticResource OsGrey500}"
+        IconSize="18"
+        VerticalOptions="Center"
+        Padding="8,0"
+        IsVisible="False"
+        AutomationId="log_view_clear_button"
+      >
+        <mi:MauiIcon.GestureRecognizers>
+          <TapGestureRecognizer Tapped="OnClearClicked" />
+        </mi:MauiIcon.GestureRecognizers>
+      </mi:MauiIcon>
 
-            <mi:MauiIcon Grid.Column="3"
-                         x:Name="ClearIcon"
-                         Icon="{mi:Material Icon=Delete}"
-                         IconColor="{StaticResource OsGrey500}"
-                         IconSize="18"
-                         VerticalOptions="Center"
-                         Padding="8,0"
-                         IsVisible="False"
-                         AutomationId="log_view_clear_button">
-                <mi:MauiIcon.GestureRecognizers>
-                    <TapGestureRecognizer Tapped="OnClearClicked" />
-                </mi:MauiIcon.GestureRecognizers>
-            </mi:MauiIcon>
-
-            <mi:MauiIcon Grid.Column="4"
-                         x:Name="CollapseArrow"
-                         Icon="{mi:Material Icon=ExpandLess}"
-                         IconColor="{StaticResource OsGrey500}"
-                         IconSize="18"
-                         VerticalOptions="Center"
-                         Padding="4,0,4,0" />
-        </Grid>
-
-        <!-- Log list -->
-        <ScrollView Grid.Row="1"
-                    x:Name="LogScrollView"
-                    HeightRequest="100"
-                    Orientation="Both"
-                    BackgroundColor="{StaticResource OsLogBackground}"
-                    AutomationId="log_view_list">
-            <VerticalStackLayout x:Name="LogList" Spacing="0" Padding="12,0" />
-        </ScrollView>
+      <mi:MauiIcon
+        Grid.Column="4"
+        x:Name="CollapseArrow"
+        Icon="{mi:Material Icon=ExpandLess}"
+        IconColor="{StaticResource OsGrey500}"
+        IconSize="18"
+        VerticalOptions="Center"
+        Padding="4,0,4,0"
+      />
     </Grid>
+
+    <!-- Log list -->
+    <ScrollView
+      Grid.Row="1"
+      x:Name="LogScrollView"
+      HeightRequest="100"
+      Orientation="Both"
+      BackgroundColor="{StaticResource OsLogBackground}"
+      AutomationId="log_view_list"
+    >
+      <VerticalStackLayout x:Name="LogList" Spacing="0" Padding="12,0" />
+    </ScrollView>
+  </Grid>
 </ContentView>
diff --git a/examples/demo/Controls/LogView.xaml.cs b/examples/demo/Controls/LogView.xaml.cs
index 2c1a66d1..4908173e 100644
--- a/examples/demo/Controls/LogView.xaml.cs
+++ b/examples/demo/Controls/LogView.xaml.cs
@@ -1,5 +1,5 @@
-using MauiIcons.Material;
 using MauiIcons.Core;
+using MauiIcons.Material;
 using OneSignalDemo.Services;
 
 namespace OneSignalDemo.Controls;
@@ -43,7 +43,7 @@ private void RebuildLogList()
                 FontSize = 11,
                 FontFamily = "DroidSansMono",
                 VerticalOptions = LayoutOptions.Center,
-                AutomationId = $"log_entry_{i}_timestamp"
+                AutomationId = $"log_entry_{i}_timestamp",
             };
             var level = new Label
             {
@@ -54,7 +54,7 @@ private void RebuildLogList()
                 FontAttributes = FontAttributes.Bold,
                 VerticalOptions = LayoutOptions.Center,
                 Margin = new Thickness(4, 0),
-                AutomationId = $"log_entry_{i}_level"
+                AutomationId = $"log_entry_{i}_level",
             };
             var msg = new Label
             {
@@ -63,7 +63,7 @@ private void RebuildLogList()
                 FontSize = 11,
                 FontFamily = "DroidSansMono",
                 VerticalOptions = LayoutOptions.Center,
-                AutomationId = $"log_entry_{i}_message"
+                AutomationId = $"log_entry_{i}_message",
             };
 
             row.Children.Add(ts);
diff --git a/examples/demo/Controls/MultiPairDialogHelper.cs b/examples/demo/Controls/MultiPairDialogHelper.cs
index 78945a25..2c77804a 100644
--- a/examples/demo/Controls/MultiPairDialogHelper.cs
+++ b/examples/demo/Controls/MultiPairDialogHelper.cs
@@ -163,13 +163,21 @@ IEnumerable<string> keys
             var row = new HorizontalStackLayout { Spacing = 8 };
             row.Children.Add(cb);
             row.Children.Add(
-                new Label { Text = key, VerticalOptions = LayoutOptions.Center, FontSize = 14 }
+                new Label
+                {
+                    Text = key,
+                    VerticalOptions = LayoutOptions.Center,
+                    FontSize = 14,
+                }
             );
             itemsLayout.Children.Add(row);
         }
 
         var cancelButton = DialogInputHelper.ActionButton("Cancel", "multi_select_cancel_button");
-        var removeButton = DialogInputHelper.ActionButtonDisabled("Remove (0)", "multi_select_remove_button");
+        var removeButton = DialogInputHelper.ActionButtonDisabled(
+            "Remove (0)",
+            "multi_select_remove_button"
+        );
 
         void UpdateButton()
         {
@@ -185,10 +193,7 @@ void UpdateButton()
 
         removeButton.Clicked += async (s, e) =>
         {
-            var selected = checkboxes
-                .Where(c => c.Box.IsChecked)
-                .Select(c => c.Key)
-                .ToList();
+            var selected = checkboxes.Where(c => c.Box.IsChecked).Select(c => c.Key).ToList();
             await parentPage.ClosePopupAsync(selected);
         };
 
@@ -217,7 +222,10 @@ void UpdateButton()
             },
         };
 
-        var result = await parentPage.ShowPopupAsync<List<string>>(content, DialogInputHelper.DialogOptions);
+        var result = await parentPage.ShowPopupAsync<List<string>>(
+            content,
+            DialogInputHelper.DialogOptions
+        );
         return result?.Result;
     }
 }
diff --git a/examples/demo/Controls/Sections/AliasesSection.xaml b/examples/demo/Controls/Sections/AliasesSection.xaml
index 9383bee8..89c9d5bb 100644
--- a/examples/demo/Controls/Sections/AliasesSection.xaml
+++ b/examples/demo/Controls/Sections/AliasesSection.xaml
@@ -1,29 +1,52 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
-    x:Class="OneSignalDemo.Controls.Sections.AliasesSection">
+  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
+  x:Class="OneSignalDemo.Controls.Sections.AliasesSection"
+>
+  <VerticalStackLayout Spacing="8">
+    <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
+      <Label
+        Grid.Column="0"
+        Text="ALIASES"
+        Style="{StaticResource SectionHeaderStyle}"
+        VerticalOptions="Center"
+      />
+      <ImageButton
+        Grid.Column="1"
+        Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
+        WidthRequest="18"
+        HeightRequest="18"
+        BackgroundColor="Transparent"
+        Clicked="OnInfoTapped"
+        Padding="0"
+      />
+    </Grid>
 
-    <VerticalStackLayout Spacing="8">
-        <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
-            <Label Grid.Column="0" Text="ALIASES" Style="{StaticResource SectionHeaderStyle}" VerticalOptions="Center" />
-            <ImageButton Grid.Column="1"
-                         Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
-                         WidthRequest="18" HeightRequest="18"
-                         BackgroundColor="Transparent" Clicked="OnInfoTapped" Padding="0" />
-        </Grid>
+    <Border Style="{StaticResource CardBorderStyle}">
+      <VerticalStackLayout x:Name="AliasListContainer" MinimumHeightRequest="50">
+        <Label
+          x:Name="EmptyLabel"
+          Text="No aliases added"
+          Style="{StaticResource EmptyStateStyle}"
+          Padding="16"
+          AutomationId="aliases_empty_label"
+        />
+      </VerticalStackLayout>
+    </Border>
 
-        <Border Style="{StaticResource CardBorderStyle}">
-            <VerticalStackLayout x:Name="AliasListContainer" MinimumHeightRequest="50">
-                <Label x:Name="EmptyLabel" Text="No aliases added" Style="{StaticResource EmptyStateStyle}"
-                       Padding="16" AutomationId="aliases_empty_label" />
-            </VerticalStackLayout>
-        </Border>
-
-        <Button Text="ADD" Style="{StaticResource PrimaryButtonStyle}"
-                Clicked="OnAddClicked" AutomationId="add_alias_button" />
-        <Button Text="ADD MULTIPLE" Style="{StaticResource PrimaryButtonStyle}"
-                Clicked="OnAddMultipleClicked" AutomationId="add_multiple_aliases_button" />
-    </VerticalStackLayout>
+    <Button
+      Text="ADD"
+      Style="{StaticResource PrimaryButtonStyle}"
+      Clicked="OnAddClicked"
+      AutomationId="add_alias_button"
+    />
+    <Button
+      Text="ADD MULTIPLE"
+      Style="{StaticResource PrimaryButtonStyle}"
+      Clicked="OnAddMultipleClicked"
+      AutomationId="add_multiple_aliases_button"
+    />
+  </VerticalStackLayout>
 </ContentView>
diff --git a/examples/demo/Controls/Sections/AliasesSection.xaml.cs b/examples/demo/Controls/Sections/AliasesSection.xaml.cs
index 91673aea..177135ce 100644
--- a/examples/demo/Controls/Sections/AliasesSection.xaml.cs
+++ b/examples/demo/Controls/Sections/AliasesSection.xaml.cs
@@ -43,31 +43,27 @@ private void RebuildList()
         {
             if (!first)
             {
-                AliasListContainer.Children.Add(new BoxView
-                {
-                    HeightRequest = 1,
-                    Color = Color.FromArgb("#E8EAED"),
-                    Margin = new Thickness(12, 0)
-                });
+                AliasListContainer.Children.Add(
+                    new BoxView
+                    {
+                        HeightRequest = 1,
+                        Color = Color.FromArgb("#E8EAED"),
+                        Margin = new Thickness(12, 0),
+                    }
+                );
             }
             first = false;
 
-            var row = new VerticalStackLayout
-            {
-                Padding = new Thickness(12, 4),
-                Spacing = 2
-            };
-            row.Children.Add(new Label
-            {
-                Text = alias.Key,
-                FontSize = 14,
-            });
-            row.Children.Add(new Label
-            {
-                Text = alias.Value,
-                FontSize = 12,
-                TextColor = Color.FromArgb("#757575")
-            });
+            var row = new VerticalStackLayout { Padding = new Thickness(12, 4), Spacing = 2 };
+            row.Children.Add(new Label { Text = alias.Key, FontSize = 14 });
+            row.Children.Add(
+                new Label
+                {
+                    Text = alias.Value,
+                    FontSize = 12,
+                    TextColor = Color.FromArgb("#757575"),
+                }
+            );
 
             AliasListContainer.Children.Add(row);
         }
@@ -75,13 +71,24 @@ private void RebuildList()
 
     private async void OnAddClicked(object? sender, EventArgs e)
     {
-        if (_parentPage == null || _viewModel == null) return;
+        if (_parentPage == null || _viewModel == null)
+            return;
 
         var form = await DialogInputHelper.ShowPairInput(
             _parentPage,
             "Add Alias",
-            new DialogInputField { Key = "label", Placeholder = "Label", AutomationId = "alias_label_input" },
-            new DialogInputField { Key = "id", Placeholder = "ID", AutomationId = "alias_id_input" },
+            new DialogInputField
+            {
+                Key = "label",
+                Placeholder = "Label",
+                AutomationId = "alias_label_input",
+            },
+            new DialogInputField
+            {
+                Key = "id",
+                Placeholder = "ID",
+                AutomationId = "alias_id_input",
+            },
             "Add"
         );
 
@@ -100,17 +107,24 @@ private async void OnAddClicked(object? sender, EventArgs e)
 
     private async void OnAddMultipleClicked(object? sender, EventArgs e)
     {
-        if (_parentPage == null || _viewModel == null) return;
+        if (_parentPage == null || _viewModel == null)
+            return;
         var pairs = await ShowMultiPairDialog("Add Multiple Aliases", "Label", "ID");
-        if (pairs == null || pairs.Count == 0) return;
+        if (pairs == null || pairs.Count == 0)
+            return;
 
         _viewModel.AddAliases(pairs);
         await Toast.Make($"{pairs.Count} alias(es) added", ToastDuration.Short).Show();
     }
 
-    private async Task<Dictionary<string, string>?> ShowMultiPairDialog(string title, string keyLabel, string valueLabel)
+    private async Task<Dictionary<string, string>?> ShowMultiPairDialog(
+        string title,
+        string keyLabel,
+        string valueLabel
+    )
     {
-        if (_parentPage == null) return null;
+        if (_parentPage == null)
+            return null;
         return await MultiPairDialogHelper.Show(_parentPage, title, keyLabel, valueLabel);
     }
 
diff --git a/examples/demo/Controls/Sections/AppSection.xaml b/examples/demo/Controls/Sections/AppSection.xaml
index 4cb58825..d3b9326e 100644
--- a/examples/demo/Controls/Sections/AppSection.xaml
+++ b/examples/demo/Controls/Sections/AppSection.xaml
@@ -1,72 +1,108 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="OneSignalDemo.Controls.Sections.AppSection"
-    x:Name="root">
+  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  x:Class="OneSignalDemo.Controls.Sections.AppSection"
+  x:Name="root"
+>
+  <VerticalStackLayout Spacing="8">
+    <!-- Section header -->
+    <Label Text="APP" Style="{StaticResource SectionHeaderStyle}" Padding="4,0,0,0" />
 
-    <VerticalStackLayout Spacing="8">
+    <!-- App ID card -->
+    <Border Style="{StaticResource CardBorderStyle}">
+      <Grid Padding="12" ColumnDefinitions="Auto,*">
+        <Label
+          Grid.Column="0"
+          Text="App ID"
+          Style="{StaticResource BodyMediumStyle}"
+          VerticalOptions="Center"
+        />
+        <Label
+          Grid.Column="1"
+          x:Name="AppIdLabel"
+          Text=""
+          Style="{StaticResource BodySmallStyle}"
+          FontFamily="DroidSansMono"
+          HorizontalOptions="End"
+          VerticalOptions="Center"
+          LineBreakMode="MiddleTruncation"
+          AutomationId="app_id_label"
+        />
+      </Grid>
+    </Border>
 
-        <!-- Section header -->
-        <Label Text="APP" Style="{StaticResource SectionHeaderStyle}" Padding="4,0,0,0" />
+    <!-- Guidance banner -->
+    <Border
+      Style="{StaticResource CardBorderStyle}"
+      Background="{StaticResource OsWarningBackground}"
+    >
+      <VerticalStackLayout Padding="12">
+        <Label
+          Text="Add your own App ID, then rebuild to fully test all functionality."
+          Style="{StaticResource BodySmallStyle}"
+        />
+        <Label
+          x:Name="GetKeysLink"
+          Text="Get your keys at onesignal.com"
+          FontSize="12"
+          TextColor="{StaticResource OsPrimary}"
+          FontAttributes="Bold"
+        >
+          <Label.GestureRecognizers>
+            <TapGestureRecognizer Tapped="OnGetKeysTapped" />
+          </Label.GestureRecognizers>
+        </Label>
+      </VerticalStackLayout>
+    </Border>
 
-        <!-- App ID card -->
-        <Border Style="{StaticResource CardBorderStyle}">
-            <Grid Padding="12" ColumnDefinitions="Auto,*">
-                <Label Grid.Column="0" Text="App ID" Style="{StaticResource BodyMediumStyle}" VerticalOptions="Center" />
-                <Label Grid.Column="1" x:Name="AppIdLabel" Text="" Style="{StaticResource BodySmallStyle}"
-                       FontFamily="DroidSansMono"
-                       HorizontalOptions="End" VerticalOptions="Center" LineBreakMode="MiddleTruncation"
-                       AutomationId="app_id_label" />
-            </Grid>
-        </Border>
+    <!-- Consent card -->
+    <Border Style="{StaticResource CardBorderStyle}">
+      <VerticalStackLayout>
+        <!-- Consent Required toggle -->
+        <Grid Padding="12" ColumnDefinitions="*,Auto">
+          <VerticalStackLayout Grid.Column="0" Spacing="2" VerticalOptions="Center">
+            <Label Text="Consent Required" Style="{StaticResource BodyMediumStyle}" />
+            <Label
+              Text="Require consent before SDK processes data"
+              Style="{StaticResource BodySmallStyle}"
+            />
+          </VerticalStackLayout>
+          <Switch
+            Grid.Column="1"
+            x:Name="ConsentRequiredSwitch"
+            IsToggled="False"
+            Toggled="OnConsentRequiredToggled"
+            AutomationId="consent_required_switch"
+          />
+        </Grid>
 
-        <!-- Guidance banner -->
-        <Border Style="{StaticResource CardBorderStyle}"
-                Background="{StaticResource OsWarningBackground}">
-            <VerticalStackLayout Padding="12">
-                <Label Text="Add your own App ID, then rebuild to fully test all functionality."
-                       Style="{StaticResource BodySmallStyle}" />
-                <Label x:Name="GetKeysLink" Text="Get your keys at onesignal.com"
-                       FontSize="12" TextColor="{StaticResource OsPrimary}" FontAttributes="Bold">
-                    <Label.GestureRecognizers>
-                        <TapGestureRecognizer Tapped="OnGetKeysTapped" />
-                    </Label.GestureRecognizers>
-                </Label>
-            </VerticalStackLayout>
-        </Border>
+        <!-- Divider + Privacy Consent (conditional) -->
+        <BoxView
+          x:Name="ConsentDivider"
+          HeightRequest="1"
+          Color="{StaticResource OsDivider}"
+          IsVisible="False"
+          Margin="12,0"
+        />
 
-        <!-- Consent card -->
-        <Border Style="{StaticResource CardBorderStyle}">
-            <VerticalStackLayout>
-                <!-- Consent Required toggle -->
-                <Grid Padding="12" ColumnDefinitions="*,Auto">
-                    <VerticalStackLayout Grid.Column="0" Spacing="2" VerticalOptions="Center">
-                        <Label Text="Consent Required" Style="{StaticResource BodyMediumStyle}" />
-                        <Label Text="Require consent before SDK processes data" Style="{StaticResource BodySmallStyle}" />
-                    </VerticalStackLayout>
-                    <Switch Grid.Column="1" x:Name="ConsentRequiredSwitch"
-                            IsToggled="False"
-                            Toggled="OnConsentRequiredToggled"
-                            AutomationId="consent_required_switch" />
-                </Grid>
-
-                <!-- Divider + Privacy Consent (conditional) -->
-                <BoxView x:Name="ConsentDivider" HeightRequest="1" Color="{StaticResource OsDivider}"
-                         IsVisible="False" Margin="12,0" />
-
-                <Grid x:Name="PrivacyConsentRow" Padding="12" ColumnDefinitions="*,Auto" IsVisible="False">
-                    <VerticalStackLayout Grid.Column="0" Spacing="2" VerticalOptions="Center">
-                        <Label Text="Privacy Consent" Style="{StaticResource BodyMediumStyle}" />
-                        <Label Text="Consent given for data collection" Style="{StaticResource BodySmallStyle}" />
-                    </VerticalStackLayout>
-                    <Switch Grid.Column="1" x:Name="PrivacyConsentSwitch"
-                            IsToggled="False"
-                            Toggled="OnPrivacyConsentToggled"
-                            AutomationId="privacy_consent_switch" />
-                </Grid>
-            </VerticalStackLayout>
-        </Border>
-
-    </VerticalStackLayout>
+        <Grid x:Name="PrivacyConsentRow" Padding="12" ColumnDefinitions="*,Auto" IsVisible="False">
+          <VerticalStackLayout Grid.Column="0" Spacing="2" VerticalOptions="Center">
+            <Label Text="Privacy Consent" Style="{StaticResource BodyMediumStyle}" />
+            <Label
+              Text="Consent given for data collection"
+              Style="{StaticResource BodySmallStyle}"
+            />
+          </VerticalStackLayout>
+          <Switch
+            Grid.Column="1"
+            x:Name="PrivacyConsentSwitch"
+            IsToggled="False"
+            Toggled="OnPrivacyConsentToggled"
+            AutomationId="privacy_consent_switch"
+          />
+        </Grid>
+      </VerticalStackLayout>
+    </Border>
+  </VerticalStackLayout>
 </ContentView>
diff --git a/examples/demo/Controls/Sections/AppSection.xaml.cs b/examples/demo/Controls/Sections/AppSection.xaml.cs
index add89567..73dc711b 100644
--- a/examples/demo/Controls/Sections/AppSection.xaml.cs
+++ b/examples/demo/Controls/Sections/AppSection.xaml.cs
@@ -51,14 +51,16 @@ private void UpdatePrivacyConsentVisibility(bool consentRequired)
 
     private void OnConsentRequiredToggled(object? sender, ToggledEventArgs e)
     {
-        if (_suppressToggle) return;
+        if (_suppressToggle)
+            return;
         _viewModel?.SetConsentRequired(e.Value);
         UpdatePrivacyConsentVisibility(e.Value);
     }
 
     private void OnPrivacyConsentToggled(object? sender, ToggledEventArgs e)
     {
-        if (_suppressToggle) return;
+        if (_suppressToggle)
+            return;
         _viewModel?.SetConsentGiven(e.Value);
     }
 
diff --git a/examples/demo/Controls/Sections/EmailsSection.xaml b/examples/demo/Controls/Sections/EmailsSection.xaml
index 7c99db40..23b468cb 100644
--- a/examples/demo/Controls/Sections/EmailsSection.xaml
+++ b/examples/demo/Controls/Sections/EmailsSection.xaml
@@ -1,27 +1,46 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
-    x:Class="OneSignalDemo.Controls.Sections.EmailsSection">
+  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
+  x:Class="OneSignalDemo.Controls.Sections.EmailsSection"
+>
+  <VerticalStackLayout Spacing="8">
+    <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
+      <Label
+        Grid.Column="0"
+        Text="EMAILS"
+        Style="{StaticResource SectionHeaderStyle}"
+        VerticalOptions="Center"
+      />
+      <ImageButton
+        Grid.Column="1"
+        Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
+        WidthRequest="18"
+        HeightRequest="18"
+        BackgroundColor="Transparent"
+        Clicked="OnInfoTapped"
+        Padding="0"
+      />
+    </Grid>
 
-    <VerticalStackLayout Spacing="8">
-        <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
-            <Label Grid.Column="0" Text="EMAILS" Style="{StaticResource SectionHeaderStyle}" VerticalOptions="Center" />
-            <ImageButton Grid.Column="1"
-                         Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
-                         WidthRequest="18" HeightRequest="18"
-                         BackgroundColor="Transparent" Clicked="OnInfoTapped" Padding="0" />
-        </Grid>
+    <Border Style="{StaticResource CardBorderStyle}">
+      <VerticalStackLayout x:Name="EmailListContainer" MinimumHeightRequest="50">
+        <Label
+          x:Name="EmptyLabel"
+          Text="No emails added"
+          Style="{StaticResource EmptyStateStyle}"
+          Padding="16"
+          AutomationId="emails_empty_label"
+        />
+      </VerticalStackLayout>
+    </Border>
 
-        <Border Style="{StaticResource CardBorderStyle}">
-            <VerticalStackLayout x:Name="EmailListContainer" MinimumHeightRequest="50">
-                <Label x:Name="EmptyLabel" Text="No emails added" Style="{StaticResource EmptyStateStyle}"
-                       Padding="16" AutomationId="emails_empty_label" />
-            </VerticalStackLayout>
-        </Border>
-
-        <Button Text="ADD EMAIL" Style="{StaticResource PrimaryButtonStyle}"
-                Clicked="OnAddEmailClicked" AutomationId="add_email_button" />
-    </VerticalStackLayout>
+    <Button
+      Text="ADD EMAIL"
+      Style="{StaticResource PrimaryButtonStyle}"
+      Clicked="OnAddEmailClicked"
+      AutomationId="add_email_button"
+    />
+  </VerticalStackLayout>
 </ContentView>
diff --git a/examples/demo/Controls/Sections/EmailsSection.xaml.cs b/examples/demo/Controls/Sections/EmailsSection.xaml.cs
index 20d2f677..dc867d7b 100644
--- a/examples/demo/Controls/Sections/EmailsSection.xaml.cs
+++ b/examples/demo/Controls/Sections/EmailsSection.xaml.cs
@@ -1,5 +1,5 @@
-using OneSignalDemo.ViewModels;
 using OneSignalDemo.Controls;
+using OneSignalDemo.ViewModels;
 
 namespace OneSignalDemo.Controls.Sections;
 
@@ -36,15 +36,23 @@ private void RebuildList()
             return;
         }
 
-        var displayList = (!_expanded && list.Count > CollapseThreshold)
-            ? list.Take(CollapseThreshold).ToList()
-            : list.ToList();
+        var displayList =
+            (!_expanded && list.Count > CollapseThreshold)
+                ? list.Take(CollapseThreshold).ToList()
+                : list.ToList();
 
         bool first = true;
         foreach (var email in displayList)
         {
             if (!first)
-                EmailListContainer.Children.Add(new BoxView { HeightRequest = 1, Color = Color.FromArgb("#E8EAED"), Margin = new Thickness(12, 0) });
+                EmailListContainer.Children.Add(
+                    new BoxView
+                    {
+                        HeightRequest = 1,
+                        Color = Color.FromArgb("#E8EAED"),
+                        Margin = new Thickness(12, 0),
+                    }
+                );
             first = false;
 
             var captured = email;
@@ -54,16 +62,18 @@ private void RebuildList()
                 ColumnDefinitions =
                 {
                     new ColumnDefinition { Width = GridLength.Star },
-                    new ColumnDefinition { Width = GridLength.Auto }
-                }
+                    new ColumnDefinition { Width = GridLength.Auto },
+                },
             };
 
-            row.Children.Add(new Label
-            {
-                Text = email,
-                FontSize = 14,
-                VerticalOptions = LayoutOptions.Center
-            });
+            row.Children.Add(
+                new Label
+                {
+                    Text = email,
+                    FontSize = 14,
+                    VerticalOptions = LayoutOptions.Center,
+                }
+            );
 
             var deleteBtn = new Button
             {
@@ -72,7 +82,7 @@ private void RebuildList()
                 TextColor = Color.FromArgb("#E54B4D"),
                 Padding = new Thickness(8, 0),
                 FontSize = 18,
-                HeightRequest = 40
+                HeightRequest = 40,
             };
             deleteBtn.Clicked += (s, e) => _viewModel?.RemoveEmail(captured);
             Grid.SetColumn(deleteBtn, 1);
@@ -90,19 +100,26 @@ private void RebuildList()
                 TextColor = Color.FromArgb("#E54B4D"),
                 FontAttributes = FontAttributes.Bold,
                 Padding = new Thickness(12, 4),
-                FontSize = 14
+                FontSize = 14,
             };
-            moreLabel.GestureRecognizers.Add(new TapGestureRecognizer
-            {
-                Command = new Command(() => { _expanded = true; RebuildList(); })
-            });
+            moreLabel.GestureRecognizers.Add(
+                new TapGestureRecognizer
+                {
+                    Command = new Command(() =>
+                    {
+                        _expanded = true;
+                        RebuildList();
+                    }),
+                }
+            );
             EmailListContainer.Children.Add(moreLabel);
         }
     }
 
     private async void OnAddEmailClicked(object? sender, EventArgs e)
     {
-        if (_parentPage == null || _viewModel == null) return;
+        if (_parentPage == null || _viewModel == null)
+            return;
 
         var email = await DialogInputHelper.ShowSingleInput(
             _parentPage,
@@ -112,7 +129,8 @@ private async void OnAddEmailClicked(object? sender, EventArgs e)
             "email_input"
         );
 
-        if (string.IsNullOrEmpty(email)) return;
+        if (string.IsNullOrEmpty(email))
+            return;
         _viewModel.AddEmail(email);
     }
 
diff --git a/examples/demo/Controls/Sections/InAppSection.xaml b/examples/demo/Controls/Sections/InAppSection.xaml
index 4d115647..455267a8 100644
--- a/examples/demo/Controls/Sections/InAppSection.xaml
+++ b/examples/demo/Controls/Sections/InAppSection.xaml
@@ -1,31 +1,43 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
-    x:Class="OneSignalDemo.Controls.Sections.InAppSection">
+  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
+  x:Class="OneSignalDemo.Controls.Sections.InAppSection"
+>
+  <VerticalStackLayout Spacing="8">
+    <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
+      <Label
+        Grid.Column="0"
+        Text="IN-APP MESSAGING"
+        Style="{StaticResource SectionHeaderStyle}"
+        VerticalOptions="Center"
+      />
+      <ImageButton
+        Grid.Column="1"
+        Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
+        WidthRequest="18"
+        HeightRequest="18"
+        BackgroundColor="Transparent"
+        Clicked="OnInfoTapped"
+        Padding="0"
+      />
+    </Grid>
 
-    <VerticalStackLayout Spacing="8">
-        <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
-            <Label Grid.Column="0" Text="IN-APP MESSAGING" Style="{StaticResource SectionHeaderStyle}" VerticalOptions="Center" />
-            <ImageButton Grid.Column="1"
-                         Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
-                         WidthRequest="18" HeightRequest="18"
-                         BackgroundColor="Transparent" Clicked="OnInfoTapped" Padding="0" />
-        </Grid>
-
-        <Border Style="{StaticResource CardBorderStyle}">
-            <Grid Padding="12" ColumnDefinitions="*,Auto">
-                <VerticalStackLayout Grid.Column="0" Spacing="2" VerticalOptions="Center">
-                    <Label Text="Pause In-App Messages" Style="{StaticResource BodyMediumStyle}" />
-                    <Label Text="Toggle in-app message display" Style="{StaticResource BodySmallStyle}" />
-                </VerticalStackLayout>
-                <Switch Grid.Column="1" x:Name="IamPausedSwitch"
-                        IsToggled="False"
-                       
-                        Toggled="OnIamPausedToggled"
-                        AutomationId="iam_paused_switch" />
-            </Grid>
-        </Border>
-    </VerticalStackLayout>
+    <Border Style="{StaticResource CardBorderStyle}">
+      <Grid Padding="12" ColumnDefinitions="*,Auto">
+        <VerticalStackLayout Grid.Column="0" Spacing="2" VerticalOptions="Center">
+          <Label Text="Pause In-App Messages" Style="{StaticResource BodyMediumStyle}" />
+          <Label Text="Toggle in-app message display" Style="{StaticResource BodySmallStyle}" />
+        </VerticalStackLayout>
+        <Switch
+          Grid.Column="1"
+          x:Name="IamPausedSwitch"
+          IsToggled="False"
+          Toggled="OnIamPausedToggled"
+          AutomationId="iam_paused_switch"
+        />
+      </Grid>
+    </Border>
+  </VerticalStackLayout>
 </ContentView>
diff --git a/examples/demo/Controls/Sections/InAppSection.xaml.cs b/examples/demo/Controls/Sections/InAppSection.xaml.cs
index 2bd524e3..816b592a 100644
--- a/examples/demo/Controls/Sections/InAppSection.xaml.cs
+++ b/examples/demo/Controls/Sections/InAppSection.xaml.cs
@@ -34,7 +34,8 @@ public void Initialize(AppViewModel viewModel)
 
     private void OnIamPausedToggled(object? sender, ToggledEventArgs e)
     {
-        if (_suppressToggle) return;
+        if (_suppressToggle)
+            return;
         _viewModel?.SetIamPaused(e.Value);
     }
 
diff --git a/examples/demo/Controls/Sections/LocationSection.xaml b/examples/demo/Controls/Sections/LocationSection.xaml
index 2f961f4a..0a7618cb 100644
--- a/examples/demo/Controls/Sections/LocationSection.xaml
+++ b/examples/demo/Controls/Sections/LocationSection.xaml
@@ -1,33 +1,53 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
-    x:Class="OneSignalDemo.Controls.Sections.LocationSection">
+  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
+  x:Class="OneSignalDemo.Controls.Sections.LocationSection"
+>
+  <VerticalStackLayout Spacing="8">
+    <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
+      <Label
+        Grid.Column="0"
+        Text="LOCATION"
+        Style="{StaticResource SectionHeaderStyle}"
+        VerticalOptions="Center"
+      />
+      <ImageButton
+        Grid.Column="1"
+        Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
+        WidthRequest="18"
+        HeightRequest="18"
+        BackgroundColor="Transparent"
+        Clicked="OnInfoTapped"
+        Padding="0"
+      />
+    </Grid>
 
-    <VerticalStackLayout Spacing="8">
-        <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
-            <Label Grid.Column="0" Text="LOCATION" Style="{StaticResource SectionHeaderStyle}" VerticalOptions="Center" />
-            <ImageButton Grid.Column="1"
-                         Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
-                         WidthRequest="18" HeightRequest="18"
-                         BackgroundColor="Transparent" Clicked="OnInfoTapped" Padding="0" />
-        </Grid>
+    <Border Style="{StaticResource CardBorderStyle}">
+      <Grid Padding="12" ColumnDefinitions="*,Auto">
+        <VerticalStackLayout Grid.Column="0" Spacing="2" VerticalOptions="Center">
+          <Label Text="Location Shared" Style="{StaticResource BodyMediumStyle}" />
+          <Label
+            Text="Share device location with OneSignal"
+            Style="{StaticResource BodySmallStyle}"
+          />
+        </VerticalStackLayout>
+        <Switch
+          Grid.Column="1"
+          x:Name="LocationSharedSwitch"
+          IsToggled="False"
+          Toggled="OnLocationSharedToggled"
+          AutomationId="location_shared_switch"
+        />
+      </Grid>
+    </Border>
 
-        <Border Style="{StaticResource CardBorderStyle}">
-            <Grid Padding="12" ColumnDefinitions="*,Auto">
-                <VerticalStackLayout Grid.Column="0" Spacing="2" VerticalOptions="Center">
-                    <Label Text="Location Shared" Style="{StaticResource BodyMediumStyle}" />
-                    <Label Text="Share device location with OneSignal" Style="{StaticResource BodySmallStyle}" />
-                </VerticalStackLayout>
-                <Switch Grid.Column="1" x:Name="LocationSharedSwitch"
-                        IsToggled="False"
-                        Toggled="OnLocationSharedToggled"
-                        AutomationId="location_shared_switch" />
-            </Grid>
-        </Border>
-
-        <Button Text="PROMPT LOCATION" Style="{StaticResource PrimaryButtonStyle}"
-                Clicked="OnPromptLocationClicked" AutomationId="prompt_location_button" />
-    </VerticalStackLayout>
+    <Button
+      Text="PROMPT LOCATION"
+      Style="{StaticResource PrimaryButtonStyle}"
+      Clicked="OnPromptLocationClicked"
+      AutomationId="prompt_location_button"
+    />
+  </VerticalStackLayout>
 </ContentView>
diff --git a/examples/demo/Controls/Sections/LocationSection.xaml.cs b/examples/demo/Controls/Sections/LocationSection.xaml.cs
index cf71e949..f83c2670 100644
--- a/examples/demo/Controls/Sections/LocationSection.xaml.cs
+++ b/examples/demo/Controls/Sections/LocationSection.xaml.cs
@@ -34,7 +34,8 @@ public void Initialize(AppViewModel viewModel)
 
     private void OnLocationSharedToggled(object? sender, ToggledEventArgs e)
     {
-        if (_suppressToggle) return;
+        if (_suppressToggle)
+            return;
         _viewModel?.SetLocationSharedValue(e.Value);
     }
 
diff --git a/examples/demo/Controls/Sections/OutcomesSection.xaml b/examples/demo/Controls/Sections/OutcomesSection.xaml
index 67b8295a..a1a8d4ee 100644
--- a/examples/demo/Controls/Sections/OutcomesSection.xaml
+++ b/examples/demo/Controls/Sections/OutcomesSection.xaml
@@ -1,20 +1,34 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
-    x:Class="OneSignalDemo.Controls.Sections.OutcomesSection">
+  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
+  x:Class="OneSignalDemo.Controls.Sections.OutcomesSection"
+>
+  <VerticalStackLayout Spacing="8">
+    <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
+      <Label
+        Grid.Column="0"
+        Text="OUTCOME EVENTS"
+        Style="{StaticResource SectionHeaderStyle}"
+        VerticalOptions="Center"
+      />
+      <ImageButton
+        Grid.Column="1"
+        Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
+        WidthRequest="18"
+        HeightRequest="18"
+        BackgroundColor="Transparent"
+        Clicked="OnInfoTapped"
+        Padding="0"
+      />
+    </Grid>
 
-    <VerticalStackLayout Spacing="8">
-        <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
-            <Label Grid.Column="0" Text="OUTCOME EVENTS" Style="{StaticResource SectionHeaderStyle}" VerticalOptions="Center" />
-            <ImageButton Grid.Column="1"
-                         Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
-                         WidthRequest="18" HeightRequest="18"
-                         BackgroundColor="Transparent" Clicked="OnInfoTapped" Padding="0" />
-        </Grid>
-
-        <Button Text="SEND OUTCOME" Style="{StaticResource PrimaryButtonStyle}"
-                Clicked="OnSendOutcomeClicked" AutomationId="send_outcome_button" />
-    </VerticalStackLayout>
+    <Button
+      Text="SEND OUTCOME"
+      Style="{StaticResource PrimaryButtonStyle}"
+      Clicked="OnSendOutcomeClicked"
+      AutomationId="send_outcome_button"
+    />
+  </VerticalStackLayout>
 </ContentView>
diff --git a/examples/demo/Controls/Sections/OutcomesSection.xaml.cs b/examples/demo/Controls/Sections/OutcomesSection.xaml.cs
index fb32742d..aa3198c6 100644
--- a/examples/demo/Controls/Sections/OutcomesSection.xaml.cs
+++ b/examples/demo/Controls/Sections/OutcomesSection.xaml.cs
@@ -27,20 +27,47 @@ public void Initialize(AppViewModel viewModel, Page parentPage)
 
     private async void OnSendOutcomeClicked(object? sender, EventArgs e)
     {
-        if (_parentPage == null || _viewModel == null) return;
+        if (_parentPage == null || _viewModel == null)
+            return;
 
         const string group = "outcome_type";
-        var radioNormal = new RadioButton { Content = "Normal Outcome", GroupName = group, IsChecked = true };
+        var radioNormal = new RadioButton
+        {
+            Content = "Normal Outcome",
+            GroupName = group,
+            IsChecked = true,
+        };
         var radioUnique = new RadioButton { Content = "Unique Outcome", GroupName = group };
         var radioWithValue = new RadioButton { Content = "Outcome with Value", GroupName = group };
 
-        var nameEntry = new Entry { Placeholder = "Outcome name", AutomationId = "outcome_name_input" };
-        var valueEntry = new Entry { Placeholder = "Value (float)", Keyboard = Keyboard.Numeric, AutomationId = "outcome_value_input" };
-        var valueContainer = new VerticalStackLayout { IsVisible = false, Children = { valueEntry } };
+        var nameEntry = new Entry
+        {
+            Placeholder = "Outcome name",
+            AutomationId = "outcome_name_input",
+        };
+        var valueEntry = new Entry
+        {
+            Placeholder = "Value (float)",
+            Keyboard = Keyboard.Numeric,
+            AutomationId = "outcome_value_input",
+        };
+        var valueContainer = new VerticalStackLayout
+        {
+            IsVisible = false,
+            Children = { valueEntry },
+        };
 
         radioWithValue.CheckedChanged += (s, e2) => valueContainer.IsVisible = e2.Value;
-        radioNormal.CheckedChanged += (s, e2) => { if (e2.Value) valueContainer.IsVisible = false; };
-        radioUnique.CheckedChanged += (s, e2) => { if (e2.Value) valueContainer.IsVisible = false; };
+        radioNormal.CheckedChanged += (s, e2) =>
+        {
+            if (e2.Value)
+                valueContainer.IsVisible = false;
+        };
+        radioUnique.CheckedChanged += (s, e2) =>
+        {
+            if (e2.Value)
+                valueContainer.IsVisible = false;
+        };
 
         var cancelButton = DialogInputHelper.ActionButton("Cancel");
         var sendButton = DialogInputHelper.ActionButton("Send");
@@ -52,9 +79,10 @@ private async void OnSendOutcomeClicked(object? sender, EventArgs e)
         cancelButton.Clicked += async (s, e2) => await _parentPage.ClosePopupAsync();
         sendButton.Clicked += async (s, e2) =>
         {
-            outcomeType = radioWithValue.IsChecked ? "Outcome with Value"
-                        : radioUnique.IsChecked ? "Unique Outcome"
-                        : "Normal Outcome";
+            outcomeType =
+                radioWithValue.IsChecked ? "Outcome with Value"
+                : radioUnique.IsChecked ? "Unique Outcome"
+                : "Normal Outcome";
             name = nameEntry.Text?.Trim();
             valueStr = valueEntry.Text?.Trim();
             await _parentPage.ClosePopupAsync();
@@ -72,7 +100,7 @@ private async void OnSendOutcomeClicked(object? sender, EventArgs e)
                 new VerticalStackLayout
                 {
                     Spacing = 4,
-                    Children = { radioNormal, radioUnique, radioWithValue }
+                    Children = { radioNormal, radioUnique, radioWithValue },
                 },
                 nameEntry,
                 valueContainer,
diff --git a/examples/demo/Controls/Sections/PushSection.xaml b/examples/demo/Controls/Sections/PushSection.xaml
index 4b3ba5a4..d33f4854 100644
--- a/examples/demo/Controls/Sections/PushSection.xaml
+++ b/examples/demo/Controls/Sections/PushSection.xaml
@@ -1,43 +1,80 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
-    x:Class="OneSignalDemo.Controls.Sections.PushSection"
-    x:Name="root">
+  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
+  x:Class="OneSignalDemo.Controls.Sections.PushSection"
+  x:Name="root"
+>
+  <VerticalStackLayout Spacing="8">
+    <!-- Section header with info icon -->
+    <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
+      <Label
+        Grid.Column="0"
+        Text="PUSH"
+        Style="{StaticResource SectionHeaderStyle}"
+        VerticalOptions="Center"
+      />
+      <ImageButton
+        Grid.Column="1"
+        x:Name="InfoButton"
+        Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
+        WidthRequest="18"
+        HeightRequest="18"
+        BackgroundColor="Transparent"
+        Clicked="OnInfoTapped"
+        Padding="0"
+      />
+    </Grid>
 
-    <VerticalStackLayout Spacing="8">
-        <!-- Section header with info icon -->
-        <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
-            <Label Grid.Column="0" Text="PUSH" Style="{StaticResource SectionHeaderStyle}" VerticalOptions="Center" />
-            <ImageButton Grid.Column="1" x:Name="InfoButton"
-                         Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
-                         WidthRequest="18" HeightRequest="18"
-                         BackgroundColor="Transparent" Clicked="OnInfoTapped" Padding="0" />
+    <!-- Push card -->
+    <Border Style="{StaticResource CardBorderStyle}">
+      <VerticalStackLayout>
+        <Grid Padding="12" ColumnDefinitions="*,Auto">
+          <Label
+            Grid.Column="0"
+            Text="Push ID"
+            Style="{StaticResource BodyMediumStyle}"
+            VerticalOptions="Center"
+          />
+          <Label
+            Grid.Column="1"
+            x:Name="PushIdLabel"
+            Text=""
+            Style="{StaticResource BodySmallStyle}"
+            FontFamily="DroidSansMono"
+            HorizontalOptions="End"
+            VerticalOptions="Center"
+            LineBreakMode="MiddleTruncation"
+            AutomationId="push_id_label"
+          />
         </Grid>
+        <BoxView HeightRequest="1" Color="{StaticResource OsDivider}" Margin="12,0" />
+        <Grid Padding="12" ColumnDefinitions="*,Auto">
+          <Label
+            Grid.Column="0"
+            Text="Enabled"
+            Style="{StaticResource BodyMediumStyle}"
+            VerticalOptions="Center"
+          />
+          <Switch
+            Grid.Column="1"
+            x:Name="PushEnabledSwitch"
+            IsToggled="False"
+            Toggled="OnPushEnabledToggled"
+            AutomationId="push_enabled_switch"
+          />
+        </Grid>
+      </VerticalStackLayout>
+    </Border>
 
-        <!-- Push card -->
-        <Border Style="{StaticResource CardBorderStyle}">
-            <VerticalStackLayout>
-                <Grid Padding="12" ColumnDefinitions="*,Auto">
-                    <Label Grid.Column="0" Text="Push ID" Style="{StaticResource BodyMediumStyle}" VerticalOptions="Center" />
-                    <Label Grid.Column="1" x:Name="PushIdLabel" Text="" Style="{StaticResource BodySmallStyle}"
-                           FontFamily="DroidSansMono"
-                           HorizontalOptions="End" VerticalOptions="Center" LineBreakMode="MiddleTruncation"
-                           AutomationId="push_id_label" />
-                </Grid>
-                <BoxView HeightRequest="1" Color="{StaticResource OsDivider}" Margin="12,0" />
-                <Grid Padding="12" ColumnDefinitions="*,Auto">
-                    <Label Grid.Column="0" Text="Enabled" Style="{StaticResource BodyMediumStyle}" VerticalOptions="Center" />
-                    <Switch Grid.Column="1" x:Name="PushEnabledSwitch"
-                            IsToggled="False"
-                            Toggled="OnPushEnabledToggled"
-                            AutomationId="push_enabled_switch" />
-                </Grid>
-            </VerticalStackLayout>
-        </Border>
-
-        <Button x:Name="PromptPushButton" Text="PROMPT PUSH" Style="{StaticResource PrimaryButtonStyle}"
-                IsVisible="False" Clicked="OnPromptPushClicked" AutomationId="prompt_push_button" />
-    </VerticalStackLayout>
+    <Button
+      x:Name="PromptPushButton"
+      Text="PROMPT PUSH"
+      Style="{StaticResource PrimaryButtonStyle}"
+      IsVisible="False"
+      Clicked="OnPromptPushClicked"
+      AutomationId="prompt_push_button"
+    />
+  </VerticalStackLayout>
 </ContentView>
diff --git a/examples/demo/Controls/Sections/PushSection.xaml.cs b/examples/demo/Controls/Sections/PushSection.xaml.cs
index 1e4e6649..5c76cd0e 100644
--- a/examples/demo/Controls/Sections/PushSection.xaml.cs
+++ b/examples/demo/Controls/Sections/PushSection.xaml.cs
@@ -22,9 +22,12 @@ public void Initialize(AppViewModel viewModel)
 
         viewModel.PropertyChanged += (s, e) =>
         {
-            if (e.PropertyName is nameof(AppViewModel.PushSubscriptionId)
-                or nameof(AppViewModel.IsPushEnabled)
-                or nameof(AppViewModel.HasNotificationPermission))
+            if (
+                e.PropertyName
+                is nameof(AppViewModel.PushSubscriptionId)
+                    or nameof(AppViewModel.IsPushEnabled)
+                    or nameof(AppViewModel.HasNotificationPermission)
+            )
             {
                 Refresh();
             }
@@ -33,7 +36,8 @@ or nameof(AppViewModel.HasNotificationPermission))
 
     private void Refresh()
     {
-        if (_viewModel == null) return;
+        if (_viewModel == null)
+            return;
         PushIdLabel.Text = _viewModel.PushSubscriptionId;
 
         _suppressToggle = true;
@@ -46,7 +50,8 @@ private void Refresh()
 
     private void OnPushEnabledToggled(object? sender, ToggledEventArgs e)
     {
-        if (_suppressToggle) return;
+        if (_suppressToggle)
+            return;
         _viewModel?.SetPushEnabled(e.Value);
     }
 
@@ -55,6 +60,7 @@ private void OnPushEnabledToggled(object? sender, ToggledEventArgs e)
     private async void OnPromptPushClicked(object? sender, EventArgs e)
     {
         PromptPushRequested?.Invoke(this, e);
-        if (_viewModel != null) await _viewModel.PromptPushAsync();
+        if (_viewModel != null)
+            await _viewModel.PromptPushAsync();
     }
 }
diff --git a/examples/demo/Controls/Sections/SendIamSection.xaml b/examples/demo/Controls/Sections/SendIamSection.xaml
index 88430f3e..93e636d5 100644
--- a/examples/demo/Controls/Sections/SendIamSection.xaml
+++ b/examples/demo/Controls/Sections/SendIamSection.xaml
@@ -1,73 +1,131 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
-    x:Class="OneSignalDemo.Controls.Sections.SendIamSection">
+  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
+  x:Class="OneSignalDemo.Controls.Sections.SendIamSection"
+>
+  <VerticalStackLayout Spacing="8">
+    <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
+      <Label
+        Grid.Column="0"
+        Text="SEND IN-APP MESSAGE"
+        Style="{StaticResource SectionHeaderStyle}"
+        VerticalOptions="Center"
+      />
+      <ImageButton
+        Grid.Column="1"
+        Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
+        WidthRequest="18"
+        HeightRequest="18"
+        BackgroundColor="Transparent"
+        Clicked="OnInfoTapped"
+        Padding="0"
+      />
+    </Grid>
 
-    <VerticalStackLayout Spacing="8">
-        <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
-            <Label Grid.Column="0" Text="SEND IN-APP MESSAGE" Style="{StaticResource SectionHeaderStyle}" VerticalOptions="Center" />
-            <ImageButton Grid.Column="1"
-                         Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
-                         WidthRequest="18" HeightRequest="18"
-                         BackgroundColor="Transparent" Clicked="OnInfoTapped" Padding="0" />
-        </Grid>
+    <!-- TOP BANNER -->
+    <Border Style="{StaticResource CardBorderStyle}" Padding="0">
+      <Grid BackgroundColor="{StaticResource OneSignalRed}" ColumnDefinitions="Auto,*" Padding="12">
+        <Grid.GestureRecognizers>
+          <TapGestureRecognizer Tapped="OnTopBannerTapped" />
+        </Grid.GestureRecognizers>
+        <mi:MauiIcon
+          Grid.Column="0"
+          Icon="{mi:Material Icon=VerticalAlignTop}"
+          IconColor="White"
+          IconSize="18"
+          VerticalOptions="Center"
+          Margin="0,0,8,0"
+        />
+        <Label
+          Grid.Column="1"
+          Text="TOP BANNER"
+          TextColor="White"
+          FontAttributes="Bold"
+          FontSize="14"
+          VerticalOptions="Center"
+          AutomationId="iam_top_banner_button"
+        />
+      </Grid>
+    </Border>
 
-        <!-- TOP BANNER -->
-        <Border Style="{StaticResource CardBorderStyle}" Padding="0">
-            <Grid BackgroundColor="{StaticResource OneSignalRed}"
-                  ColumnDefinitions="Auto,*"
-                  Padding="12">
-                <Grid.GestureRecognizers>
-                    <TapGestureRecognizer Tapped="OnTopBannerTapped" />
-                </Grid.GestureRecognizers>
-                <mi:MauiIcon Grid.Column="0" Icon="{mi:Material Icon=VerticalAlignTop}" IconColor="White" IconSize="18" VerticalOptions="Center" Margin="0,0,8,0" />
-                <Label Grid.Column="1" Text="TOP BANNER" TextColor="White" FontAttributes="Bold"
-                       FontSize="14" VerticalOptions="Center" AutomationId="iam_top_banner_button" />
-            </Grid>
-        </Border>
+    <!-- BOTTOM BANNER -->
+    <Border Style="{StaticResource CardBorderStyle}" Padding="0">
+      <Grid BackgroundColor="{StaticResource OneSignalRed}" ColumnDefinitions="Auto,*" Padding="12">
+        <Grid.GestureRecognizers>
+          <TapGestureRecognizer Tapped="OnBottomBannerTapped" />
+        </Grid.GestureRecognizers>
+        <mi:MauiIcon
+          Grid.Column="0"
+          Icon="{mi:Material Icon=VerticalAlignBottom}"
+          IconColor="White"
+          IconSize="18"
+          VerticalOptions="Center"
+          Margin="0,0,8,0"
+        />
+        <Label
+          Grid.Column="1"
+          Text="BOTTOM BANNER"
+          TextColor="White"
+          FontAttributes="Bold"
+          FontSize="14"
+          VerticalOptions="Center"
+          AutomationId="iam_bottom_banner_button"
+        />
+      </Grid>
+    </Border>
 
-        <!-- BOTTOM BANNER -->
-        <Border Style="{StaticResource CardBorderStyle}" Padding="0">
-            <Grid BackgroundColor="{StaticResource OneSignalRed}"
-                  ColumnDefinitions="Auto,*"
-                  Padding="12">
-                <Grid.GestureRecognizers>
-                    <TapGestureRecognizer Tapped="OnBottomBannerTapped" />
-                </Grid.GestureRecognizers>
-                <mi:MauiIcon Grid.Column="0" Icon="{mi:Material Icon=VerticalAlignBottom}" IconColor="White" IconSize="18" VerticalOptions="Center" Margin="0,0,8,0" />
-                <Label Grid.Column="1" Text="BOTTOM BANNER" TextColor="White" FontAttributes="Bold"
-                       FontSize="14" VerticalOptions="Center" AutomationId="iam_bottom_banner_button" />
-            </Grid>
-        </Border>
+    <!-- CENTER MODAL -->
+    <Border Style="{StaticResource CardBorderStyle}" Padding="0">
+      <Grid BackgroundColor="{StaticResource OneSignalRed}" ColumnDefinitions="Auto,*" Padding="12">
+        <Grid.GestureRecognizers>
+          <TapGestureRecognizer Tapped="OnCenterModalTapped" />
+        </Grid.GestureRecognizers>
+        <mi:MauiIcon
+          Grid.Column="0"
+          Icon="{mi:Material Icon=CropSquare}"
+          IconColor="White"
+          IconSize="18"
+          VerticalOptions="Center"
+          Margin="0,0,8,0"
+        />
+        <Label
+          Grid.Column="1"
+          Text="CENTER MODAL"
+          TextColor="White"
+          FontAttributes="Bold"
+          FontSize="14"
+          VerticalOptions="Center"
+          AutomationId="iam_center_modal_button"
+        />
+      </Grid>
+    </Border>
 
-        <!-- CENTER MODAL -->
-        <Border Style="{StaticResource CardBorderStyle}" Padding="0">
-            <Grid BackgroundColor="{StaticResource OneSignalRed}"
-                  ColumnDefinitions="Auto,*"
-                  Padding="12">
-                <Grid.GestureRecognizers>
-                    <TapGestureRecognizer Tapped="OnCenterModalTapped" />
-                </Grid.GestureRecognizers>
-                <mi:MauiIcon Grid.Column="0" Icon="{mi:Material Icon=CropSquare}" IconColor="White" IconSize="18" VerticalOptions="Center" Margin="0,0,8,0" />
-                <Label Grid.Column="1" Text="CENTER MODAL" TextColor="White" FontAttributes="Bold"
-                       FontSize="14" VerticalOptions="Center" AutomationId="iam_center_modal_button" />
-            </Grid>
-        </Border>
-
-        <!-- FULL SCREEN -->
-        <Border Style="{StaticResource CardBorderStyle}" Padding="0">
-            <Grid BackgroundColor="{StaticResource OneSignalRed}"
-                  ColumnDefinitions="Auto,*"
-                  Padding="12">
-                <Grid.GestureRecognizers>
-                    <TapGestureRecognizer Tapped="OnFullScreenTapped" />
-                </Grid.GestureRecognizers>
-                <mi:MauiIcon Grid.Column="0" Icon="{mi:Material Icon=Fullscreen}" IconColor="White" IconSize="18" VerticalOptions="Center" Margin="0,0,8,0" />
-                <Label Grid.Column="1" Text="FULL SCREEN" TextColor="White" FontAttributes="Bold"
-                       FontSize="14" VerticalOptions="Center" AutomationId="iam_full_screen_button" />
-            </Grid>
-        </Border>
-    </VerticalStackLayout>
+    <!-- FULL SCREEN -->
+    <Border Style="{StaticResource CardBorderStyle}" Padding="0">
+      <Grid BackgroundColor="{StaticResource OneSignalRed}" ColumnDefinitions="Auto,*" Padding="12">
+        <Grid.GestureRecognizers>
+          <TapGestureRecognizer Tapped="OnFullScreenTapped" />
+        </Grid.GestureRecognizers>
+        <mi:MauiIcon
+          Grid.Column="0"
+          Icon="{mi:Material Icon=Fullscreen}"
+          IconColor="White"
+          IconSize="18"
+          VerticalOptions="Center"
+          Margin="0,0,8,0"
+        />
+        <Label
+          Grid.Column="1"
+          Text="FULL SCREEN"
+          TextColor="White"
+          FontAttributes="Bold"
+          FontSize="14"
+          VerticalOptions="Center"
+          AutomationId="iam_full_screen_button"
+        />
+      </Grid>
+    </Border>
+  </VerticalStackLayout>
 </ContentView>
diff --git a/examples/demo/Controls/Sections/SendIamSection.xaml.cs b/examples/demo/Controls/Sections/SendIamSection.xaml.cs
index 4ee5a216..c5ffcc51 100644
--- a/examples/demo/Controls/Sections/SendIamSection.xaml.cs
+++ b/examples/demo/Controls/Sections/SendIamSection.xaml.cs
@@ -1,7 +1,7 @@
-using OneSignalDemo.Models;
-using OneSignalDemo.ViewModels;
 using CommunityToolkit.Maui.Alerts;
 using CommunityToolkit.Maui.Core;
+using OneSignalDemo.Models;
+using OneSignalDemo.ViewModels;
 
 namespace OneSignalDemo.Controls.Sections;
 
@@ -23,16 +23,25 @@ public void Initialize(AppViewModel viewModel, Page parentPage)
         _parentPage = parentPage;
     }
 
-    private async void OnTopBannerTapped(object? sender, TappedEventArgs e) => await SendIam(InAppMessageType.TopBanner);
-    private async void OnBottomBannerTapped(object? sender, TappedEventArgs e) => await SendIam(InAppMessageType.BottomBanner);
-    private async void OnCenterModalTapped(object? sender, TappedEventArgs e) => await SendIam(InAppMessageType.CenterModal);
-    private async void OnFullScreenTapped(object? sender, TappedEventArgs e) => await SendIam(InAppMessageType.FullScreen);
+    private async void OnTopBannerTapped(object? sender, TappedEventArgs e) =>
+        await SendIam(InAppMessageType.TopBanner);
+
+    private async void OnBottomBannerTapped(object? sender, TappedEventArgs e) =>
+        await SendIam(InAppMessageType.BottomBanner);
+
+    private async void OnCenterModalTapped(object? sender, TappedEventArgs e) =>
+        await SendIam(InAppMessageType.CenterModal);
+
+    private async void OnFullScreenTapped(object? sender, TappedEventArgs e) =>
+        await SendIam(InAppMessageType.FullScreen);
 
     private async Task SendIam(InAppMessageType type)
     {
         _viewModel?.SendInAppMessage(type);
         if (_parentPage != null)
-            await Toast.Make($"Sent In-App Message: {type.GetDisplayName()}", ToastDuration.Short).Show();
+            await Toast
+                .Make($"Sent In-App Message: {type.GetDisplayName()}", ToastDuration.Short)
+                .Show();
     }
 
     private void OnInfoTapped(object? sender, EventArgs e) => InfoTapped?.Invoke(this, e);
diff --git a/examples/demo/Controls/Sections/SendPushSection.xaml b/examples/demo/Controls/Sections/SendPushSection.xaml
index ac841887..36741168 100644
--- a/examples/demo/Controls/Sections/SendPushSection.xaml
+++ b/examples/demo/Controls/Sections/SendPushSection.xaml
@@ -1,24 +1,46 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
-    x:Class="OneSignalDemo.Controls.Sections.SendPushSection">
+  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
+  x:Class="OneSignalDemo.Controls.Sections.SendPushSection"
+>
+  <VerticalStackLayout Spacing="8">
+    <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
+      <Label
+        Grid.Column="0"
+        Text="SEND PUSH NOTIFICATION"
+        Style="{StaticResource SectionHeaderStyle}"
+        VerticalOptions="Center"
+      />
+      <ImageButton
+        Grid.Column="1"
+        Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
+        WidthRequest="18"
+        HeightRequest="18"
+        BackgroundColor="Transparent"
+        Clicked="OnInfoTapped"
+        Padding="0"
+      />
+    </Grid>
 
-    <VerticalStackLayout Spacing="8">
-        <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
-            <Label Grid.Column="0" Text="SEND PUSH NOTIFICATION" Style="{StaticResource SectionHeaderStyle}" VerticalOptions="Center" />
-            <ImageButton Grid.Column="1"
-                         Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
-                         WidthRequest="18" HeightRequest="18"
-                         BackgroundColor="Transparent" Clicked="OnInfoTapped" Padding="0" />
-        </Grid>
-
-        <Button Text="SIMPLE" Style="{StaticResource PrimaryButtonStyle}"
-                Clicked="OnSimpleClicked" AutomationId="send_simple_push_button" />
-        <Button Text="WITH IMAGE" Style="{StaticResource PrimaryButtonStyle}"
-                Clicked="OnWithImageClicked" AutomationId="send_image_push_button" />
-        <Button Text="CUSTOM" Style="{StaticResource PrimaryButtonStyle}"
-                Clicked="OnCustomClicked" AutomationId="send_custom_push_button" />
-    </VerticalStackLayout>
+    <Button
+      Text="SIMPLE"
+      Style="{StaticResource PrimaryButtonStyle}"
+      Clicked="OnSimpleClicked"
+      AutomationId="send_simple_push_button"
+    />
+    <Button
+      Text="WITH IMAGE"
+      Style="{StaticResource PrimaryButtonStyle}"
+      Clicked="OnWithImageClicked"
+      AutomationId="send_image_push_button"
+    />
+    <Button
+      Text="CUSTOM"
+      Style="{StaticResource PrimaryButtonStyle}"
+      Clicked="OnCustomClicked"
+      AutomationId="send_custom_push_button"
+    />
+  </VerticalStackLayout>
 </ContentView>
diff --git a/examples/demo/Controls/Sections/SendPushSection.xaml.cs b/examples/demo/Controls/Sections/SendPushSection.xaml.cs
index c123d259..8ac653d2 100644
--- a/examples/demo/Controls/Sections/SendPushSection.xaml.cs
+++ b/examples/demo/Controls/Sections/SendPushSection.xaml.cs
@@ -22,13 +22,15 @@ public void Initialize(AppViewModel viewModel)
 
     private async void OnSimpleClicked(object? sender, EventArgs e)
     {
-        if (_viewModel == null) return;
+        if (_viewModel == null)
+            return;
         await _viewModel.SendNotificationAsync(NotificationType.Simple);
     }
 
     private async void OnWithImageClicked(object? sender, EventArgs e)
     {
-        if (_viewModel == null) return;
+        if (_viewModel == null)
+            return;
         await _viewModel.SendNotificationAsync(NotificationType.WithImage);
     }
 
diff --git a/examples/demo/Controls/Sections/SmsSection.xaml b/examples/demo/Controls/Sections/SmsSection.xaml
index dcb9d3ab..e830ad4f 100644
--- a/examples/demo/Controls/Sections/SmsSection.xaml
+++ b/examples/demo/Controls/Sections/SmsSection.xaml
@@ -1,27 +1,46 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
-    x:Class="OneSignalDemo.Controls.Sections.SmsSection">
+  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
+  x:Class="OneSignalDemo.Controls.Sections.SmsSection"
+>
+  <VerticalStackLayout Spacing="8">
+    <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
+      <Label
+        Grid.Column="0"
+        Text="SMS"
+        Style="{StaticResource SectionHeaderStyle}"
+        VerticalOptions="Center"
+      />
+      <ImageButton
+        Grid.Column="1"
+        Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
+        WidthRequest="18"
+        HeightRequest="18"
+        BackgroundColor="Transparent"
+        Clicked="OnInfoTapped"
+        Padding="0"
+      />
+    </Grid>
 
-    <VerticalStackLayout Spacing="8">
-        <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
-            <Label Grid.Column="0" Text="SMS" Style="{StaticResource SectionHeaderStyle}" VerticalOptions="Center" />
-            <ImageButton Grid.Column="1"
-                         Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
-                         WidthRequest="18" HeightRequest="18"
-                         BackgroundColor="Transparent" Clicked="OnInfoTapped" Padding="0" />
-        </Grid>
+    <Border Style="{StaticResource CardBorderStyle}">
+      <VerticalStackLayout x:Name="SmsListContainer" MinimumHeightRequest="50">
+        <Label
+          x:Name="EmptyLabel"
+          Text="No SMS added"
+          Style="{StaticResource EmptyStateStyle}"
+          Padding="16"
+          AutomationId="sms_empty_label"
+        />
+      </VerticalStackLayout>
+    </Border>
 
-        <Border Style="{StaticResource CardBorderStyle}">
-            <VerticalStackLayout x:Name="SmsListContainer" MinimumHeightRequest="50">
-                <Label x:Name="EmptyLabel" Text="No SMS added" Style="{StaticResource EmptyStateStyle}"
-                       Padding="16" AutomationId="sms_empty_label" />
-            </VerticalStackLayout>
-        </Border>
-
-        <Button Text="ADD SMS" Style="{StaticResource PrimaryButtonStyle}"
-                Clicked="OnAddSmsClicked" AutomationId="add_sms_button" />
-    </VerticalStackLayout>
+    <Button
+      Text="ADD SMS"
+      Style="{StaticResource PrimaryButtonStyle}"
+      Clicked="OnAddSmsClicked"
+      AutomationId="add_sms_button"
+    />
+  </VerticalStackLayout>
 </ContentView>
diff --git a/examples/demo/Controls/Sections/SmsSection.xaml.cs b/examples/demo/Controls/Sections/SmsSection.xaml.cs
index 1e9fbfdf..0102fba8 100644
--- a/examples/demo/Controls/Sections/SmsSection.xaml.cs
+++ b/examples/demo/Controls/Sections/SmsSection.xaml.cs
@@ -1,5 +1,5 @@
-using OneSignalDemo.ViewModels;
 using OneSignalDemo.Controls;
+using OneSignalDemo.ViewModels;
 
 namespace OneSignalDemo.Controls.Sections;
 
@@ -36,15 +36,23 @@ private void RebuildList()
             return;
         }
 
-        var displayList = (!_expanded && list.Count > CollapseThreshold)
-            ? list.Take(CollapseThreshold).ToList()
-            : list.ToList();
+        var displayList =
+            (!_expanded && list.Count > CollapseThreshold)
+                ? list.Take(CollapseThreshold).ToList()
+                : list.ToList();
 
         bool first = true;
         foreach (var sms in displayList)
         {
             if (!first)
-                SmsListContainer.Children.Add(new BoxView { HeightRequest = 1, Color = Color.FromArgb("#E8EAED"), Margin = new Thickness(12, 0) });
+                SmsListContainer.Children.Add(
+                    new BoxView
+                    {
+                        HeightRequest = 1,
+                        Color = Color.FromArgb("#E8EAED"),
+                        Margin = new Thickness(12, 0),
+                    }
+                );
             first = false;
 
             var captured = sms;
@@ -54,11 +62,18 @@ private void RebuildList()
                 ColumnDefinitions =
                 {
                     new ColumnDefinition { Width = GridLength.Star },
-                    new ColumnDefinition { Width = GridLength.Auto }
-                }
+                    new ColumnDefinition { Width = GridLength.Auto },
+                },
             };
 
-            row.Children.Add(new Label { Text = sms, FontSize = 14, VerticalOptions = LayoutOptions.Center });
+            row.Children.Add(
+                new Label
+                {
+                    Text = sms,
+                    FontSize = 14,
+                    VerticalOptions = LayoutOptions.Center,
+                }
+            );
 
             var deleteBtn = new Button
             {
@@ -67,7 +82,7 @@ private void RebuildList()
                 TextColor = Color.FromArgb("#E54B4D"),
                 Padding = new Thickness(8, 0),
                 FontSize = 18,
-                HeightRequest = 40
+                HeightRequest = 40,
             };
             deleteBtn.Clicked += (s, e) => _viewModel?.RemoveSms(captured);
             Grid.SetColumn(deleteBtn, 1);
@@ -85,19 +100,26 @@ private void RebuildList()
                 TextColor = Color.FromArgb("#E54B4D"),
                 FontAttributes = FontAttributes.Bold,
                 Padding = new Thickness(12, 4),
-                FontSize = 14
+                FontSize = 14,
             };
-            moreLabel.GestureRecognizers.Add(new TapGestureRecognizer
-            {
-                Command = new Command(() => { _expanded = true; RebuildList(); })
-            });
+            moreLabel.GestureRecognizers.Add(
+                new TapGestureRecognizer
+                {
+                    Command = new Command(() =>
+                    {
+                        _expanded = true;
+                        RebuildList();
+                    }),
+                }
+            );
             SmsListContainer.Children.Add(moreLabel);
         }
     }
 
     private async void OnAddSmsClicked(object? sender, EventArgs e)
     {
-        if (_parentPage == null || _viewModel == null) return;
+        if (_parentPage == null || _viewModel == null)
+            return;
 
         var sms = await DialogInputHelper.ShowSingleInput(
             _parentPage,
@@ -108,7 +130,8 @@ private async void OnAddSmsClicked(object? sender, EventArgs e)
             keyboard: Keyboard.Telephone
         );
 
-        if (string.IsNullOrEmpty(sms)) return;
+        if (string.IsNullOrEmpty(sms))
+            return;
         _viewModel.AddSms(sms);
     }
 
diff --git a/examples/demo/Controls/Sections/TagsSection.xaml b/examples/demo/Controls/Sections/TagsSection.xaml
index 48ce141e..1d0e5c95 100644
--- a/examples/demo/Controls/Sections/TagsSection.xaml
+++ b/examples/demo/Controls/Sections/TagsSection.xaml
@@ -1,31 +1,60 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
-    x:Class="OneSignalDemo.Controls.Sections.TagsSection">
+  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
+  x:Class="OneSignalDemo.Controls.Sections.TagsSection"
+>
+  <VerticalStackLayout Spacing="8">
+    <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
+      <Label
+        Grid.Column="0"
+        Text="TAGS"
+        Style="{StaticResource SectionHeaderStyle}"
+        VerticalOptions="Center"
+      />
+      <ImageButton
+        Grid.Column="1"
+        Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
+        WidthRequest="18"
+        HeightRequest="18"
+        BackgroundColor="Transparent"
+        Clicked="OnInfoTapped"
+        Padding="0"
+      />
+    </Grid>
 
-    <VerticalStackLayout Spacing="8">
-        <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
-            <Label Grid.Column="0" Text="TAGS" Style="{StaticResource SectionHeaderStyle}" VerticalOptions="Center" />
-            <ImageButton Grid.Column="1"
-                         Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
-                         WidthRequest="18" HeightRequest="18"
-                         BackgroundColor="Transparent" Clicked="OnInfoTapped" Padding="0" />
-        </Grid>
+    <Border Style="{StaticResource CardBorderStyle}">
+      <VerticalStackLayout x:Name="TagListContainer" MinimumHeightRequest="50">
+        <Label
+          x:Name="EmptyLabel"
+          Text="No tags added"
+          Style="{StaticResource EmptyStateStyle}"
+          Padding="16"
+          AutomationId="tags_empty_label"
+        />
+      </VerticalStackLayout>
+    </Border>
 
-        <Border Style="{StaticResource CardBorderStyle}">
-            <VerticalStackLayout x:Name="TagListContainer" MinimumHeightRequest="50">
-                <Label x:Name="EmptyLabel" Text="No tags added" Style="{StaticResource EmptyStateStyle}"
-                       Padding="16" AutomationId="tags_empty_label" />
-            </VerticalStackLayout>
-        </Border>
-
-        <Button Text="ADD" Style="{StaticResource PrimaryButtonStyle}"
-                Clicked="OnAddClicked" AutomationId="add_tag_button" />
-        <Button Text="ADD MULTIPLE" Style="{StaticResource PrimaryButtonStyle}"
-                Clicked="OnAddMultipleClicked" AutomationId="add_multiple_tags_button" />
-        <Button x:Name="RemoveSelectedButton" Text="REMOVE SELECTED" Style="{StaticResource PrimaryButtonStyle}"
-                IsVisible="False" Clicked="OnRemoveSelectedClicked" AutomationId="remove_selected_tags_button" />
-    </VerticalStackLayout>
+    <Button
+      Text="ADD"
+      Style="{StaticResource PrimaryButtonStyle}"
+      Clicked="OnAddClicked"
+      AutomationId="add_tag_button"
+    />
+    <Button
+      Text="ADD MULTIPLE"
+      Style="{StaticResource PrimaryButtonStyle}"
+      Clicked="OnAddMultipleClicked"
+      AutomationId="add_multiple_tags_button"
+    />
+    <Button
+      x:Name="RemoveSelectedButton"
+      Text="REMOVE SELECTED"
+      Style="{StaticResource PrimaryButtonStyle}"
+      IsVisible="False"
+      Clicked="OnRemoveSelectedClicked"
+      AutomationId="remove_selected_tags_button"
+    />
+  </VerticalStackLayout>
 </ContentView>
diff --git a/examples/demo/Controls/Sections/TagsSection.xaml.cs b/examples/demo/Controls/Sections/TagsSection.xaml.cs
index 9a2d92e4..098242fc 100644
--- a/examples/demo/Controls/Sections/TagsSection.xaml.cs
+++ b/examples/demo/Controls/Sections/TagsSection.xaml.cs
@@ -1,5 +1,5 @@
-using OneSignalDemo.ViewModels;
 using OneSignalDemo.Controls;
+using OneSignalDemo.ViewModels;
 
 namespace OneSignalDemo.Controls.Sections;
 
@@ -40,7 +40,14 @@ private void RebuildList()
         foreach (var tag in list)
         {
             if (!first)
-                TagListContainer.Children.Add(new BoxView { HeightRequest = 1, Color = Color.FromArgb("#E8EAED"), Margin = new Thickness(12, 0) });
+                TagListContainer.Children.Add(
+                    new BoxView
+                    {
+                        HeightRequest = 1,
+                        Color = Color.FromArgb("#E8EAED"),
+                        Margin = new Thickness(12, 0),
+                    }
+                );
             first = false;
 
             var captured = tag;
@@ -50,22 +57,20 @@ private void RebuildList()
                 ColumnDefinitions =
                 {
                     new ColumnDefinition { Width = GridLength.Star },
-                    new ColumnDefinition { Width = GridLength.Auto }
-                }
+                    new ColumnDefinition { Width = GridLength.Auto },
+                },
             };
 
             var textStack = new VerticalStackLayout { Spacing = 2 };
-            textStack.Children.Add(new Label
-            {
-                Text = tag.Key,
-                FontSize = 14,
-            });
-            textStack.Children.Add(new Label
-            {
-                Text = tag.Value,
-                FontSize = 12,
-                TextColor = Color.FromArgb("#757575")
-            });
+            textStack.Children.Add(new Label { Text = tag.Key, FontSize = 14 });
+            textStack.Children.Add(
+                new Label
+                {
+                    Text = tag.Value,
+                    FontSize = 12,
+                    TextColor = Color.FromArgb("#757575"),
+                }
+            );
             row.Children.Add(textStack);
 
             var deleteBtn = new Button
@@ -76,7 +81,7 @@ private void RebuildList()
                 Padding = new Thickness(8, 0),
                 FontSize = 18,
                 HeightRequest = 40,
-                VerticalOptions = LayoutOptions.Center
+                VerticalOptions = LayoutOptions.Center,
             };
             deleteBtn.Clicked += (s, e) => _viewModel?.RemoveTag(captured.Key);
             Grid.SetColumn(deleteBtn, 1);
@@ -88,13 +93,24 @@ private void RebuildList()
 
     private async void OnAddClicked(object? sender, EventArgs e)
     {
-        if (_parentPage == null || _viewModel == null) return;
+        if (_parentPage == null || _viewModel == null)
+            return;
 
         var form = await DialogInputHelper.ShowPairInput(
             _parentPage,
             "Add Tag",
-            new DialogInputField { Key = "key", Placeholder = "Key", AutomationId = "tag_key_input" },
-            new DialogInputField { Key = "value", Placeholder = "Value", AutomationId = "tag_value_input" },
+            new DialogInputField
+            {
+                Key = "key",
+                Placeholder = "Key",
+                AutomationId = "tag_key_input",
+            },
+            new DialogInputField
+            {
+                Key = "value",
+                Placeholder = "Value",
+                AutomationId = "tag_value_input",
+            },
             "Add"
         );
 
@@ -111,18 +127,31 @@ private async void OnAddClicked(object? sender, EventArgs e)
 
     private async void OnAddMultipleClicked(object? sender, EventArgs e)
     {
-        if (_parentPage == null || _viewModel == null) return;
-        var pairs = await MultiPairDialogHelper.Show(_parentPage, "Add Multiple Tags", "Key", "Value");
-        if (pairs == null || pairs.Count == 0) return;
+        if (_parentPage == null || _viewModel == null)
+            return;
+        var pairs = await MultiPairDialogHelper.Show(
+            _parentPage,
+            "Add Multiple Tags",
+            "Key",
+            "Value"
+        );
+        if (pairs == null || pairs.Count == 0)
+            return;
         _viewModel.AddTags(pairs);
     }
 
     private async void OnRemoveSelectedClicked(object? sender, EventArgs e)
     {
-        if (_parentPage == null || _viewModel == null) return;
+        if (_parentPage == null || _viewModel == null)
+            return;
         var keys = _viewModel.TagsList.Select(t => t.Key).ToList();
-        var selected = await MultiPairDialogHelper.ShowMultiSelect(_parentPage, "Remove Tags", keys);
-        if (selected == null || selected.Count == 0) return;
+        var selected = await MultiPairDialogHelper.ShowMultiSelect(
+            _parentPage,
+            "Remove Tags",
+            keys
+        );
+        if (selected == null || selected.Count == 0)
+            return;
         _viewModel.RemoveSelectedTags(selected);
     }
 
diff --git a/examples/demo/Controls/Sections/TrackEventSection.xaml b/examples/demo/Controls/Sections/TrackEventSection.xaml
index fc467843..f4166467 100644
--- a/examples/demo/Controls/Sections/TrackEventSection.xaml
+++ b/examples/demo/Controls/Sections/TrackEventSection.xaml
@@ -1,20 +1,34 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
-    x:Class="OneSignalDemo.Controls.Sections.TrackEventSection">
+  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
+  x:Class="OneSignalDemo.Controls.Sections.TrackEventSection"
+>
+  <VerticalStackLayout Spacing="8">
+    <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
+      <Label
+        Grid.Column="0"
+        Text="TRACK EVENT"
+        Style="{StaticResource SectionHeaderStyle}"
+        VerticalOptions="Center"
+      />
+      <ImageButton
+        Grid.Column="1"
+        Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
+        WidthRequest="18"
+        HeightRequest="18"
+        BackgroundColor="Transparent"
+        Clicked="OnInfoTapped"
+        Padding="0"
+      />
+    </Grid>
 
-    <VerticalStackLayout Spacing="8">
-        <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
-            <Label Grid.Column="0" Text="TRACK EVENT" Style="{StaticResource SectionHeaderStyle}" VerticalOptions="Center" />
-            <ImageButton Grid.Column="1"
-                         Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
-                         WidthRequest="18" HeightRequest="18"
-                         BackgroundColor="Transparent" Clicked="OnInfoTapped" Padding="0" />
-        </Grid>
-
-        <Button Text="TRACK EVENT" Style="{StaticResource PrimaryButtonStyle}"
-                Clicked="OnTrackEventClicked" AutomationId="track_event_button" />
-    </VerticalStackLayout>
+    <Button
+      Text="TRACK EVENT"
+      Style="{StaticResource PrimaryButtonStyle}"
+      Clicked="OnTrackEventClicked"
+      AutomationId="track_event_button"
+    />
+  </VerticalStackLayout>
 </ContentView>
diff --git a/examples/demo/Controls/Sections/TrackEventSection.xaml.cs b/examples/demo/Controls/Sections/TrackEventSection.xaml.cs
index b3b14ddc..17dfcc9d 100644
--- a/examples/demo/Controls/Sections/TrackEventSection.xaml.cs
+++ b/examples/demo/Controls/Sections/TrackEventSection.xaml.cs
@@ -28,16 +28,21 @@ public void Initialize(AppViewModel viewModel, Page parentPage)
 
     private async void OnTrackEventClicked(object? sender, EventArgs e)
     {
-        if (_parentPage == null || _viewModel == null) return;
+        if (_parentPage == null || _viewModel == null)
+            return;
 
         var result = await ShowTrackEventPopup(_parentPage);
-        if (result == null) return;
+        if (result == null)
+            return;
 
         _viewModel.TrackEvent(result.Value.name, result.Value.properties);
         await Toast.Make($"Event tracked: {result.Value.name}", ToastDuration.Short).Show();
     }
 
-    private static async Task<(string name, Dictionary<string, object>? properties)?> ShowTrackEventPopup(Page parentPage)
+    private static async Task<(
+        string name,
+        Dictionary<string, object>? properties
+    )?> ShowTrackEventPopup(Page parentPage)
     {
         var nameEntry = new Entry
         {
@@ -67,7 +72,8 @@ private async void OnTrackEventClicked(object? sender, EventArgs e)
         confirmButton.Clicked += async (s, ev) =>
         {
             var name = nameEntry.Text?.Trim() ?? string.Empty;
-            if (string.IsNullOrEmpty(name)) return;
+            if (string.IsNullOrEmpty(name))
+                return;
 
             var propsText = propsEntry.Text?.Trim() ?? string.Empty;
             Dictionary<string, object>? properties = null;
@@ -111,12 +117,7 @@ private async void OnTrackEventClicked(object? sender, EventArgs e)
                 new VerticalStackLayout
                 {
                     Spacing = 8,
-                    Children =
-                    {
-                        nameEntry,
-                        propsEntry,
-                        errorLabel,
-                    }
+                    Children = { nameEntry, propsEntry, errorLabel },
                 },
                 new HorizontalStackLayout
                 {
@@ -128,7 +129,10 @@ private async void OnTrackEventClicked(object? sender, EventArgs e)
             },
         };
 
-        await parentPage.ShowPopupAsync<(string, Dictionary<string, object>?)?>(card, DialogInputHelper.DialogOptions);
+        await parentPage.ShowPopupAsync<(string, Dictionary<string, object>?)?>(
+            card,
+            DialogInputHelper.DialogOptions
+        );
         return popupResult;
     }
 
diff --git a/examples/demo/Controls/Sections/TriggersSection.xaml b/examples/demo/Controls/Sections/TriggersSection.xaml
index e9d2db59..5923e82a 100644
--- a/examples/demo/Controls/Sections/TriggersSection.xaml
+++ b/examples/demo/Controls/Sections/TriggersSection.xaml
@@ -1,33 +1,68 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
-    x:Class="OneSignalDemo.Controls.Sections.TriggersSection">
+  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
+  x:Class="OneSignalDemo.Controls.Sections.TriggersSection"
+>
+  <VerticalStackLayout Spacing="8">
+    <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
+      <Label
+        Grid.Column="0"
+        Text="TRIGGERS"
+        Style="{StaticResource SectionHeaderStyle}"
+        VerticalOptions="Center"
+      />
+      <ImageButton
+        Grid.Column="1"
+        Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
+        WidthRequest="18"
+        HeightRequest="18"
+        BackgroundColor="Transparent"
+        Clicked="OnInfoTapped"
+        Padding="0"
+      />
+    </Grid>
 
-    <VerticalStackLayout Spacing="8">
-        <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
-            <Label Grid.Column="0" Text="TRIGGERS" Style="{StaticResource SectionHeaderStyle}" VerticalOptions="Center" />
-            <ImageButton Grid.Column="1"
-                         Source="{mi:Material Icon=InfoOutline, IconSize=18, IconColor=#9E9E9E}"
-                         WidthRequest="18" HeightRequest="18"
-                         BackgroundColor="Transparent" Clicked="OnInfoTapped" Padding="0" />
-        </Grid>
+    <Border Style="{StaticResource CardBorderStyle}">
+      <VerticalStackLayout x:Name="TriggerListContainer" MinimumHeightRequest="50">
+        <Label
+          x:Name="EmptyLabel"
+          Text="No triggers added"
+          Style="{StaticResource EmptyStateStyle}"
+          Padding="16"
+          AutomationId="triggers_empty_label"
+        />
+      </VerticalStackLayout>
+    </Border>
 
-        <Border Style="{StaticResource CardBorderStyle}">
-            <VerticalStackLayout x:Name="TriggerListContainer" MinimumHeightRequest="50">
-                <Label x:Name="EmptyLabel" Text="No triggers added" Style="{StaticResource EmptyStateStyle}"
-                       Padding="16" AutomationId="triggers_empty_label" />
-            </VerticalStackLayout>
-        </Border>
-
-        <Button Text="ADD" Style="{StaticResource PrimaryButtonStyle}"
-                Clicked="OnAddClicked" AutomationId="add_trigger_button" />
-        <Button Text="ADD MULTIPLE" Style="{StaticResource PrimaryButtonStyle}"
-                Clicked="OnAddMultipleClicked" AutomationId="add_multiple_triggers_button" />
-        <Button x:Name="RemoveSelectedButton" Text="REMOVE SELECTED" Style="{StaticResource PrimaryButtonStyle}"
-                IsVisible="False" Clicked="OnRemoveSelectedClicked" AutomationId="remove_selected_triggers_button" />
-        <Button x:Name="ClearAllButton" Text="CLEAR ALL" Style="{StaticResource PrimaryButtonStyle}"
-                IsVisible="False" Clicked="OnClearAllClicked" AutomationId="clear_all_triggers_button" />
-    </VerticalStackLayout>
+    <Button
+      Text="ADD"
+      Style="{StaticResource PrimaryButtonStyle}"
+      Clicked="OnAddClicked"
+      AutomationId="add_trigger_button"
+    />
+    <Button
+      Text="ADD MULTIPLE"
+      Style="{StaticResource PrimaryButtonStyle}"
+      Clicked="OnAddMultipleClicked"
+      AutomationId="add_multiple_triggers_button"
+    />
+    <Button
+      x:Name="RemoveSelectedButton"
+      Text="REMOVE SELECTED"
+      Style="{StaticResource PrimaryButtonStyle}"
+      IsVisible="False"
+      Clicked="OnRemoveSelectedClicked"
+      AutomationId="remove_selected_triggers_button"
+    />
+    <Button
+      x:Name="ClearAllButton"
+      Text="CLEAR ALL"
+      Style="{StaticResource PrimaryButtonStyle}"
+      IsVisible="False"
+      Clicked="OnClearAllClicked"
+      AutomationId="clear_all_triggers_button"
+    />
+  </VerticalStackLayout>
 </ContentView>
diff --git a/examples/demo/Controls/Sections/TriggersSection.xaml.cs b/examples/demo/Controls/Sections/TriggersSection.xaml.cs
index 5f65f306..decfbc29 100644
--- a/examples/demo/Controls/Sections/TriggersSection.xaml.cs
+++ b/examples/demo/Controls/Sections/TriggersSection.xaml.cs
@@ -1,5 +1,5 @@
-using OneSignalDemo.ViewModels;
 using OneSignalDemo.Controls;
+using OneSignalDemo.ViewModels;
 
 namespace OneSignalDemo.Controls.Sections;
 
@@ -42,7 +42,14 @@ private void RebuildList()
         foreach (var trigger in list!)
         {
             if (!first)
-                TriggerListContainer.Children.Add(new BoxView { HeightRequest = 1, Color = Color.FromArgb("#E8EAED"), Margin = new Thickness(12, 0) });
+                TriggerListContainer.Children.Add(
+                    new BoxView
+                    {
+                        HeightRequest = 1,
+                        Color = Color.FromArgb("#E8EAED"),
+                        Margin = new Thickness(12, 0),
+                    }
+                );
             first = false;
 
             var captured = trigger;
@@ -52,13 +59,20 @@ private void RebuildList()
                 ColumnDefinitions =
                 {
                     new ColumnDefinition { Width = GridLength.Star },
-                    new ColumnDefinition { Width = GridLength.Auto }
-                }
+                    new ColumnDefinition { Width = GridLength.Auto },
+                },
             };
 
             var textStack = new VerticalStackLayout { Spacing = 2 };
             textStack.Children.Add(new Label { Text = trigger.Key, FontSize = 14 });
-            textStack.Children.Add(new Label { Text = trigger.Value, FontSize = 12, TextColor = Color.FromArgb("#757575") });
+            textStack.Children.Add(
+                new Label
+                {
+                    Text = trigger.Value,
+                    FontSize = 12,
+                    TextColor = Color.FromArgb("#757575"),
+                }
+            );
             row.Children.Add(textStack);
 
             var deleteBtn = new Button
@@ -69,7 +83,7 @@ private void RebuildList()
                 Padding = new Thickness(8, 0),
                 FontSize = 18,
                 HeightRequest = 40,
-                VerticalOptions = LayoutOptions.Center
+                VerticalOptions = LayoutOptions.Center,
             };
             deleteBtn.Clicked += (s, e) => _viewModel?.RemoveTrigger(captured.Key);
             Grid.SetColumn(deleteBtn, 1);
@@ -81,13 +95,24 @@ private void RebuildList()
 
     private async void OnAddClicked(object? sender, EventArgs e)
     {
-        if (_parentPage == null || _viewModel == null) return;
+        if (_parentPage == null || _viewModel == null)
+            return;
 
         var form = await DialogInputHelper.ShowPairInput(
             _parentPage,
             "Add Trigger",
-            new DialogInputField { Key = "key", Placeholder = "Key", AutomationId = "trigger_key_input" },
-            new DialogInputField { Key = "value", Placeholder = "Value", AutomationId = "trigger_value_input" },
+            new DialogInputField
+            {
+                Key = "key",
+                Placeholder = "Key",
+                AutomationId = "trigger_key_input",
+            },
+            new DialogInputField
+            {
+                Key = "value",
+                Placeholder = "Value",
+                AutomationId = "trigger_value_input",
+            },
             "Add"
         );
 
@@ -104,18 +129,31 @@ private async void OnAddClicked(object? sender, EventArgs e)
 
     private async void OnAddMultipleClicked(object? sender, EventArgs e)
     {
-        if (_parentPage == null || _viewModel == null) return;
-        var pairs = await MultiPairDialogHelper.Show(_parentPage, "Add Multiple Triggers", "Key", "Value");
-        if (pairs == null || pairs.Count == 0) return;
+        if (_parentPage == null || _viewModel == null)
+            return;
+        var pairs = await MultiPairDialogHelper.Show(
+            _parentPage,
+            "Add Multiple Triggers",
+            "Key",
+            "Value"
+        );
+        if (pairs == null || pairs.Count == 0)
+            return;
         _viewModel.AddTriggers(pairs);
     }
 
     private async void OnRemoveSelectedClicked(object? sender, EventArgs e)
     {
-        if (_parentPage == null || _viewModel == null) return;
+        if (_parentPage == null || _viewModel == null)
+            return;
         var keys = _viewModel.TriggersList.Select(t => t.Key).ToList();
-        var selected = await MultiPairDialogHelper.ShowMultiSelect(_parentPage, "Remove Triggers", keys);
-        if (selected == null || selected.Count == 0) return;
+        var selected = await MultiPairDialogHelper.ShowMultiSelect(
+            _parentPage,
+            "Remove Triggers",
+            keys
+        );
+        if (selected == null || selected.Count == 0)
+            return;
         _viewModel.RemoveSelectedTriggers(selected);
     }
 
diff --git a/examples/demo/Controls/Sections/UserSection.xaml b/examples/demo/Controls/Sections/UserSection.xaml
index 4fcc8805..31dd1137 100644
--- a/examples/demo/Controls/Sections/UserSection.xaml
+++ b/examples/demo/Controls/Sections/UserSection.xaml
@@ -1,39 +1,70 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="OneSignalDemo.Controls.Sections.UserSection"
-    x:Name="root">
+  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  x:Class="OneSignalDemo.Controls.Sections.UserSection"
+  x:Name="root"
+>
+  <VerticalStackLayout Spacing="8">
+    <!-- Section header -->
+    <Label Text="USER" Style="{StaticResource SectionHeaderStyle}" Padding="4,0,0,0" />
 
-    <VerticalStackLayout Spacing="8">
+    <!-- User status card -->
+    <Border Style="{StaticResource CardBorderStyle}">
+      <VerticalStackLayout>
+        <Grid Padding="12" ColumnDefinitions="*,Auto">
+          <Label
+            Grid.Column="0"
+            Text="Status"
+            Style="{StaticResource BodyMediumStyle}"
+            VerticalOptions="Center"
+          />
+          <Label
+            Grid.Column="1"
+            x:Name="StatusLabel"
+            Text="Anonymous"
+            Style="{StaticResource BodySmallStyle}"
+            FontFamily="DroidSansMono"
+            VerticalOptions="Center"
+            AutomationId="user_status_label"
+          />
+        </Grid>
+        <BoxView HeightRequest="1" Color="{StaticResource OsDivider}" Margin="12,0" />
+        <Grid Padding="12" ColumnDefinitions="*,Auto">
+          <Label
+            Grid.Column="0"
+            Text="External ID"
+            Style="{StaticResource BodyMediumStyle}"
+            VerticalOptions="Center"
+          />
+          <Label
+            Grid.Column="1"
+            x:Name="ExternalIdLabel"
+            Text="–"
+            Style="{StaticResource BodySmallStyle}"
+            FontFamily="DroidSansMono"
+            VerticalOptions="Center"
+            AutomationId="external_id_label"
+          />
+        </Grid>
+      </VerticalStackLayout>
+    </Border>
 
-        <!-- Section header -->
-        <Label Text="USER" Style="{StaticResource SectionHeaderStyle}" Padding="4,0,0,0" />
-
-        <!-- User status card -->
-        <Border Style="{StaticResource CardBorderStyle}">
-            <VerticalStackLayout>
-                <Grid Padding="12" ColumnDefinitions="*,Auto">
-                    <Label Grid.Column="0" Text="Status" Style="{StaticResource BodyMediumStyle}" VerticalOptions="Center" />
-                    <Label Grid.Column="1" x:Name="StatusLabel" Text="Anonymous"
-                           Style="{StaticResource BodySmallStyle}" FontFamily="DroidSansMono" VerticalOptions="Center"
-                           AutomationId="user_status_label" />
-                </Grid>
-                <BoxView HeightRequest="1" Color="{StaticResource OsDivider}" Margin="12,0" />
-                <Grid Padding="12" ColumnDefinitions="*,Auto">
-                    <Label Grid.Column="0" Text="External ID" Style="{StaticResource BodyMediumStyle}" VerticalOptions="Center" />
-                    <Label Grid.Column="1" x:Name="ExternalIdLabel" Text="–"
-                           Style="{StaticResource BodySmallStyle}" FontFamily="DroidSansMono" VerticalOptions="Center"
-                           AutomationId="external_id_label" />
-                </Grid>
-            </VerticalStackLayout>
-        </Border>
-
-        <!-- Login/Logout buttons -->
-        <Button x:Name="LoginButton" Text="LOGIN USER" Style="{StaticResource PrimaryButtonStyle}"
-                Clicked="OnLoginClicked" AutomationId="login_button" />
-        <Button x:Name="LogoutButton" Text="LOGOUT USER" Style="{StaticResource OutlineButtonStyle}"
-                IsVisible="False" Clicked="OnLogoutClicked" AutomationId="logout_button" />
-
-    </VerticalStackLayout>
+    <!-- Login/Logout buttons -->
+    <Button
+      x:Name="LoginButton"
+      Text="LOGIN USER"
+      Style="{StaticResource PrimaryButtonStyle}"
+      Clicked="OnLoginClicked"
+      AutomationId="login_button"
+    />
+    <Button
+      x:Name="LogoutButton"
+      Text="LOGOUT USER"
+      Style="{StaticResource OutlineButtonStyle}"
+      IsVisible="False"
+      Clicked="OnLogoutClicked"
+      AutomationId="logout_button"
+    />
+  </VerticalStackLayout>
 </ContentView>
diff --git a/examples/demo/Controls/TooltipDialogHelper.cs b/examples/demo/Controls/TooltipDialogHelper.cs
index 4b747f7c..e6983e45 100644
--- a/examples/demo/Controls/TooltipDialogHelper.cs
+++ b/examples/demo/Controls/TooltipDialogHelper.cs
@@ -12,30 +12,36 @@ public static async Task Show(Page parentPage, TooltipData tooltip)
         okButton.Clicked += async (s, e) => await parentPage.ClosePopupAsync();
 
         var contentStack = new VerticalStackLayout { Spacing = 8 };
-        contentStack.Children.Add(new Label
-        {
-            Text = tooltip.Description,
-            FontSize = 14,
-            TextColor = Color.FromArgb("#5F6368"),
-        });
+        contentStack.Children.Add(
+            new Label
+            {
+                Text = tooltip.Description,
+                FontSize = 14,
+                TextColor = Color.FromArgb("#5F6368"),
+            }
+        );
 
         if (tooltip.Options is { Count: > 0 })
         {
             foreach (var option in tooltip.Options)
             {
-                contentStack.Children.Add(new Label
-                {
-                    Text = option.Name,
-                    FontSize = 14,
-                    FontAttributes = FontAttributes.Bold,
-                });
-                contentStack.Children.Add(new Label
-                {
-                    Text = option.Description,
-                    FontSize = 13,
-                    TextColor = Color.FromArgb("#5F6368"),
-                    Margin = new Thickness(0, 0, 0, 4),
-                });
+                contentStack.Children.Add(
+                    new Label
+                    {
+                        Text = option.Name,
+                        FontSize = 14,
+                        FontAttributes = FontAttributes.Bold,
+                    }
+                );
+                contentStack.Children.Add(
+                    new Label
+                    {
+                        Text = option.Description,
+                        FontSize = 13,
+                        TextColor = Color.FromArgb("#5F6368"),
+                        Margin = new Thickness(0, 0, 0, 4),
+                    }
+                );
             }
         }
 
diff --git a/examples/demo/MauiProgram.cs b/examples/demo/MauiProgram.cs
index 3e5bd8fd..bc938b4f 100644
--- a/examples/demo/MauiProgram.cs
+++ b/examples/demo/MauiProgram.cs
@@ -81,19 +81,17 @@ public static MauiApp CreateMauiApp()
         OneSignal.Initialize(prefs.AppId);
 
         // Register observers
-        OneSignal.InAppMessages.WillDisplay +=
-            (s, e) => LogManager.Instance.D("IAM", $"WillDisplay");
-        OneSignal.InAppMessages.DidDisplay +=
-            (s, e) => LogManager.Instance.D("IAM", $"DidDisplay");
-        OneSignal.InAppMessages.WillDismiss +=
-            (s, e) => LogManager.Instance.D("IAM", $"WillDismiss");
-        OneSignal.InAppMessages.DidDismiss +=
-            (s, e) => LogManager.Instance.D("IAM", $"DidDismiss");
+        OneSignal.InAppMessages.WillDisplay += (s, e) =>
+            LogManager.Instance.D("IAM", $"WillDisplay");
+        OneSignal.InAppMessages.DidDisplay += (s, e) => LogManager.Instance.D("IAM", $"DidDisplay");
+        OneSignal.InAppMessages.WillDismiss += (s, e) =>
+            LogManager.Instance.D("IAM", $"WillDismiss");
+        OneSignal.InAppMessages.DidDismiss += (s, e) => LogManager.Instance.D("IAM", $"DidDismiss");
         OneSignal.InAppMessages.Clicked += (s, e) => LogManager.Instance.D("IAM", $"Clicked");
-        OneSignal.Notifications.Clicked +=
-            (s, e) => LogManager.Instance.D("Notifications", "Clicked");
-        OneSignal.Notifications.WillDisplay +=
-            (s, e) => LogManager.Instance.D("Notifications", "WillDisplay");
+        OneSignal.Notifications.Clicked += (s, e) =>
+            LogManager.Instance.D("Notifications", "Clicked");
+        OneSignal.Notifications.WillDisplay += (s, e) =>
+            LogManager.Instance.D("Notifications", "WillDisplay");
 
         // Restore SDK state from prefs (after Initialize)
         OneSignal.InAppMessages.Paused = prefs.IamPaused;
diff --git a/examples/demo/Models/InAppMessageType.cs b/examples/demo/Models/InAppMessageType.cs
index 49af63be..8a69bbd7 100644
--- a/examples/demo/Models/InAppMessageType.cs
+++ b/examples/demo/Models/InAppMessageType.cs
@@ -5,26 +5,28 @@ public enum InAppMessageType
     TopBanner,
     BottomBanner,
     CenterModal,
-    FullScreen
+    FullScreen,
 }
 
 public static class InAppMessageTypeExtensions
 {
-    public static string GetTriggerValue(this InAppMessageType type) => type switch
-    {
-        InAppMessageType.TopBanner => "top_banner",
-        InAppMessageType.BottomBanner => "bottom_banner",
-        InAppMessageType.CenterModal => "center_modal",
-        InAppMessageType.FullScreen => "full_screen",
-        _ => "top_banner"
-    };
+    public static string GetTriggerValue(this InAppMessageType type) =>
+        type switch
+        {
+            InAppMessageType.TopBanner => "top_banner",
+            InAppMessageType.BottomBanner => "bottom_banner",
+            InAppMessageType.CenterModal => "center_modal",
+            InAppMessageType.FullScreen => "full_screen",
+            _ => "top_banner",
+        };
 
-    public static string GetDisplayName(this InAppMessageType type) => type switch
-    {
-        InAppMessageType.TopBanner => "Top Banner",
-        InAppMessageType.BottomBanner => "Bottom Banner",
-        InAppMessageType.CenterModal => "Center Modal",
-        InAppMessageType.FullScreen => "Full Screen",
-        _ => "Top Banner"
-    };
+    public static string GetDisplayName(this InAppMessageType type) =>
+        type switch
+        {
+            InAppMessageType.TopBanner => "Top Banner",
+            InAppMessageType.BottomBanner => "Bottom Banner",
+            InAppMessageType.CenterModal => "Center Modal",
+            InAppMessageType.FullScreen => "Full Screen",
+            _ => "Top Banner",
+        };
 }
diff --git a/examples/demo/Models/NotificationType.cs b/examples/demo/Models/NotificationType.cs
index c69d6eae..92cd562d 100644
--- a/examples/demo/Models/NotificationType.cs
+++ b/examples/demo/Models/NotificationType.cs
@@ -4,5 +4,5 @@ public enum NotificationType
 {
     Simple,
     WithImage,
-    Custom
+    Custom,
 }
diff --git a/examples/demo/Models/UserData.cs b/examples/demo/Models/UserData.cs
index 05ee2621..72eac719 100644
--- a/examples/demo/Models/UserData.cs
+++ b/examples/demo/Models/UserData.cs
@@ -15,7 +15,8 @@ public UserData(
         Dictionary<string, string> tags,
         List<string> emails,
         List<string> smsNumbers,
-        string? externalId)
+        string? externalId
+    )
     {
         Aliases = aliases;
         Tags = tags;
@@ -33,17 +34,24 @@ public UserData(
             {
                 foreach (var prop in identity.EnumerateObject())
                 {
-                    if (prop.Name is "external_id" or "onesignal_id") continue;
+                    if (prop.Name is "external_id" or "onesignal_id")
+                        continue;
                     aliases[prop.Name] = prop.Value.GetString() ?? "";
                 }
             }
 
             string? externalId = null;
-            if (json.TryGetProperty("identity", out var id2) && id2.TryGetProperty("external_id", out var extId))
+            if (
+                json.TryGetProperty("identity", out var id2)
+                && id2.TryGetProperty("external_id", out var extId)
+            )
                 externalId = extId.GetString();
 
             var tags = new Dictionary<string, string>();
-            if (json.TryGetProperty("properties", out var props) && props.TryGetProperty("tags", out var tagsEl))
+            if (
+                json.TryGetProperty("properties", out var props)
+                && props.TryGetProperty("tags", out var tagsEl)
+            )
             {
                 foreach (var prop in tagsEl.EnumerateObject())
                     tags[prop.Name] = prop.Value.GetString() ?? "";
@@ -55,13 +63,19 @@ public UserData(
             {
                 foreach (var sub in subs.EnumerateArray())
                 {
-                    if (!sub.TryGetProperty("type", out var typeEl)) continue;
+                    if (!sub.TryGetProperty("type", out var typeEl))
+                        continue;
                     var subType = typeEl.GetString();
-                    var token = sub.TryGetProperty("token", out var tokenEl) ? tokenEl.GetString() : null;
-                    if (string.IsNullOrEmpty(token)) continue;
+                    var token = sub.TryGetProperty("token", out var tokenEl)
+                        ? tokenEl.GetString()
+                        : null;
+                    if (string.IsNullOrEmpty(token))
+                        continue;
 
-                    if (subType == "Email") emails.Add(token);
-                    else if (subType == "SMS") smsNumbers.Add(token);
+                    if (subType == "Email")
+                        emails.Add(token);
+                    else if (subType == "SMS")
+                        smsNumbers.Add(token);
                 }
             }
 
diff --git a/examples/demo/NotificationServiceExtension/NotificationService.cs b/examples/demo/NotificationServiceExtension/NotificationService.cs
index 49f7e7b9..73032a3e 100644
--- a/examples/demo/NotificationServiceExtension/NotificationService.cs
+++ b/examples/demo/NotificationServiceExtension/NotificationService.cs
@@ -12,23 +12,32 @@ public class NotificationService : UNNotificationServiceExtension
     UNMutableNotificationContent? BestAttemptContent { get; set; }
     UNNotificationRequest? ReceivedRequest { get; set; }
 
-    protected NotificationService(IntPtr handle) : base(handle)
-    {
-    }
+    protected NotificationService(IntPtr handle)
+        : base(handle) { }
 
-    public override void DidReceiveNotificationRequest(UNNotificationRequest request, Action<UNNotificationContent> contentHandler)
+    public override void DidReceiveNotificationRequest(
+        UNNotificationRequest request,
+        Action<UNNotificationContent> contentHandler
+    )
     {
         ReceivedRequest = request;
         ContentHandler = contentHandler;
         BestAttemptContent = (UNMutableNotificationContent)request.Content.MutableCopy();
 
-        NotificationServiceExtension.DidReceiveNotificationExtensionRequest(request, BestAttemptContent, contentHandler);
+        NotificationServiceExtension.DidReceiveNotificationExtensionRequest(
+            request,
+            BestAttemptContent,
+            contentHandler
+        );
     }
 
     public override void TimeWillExpire()
     {
         if (ReceivedRequest != null && BestAttemptContent != null)
-            NotificationServiceExtension.ServiceExtensionTimeWillExpireRequest(ReceivedRequest, BestAttemptContent);
+            NotificationServiceExtension.ServiceExtensionTimeWillExpireRequest(
+                ReceivedRequest,
+                BestAttemptContent
+            );
 
         ContentHandler?.Invoke(BestAttemptContent ?? new UNMutableNotificationContent());
     }
diff --git a/examples/demo/Pages/MainPage.xaml b/examples/demo/Pages/MainPage.xaml
index cc6c80d1..d2c18d46 100644
--- a/examples/demo/Pages/MainPage.xaml
+++ b/examples/demo/Pages/MainPage.xaml
@@ -1,55 +1,60 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
-    xmlns:controls="clr-namespace:OneSignalDemo.Controls"
-    xmlns:sections="clr-namespace:OneSignalDemo.Controls.Sections"
-    x:Class="OneSignalDemo.Pages.MainPage"
-    Title="DotNet"
-    BackgroundColor="{StaticResource OsLightBackground}">
-
-    <ContentPage.Behaviors>
-        <toolkit:StatusBarBehavior StatusBarColor="{StaticResource OsPrimary}" StatusBarStyle="LightContent" />
-    </ContentPage.Behaviors>
-
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-
-        <!-- Sticky LogView at the very top -->
-        <controls:LogView Grid.Row="0" x:Name="LogViewControl" />
-
-        <!-- Main scrollable content -->
-        <ScrollView Grid.Row="1">
-            <VerticalStackLayout Padding="16,24" Spacing="24">
-
-                <sections:AppSection x:Name="AppSectionControl" />
-                <sections:UserSection x:Name="UserSectionControl" />
-                <sections:PushSection x:Name="PushSectionControl" />
-                <sections:SendPushSection x:Name="SendPushSectionControl" />
-                <sections:InAppSection x:Name="InAppSectionControl" />
-                <sections:SendIamSection x:Name="SendIamSectionControl" />
-                <sections:AliasesSection x:Name="AliasesSectionControl" />
-                <sections:EmailsSection x:Name="EmailsSectionControl" />
-                <sections:SmsSection x:Name="SmsSectionControl" />
-                <sections:TagsSection x:Name="TagsSectionControl" />
-                <sections:OutcomesSection x:Name="OutcomesSectionControl" />
-                <sections:TriggersSection x:Name="TriggersSectionControl" />
-                <sections:TrackEventSection x:Name="TrackEventSectionControl" />
-                <sections:LocationSection x:Name="LocationSectionControl" />
-
-                <!-- Next Activity button -->
-                <Button Text="NEXT ACTIVITY" Style="{StaticResource PrimaryButtonStyle}"
-                        Clicked="OnNextActivityClicked" AutomationId="next_activity_button"
-                        Margin="0,0,0,16" />
-
-            </VerticalStackLayout>
-        </ScrollView>
-
-        <!-- Loading overlay (sits above everything) -->
-        <controls:LoadingOverlay Grid.RowSpan="2" x:Name="LoadingOverlayControl" />
-    </Grid>
+  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+  xmlns:controls="clr-namespace:OneSignalDemo.Controls"
+  xmlns:sections="clr-namespace:OneSignalDemo.Controls.Sections"
+  x:Class="OneSignalDemo.Pages.MainPage"
+  Title="DotNet"
+  BackgroundColor="{StaticResource OsLightBackground}"
+>
+  <ContentPage.Behaviors>
+    <toolkit:StatusBarBehavior
+      StatusBarColor="{StaticResource OsPrimary}"
+      StatusBarStyle="LightContent"
+    />
+  </ContentPage.Behaviors>
+
+  <Grid>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="*" />
+    </Grid.RowDefinitions>
+
+    <!-- Sticky LogView at the very top -->
+    <controls:LogView Grid.Row="0" x:Name="LogViewControl" />
+
+    <!-- Main scrollable content -->
+    <ScrollView Grid.Row="1">
+      <VerticalStackLayout Padding="16,24" Spacing="24">
+        <sections:AppSection x:Name="AppSectionControl" />
+        <sections:UserSection x:Name="UserSectionControl" />
+        <sections:PushSection x:Name="PushSectionControl" />
+        <sections:SendPushSection x:Name="SendPushSectionControl" />
+        <sections:InAppSection x:Name="InAppSectionControl" />
+        <sections:SendIamSection x:Name="SendIamSectionControl" />
+        <sections:AliasesSection x:Name="AliasesSectionControl" />
+        <sections:EmailsSection x:Name="EmailsSectionControl" />
+        <sections:SmsSection x:Name="SmsSectionControl" />
+        <sections:TagsSection x:Name="TagsSectionControl" />
+        <sections:OutcomesSection x:Name="OutcomesSectionControl" />
+        <sections:TriggersSection x:Name="TriggersSectionControl" />
+        <sections:TrackEventSection x:Name="TrackEventSectionControl" />
+        <sections:LocationSection x:Name="LocationSectionControl" />
+
+        <!-- Next Activity button -->
+        <Button
+          Text="NEXT ACTIVITY"
+          Style="{StaticResource PrimaryButtonStyle}"
+          Clicked="OnNextActivityClicked"
+          AutomationId="next_activity_button"
+          Margin="0,0,0,16"
+        />
+      </VerticalStackLayout>
+    </ScrollView>
+
+    <!-- Loading overlay (sits above everything) -->
+    <controls:LoadingOverlay Grid.RowSpan="2" x:Name="LoadingOverlayControl" />
+  </Grid>
 </ContentPage>
diff --git a/examples/demo/Pages/MainPage.xaml.cs b/examples/demo/Pages/MainPage.xaml.cs
index 3fc87279..dda04e4c 100644
--- a/examples/demo/Pages/MainPage.xaml.cs
+++ b/examples/demo/Pages/MainPage.xaml.cs
@@ -1,7 +1,7 @@
+using OneSignalDemo.Controls;
 using OneSignalDemo.Models;
 using OneSignalDemo.Services;
 using OneSignalDemo.ViewModels;
-using OneSignalDemo.Controls;
 
 namespace OneSignalDemo.Pages;
 
@@ -70,7 +70,8 @@ public MainPage(AppViewModel viewModel)
     protected override async void OnAppearing()
     {
         base.OnAppearing();
-        if (_initialLoadDone) return;
+        if (_initialLoadDone)
+            return;
         _initialLoadDone = true;
         await _viewModel.LoadInitialStateAsync();
         await _viewModel.PromptPushAsync();
@@ -122,7 +123,11 @@ private async void OnCustomNotificationRequested(object? sender, EventArgs e)
             "custom_notif_send_button"
         );
 
-        if (form == null || !form.TryGetValue("title", out var title) || string.IsNullOrEmpty(title))
+        if (
+            form == null
+            || !form.TryGetValue("title", out var title)
+            || string.IsNullOrEmpty(title)
+        )
             return;
 
         form.TryGetValue("body", out var body);
@@ -132,7 +137,8 @@ private async void OnCustomNotificationRequested(object? sender, EventArgs e)
     private async void ShowTooltip(string key)
     {
         var tooltip = TooltipHelper.Instance.GetTooltip(key);
-        if (tooltip == null) return;
+        if (tooltip == null)
+            return;
 
         await TooltipDialogHelper.Show(this, tooltip);
     }
diff --git a/examples/demo/Pages/SecondaryPage.xaml b/examples/demo/Pages/SecondaryPage.xaml
index bbeba76d..d02c9641 100644
--- a/examples/demo/Pages/SecondaryPage.xaml
+++ b/examples/demo/Pages/SecondaryPage.xaml
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="OneSignalDemo.Pages.SecondaryPage"
-    Title="Secondary Activity"
-    BackgroundColor="{StaticResource LightBackground}">
-
-    <VerticalStackLayout HorizontalOptions="Center" VerticalOptions="Center">
-        <Label Text="Secondary Activity"
-               FontSize="24"
-               FontAttributes="Bold"
-               TextColor="{StaticResource OsGrey700}"
-               HorizontalOptions="Center"
-               AutomationId="secondary_activity_label" />
-    </VerticalStackLayout>
+  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  x:Class="OneSignalDemo.Pages.SecondaryPage"
+  Title="Secondary Activity"
+  BackgroundColor="{StaticResource LightBackground}"
+>
+  <VerticalStackLayout HorizontalOptions="Center" VerticalOptions="Center">
+    <Label
+      Text="Secondary Activity"
+      FontSize="24"
+      FontAttributes="Bold"
+      TextColor="{StaticResource OsGrey700}"
+      HorizontalOptions="Center"
+      AutomationId="secondary_activity_label"
+    />
+  </VerticalStackLayout>
 </ContentPage>
diff --git a/examples/demo/Platforms/Android/AndroidManifest.xml b/examples/demo/Platforms/Android/AndroidManifest.xml
index 4b428815..e4aadb9f 100644
--- a/examples/demo/Platforms/Android/AndroidManifest.xml
+++ b/examples/demo/Platforms/Android/AndroidManifest.xml
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.onesignal.example">
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true">
-    </application>
+<manifest
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  package="com.onesignal.example"
+>
+  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+  <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+  <uses-permission android:name="android.permission.VIBRATE" />
+  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+  <application
+    android:allowBackup="true"
+    android:icon="@mipmap/appicon"
+    android:roundIcon="@mipmap/appicon_round"
+    android:supportsRtl="true"
+  ></application>
 </manifest>
diff --git a/examples/demo/Platforms/Android/MainActivity.cs b/examples/demo/Platforms/Android/MainActivity.cs
index aae4fdb7..0c1c9d48 100644
--- a/examples/demo/Platforms/Android/MainActivity.cs
+++ b/examples/demo/Platforms/Android/MainActivity.cs
@@ -5,9 +5,14 @@
 
 namespace OneSignalDemo;
 
-[Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true,
-    ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode |
-                           ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)]
-public class MainActivity : MauiAppCompatActivity
-{
-}
+[Activity(
+    Theme = "@style/Maui.SplashTheme",
+    MainLauncher = true,
+    ConfigurationChanges = ConfigChanges.ScreenSize
+        | ConfigChanges.Orientation
+        | ConfigChanges.UiMode
+        | ConfigChanges.ScreenLayout
+        | ConfigChanges.SmallestScreenSize
+        | ConfigChanges.Density
+)]
+public class MainActivity : MauiAppCompatActivity { }
diff --git a/examples/demo/Platforms/Android/MainApplication.cs b/examples/demo/Platforms/Android/MainApplication.cs
index 39527260..78501708 100644
--- a/examples/demo/Platforms/Android/MainApplication.cs
+++ b/examples/demo/Platforms/Android/MainApplication.cs
@@ -9,9 +9,7 @@ namespace OneSignalDemo;
 public class MainApplication : MauiApplication
 {
     public MainApplication(IntPtr handle, JniHandleOwnership ownership)
-        : base(handle, ownership)
-    {
-    }
+        : base(handle, ownership) { }
 
     protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 }
diff --git a/examples/demo/Repositories/OneSignalRepository.cs b/examples/demo/Repositories/OneSignalRepository.cs
index 2cc1127e..9e58b330 100644
--- a/examples/demo/Repositories/OneSignalRepository.cs
+++ b/examples/demo/Repositories/OneSignalRepository.cs
@@ -1,6 +1,6 @@
-using OneSignalSDK.DotNet;
 using OneSignalDemo.Models;
 using OneSignalDemo.Services;
+using OneSignalSDK.DotNet;
 
 namespace OneSignalDemo.Repositories;
 
@@ -15,38 +15,57 @@ public OneSignalRepository(OneSignalApiService apiService)
 
     // User
     public void LoginUser(string externalUserId) => OneSignal.Login(externalUserId);
+
     public void LogoutUser() => OneSignal.Logout();
 
     // Aliases
     public void AddAlias(string label, string id) => OneSignal.User.AddAlias(label, id);
-    public void AddAliases(IDictionary<string, string> aliases) => OneSignal.User.AddAliases(aliases);
+
+    public void AddAliases(IDictionary<string, string> aliases) =>
+        OneSignal.User.AddAliases(aliases);
 
     // Email
     public void AddEmail(string email) => OneSignal.User.AddEmail(email);
+
     public void RemoveEmail(string email) => OneSignal.User.RemoveEmail(email);
 
     // SMS
     public void AddSms(string smsNumber) => OneSignal.User.AddSms(smsNumber);
+
     public void RemoveSms(string smsNumber) => OneSignal.User.RemoveSms(smsNumber);
 
     // Tags
     public void AddTag(string key, string value) => OneSignal.User.AddTag(key, value);
+
     public void AddTags(IDictionary<string, string> tags) => OneSignal.User.AddTags(tags);
+
     public void RemoveTag(string key) => OneSignal.User.RemoveTag(key);
+
     public void RemoveTags(IEnumerable<string> keys) => OneSignal.User.RemoveTags(keys.ToArray());
+
     public IDictionary<string, string> GetTags() => OneSignal.User.GetTags();
 
     // Triggers
-    public void AddTrigger(string key, string value) => OneSignal.InAppMessages.AddTrigger(key, value);
-    public void AddTriggers(IDictionary<string, string> triggers) => OneSignal.InAppMessages.AddTriggers(triggers);
+    public void AddTrigger(string key, string value) =>
+        OneSignal.InAppMessages.AddTrigger(key, value);
+
+    public void AddTriggers(IDictionary<string, string> triggers) =>
+        OneSignal.InAppMessages.AddTriggers(triggers);
+
     public void RemoveTrigger(string key) => OneSignal.InAppMessages.RemoveTrigger(key);
-    public void RemoveTriggers(IEnumerable<string> keys) => OneSignal.InAppMessages.RemoveTriggers(keys.ToArray());
+
+    public void RemoveTriggers(IEnumerable<string> keys) =>
+        OneSignal.InAppMessages.RemoveTriggers(keys.ToArray());
+
     public void ClearTriggers() => OneSignal.InAppMessages.ClearTriggers();
 
     // Outcomes
     public void SendOutcome(string name) => OneSignal.Session.AddOutcome(name);
+
     public void SendUniqueOutcome(string name) => OneSignal.Session.AddUniqueOutcome(name);
-    public void SendOutcomeWithValue(string name, float value) => OneSignal.Session.AddOutcomeWithValue(name, value);
+
+    public void SendOutcomeWithValue(string name, float value) =>
+        OneSignal.Session.AddOutcomeWithValue(name, value);
 
     // Track Event
     public void TrackEvent(string name, IDictionary<string, object>? properties) =>
@@ -54,44 +73,55 @@ public void TrackEvent(string name, IDictionary<string, object>? properties) =>
 
     // Push subscription
     public string? GetPushSubscriptionId() => OneSignal.User.PushSubscription.Id;
+
     public bool IsPushOptedIn() => OneSignal.User.PushSubscription.OptedIn;
+
     public void OptInPush() => OneSignal.User.PushSubscription.OptIn();
+
     public void OptOutPush() => OneSignal.User.PushSubscription.OptOut();
 
     // Notifications
     public bool HasPermission() => OneSignal.Notifications.Permission;
+
     public Task<bool> RequestPermissionAsync(bool fallbackToSettings) =>
         OneSignal.Notifications.RequestPermissionAsync(fallbackToSettings);
 
     // In-App Messages
     public void SetInAppMessagesPaused(bool paused) => OneSignal.InAppMessages.Paused = paused;
+
     public bool IsInAppMessagesPaused() => OneSignal.InAppMessages.Paused;
 
     // Location
     public void SetLocationShared(bool shared) => OneSignal.Location.IsShared = shared;
+
     public bool IsLocationShared() => OneSignal.Location.IsShared;
+
     public void RequestLocationPermission() => OneSignal.Location.RequestPermission();
 
     // Privacy consent
     public void SetConsentRequired(bool required) => OneSignal.ConsentRequired = required;
+
     public void SetConsentGiven(bool granted) => OneSignal.ConsentGiven = granted;
 
     // User IDs
     public string? GetExternalId() => OneSignal.User.ExternalId;
+
     public string? GetOnesignalId() => OneSignal.User.OneSignalId;
 
     // Notifications (API)
     public Task<bool> SendNotificationAsync(NotificationType type)
     {
         var id = GetPushSubscriptionId();
-        if (string.IsNullOrEmpty(id)) return Task.FromResult(false);
+        if (string.IsNullOrEmpty(id))
+            return Task.FromResult(false);
         return _apiService.SendNotificationAsync(type, id);
     }
 
     public Task<bool> SendCustomNotificationAsync(string title, string body)
     {
         var id = GetPushSubscriptionId();
-        if (string.IsNullOrEmpty(id)) return Task.FromResult(false);
+        if (string.IsNullOrEmpty(id))
+            return Task.FromResult(false);
         return _apiService.SendCustomNotificationAsync(title, body, id);
     }
 
diff --git a/examples/demo/Resources/Styles/Colors.xaml b/examples/demo/Resources/Styles/Colors.xaml
index 629665b1..32256b08 100644
--- a/examples/demo/Resources/Styles/Colors.xaml
+++ b/examples/demo/Resources/Styles/Colors.xaml
@@ -1,32 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ResourceDictionary
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
-
-    <Color x:Key="OsPrimary">#E54B4D</Color>
-    <Color x:Key="OsSuccess">#34A853</Color>
-    <Color x:Key="OsGrey700">#616161</Color>
-    <Color x:Key="OsGrey600">#757575</Color>
-    <Color x:Key="OsGrey500">#9E9E9E</Color>
-    <Color x:Key="OsLightBackground">#F8F9FA</Color>
-    <Color x:Key="OsCardBackground">#FFFFFF</Color>
-    <Color x:Key="OsCardBorder">#1A000000</Color>
-    <Color x:Key="OsDivider">#E8EAED</Color>
-    <Color x:Key="OsWarningBackground">#FFF8E1</Color>
-    <Color x:Key="OsLogBackground">#1A1B1E</Color>
-    <Color x:Key="OsLogDebug">#82AAFF</Color>
-    <Color x:Key="OsLogInfo">#C3E88D</Color>
-    <Color x:Key="OsLogWarn">#FFCB6B</Color>
-    <Color x:Key="OsLogError">#FF5370</Color>
-    <Color x:Key="OsLogTimestamp">#676E7B</Color>
-
-    <!-- Legacy aliases kept so existing XAML references still compile -->
-    <Color x:Key="OneSignalRed">#E54B4D</Color>
-    <Color x:Key="OneSignalGreen">#34A853</Color>
-    <Color x:Key="LightBackground">#F8F9FA</Color>
-    <Color x:Key="CardBackground">#FFFFFF</Color>
-    <Color x:Key="DividerColor">#E8EAED</Color>
-    <Color x:Key="WarningBackground">#FFF8E1</Color>
-    <Color x:Key="LogViewBackground">#1A1B1E</Color>
+  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+>
+  <Color x:Key="OsPrimary">#E54B4D</Color>
+  <Color x:Key="OsSuccess">#34A853</Color>
+  <Color x:Key="OsGrey700">#616161</Color>
+  <Color x:Key="OsGrey600">#757575</Color>
+  <Color x:Key="OsGrey500">#9E9E9E</Color>
+  <Color x:Key="OsLightBackground">#F8F9FA</Color>
+  <Color x:Key="OsCardBackground">#FFFFFF</Color>
+  <Color x:Key="OsCardBorder">#1A000000</Color>
+  <Color x:Key="OsDivider">#E8EAED</Color>
+  <Color x:Key="OsWarningBackground">#FFF8E1</Color>
+  <Color x:Key="OsLogBackground">#1A1B1E</Color>
+  <Color x:Key="OsLogDebug">#82AAFF</Color>
+  <Color x:Key="OsLogInfo">#C3E88D</Color>
+  <Color x:Key="OsLogWarn">#FFCB6B</Color>
+  <Color x:Key="OsLogError">#FF5370</Color>
+  <Color x:Key="OsLogTimestamp">#676E7B</Color>
 
+  <!-- Legacy aliases kept so existing XAML references still compile -->
+  <Color x:Key="OneSignalRed">#E54B4D</Color>
+  <Color x:Key="OneSignalGreen">#34A853</Color>
+  <Color x:Key="LightBackground">#F8F9FA</Color>
+  <Color x:Key="CardBackground">#FFFFFF</Color>
+  <Color x:Key="DividerColor">#E8EAED</Color>
+  <Color x:Key="WarningBackground">#FFF8E1</Color>
+  <Color x:Key="LogViewBackground">#1A1B1E</Color>
 </ResourceDictionary>
diff --git a/examples/demo/Resources/Styles/Styles.xaml b/examples/demo/Resources/Styles/Styles.xaml
index 241fb193..9dc7a609 100644
--- a/examples/demo/Resources/Styles/Styles.xaml
+++ b/examples/demo/Resources/Styles/Styles.xaml
@@ -1,82 +1,81 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ResourceDictionary
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
+  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+>
+  <Style TargetType="Border" x:Key="CardBorderStyle">
+    <Setter Property="Background" Value="{StaticResource OsCardBackground}" />
+    <Setter Property="StrokeShape" Value="RoundRectangle 12" />
+    <Setter Property="Stroke" Value="{StaticResource OsCardBorder}" />
+    <Setter Property="StrokeThickness" Value="2" />
+    <Setter Property="Padding" Value="0" />
+  </Style>
 
-    <Style TargetType="Border" x:Key="CardBorderStyle">
-        <Setter Property="Background" Value="{StaticResource OsCardBackground}" />
-        <Setter Property="StrokeShape" Value="RoundRectangle 12" />
-        <Setter Property="Stroke" Value="{StaticResource OsCardBorder}" />
-        <Setter Property="StrokeThickness" Value="2" />
-        <Setter Property="Padding" Value="0" />
-    </Style>
+  <Style TargetType="Button" x:Key="PrimaryButtonStyle">
+    <Setter Property="BackgroundColor" Value="{StaticResource OsPrimary}" />
+    <Setter Property="TextColor" Value="White" />
+    <Setter Property="CornerRadius" Value="8" />
+    <Setter Property="FontAttributes" Value="Bold" />
+    <Setter Property="HeightRequest" Value="48" />
+    <Setter Property="HorizontalOptions" Value="Fill" />
+  </Style>
 
-    <Style TargetType="Button" x:Key="PrimaryButtonStyle">
-        <Setter Property="BackgroundColor" Value="{StaticResource OsPrimary}" />
-        <Setter Property="TextColor" Value="White" />
-        <Setter Property="CornerRadius" Value="8" />
-        <Setter Property="FontAttributes" Value="Bold" />
-        <Setter Property="HeightRequest" Value="48" />
-        <Setter Property="HorizontalOptions" Value="Fill" />
-    </Style>
+  <Style TargetType="Button" x:Key="OutlineButtonStyle">
+    <Setter Property="BackgroundColor" Value="Transparent" />
+    <Setter Property="TextColor" Value="{StaticResource OsPrimary}" />
+    <Setter Property="BorderColor" Value="{StaticResource OsPrimary}" />
+    <Setter Property="BorderWidth" Value="1.5" />
+    <Setter Property="CornerRadius" Value="8" />
+    <Setter Property="FontAttributes" Value="Bold" />
+    <Setter Property="HeightRequest" Value="48" />
+    <Setter Property="HorizontalOptions" Value="Fill" />
+  </Style>
 
-    <Style TargetType="Button" x:Key="OutlineButtonStyle">
-        <Setter Property="BackgroundColor" Value="Transparent" />
-        <Setter Property="TextColor" Value="{StaticResource OsPrimary}" />
-        <Setter Property="BorderColor" Value="{StaticResource OsPrimary}" />
-        <Setter Property="BorderWidth" Value="1.5" />
-        <Setter Property="CornerRadius" Value="8" />
-        <Setter Property="FontAttributes" Value="Bold" />
-        <Setter Property="HeightRequest" Value="48" />
-        <Setter Property="HorizontalOptions" Value="Fill" />
-    </Style>
+  <Style TargetType="Button">
+    <Setter Property="TextTransform" Value="None" />
+  </Style>
 
-    <Style TargetType="Button">
-        <Setter Property="TextTransform" Value="None" />
-    </Style>
+  <Style TargetType="Switch">
+    <Setter Property="OnColor" Value="{StaticResource OsPrimary}" />
+  </Style>
 
-    <Style TargetType="Switch">
-        <Setter Property="OnColor" Value="{StaticResource OsPrimary}" />
-    </Style>
+  <Style TargetType="Label">
+    <Setter Property="TextColor" Value="Black" />
+  </Style>
 
-    <Style TargetType="Label">
-        <Setter Property="TextColor" Value="Black" />
-    </Style>
+  <Style TargetType="Entry">
+    <Setter Property="PlaceholderColor" Value="{StaticResource OsGrey600}" />
+  </Style>
 
-    <Style TargetType="Entry">
-        <Setter Property="PlaceholderColor" Value="{StaticResource OsGrey600}" />
-    </Style>
+  <Style TargetType="Label" x:Key="SectionHeaderStyle">
+    <Setter Property="FontAttributes" Value="Bold" />
+    <Setter Property="TextColor" Value="{StaticResource OsGrey700}" />
+    <Setter Property="FontSize" Value="12" />
+    <Setter Property="CharacterSpacing" Value="0.5" />
+  </Style>
 
-    <Style TargetType="Label" x:Key="SectionHeaderStyle">
-        <Setter Property="FontAttributes" Value="Bold" />
-        <Setter Property="TextColor" Value="{StaticResource OsGrey700}" />
-        <Setter Property="FontSize" Value="12" />
-        <Setter Property="CharacterSpacing" Value="0.5" />
-    </Style>
+  <Style TargetType="Label" x:Key="BodyLargeStyle">
+    <Setter Property="FontSize" Value="16" />
+  </Style>
 
-    <Style TargetType="Label" x:Key="BodyLargeStyle">
-        <Setter Property="FontSize" Value="16" />
-    </Style>
+  <Style TargetType="Label" x:Key="BodyMediumStyle">
+    <Setter Property="FontSize" Value="14" />
+  </Style>
 
-    <Style TargetType="Label" x:Key="BodyMediumStyle">
-        <Setter Property="FontSize" Value="14" />
-    </Style>
+  <Style TargetType="Label" x:Key="BodySmallStyle">
+    <Setter Property="FontSize" Value="12" />
+    <Setter Property="TextColor" Value="{StaticResource OsGrey600}" />
+  </Style>
 
-    <Style TargetType="Label" x:Key="BodySmallStyle">
-        <Setter Property="FontSize" Value="12" />
-        <Setter Property="TextColor" Value="{StaticResource OsGrey600}" />
-    </Style>
-
-    <Style TargetType="Label" x:Key="LabelSmallStyle">
-        <Setter Property="FontSize" Value="11" />
-    </Style>
-
-    <Style TargetType="Label" x:Key="EmptyStateStyle">
-        <Setter Property="TextColor" Value="{StaticResource OsGrey600}" />
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="HorizontalOptions" Value="Center" />
-        <Setter Property="VerticalOptions" Value="Center" />
-        <Setter Property="Padding" Value="0,12" />
-    </Style>
+  <Style TargetType="Label" x:Key="LabelSmallStyle">
+    <Setter Property="FontSize" Value="11" />
+  </Style>
 
+  <Style TargetType="Label" x:Key="EmptyStateStyle">
+    <Setter Property="TextColor" Value="{StaticResource OsGrey600}" />
+    <Setter Property="FontSize" Value="14" />
+    <Setter Property="HorizontalOptions" Value="Center" />
+    <Setter Property="VerticalOptions" Value="Center" />
+    <Setter Property="Padding" Value="0,12" />
+  </Style>
 </ResourceDictionary>
diff --git a/examples/demo/Services/LogManager.cs b/examples/demo/Services/LogManager.cs
index 76f7924f..4cb355f9 100644
--- a/examples/demo/Services/LogManager.cs
+++ b/examples/demo/Services/LogManager.cs
@@ -40,8 +40,11 @@ public class LogManager : INotifyPropertyChanged
     private LogManager() { }
 
     public void D(string tag, string message) => AddLog("D", tag, message);
+
     public void I(string tag, string message) => AddLog("I", tag, message);
+
     public void W(string tag, string message) => AddLog("W", tag, message);
+
     public void E(string tag, string message) => AddLog("E", tag, message);
 
     private void AddLog(string level, string tag, string message)
diff --git a/examples/demo/Services/OneSignalApiService.cs b/examples/demo/Services/OneSignalApiService.cs
index d17df7fc..9a3305e9 100644
--- a/examples/demo/Services/OneSignalApiService.cs
+++ b/examples/demo/Services/OneSignalApiService.cs
@@ -9,13 +9,15 @@ public class OneSignalApiService
     private string _appId = "";
 
     public void SetAppId(string appId) => _appId = appId;
+
     public string GetAppId() => _appId;
 
     public async Task<bool> SendNotificationAsync(NotificationType type, string subscriptionId)
     {
         try
         {
-            string title, body;
+            string title,
+                body;
             Dictionary<string, object>? extra = null;
 
             switch (type)
@@ -29,12 +31,14 @@ public async Task<bool> SendNotificationAsync(NotificationType type, string subs
                     body = "This notification includes an image";
                     extra = new Dictionary<string, object>
                     {
-                        ["big_picture"] = "https://media.onesignal.com/automated_push_templates/ratings_template.png",
+                        ["big_picture"] =
+                            "https://media.onesignal.com/automated_push_templates/ratings_template.png",
                         ["ios_attachments"] = new Dictionary<string, string>
                         {
-                            ["image"] = "https://media.onesignal.com/automated_push_templates/ratings_template.png"
+                            ["image"] =
+                                "https://media.onesignal.com/automated_push_templates/ratings_template.png",
                         },
-                        ["mutable_content"] = true
+                        ["mutable_content"] = true,
                     };
                     break;
                 default:
@@ -49,7 +53,11 @@ public async Task<bool> SendNotificationAsync(NotificationType type, string subs
         }
     }
 
-    public async Task<bool> SendCustomNotificationAsync(string title, string body, string subscriptionId)
+    public async Task<bool> SendCustomNotificationAsync(
+        string title,
+        string body,
+        string subscriptionId
+    )
     {
         try
         {
@@ -61,7 +69,12 @@ public async Task<bool> SendCustomNotificationAsync(string title, string body, s
         }
     }
 
-    private async Task<bool> SendAsync(string title, string body, string subscriptionId, Dictionary<string, object>? extra)
+    private async Task<bool> SendAsync(
+        string title,
+        string body,
+        string subscriptionId,
+        Dictionary<string, object>? extra
+    )
     {
         using var client = new HttpClient();
         client.DefaultRequestHeaders.Add("Accept", "application/vnd.onesignal.v1+json");
@@ -71,7 +84,7 @@ private async Task<bool> SendAsync(string title, string body, string subscriptio
             ["app_id"] = _appId,
             ["headings"] = new Dictionary<string, string> { ["en"] = title },
             ["contents"] = new Dictionary<string, string> { ["en"] = body },
-            ["include_subscription_ids"] = new[] { subscriptionId }
+            ["include_subscription_ids"] = new[] { subscriptionId },
         };
 
         if (extra != null)
@@ -82,7 +95,10 @@ private async Task<bool> SendAsync(string title, string body, string subscriptio
 
         var json = JsonSerializer.Serialize(payload);
         var content = new StringContent(json, Encoding.UTF8, "application/json");
-        var response = await client.PostAsync("https://onesignal.com/api/v1/notifications", content);
+        var response = await client.PostAsync(
+            "https://onesignal.com/api/v1/notifications",
+            content
+        );
         return response.IsSuccessStatusCode;
     }
 
@@ -91,9 +107,11 @@ private async Task<bool> SendAsync(string title, string body, string subscriptio
         try
         {
             using var client = new HttpClient();
-            var url = $"https://api.onesignal.com/apps/{_appId}/users/by/onesignal_id/{onesignalId}";
+            var url =
+                $"https://api.onesignal.com/apps/{_appId}/users/by/onesignal_id/{onesignalId}";
             var response = await client.GetAsync(url);
-            if (!response.IsSuccessStatusCode) return null;
+            if (!response.IsSuccessStatusCode)
+                return null;
 
             var json = await response.Content.ReadAsStringAsync();
             var doc = JsonDocument.Parse(json);
diff --git a/examples/demo/Services/PreferencesService.cs b/examples/demo/Services/PreferencesService.cs
index 02bebaba..52c6d2e5 100644
--- a/examples/demo/Services/PreferencesService.cs
+++ b/examples/demo/Services/PreferencesService.cs
@@ -36,8 +36,10 @@ public string? ExternalUserId
         get => Preferences.Get(KeyExternalUserId, (string?)null);
         set
         {
-            if (value == null) Preferences.Remove(KeyExternalUserId);
-            else Preferences.Set(KeyExternalUserId, value);
+            if (value == null)
+                Preferences.Remove(KeyExternalUserId);
+            else
+                Preferences.Set(KeyExternalUserId, value);
         }
     }
 
diff --git a/examples/demo/Services/TooltipHelper.cs b/examples/demo/Services/TooltipHelper.cs
index 042ef757..b045d4be 100644
--- a/examples/demo/Services/TooltipHelper.cs
+++ b/examples/demo/Services/TooltipHelper.cs
@@ -3,6 +3,7 @@
 namespace OneSignalDemo.Services;
 
 public record TooltipOption(string Name, string Description);
+
 public record TooltipData(string Title, string Description, List<TooltipOption>? Options);
 
 public class TooltipHelper
@@ -20,7 +21,8 @@ private TooltipHelper() { }
 
     public async Task InitAsync()
     {
-        if (_initialized) return;
+        if (_initialized)
+            return;
         try
         {
             using var client = new HttpClient();
@@ -36,13 +38,18 @@ public async Task InitAsync()
                 var desc = el.TryGetProperty("description", out var d) ? d.GetString() ?? "" : "";
                 List<TooltipOption>? options = null;
 
-                if (el.TryGetProperty("options", out var opts) && opts.ValueKind == JsonValueKind.Array)
+                if (
+                    el.TryGetProperty("options", out var opts)
+                    && opts.ValueKind == JsonValueKind.Array
+                )
                 {
                     options = new List<TooltipOption>();
                     foreach (var opt in opts.EnumerateArray())
                     {
                         var name = opt.TryGetProperty("name", out var n) ? n.GetString() ?? "" : "";
-                        var optDesc = opt.TryGetProperty("description", out var od) ? od.GetString() ?? "" : "";
+                        var optDesc = opt.TryGetProperty("description", out var od)
+                            ? od.GetString() ?? ""
+                            : "";
                         options.Add(new TooltipOption(name, optDesc));
                     }
                 }
diff --git a/examples/demo/ViewModels/AppViewModel.cs b/examples/demo/ViewModels/AppViewModel.cs
index fac4a6b1..afafdb47 100644
--- a/examples/demo/ViewModels/AppViewModel.cs
+++ b/examples/demo/ViewModels/AppViewModel.cs
@@ -1,12 +1,12 @@
 using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using OneSignalSDK.DotNet;
-using OneSignalSDK.DotNet.Core.User;
-using OneSignalSDK.DotNet.Core.User.Subscriptions;
 using OneSignalDemo.Models;
 using OneSignalDemo.Repositories;
 using OneSignalDemo.Services;
+using OneSignalSDK.DotNet;
+using OneSignalSDK.DotNet.Core.User;
+using OneSignalSDK.DotNet.Core.User.Subscriptions;
 
 namespace OneSignalDemo.ViewModels;
 
@@ -16,27 +16,48 @@ public partial class AppViewModel : ObservableObject
     private readonly PreferencesService _prefs;
 
     // App section
-    [ObservableProperty] private string _appId = "";
-    [ObservableProperty] private bool _consentRequired;
-    [ObservableProperty] private bool _privacyConsentGiven;
-    [ObservableProperty] private string _userStatus = "Anonymous";
-    [ObservableProperty] private string _externalIdDisplay = "–";
-    [ObservableProperty] private bool _isLoggedIn;
-    [ObservableProperty] private string _loginButtonText = "LOGIN USER";
+    [ObservableProperty]
+    private string _appId = "";
+
+    [ObservableProperty]
+    private bool _consentRequired;
+
+    [ObservableProperty]
+    private bool _privacyConsentGiven;
+
+    [ObservableProperty]
+    private string _userStatus = "Anonymous";
+
+    [ObservableProperty]
+    private string _externalIdDisplay = "–";
+
+    [ObservableProperty]
+    private bool _isLoggedIn;
+
+    [ObservableProperty]
+    private string _loginButtonText = "LOGIN USER";
 
     // Push section
-    [ObservableProperty] private string _pushSubscriptionId = "";
-    [ObservableProperty] private bool _isPushEnabled;
-    [ObservableProperty] private bool _hasNotificationPermission;
+    [ObservableProperty]
+    private string _pushSubscriptionId = "";
+
+    [ObservableProperty]
+    private bool _isPushEnabled;
+
+    [ObservableProperty]
+    private bool _hasNotificationPermission;
 
     // IAM section
-    [ObservableProperty] private bool _inAppMessagesPaused;
+    [ObservableProperty]
+    private bool _inAppMessagesPaused;
 
     // Location section
-    [ObservableProperty] private bool _locationShared;
+    [ObservableProperty]
+    private bool _locationShared;
 
     // Loading
-    [ObservableProperty] private bool _isLoading;
+    [ObservableProperty]
+    private bool _isLoading;
 
     // Lists
     public ObservableCollection<KeyValuePair<string, string>> AliasesList { get; } = new();
@@ -109,7 +130,8 @@ private void UpdateUserStatus(string? externalId)
     [RelayCommand]
     public async Task LoginUserAsync(string externalUserId)
     {
-        if (string.IsNullOrWhiteSpace(externalUserId)) return;
+        if (string.IsNullOrWhiteSpace(externalUserId))
+            return;
         IsLoading = true;
         ClearUserData();
         _repository.LoginUser(externalUserId);
@@ -153,7 +175,8 @@ public void AddAlias(KeyValuePair<string, string> pair)
     public void AddAliases(IDictionary<string, string> aliases)
     {
         _repository.AddAliases(aliases);
-        foreach (var kv in aliases) UpsertAlias(kv.Key, kv.Value);
+        foreach (var kv in aliases)
+            UpsertAlias(kv.Key, kv.Value);
         LogManager.Instance.I("AppVM", $"{aliases.Count} alias(es) added");
     }
 
@@ -176,7 +199,8 @@ private void UpsertAlias(string key, string value)
     public void AddEmail(string email)
     {
         _repository.AddEmail(email);
-        if (!EmailsList.Contains(email)) EmailsList.Add(email);
+        if (!EmailsList.Contains(email))
+            EmailsList.Add(email);
         LogManager.Instance.I("AppVM", $"Email added: {email}");
     }
 
@@ -193,7 +217,8 @@ public void RemoveEmail(string email)
     public void AddSms(string sms)
     {
         _repository.AddSms(sms);
-        if (!SmsNumbersList.Contains(sms)) SmsNumbersList.Add(sms);
+        if (!SmsNumbersList.Contains(sms))
+            SmsNumbersList.Add(sms);
         LogManager.Instance.I("AppVM", $"SMS added: {sms}");
     }
 
@@ -218,7 +243,8 @@ public void AddTag(KeyValuePair<string, string> pair)
     public void AddTags(IDictionary<string, string> tags)
     {
         _repository.AddTags(tags);
-        foreach (var kv in tags) UpsertTag(kv.Key, kv.Value);
+        foreach (var kv in tags)
+            UpsertTag(kv.Key, kv.Value);
         LogManager.Instance.I("AppVM", $"{tags.Count} tag(s) added");
     }
 
@@ -227,7 +253,8 @@ public void RemoveTag(string key)
     {
         _repository.RemoveTag(key);
         var item = TagsList.FirstOrDefault(t => t.Key == key);
-        if (item.Key != null) TagsList.Remove(item);
+        if (item.Key != null)
+            TagsList.Remove(item);
         LogManager.Instance.I("AppVM", $"Tag removed: {key}");
     }
 
@@ -239,7 +266,8 @@ public void RemoveSelectedTags(IEnumerable<string> keys)
         foreach (var key in keyList)
         {
             var item = TagsList.FirstOrDefault(t => t.Key == key);
-            if (item.Key != null) TagsList.Remove(item);
+            if (item.Key != null)
+                TagsList.Remove(item);
         }
         LogManager.Instance.I("AppVM", $"{keyList.Count} tag(s) removed");
     }
@@ -271,7 +299,8 @@ public void AddTrigger(KeyValuePair<string, string> pair)
     public void AddTriggers(IDictionary<string, string> triggers)
     {
         _repository.AddTriggers(triggers);
-        foreach (var kv in triggers) UpsertTrigger(kv.Key, kv.Value);
+        foreach (var kv in triggers)
+            UpsertTrigger(kv.Key, kv.Value);
         LogManager.Instance.I("AppVM", $"{triggers.Count} trigger(s) added");
     }
 
@@ -280,7 +309,8 @@ public void RemoveTrigger(string key)
     {
         _repository.RemoveTrigger(key);
         var item = TriggersList.FirstOrDefault(t => t.Key == key);
-        if (item.Key != null) TriggersList.Remove(item);
+        if (item.Key != null)
+            TriggersList.Remove(item);
         LogManager.Instance.I("AppVM", $"Trigger removed: {key}");
     }
 
@@ -292,7 +322,8 @@ public void RemoveSelectedTriggers(IEnumerable<string> keys)
         foreach (var key in keyList)
         {
             var item = TriggersList.FirstOrDefault(t => t.Key == key);
-            if (item.Key != null) TriggersList.Remove(item);
+            if (item.Key != null)
+                TriggersList.Remove(item);
         }
         LogManager.Instance.I("AppVM", $"{keyList.Count} trigger(s) removed");
     }
@@ -352,13 +383,19 @@ public void TrackEvent(string name, IDictionary<string, object>? properties = nu
     public async Task SendNotificationAsync(NotificationType type)
     {
         var success = await _repository.SendNotificationAsync(type);
-        LogManager.Instance.I("AppVM", success ? $"Notification sent: {type}" : "Failed to send notification");
+        LogManager.Instance.I(
+            "AppVM",
+            success ? $"Notification sent: {type}" : "Failed to send notification"
+        );
     }
 
     public async Task SendCustomNotificationAsync(string title, string body)
     {
         var success = await _repository.SendCustomNotificationAsync(title, body);
-        LogManager.Instance.I("AppVM", success ? $"Notification sent: {title}" : "Failed to send notification");
+        LogManager.Instance.I(
+            "AppVM",
+            success ? $"Notification sent: {title}" : "Failed to send notification"
+        );
     }
 
     // IAM
@@ -367,7 +404,10 @@ public void SetIamPaused(bool paused)
         _repository.SetInAppMessagesPaused(paused);
         _prefs.IamPaused = paused;
         InAppMessagesPaused = paused;
-        LogManager.Instance.I("AppVM", paused ? "In-App Messages paused" : "In-App Messages resumed");
+        LogManager.Instance.I(
+            "AppVM",
+            paused ? "In-App Messages paused" : "In-App Messages resumed"
+        );
     }
 
     public void SendInAppMessage(InAppMessageType type)
@@ -384,7 +424,10 @@ public void SetLocationSharedValue(bool shared)
         _repository.SetLocationShared(shared);
         _prefs.LocationShared = shared;
         LocationShared = shared;
-        LogManager.Instance.I("AppVM", shared ? "Location sharing enabled" : "Location sharing disabled");
+        LogManager.Instance.I(
+            "AppVM",
+            shared ? "Location sharing enabled" : "Location sharing disabled"
+        );
     }
 
     [RelayCommand]
@@ -412,8 +455,10 @@ public void SetConsentGiven(bool granted)
     // Toggle push
     public void SetPushEnabled(bool enabled)
     {
-        if (enabled) _repository.OptInPush();
-        else _repository.OptOutPush();
+        if (enabled)
+            _repository.OptInPush();
+        else
+            _repository.OptOutPush();
         IsPushEnabled = enabled;
         LogManager.Instance.I("AppVM", enabled ? "Push enabled" : "Push disabled");
     }
@@ -425,11 +470,17 @@ private void OnPushSubscriptionChanged(object? sender, PushSubscriptionChangedEv
         {
             PushSubscriptionId = _repository.GetPushSubscriptionId() ?? "";
             IsPushEnabled = _repository.IsPushOptedIn();
-            LogManager.Instance.D("AppVM", $"Push subscription changed: id={PushSubscriptionId}, optedIn={IsPushEnabled}");
+            LogManager.Instance.D(
+                "AppVM",
+                $"Push subscription changed: id={PushSubscriptionId}, optedIn={IsPushEnabled}"
+            );
         });
     }
 
-    private void OnPermissionChanged(object? sender, OneSignalSDK.DotNet.Core.Notifications.NotificationPermissionChangedEventArgs args)
+    private void OnPermissionChanged(
+        object? sender,
+        OneSignalSDK.DotNet.Core.Notifications.NotificationPermissionChangedEventArgs args
+    )
     {
         MainThread.BeginInvokeOnMainThread(() =>
         {
@@ -438,7 +489,10 @@ private void OnPermissionChanged(object? sender, OneSignalSDK.DotNet.Core.Notifi
         });
     }
 
-    private void OnUserChanged(object? sender, OneSignalSDK.DotNet.Core.User.UserStateChangedEventArgs args)
+    private void OnUserChanged(
+        object? sender,
+        OneSignalSDK.DotNet.Core.User.UserStateChangedEventArgs args
+    )
     {
         MainThread.BeginInvokeOnMainThread(async () =>
         {
diff --git a/examples/demo/demo.csproj b/examples/demo/demo.csproj
index 699bf346..1ffc4e41 100644
--- a/examples/demo/demo.csproj
+++ b/examples/demo/demo.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFrameworks>net10.0-android;net10.0-ios</TargetFrameworks>
     <OutputType>Exe</OutputType>
@@ -14,8 +13,14 @@
     <ApplicationVersion>1</ApplicationVersion>
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
 
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">26.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion
+      Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'"
+      >14.2</SupportedOSPlatformVersion
+    >
+    <SupportedOSPlatformVersion
+      Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'"
+      >26.0</SupportedOSPlatformVersion
+    >
   </PropertyGroup>
 
   <ItemGroup>
@@ -30,7 +35,6 @@
 
     <!-- Images -->
     <MauiImage Include="Resources\Images\*" />
-
   </ItemGroup>
 
   <ItemGroup>
@@ -46,7 +50,10 @@
 
   <!-- Android -->
   <ItemGroup Condition="$(TargetFramework.Contains('-android'))">
-    <GoogleServicesJson Include="Platforms\Android\google-services.json" Condition="Exists('Platforms\Android\google-services.json')" />
+    <GoogleServicesJson
+      Include="Platforms\Android\google-services.json"
+      Condition="Exists('Platforms\Android\google-services.json')"
+    />
   </ItemGroup>
 
   <!-- iOS -->
@@ -64,5 +71,4 @@
       <IsAppExtension>true</IsAppExtension>
     </ProjectReference>
   </ItemGroup>
-
 </Project>

From 1e787bc21ac138795f27a2532ab2fbcec896ec24 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Mon, 9 Mar 2026 10:42:31 -0700
Subject: [PATCH 2/5] add ci workflow

---
 .github/workflows/ci.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..1d645a54
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,19 @@
+name: Run Checks
+on:
+  pull_request:
+    branches:
+      - "**"
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      - name: Install CSharpier
+        run: dotnet tool install -g csharpier
+
+      - name: Check formatting
+        run: csharpier check .

From 4b4037a1966e06bd63682d74bb9fc4d46c0c19ee Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Mon, 9 Mar 2026 10:42:55 -0700
Subject: [PATCH 3/5] remove old unused tests

---
 Testing/ProtoIntegrationTest.cs | 151 --------------------------------
 1 file changed, 151 deletions(-)
 delete mode 100644 Testing/ProtoIntegrationTest.cs

diff --git a/Testing/ProtoIntegrationTest.cs b/Testing/ProtoIntegrationTest.cs
deleted file mode 100644
index b3c1260e..00000000
--- a/Testing/ProtoIntegrationTest.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-ProtoIntegrationTest.cs
-- Add the RunTests function to MainActivity/AppDelegate class to test Android/iOS.
-- Make sure you edit userId, which is the player ID to send the notification to.
-- Call the function from a separate thread after calling OneSignal.Init ():
-// Run Tests
-System.Threading.Thread th = new System.Threading.Thread (RunTests);
-th.Start ();
-*/
-
-public static void RunTests ()
-{
-	// SETUP DELEGATES
-	// tag printer delegate for get tags
-	OneSignal.TagsAvailable tagPrinterDelegate = delegate(System.Collections.Generic.Dictionary<string, object> tags) {
-		if (tags == null)
-		{
-			System.Console.WriteLine ("No tags found!");
-			return;
-		}
-		foreach (KeyValuePair<string, object> kvp in tags)
-		{
-			System.Console.WriteLine ("Key = {0}, Value = {1}", kvp.Key, kvp.Value);
-		}
-	};
-	// id printer delegate for get ids available
-	OneSignal.IdsAvailable idsPrinterDelegate = delegate(string playerID, string pushToken) {
-		System.Console.WriteLine ("playerId: {0}, pushToken: {1}", playerID, pushToken);
-	};
-	// post notification delegates
-	OneSignal.OnPostNotificationSuccess successDelegate = delegate(Dictionary<string, object> response) {
-		if (response == null)
-		{
-			System.Console.WriteLine ("No response found!");
-			return;
-		}
-		System.Console.WriteLine ("SUCCESS: {0}", response);
-	};
-	OneSignal.OnPostNotificationFailure failureDelegate = delegate(Dictionary<string, object> response) {
-		if (response == null)
-		{
-			System.Console.WriteLine ("No response found!");
-			return;
-		}
-		System.Console.WriteLine ("FAILURE: {0}", response);
-	};
-
-	// Disabling in-app alerts
-	OneSignal.EnableInAppAlertNotification (false);
-
-	// Delete all tags before test starts (implicitly testing delete tags)
-	System.Console.Write ("Deleting hello, foo, fuz...");
-	OneSignal.DeleteTags (new List<string>() { "hello", "foo", "fuz" });
-	System.Console.WriteLine ("DONE!");
-	System.Console.Write ("Sleeping for 15 seconds...");
-	System.Threading.Thread.Sleep (15000);
-	System.Console.WriteLine ("DONE!");
-
-	// Tags Testing: Open Xcode Devices and follow the steps
-	// Test #1: Send the first tag to OneSignal
-	System.Console.Write ("Sending {hello, world} tag...");
-	OneSignal.SendTag ("hello", "world");
-	System.Console.WriteLine ("DONE!");
-	System.Console.WriteLine ("Now go and check the dashboard. Quick!!");
-	System.Console.Write ("Sleeping for 15 seconds...");
-	System.Threading.Thread.Sleep (15000);
-	System.Console.WriteLine ("DONE!");
-
-	// Test #2: Send the other tags to OneSignal
-	System.Console.Write ("Sending {foo, bar; fuz, baz} tag...");
-	OneSignal.SendTags (new Dictionary<string, string>() { {"foo", "bar"}, {"fuz", "baz"} } );
-	System.Console.WriteLine ("DONE!");
-	System.Console.WriteLine ("Now go and check the dashboard. Quick!!");
-	System.Console.Write ("Sleeping for 15 seconds...");
-	System.Threading.Thread.Sleep (15000);
-	System.Console.WriteLine ("DONE!");
-
-	// Test #3: Get all tags from OneSignal
-	System.Console.Write ("Getting all tags...");
-	OneSignal.GetTags (tagPrinterDelegate);
-	System.Console.WriteLine ("DONE!");
-	System.Console.WriteLine ("Now check to make sure all tags were returned here. Quick!!");
-	System.Console.Write ("Sleeping for 15 seconds...");
-	System.Threading.Thread.Sleep (15000);
-	System.Console.WriteLine ("DONE!");
-
-	// Test #4: Delete last tag sent
-	System.Console.Write ("Deleting the fuz tag...");
-	OneSignal.DeleteTag ("fuz");
-	System.Console.Write ("DONE!");
-	System.Console.WriteLine ("Now go and check the dashboard. Quick!!");
-	System.Console.Write ("Sleeping for 15 seconds...");
-	System.Threading.Thread.Sleep (15000);
-	System.Console.WriteLine ("DONE!");
-
-	// Test #5: Get Ids Available
-	System.Console.Write ("Getting player ID and push token...");
-	OneSignal.GetIdsAvailable (idsPrinterDelegate);
-	System.Console.WriteLine ("DONE!");
-	System.Console.WriteLine ("Now check to make sure correct push token and player id were returned here. Quick!!");
-	System.Console.Write ("Sleeping for 15 seconds...");
-	System.Threading.Thread.Sleep (15000);
-	System.Console.WriteLine ("DONE!");
-
-	// Test #6: Post Notification
-	string userId = "EDITME";
-
-	// Success
-	Dictionary<string, object> goodNotification = new Dictionary<string, object>();
-	goodNotification["contents"] = new Dictionary<string, string>() { {"en", "Test Message"} };
-	goodNotification["include_player_ids"] = new List<string>() { userId };
-	System.Console.Write ("Sending a good notification to self...");
-	OneSignal.PostNotification (goodNotification, successDelegate, failureDelegate);
-	System.Console.WriteLine ("DONE!");
-	System.Console.WriteLine ("Check the log quick!");
-	System.Console.Write ("Sleeping for 15 seconds...");
-	System.Threading.Thread.Sleep (15000);
-	System.Console.WriteLine ("DONE!");
-
-	// Failure
-	Dictionary<string, object> badNotification = new Dictionary<string, object>();
-	badNotification["contentz"] = new Dictionary<string, string>() { {"en", "Test Message"} };
-	badNotification["include_player_ids"] = new List<string>() { userId };
-	System.Console.Write ("Sending a bad notification to self...");
-	OneSignal.PostNotification (badNotification, successDelegate, failureDelegate);
-	System.Console.WriteLine ("DONE!");
-	System.Console.WriteLine ("Check the log quick!");
-	System.Console.Write ("Sleeping for 15 seconds...");
-	System.Threading.Thread.Sleep (15000);
-	System.Console.WriteLine ("DONE!");
-
-	// Test #7: Disable Stuff (Android Only)
-	System.Console.Write ("Disabling Sound, Vibrate, and Notification when active...");
-	OneSignal.EnableSound (false);
-	OneSignal.EnableVibrate (false);
-	OneSignal.EnableNotificationsWhenActive (false);
-	System.Console.WriteLine ("DONE!");
-	System.Console.WriteLine ("Now send a notification and check the sound, vibration, enable notification when active and in-app alert. Quick!!");
-	System.Console.Write ("Sleeping for 30 seconds...");
-	System.Threading.Thread.Sleep (30000);
-	System.Console.WriteLine ("DONE!");
-
-	// Test #8: Enable In-App Alert
-	System.Console.Write ("Enabling In-App Alert...");
-	OneSignal.EnableInAppAlertNotification (true);
-	System.Console.WriteLine ("DONE!");	
-	OneSignal.PostNotification (goodNotification, successDelegate, failureDelegate);
-	System.Console.Write ("Sleeping for 15 seconds...");
-	System.Threading.Thread.Sleep (15000);
-	System.Console.WriteLine ("DONE!");
-}
\ No newline at end of file

From aba2b3f1cf723ca2f70ef5d2ae2276fa26db589d Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Mon, 9 Mar 2026 10:44:27 -0700
Subject: [PATCH 4/5] docs: add PR conventions and semantic commit rules

---
 .cursor/rules/pr-conventions.mdc | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 .cursor/rules/pr-conventions.mdc

diff --git a/.cursor/rules/pr-conventions.mdc b/.cursor/rules/pr-conventions.mdc
new file mode 100644
index 00000000..cd953b17
--- /dev/null
+++ b/.cursor/rules/pr-conventions.mdc
@@ -0,0 +1,32 @@
+---
+description: Conventions for pull request titles and body content
+alwaysApply: true
+---
+
+# Pull Request Conventions
+
+## PR Title
+
+Use semantic/conventional commit prefixes in PR titles:
+
+- `fix:` for bug fixes
+- `feat:` for new features
+- `chore:` for maintenance tasks (deps, CI, tooling)
+- `refactor:` for code restructuring without behavior changes
+- `docs:` for documentation-only changes
+- `test:` for test-only changes
+
+Example: `fix: resolve notification grouping on Android 14`
+
+## PR Body
+
+Follow the repo's PR template at `.github/pull_request_template.md`. Every PR body must include:
+
+1. **One Line Summary** (required)
+2. **Motivation** (required) explaining why the change is being made
+3. **Scope** (recommended) describing what is and isn't affected
+4. **Testing** section with manual and/or unit testing details
+5. **Affected code checklist** with relevant items checked
+6. **Checklist** sections confirmed
+
+Remove the instructional header block (between `<!-- START -->` and `<!-- END -->`) before submitting.

From 0f2d8cddfdfa19f52a808d238a4fd941a5278148 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Mon, 9 Mar 2026 10:47:08 -0700
Subject: [PATCH 5/5] Potential fix for code scanning alert no. 10: Workflow
 does not contain permissions

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1d645a54..65156fae 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,6 @@
 name: Run Checks
+permissions:
+  contents: read
 on:
   pull_request:
     branches: