From ee5b818d3d4dcbfecdb610cc97e4cd239790abbd Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Mon, 6 Apr 2026 15:19:18 -0700
Subject: [PATCH 01/11] feat(live-activities): deprecate Exit method

---
 OneSignalSDK.DotNet.Android/AndroidLiveActivitiesManager.cs | 1 +
 OneSignalSDK.DotNet.Core/LiveActivities/ILiveActivities.cs  | 1 +
 OneSignalSDK.DotNet.iOS/iOSLiveActivitiesManager.cs         | 1 +
 3 files changed, 3 insertions(+)

diff --git a/OneSignalSDK.DotNet.Android/AndroidLiveActivitiesManager.cs b/OneSignalSDK.DotNet.Android/AndroidLiveActivitiesManager.cs
index b63a9506..0366fdad 100644
--- a/OneSignalSDK.DotNet.Android/AndroidLiveActivitiesManager.cs
+++ b/OneSignalSDK.DotNet.Android/AndroidLiveActivitiesManager.cs
@@ -14,6 +14,7 @@ public Task<bool> Enter(string activityId, string token)
         return Task.FromResult(false);
     }
 
+    [Obsolete("Currently unsupported, avoid using this method.")]
     public Task<bool> Exit(string activityId)
     {
         Console.WriteLine("OneSignal: ExitLiveActivity is available on iOS only");
diff --git a/OneSignalSDK.DotNet.Core/LiveActivities/ILiveActivities.cs b/OneSignalSDK.DotNet.Core/LiveActivities/ILiveActivities.cs
index 089ada29..427b79c2 100644
--- a/OneSignalSDK.DotNet.Core/LiveActivities/ILiveActivities.cs
+++ b/OneSignalSDK.DotNet.Core/LiveActivities/ILiveActivities.cs
@@ -19,6 +19,7 @@ public interface ILiveActivitiesManager
         /// </summary>
         /// <param name="activityId">The (app-provided) ID of the activity that is being exited.</param>
         /// <returns>Awaitable boolean of whether the operation succeeded or failed</returns>
+        [Obsolete("Currently unsupported, avoid using this method.")]
         Task<bool> Exit(string activityId);
 
         /// <summary>
diff --git a/OneSignalSDK.DotNet.iOS/iOSLiveActivitiesManager.cs b/OneSignalSDK.DotNet.iOS/iOSLiveActivitiesManager.cs
index 7290cca4..1b63aca1 100644
--- a/OneSignalSDK.DotNet.iOS/iOSLiveActivitiesManager.cs
+++ b/OneSignalSDK.DotNet.iOS/iOSLiveActivitiesManager.cs
@@ -22,6 +22,7 @@ public async Task<bool> Enter(string activityId, string token)
             return await proxy;
         }
 
+        [Obsolete("Currently unsupported, avoid using this method.")]
         public async Task<bool> Exit(string activityId)
         {
             BooleanCallbackProxy proxy = new BooleanCallbackProxy();

From 078ff3ac7f7d0d482dd966212526b72c611dec13 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Mon, 6 Apr 2026 15:41:35 -0700
Subject: [PATCH 02/11] feat(live-activities): add iOS Live Activities demo

---
 .gitignore                                    |   3 +
 examples/demo/.env.example                    |   1 +
 .../Sections/LiveActivitiesSection.xaml       |  97 ++++++++++++
 .../Sections/LiveActivitiesSection.xaml.cs    |  76 ++++++++++
 examples/demo/MauiProgram.cs                  |  11 ++
 examples/demo/OneSignalWidget/Info.plist      |  13 ++
 .../OneSignalWidgetBundle.swift               |  11 ++
 .../OneSignalWidgetLiveActivity.swift         | 142 ++++++++++++++++++
 examples/demo/Pages/MainPage.xaml             |   7 +-
 examples/demo/Pages/MainPage.xaml.cs          |   6 +
 examples/demo/Pages/SecondaryPage.xaml        |   4 +-
 examples/demo/Platforms/iOS/Info.plist        |   2 +
 .../demo/Repositories/OneSignalRepository.cs  |  18 +++
 examples/demo/Services/OneSignalApiService.cs |  60 ++++++++
 examples/demo/ViewModels/AppViewModel.cs      | 129 ++++++++++++++++
 examples/demo/demo.csproj                     |   2 +
 16 files changed, 577 insertions(+), 5 deletions(-)
 create mode 100644 examples/demo/.env.example
 create mode 100644 examples/demo/Controls/Sections/LiveActivitiesSection.xaml
 create mode 100644 examples/demo/Controls/Sections/LiveActivitiesSection.xaml.cs
 create mode 100644 examples/demo/OneSignalWidget/Info.plist
 create mode 100644 examples/demo/OneSignalWidget/OneSignalWidgetBundle.swift
 create mode 100644 examples/demo/OneSignalWidget/OneSignalWidgetLiveActivity.swift

diff --git a/.gitignore b/.gitignore
index 327a1dd2..fc5849df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,6 @@ Thumbs.db
 
 # dotCover
 *.dotCover
+
+# Environment files
+.env
diff --git a/examples/demo/.env.example b/examples/demo/.env.example
new file mode 100644
index 00000000..674a938f
--- /dev/null
+++ b/examples/demo/.env.example
@@ -0,0 +1 @@
+ONESIGNAL_API_KEY=your_rest_api_key
diff --git a/examples/demo/Controls/Sections/LiveActivitiesSection.xaml b/examples/demo/Controls/Sections/LiveActivitiesSection.xaml
new file mode 100644
index 00000000..b08979a8
--- /dev/null
+++ b/examples/demo/Controls/Sections/LiveActivitiesSection.xaml
@@ -0,0 +1,97 @@
+<?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.LiveActivitiesSection"
+>
+  <VerticalStackLayout Spacing="8">
+    <Grid ColumnDefinitions="*,Auto" Padding="4,0,0,0">
+      <Label
+        Grid.Column="0"
+        Text="LIVE ACTIVITIES"
+        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>
+
+    <!-- Input card -->
+    <Border Style="{StaticResource CardBorderStyle}">
+      <VerticalStackLayout Padding="16,12" Spacing="0">
+        <Grid ColumnDefinitions="Auto,*" HeightRequest="36">
+          <Label
+            Grid.Column="0"
+            Text="Activity ID"
+            Style="{StaticResource BodyMediumStyle}"
+            TextColor="{StaticResource OsGrey600}"
+            VerticalOptions="Center"
+          />
+          <Entry
+            Grid.Column="1"
+            x:Name="ActivityIdEntry"
+            Text="order-1"
+            HorizontalTextAlignment="End"
+            BackgroundColor="Transparent"
+            TextColor="#212121"
+            FontSize="14"
+            AutomationId="live_activity_id_input"
+            TextChanged="OnActivityIdChanged"
+          />
+        </Grid>
+        <Grid ColumnDefinitions="Auto,*" HeightRequest="36">
+          <Label
+            Grid.Column="0"
+            Text="Order #"
+            Style="{StaticResource BodyMediumStyle}"
+            TextColor="{StaticResource OsGrey600}"
+            VerticalOptions="Center"
+          />
+          <Entry
+            Grid.Column="1"
+            x:Name="OrderNumberEntry"
+            Text="ORD-1234"
+            HorizontalTextAlignment="End"
+            BackgroundColor="Transparent"
+            TextColor="#212121"
+            FontSize="14"
+            AutomationId="live_activity_order_input"
+            TextChanged="OnOrderNumberChanged"
+          />
+        </Grid>
+      </VerticalStackLayout>
+    </Border>
+
+    <Button
+      x:Name="StartButton"
+      Text="START LIVE ACTIVITY"
+      Style="{StaticResource PrimaryButtonStyle}"
+      Clicked="OnStartClicked"
+      AutomationId="start_live_activity_button"
+    />
+    <Button
+      x:Name="UpdateButton"
+      Text="UPDATE → ON THE WAY"
+      Style="{StaticResource PrimaryButtonStyle}"
+      IsEnabled="False"
+      Clicked="OnUpdateClicked"
+      AutomationId="update_live_activity_button"
+    />
+    <Button
+      x:Name="EndButton"
+      Text="END LIVE ACTIVITY"
+      Style="{StaticResource OutlineButtonStyle}"
+      IsEnabled="False"
+      Clicked="OnEndClicked"
+      AutomationId="end_live_activity_button"
+    />
+  </VerticalStackLayout>
+</ContentView>
diff --git a/examples/demo/Controls/Sections/LiveActivitiesSection.xaml.cs b/examples/demo/Controls/Sections/LiveActivitiesSection.xaml.cs
new file mode 100644
index 00000000..fc16c0ec
--- /dev/null
+++ b/examples/demo/Controls/Sections/LiveActivitiesSection.xaml.cs
@@ -0,0 +1,76 @@
+using OneSignalDemo.ViewModels;
+
+namespace OneSignalDemo.Controls.Sections;
+
+public partial class LiveActivitiesSection : ContentView
+{
+    private AppViewModel? _viewModel;
+
+    public event EventHandler? InfoTapped;
+
+    public LiveActivitiesSection()
+    {
+        InitializeComponent();
+    }
+
+    public void Initialize(AppViewModel viewModel)
+    {
+        _viewModel = viewModel;
+
+        var hasApiKey = viewModel.HasApiKey();
+        UpdateButton.IsEnabled = hasApiKey;
+        EndButton.IsEnabled = hasApiKey;
+
+        viewModel.PropertyChanged += (s, e) =>
+        {
+            if (e.PropertyName == nameof(AppViewModel.LiveActivityUpdateButtonText))
+                UpdateButton.Text = viewModel.LiveActivityUpdateButtonText;
+
+            if (e.PropertyName == nameof(AppViewModel.IsLiveActivityUpdating))
+            {
+                UpdateButton.IsEnabled = !viewModel.IsLiveActivityUpdating && viewModel.HasApiKey()
+                    && !string.IsNullOrWhiteSpace(ActivityIdEntry.Text);
+                EndButton.IsEnabled = !viewModel.IsLiveActivityUpdating && viewModel.HasApiKey()
+                    && !string.IsNullOrWhiteSpace(ActivityIdEntry.Text);
+            }
+        };
+    }
+
+    private void OnActivityIdChanged(object? sender, TextChangedEventArgs e)
+    {
+        if (_viewModel != null)
+            _viewModel.LiveActivityId = e.NewTextValue;
+
+        var hasText = !string.IsNullOrWhiteSpace(e.NewTextValue);
+        StartButton.IsEnabled = hasText;
+        UpdateButton.IsEnabled = hasText && _viewModel?.HasApiKey() == true
+            && _viewModel?.IsLiveActivityUpdating != true;
+        EndButton.IsEnabled = hasText && _viewModel?.HasApiKey() == true
+            && _viewModel?.IsLiveActivityUpdating != true;
+    }
+
+    private void OnOrderNumberChanged(object? sender, TextChangedEventArgs e)
+    {
+        if (_viewModel != null)
+            _viewModel.LiveActivityOrderNumber = e.NewTextValue;
+    }
+
+    private void OnStartClicked(object? sender, EventArgs e)
+    {
+        _viewModel?.StartLiveActivity();
+    }
+
+    private async void OnUpdateClicked(object? sender, EventArgs e)
+    {
+        if (_viewModel != null)
+            await _viewModel.UpdateLiveActivityAsync();
+    }
+
+    private async void OnEndClicked(object? sender, EventArgs e)
+    {
+        if (_viewModel != null)
+            await _viewModel.EndLiveActivityAsync();
+    }
+
+    private void OnInfoTapped(object? sender, EventArgs e) => InfoTapped?.Invoke(this, e);
+}
diff --git a/examples/demo/MauiProgram.cs b/examples/demo/MauiProgram.cs
index bc938b4f..8fb85d39 100644
--- a/examples/demo/MauiProgram.cs
+++ b/examples/demo/MauiProgram.cs
@@ -5,6 +5,7 @@
 using OneSignalDemo.Services;
 using OneSignalDemo.ViewModels;
 using OneSignalSDK.DotNet;
+using OneSignalSDK.DotNet.Core.LiveActivities;
 using OsLogLevel = OneSignalSDK.DotNet.Core.Debug.LogLevel;
 #if ANDROID
 using AndroidX.AppCompat.Content.Res;
@@ -80,6 +81,16 @@ public static MauiApp CreateMauiApp()
         OneSignal.ConsentGiven = prefs.PrivacyConsent;
         OneSignal.Initialize(prefs.AppId);
 
+#if IOS
+        OneSignal.LiveActivities.SetupDefault(
+            new LiveActivitySetupOptions
+            {
+                EnablePushToStart = true,
+                EnablePushToUpdate = true,
+            }
+        );
+#endif
+
         // Register observers
         OneSignal.InAppMessages.WillDisplay += (s, e) =>
             LogManager.Instance.D("IAM", $"WillDisplay");
diff --git a/examples/demo/OneSignalWidget/Info.plist b/examples/demo/OneSignalWidget/Info.plist
new file mode 100644
index 00000000..906dc6c4
--- /dev/null
+++ b/examples/demo/OneSignalWidget/Info.plist
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>NSExtension</key>
+    <dict>
+        <key>NSExtensionPointIdentifier</key>
+        <string>com.apple.widgetkit-extension</string>
+    </dict>
+    <key>NSSupportsLiveActivities</key>
+    <true/>
+</dict>
+</plist>
diff --git a/examples/demo/OneSignalWidget/OneSignalWidgetBundle.swift b/examples/demo/OneSignalWidget/OneSignalWidgetBundle.swift
new file mode 100644
index 00000000..e8c3a638
--- /dev/null
+++ b/examples/demo/OneSignalWidget/OneSignalWidgetBundle.swift
@@ -0,0 +1,11 @@
+import WidgetKit
+import SwiftUI
+
+@main
+struct OneSignalWidgetBundle: WidgetBundle {
+    var body: some Widget {
+        if #available(iOS 16.2, *) {
+            OneSignalWidgetLiveActivity()
+        }
+    }
+}
diff --git a/examples/demo/OneSignalWidget/OneSignalWidgetLiveActivity.swift b/examples/demo/OneSignalWidget/OneSignalWidgetLiveActivity.swift
new file mode 100644
index 00000000..f4a95f75
--- /dev/null
+++ b/examples/demo/OneSignalWidget/OneSignalWidgetLiveActivity.swift
@@ -0,0 +1,142 @@
+import ActivityKit
+import WidgetKit
+import SwiftUI
+import OneSignalLiveActivities
+
+@available(iOS 16.2, *)
+struct OneSignalWidgetLiveActivity: Widget {
+
+    private func statusIcon(for status: String) -> String {
+        switch status {
+        case "on_the_way": return "box.truck.fill"
+        case "delivered":  return "checkmark.circle.fill"
+        default:           return "bag.fill"
+        }
+    }
+
+    private func statusColor(for status: String) -> Color {
+        switch status {
+        case "on_the_way": return .blue
+        case "delivered":  return .green
+        default:           return .orange
+        }
+    }
+
+    private func statusLabel(for status: String) -> String {
+        switch status {
+        case "on_the_way": return "On the Way"
+        case "delivered":  return "Delivered"
+        default:           return "Preparing"
+        }
+    }
+
+    var body: some WidgetConfiguration {
+        ActivityConfiguration(for: DefaultLiveActivityAttributes.self) { context in
+            let orderNumber = context.attributes.data["orderNumber"]?.asString() ?? "Order"
+            let status = context.state.data["status"]?.asString() ?? "preparing"
+            let message = context.state.data["message"]?.asString() ?? "Your order is being prepared"
+            let eta = context.state.data["estimatedTime"]?.asString() ?? ""
+
+            VStack(spacing: 10) {
+                HStack {
+                    Text(orderNumber)
+                        .font(.caption)
+                        .foregroundColor(.gray)
+                    Spacer()
+                    if !eta.isEmpty {
+                        Text(eta)
+                            .font(.caption)
+                            .foregroundColor(.white.opacity(0.7))
+                    }
+                }
+
+                HStack(spacing: 12) {
+                    Image(systemName: statusIcon(for: status))
+                        .font(.title2)
+                        .foregroundColor(statusColor(for: status))
+
+                    VStack(alignment: .leading, spacing: 2) {
+                        Text(statusLabel(for: status))
+                            .font(.headline)
+                            .foregroundColor(.white)
+                        Text(message)
+                            .font(.subheadline)
+                            .foregroundColor(.white.opacity(0.8))
+                            .lineLimit(1)
+                    }
+                    Spacer()
+                }
+
+                DeliveryProgressBar(status: status)
+            }
+            .padding()
+            .activityBackgroundTint(Color(red: 0.11, green: 0.13, blue: 0.19))
+            .activitySystemActionForegroundColor(.white)
+
+        } dynamicIsland: { context in
+            let status = context.state.data["status"]?.asString() ?? "preparing"
+            let message = context.state.data["message"]?.asString() ?? "Preparing"
+            let eta = context.state.data["estimatedTime"]?.asString() ?? ""
+
+            return DynamicIsland {
+                DynamicIslandExpandedRegion(.leading) {
+                    Image(systemName: statusIcon(for: status))
+                        .font(.title2)
+                        .foregroundColor(statusColor(for: status))
+                }
+                DynamicIslandExpandedRegion(.center) {
+                    Text(statusLabel(for: status))
+                        .font(.headline)
+                }
+                DynamicIslandExpandedRegion(.trailing) {
+                    if !eta.isEmpty {
+                        Text(eta)
+                            .font(.caption)
+                            .foregroundColor(.secondary)
+                    }
+                }
+                DynamicIslandExpandedRegion(.bottom) {
+                    Text(message)
+                        .font(.caption)
+                        .foregroundColor(.secondary)
+                }
+            } compactLeading: {
+                Image(systemName: statusIcon(for: status))
+                    .foregroundColor(statusColor(for: status))
+            } compactTrailing: {
+                Text(statusLabel(for: status))
+                    .font(.caption)
+            } minimal: {
+                Image(systemName: statusIcon(for: status))
+                    .foregroundColor(statusColor(for: status))
+            }
+        }
+    }
+}
+
+@available(iOS 16.2, *)
+struct DeliveryProgressBar: View {
+    let status: String
+
+    private var progress: CGFloat {
+        switch status {
+        case "on_the_way": return 0.6
+        case "delivered":  return 1.0
+        default:           return 0.25
+        }
+    }
+
+    var body: some View {
+        GeometryReader { geo in
+            ZStack(alignment: .leading) {
+                RoundedRectangle(cornerRadius: 3)
+                    .fill(Color.white.opacity(0.2))
+                    .frame(height: 6)
+                RoundedRectangle(cornerRadius: 3)
+                    .fill(progress >= 1.0 ? Color.green : Color.blue)
+                    .frame(width: geo.size.width * progress, height: 6)
+            }
+        }
+        .frame(height: 6)
+    }
+}
diff --git a/examples/demo/Pages/MainPage.xaml b/examples/demo/Pages/MainPage.xaml
index d2c18d46..6638f882 100644
--- a/examples/demo/Pages/MainPage.xaml
+++ b/examples/demo/Pages/MainPage.xaml
@@ -42,13 +42,14 @@
         <sections:TriggersSection x:Name="TriggersSectionControl" />
         <sections:TrackEventSection x:Name="TrackEventSectionControl" />
         <sections:LocationSection x:Name="LocationSectionControl" />
+        <sections:LiveActivitiesSection x:Name="LiveActivitiesSectionControl" IsVisible="False" />
 
-        <!-- Next Activity button -->
+        <!-- Next Screen button -->
         <Button
-          Text="NEXT ACTIVITY"
+          Text="NEXT SCREEN"
           Style="{StaticResource PrimaryButtonStyle}"
           Clicked="OnNextActivityClicked"
-          AutomationId="next_activity_button"
+          AutomationId="next_screen_button"
           Margin="0,0,0,16"
         />
       </VerticalStackLayout>
diff --git a/examples/demo/Pages/MainPage.xaml.cs b/examples/demo/Pages/MainPage.xaml.cs
index dda04e4c..b4bc910f 100644
--- a/examples/demo/Pages/MainPage.xaml.cs
+++ b/examples/demo/Pages/MainPage.xaml.cs
@@ -65,6 +65,12 @@ public MainPage(AppViewModel viewModel)
 
         LocationSectionControl.Initialize(_viewModel);
         LocationSectionControl.InfoTapped += (s, e) => ShowTooltip("location");
+
+#if IOS
+        LiveActivitiesSectionControl.IsVisible = true;
+        LiveActivitiesSectionControl.Initialize(_viewModel);
+        LiveActivitiesSectionControl.InfoTapped += (s, e) => ShowTooltip("liveActivities");
+#endif
     }
 
     protected override async void OnAppearing()
diff --git a/examples/demo/Pages/SecondaryPage.xaml b/examples/demo/Pages/SecondaryPage.xaml
index d02c9641..ae501f5f 100644
--- a/examples/demo/Pages/SecondaryPage.xaml
+++ b/examples/demo/Pages/SecondaryPage.xaml
@@ -3,12 +3,12 @@
   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"
+  Title="Secondary Screen"
   BackgroundColor="{StaticResource LightBackground}"
 >
   <VerticalStackLayout HorizontalOptions="Center" VerticalOptions="Center">
     <Label
-      Text="Secondary Activity"
+      Text="Secondary Screen"
       FontSize="24"
       FontAttributes="Bold"
       TextColor="{StaticResource OsGrey700}"
diff --git a/examples/demo/Platforms/iOS/Info.plist b/examples/demo/Platforms/iOS/Info.plist
index f935e8fa..9f4a8503 100644
--- a/examples/demo/Platforms/iOS/Info.plist
+++ b/examples/demo/Platforms/iOS/Info.plist
@@ -42,5 +42,7 @@
     <string>development</string>
     <key>XSAppIconAssets</key>
     <string>Assets.xcassets/appicon.appiconset</string>
+    <key>NSSupportsLiveActivities</key>
+    <true/>
 </dict>
 </plist>
diff --git a/examples/demo/Repositories/OneSignalRepository.cs b/examples/demo/Repositories/OneSignalRepository.cs
index cc51ae70..6bc1d47c 100644
--- a/examples/demo/Repositories/OneSignalRepository.cs
+++ b/examples/demo/Repositories/OneSignalRepository.cs
@@ -129,4 +129,22 @@ public Task<bool> SendCustomNotificationAsync(string title, string body)
 
     public Task<UserData?> FetchUserAsync(string onesignalId) =>
         _apiService.FetchUserAsync(onesignalId);
+
+    // Live Activities (iOS only)
+    public void StartDefaultLiveActivity(
+        string activityId,
+        IDictionary<string, object> attributes,
+        IDictionary<string, object> content
+    )
+    {
+        OneSignal.LiveActivities.StartDefault(activityId, attributes, content);
+    }
+
+    public Task<bool> UpdateLiveActivityAsync(
+        string activityId,
+        string eventType,
+        Dictionary<string, object>? eventUpdates = null
+    ) => _apiService.UpdateLiveActivityAsync(activityId, eventType, eventUpdates);
+
+    public bool HasApiKey() => _apiService.HasApiKey();
 }
diff --git a/examples/demo/Services/OneSignalApiService.cs b/examples/demo/Services/OneSignalApiService.cs
index 9a3305e9..ef9755d8 100644
--- a/examples/demo/Services/OneSignalApiService.cs
+++ b/examples/demo/Services/OneSignalApiService.cs
@@ -12,6 +12,15 @@ public class OneSignalApiService
 
     public string GetAppId() => _appId;
 
+    public bool HasApiKey()
+    {
+        var key = Environment.GetEnvironmentVariable("ONESIGNAL_API_KEY");
+        return !string.IsNullOrWhiteSpace(key) && key != "your_rest_api_key";
+    }
+
+    private string GetApiKey() =>
+        Environment.GetEnvironmentVariable("ONESIGNAL_API_KEY") ?? "";
+
     public async Task<bool> SendNotificationAsync(NotificationType type, string subscriptionId)
     {
         try
@@ -122,4 +131,55 @@ private async Task<bool> SendAsync(
             return null;
         }
     }
+
+    public async Task<bool> UpdateLiveActivityAsync(
+        string activityId,
+        string eventType,
+        Dictionary<string, object>? eventUpdates = null
+    )
+    {
+        try
+        {
+            using var client = new HttpClient();
+            client.DefaultRequestHeaders.Add("Authorization", $"Key {GetApiKey()}");
+
+            var payload = new Dictionary<string, object>
+            {
+                ["event"] = eventType,
+                ["name"] = "Live Activity Update",
+                ["priority"] = 10,
+            };
+
+            if (eventUpdates != null)
+            {
+                payload["event_updates"] = new Dictionary<string, object>
+                {
+                    ["data"] = eventUpdates,
+                };
+            }
+
+            if (eventType == "end")
+            {
+                payload["dismissal_date"] = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
+                payload["event_updates"] = new Dictionary<string, object>
+                {
+                    ["data"] = eventUpdates ?? new Dictionary<string, object>
+                    {
+                        ["message"] = "Ended",
+                    },
+                };
+            }
+
+            var json = JsonSerializer.Serialize(payload);
+            var content = new StringContent(json, Encoding.UTF8, "application/json");
+            var url =
+                $"https://api.onesignal.com/apps/{_appId}/live_activities/{activityId}/notifications";
+            var response = await client.PostAsync(url, content);
+            return response.IsSuccessStatusCode;
+        }
+        catch
+        {
+            return false;
+        }
+    }
 }
diff --git a/examples/demo/ViewModels/AppViewModel.cs b/examples/demo/ViewModels/AppViewModel.cs
index 78386438..117ed11b 100644
--- a/examples/demo/ViewModels/AppViewModel.cs
+++ b/examples/demo/ViewModels/AppViewModel.cs
@@ -55,6 +55,29 @@ public partial class AppViewModel : ObservableObject
     [ObservableProperty]
     private bool _locationShared;
 
+    // Live Activities section
+    [ObservableProperty]
+    private string _liveActivityId = "order-1";
+
+    [ObservableProperty]
+    private string _liveActivityOrderNumber = "ORD-1234";
+
+    [ObservableProperty]
+    private int _liveActivityStatusIndex;
+
+    [ObservableProperty]
+    private string _liveActivityUpdateButtonText = "UPDATE → ON THE WAY";
+
+    [ObservableProperty]
+    private bool _isLiveActivityUpdating;
+
+    private static readonly (string Status, string Message, string EstimatedTime)[] OrderStatuses =
+    {
+        ("preparing", "Your order is being prepared", "15 min"),
+        ("on_the_way", "Driver is heading your way", "10 min"),
+        ("delivered", "Order delivered!", ""),
+    };
+
     // Loading
     [ObservableProperty]
     private bool _isLoading;
@@ -444,6 +467,112 @@ public void PromptLocation()
         LogManager.Instance.I("AppVM", "Location permission requested");
     }
 
+    // Live Activities
+    public bool HasApiKey() => _repository.HasApiKey();
+
+    public void StartLiveActivity()
+    {
+        var activityId = LiveActivityId;
+        if (string.IsNullOrWhiteSpace(activityId))
+            return;
+
+        var currentStatus = OrderStatuses[0];
+        var attributes = new Dictionary<string, object>
+        {
+            ["orderNumber"] = LiveActivityOrderNumber,
+        };
+        var content = new Dictionary<string, object>
+        {
+            ["status"] = currentStatus.Status,
+            ["message"] = currentStatus.Message,
+            ["estimatedTime"] = currentStatus.EstimatedTime,
+        };
+
+        _repository.StartDefaultLiveActivity(activityId, attributes, content);
+        LiveActivityStatusIndex = 0;
+        UpdateLiveActivityButtonText();
+        LogManager.Instance.I("AppVM", $"Started Live Activity: {activityId}");
+    }
+
+    public async Task UpdateLiveActivityAsync()
+    {
+        var activityId = LiveActivityId;
+        if (string.IsNullOrWhiteSpace(activityId) || IsLiveActivityUpdating)
+            return;
+
+        IsLiveActivityUpdating = true;
+
+        var nextIndex = LiveActivityStatusIndex + 1;
+        if (nextIndex >= OrderStatuses.Length)
+            nextIndex = 0;
+
+        var nextStatus = OrderStatuses[nextIndex];
+        var eventUpdates = new Dictionary<string, object>
+        {
+            ["status"] = nextStatus.Status,
+            ["message"] = nextStatus.Message,
+            ["estimatedTime"] = nextStatus.EstimatedTime,
+        };
+
+        var success = await _repository.UpdateLiveActivityAsync(
+            activityId,
+            "update",
+            eventUpdates
+        );
+
+        if (success)
+        {
+            LiveActivityStatusIndex = nextIndex;
+            UpdateLiveActivityButtonText();
+            LogManager.Instance.I("AppVM", $"Updated Live Activity: {activityId}");
+        }
+        else
+        {
+            LogManager.Instance.E("AppVM", "Failed to update Live Activity");
+        }
+
+        IsLiveActivityUpdating = false;
+    }
+
+    public async Task EndLiveActivityAsync()
+    {
+        var activityId = LiveActivityId;
+        if (string.IsNullOrWhiteSpace(activityId) || IsLiveActivityUpdating)
+            return;
+
+        IsLiveActivityUpdating = true;
+
+        var eventUpdates = new Dictionary<string, object>
+        {
+            ["message"] = "Ended",
+        };
+
+        var success = await _repository.UpdateLiveActivityAsync(activityId, "end", eventUpdates);
+
+        if (success)
+        {
+            LiveActivityStatusIndex = 0;
+            UpdateLiveActivityButtonText();
+            LogManager.Instance.I("AppVM", $"Ended Live Activity: {activityId}");
+        }
+        else
+        {
+            LogManager.Instance.E("AppVM", "Failed to end Live Activity");
+        }
+
+        IsLiveActivityUpdating = false;
+    }
+
+    private void UpdateLiveActivityButtonText()
+    {
+        var nextIndex = LiveActivityStatusIndex + 1;
+        if (nextIndex >= OrderStatuses.Length)
+            nextIndex = 0;
+
+        var nextStatus = OrderStatuses[nextIndex].Status.ToUpper().Replace('_', ' ');
+        LiveActivityUpdateButtonText = $"UPDATE → {nextStatus}";
+    }
+
     // Consent
     public void SetConsentRequired(bool required)
     {
diff --git a/examples/demo/demo.csproj b/examples/demo/demo.csproj
index 8c066944..5a42a758 100644
--- a/examples/demo/demo.csproj
+++ b/examples/demo/demo.csproj
@@ -64,6 +64,8 @@
 
   <ItemGroup>
     <Compile Remove="NotificationServiceExtension\**" />
+    <Compile Remove="OneSignalWidget\**" />
+    <None Remove="OneSignalWidget\**" />
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework.Contains('-ios'))">

From 0e70e4dd54b58dd43dd15d038e5e10ea65b07b87 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Mon, 6 Apr 2026 16:08:52 -0700
Subject: [PATCH 03/11] feat(demo): add .env support and widget build

---
 .gitignore                                    |  3 +
 .../Sections/LiveActivitiesSection.xaml.cs    | 21 +++++
 examples/demo/MauiProgram.cs                  |  3 +
 examples/demo/OneSignalWidget/build-widget.sh | 85 +++++++++++++++++++
 examples/demo/Services/DotEnv.cs              | 41 +++++++++
 examples/demo/Services/OneSignalApiService.cs |  5 +-
 examples/demo/demo.csproj                     | 20 +++++
 7 files changed, 175 insertions(+), 3 deletions(-)
 create mode 100755 examples/demo/OneSignalWidget/build-widget.sh
 create mode 100644 examples/demo/Services/DotEnv.cs

diff --git a/.gitignore b/.gitignore
index fc5849df..30147aa4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,6 @@ Thumbs.db
 
 # Environment files
 .env
+
+# Widget extension build artifacts
+examples/demo/OneSignalWidget/build/
diff --git a/examples/demo/Controls/Sections/LiveActivitiesSection.xaml.cs b/examples/demo/Controls/Sections/LiveActivitiesSection.xaml.cs
index fc16c0ec..d76f0b4d 100644
--- a/examples/demo/Controls/Sections/LiveActivitiesSection.xaml.cs
+++ b/examples/demo/Controls/Sections/LiveActivitiesSection.xaml.cs
@@ -1,3 +1,4 @@
+using Microsoft.Maui.Handlers;
 using OneSignalDemo.ViewModels;
 
 namespace OneSignalDemo.Controls.Sections;
@@ -11,6 +12,26 @@ public partial class LiveActivitiesSection : ContentView
     public LiveActivitiesSection()
     {
         InitializeComponent();
+        RemoveEntryBorder(ActivityIdEntry);
+        RemoveEntryBorder(OrderNumberEntry);
+    }
+
+    private static void RemoveEntryBorder(Entry entry)
+    {
+        entry.HandlerChanged += (s, e) =>
+        {
+#if IOS
+            if (entry.Handler?.PlatformView is UIKit.UITextField textField)
+            {
+                textField.BorderStyle = UIKit.UITextBorderStyle.None;
+            }
+#elif ANDROID
+            if (entry.Handler?.PlatformView is Android.Widget.EditText editText)
+            {
+                editText.SetBackgroundColor(Android.Graphics.Color.Transparent);
+            }
+#endif
+        };
     }
 
     public void Initialize(AppViewModel viewModel)
diff --git a/examples/demo/MauiProgram.cs b/examples/demo/MauiProgram.cs
index 8fb85d39..9f69b683 100644
--- a/examples/demo/MauiProgram.cs
+++ b/examples/demo/MauiProgram.cs
@@ -71,6 +71,9 @@ public static MauiApp CreateMauiApp()
 
         var app = builder.Build();
 
+        // Load .env file for API keys
+        DotEnv.LoadAsync().GetAwaiter().GetResult();
+
         // Initialize OneSignal SDK before building the app
         var prefs = app.Services.GetRequiredService<PreferencesService>();
         var apiService = app.Services.GetRequiredService<OneSignalApiService>();
diff --git a/examples/demo/OneSignalWidget/build-widget.sh b/examples/demo/OneSignalWidget/build-widget.sh
new file mode 100755
index 00000000..26640deb
--- /dev/null
+++ b/examples/demo/OneSignalWidget/build-widget.sh
@@ -0,0 +1,85 @@
+#!/bin/bash
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+DEMO_DIR="$(dirname "$SCRIPT_DIR")"
+BINDING_DIR="$DEMO_DIR/../../OneSignalSDK.DotNet.iOS.Binding"
+WIDGET_SOURCES="$SCRIPT_DIR/OneSignalWidgetBundle.swift $SCRIPT_DIR/OneSignalWidgetLiveActivity.swift"
+
+CONFIGURATION="${1:-Debug}"
+PLATFORM="${2:-iossimulator}"  # iossimulator or ios
+ARCH="${3:-arm64}"
+
+BUILD_DIR="$SCRIPT_DIR/build"
+APPEX_NAME="OneSignalWidgetExtension"
+APPEX_DIR="$BUILD_DIR/$APPEX_NAME.appex"
+BUNDLE_ID="com.onesignal.example.OneSignalWidget"
+
+rm -rf "$BUILD_DIR"
+mkdir -p "$APPEX_DIR"
+
+if [ "$PLATFORM" = "iossimulator" ]; then
+    SDK="iphonesimulator"
+    TARGET="$ARCH-apple-ios16.2-simulator"
+    FRAMEWORK_SLICE="ios-arm64_x86_64-simulator"
+else
+    SDK="iphoneos"
+    TARGET="$ARCH-apple-ios16.2"
+    FRAMEWORK_SLICE="ios-arm64"
+fi
+
+SDK_PATH=$(xcrun --sdk "$SDK" --show-sdk-path)
+MIN_IOS="16.2"
+
+FW_DIRS=""
+FW_FLAGS=""
+for fw in OneSignalLiveActivities OneSignalCore OneSignalOSCore OneSignalFramework OneSignalUser OneSignalNotifications OneSignalOutcomes OneSignalExtension OneSignalInAppMessages OneSignalLocation; do
+    FW_PATH="$BINDING_DIR/$fw.xcframework/$FRAMEWORK_SLICE"
+    if [ -d "$FW_PATH" ]; then
+        FW_DIRS="$FW_DIRS -F $FW_PATH"
+        FW_FLAGS="$FW_FLAGS -framework $fw"
+    fi
+done
+
+echo "Building OneSignalWidget extension ($PLATFORM/$ARCH/$CONFIGURATION)..."
+
+swiftc \
+    -target "$TARGET" \
+    -sdk "$SDK_PATH" \
+    -O \
+    -module-name "$APPEX_NAME" \
+    $FW_DIRS \
+    $FW_FLAGS \
+    -framework WidgetKit \
+    -framework SwiftUI \
+    -framework ActivityKit \
+    -Xlinker -rpath -Xlinker @executable_path/../../Frameworks \
+    -emit-executable \
+    -o "$APPEX_DIR/$APPEX_NAME" \
+    $WIDGET_SOURCES
+
+cp "$SCRIPT_DIR/Info.plist" "$APPEX_DIR/Info.plist"
+
+# Add CFBundleIdentifier and other required keys to the extension Info.plist
+/usr/libexec/PlistBuddy -c "Add :CFBundleIdentifier string $BUNDLE_ID" "$APPEX_DIR/Info.plist" 2>/dev/null || \
+/usr/libexec/PlistBuddy -c "Set :CFBundleIdentifier $BUNDLE_ID" "$APPEX_DIR/Info.plist"
+
+/usr/libexec/PlistBuddy -c "Add :CFBundleExecutable string $APPEX_NAME" "$APPEX_DIR/Info.plist" 2>/dev/null || \
+/usr/libexec/PlistBuddy -c "Set :CFBundleExecutable $APPEX_NAME" "$APPEX_DIR/Info.plist"
+
+/usr/libexec/PlistBuddy -c "Add :CFBundleName string $APPEX_NAME" "$APPEX_DIR/Info.plist" 2>/dev/null || \
+/usr/libexec/PlistBuddy -c "Set :CFBundleName $APPEX_NAME" "$APPEX_DIR/Info.plist"
+
+/usr/libexec/PlistBuddy -c "Add :CFBundleVersion string 1" "$APPEX_DIR/Info.plist" 2>/dev/null || \
+/usr/libexec/PlistBuddy -c "Set :CFBundleVersion 1" "$APPEX_DIR/Info.plist"
+
+/usr/libexec/PlistBuddy -c "Add :CFBundleShortVersionString string 1.0" "$APPEX_DIR/Info.plist" 2>/dev/null || \
+/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString 1.0" "$APPEX_DIR/Info.plist"
+
+/usr/libexec/PlistBuddy -c "Add :CFBundlePackageType string XPC!" "$APPEX_DIR/Info.plist" 2>/dev/null || \
+/usr/libexec/PlistBuddy -c "Set :CFBundlePackageType XPC!" "$APPEX_DIR/Info.plist"
+
+/usr/libexec/PlistBuddy -c "Add :MinimumOSVersion string $MIN_IOS" "$APPEX_DIR/Info.plist" 2>/dev/null || \
+/usr/libexec/PlistBuddy -c "Set :MinimumOSVersion $MIN_IOS" "$APPEX_DIR/Info.plist"
+
+echo "Widget extension built at: $APPEX_DIR"
diff --git a/examples/demo/Services/DotEnv.cs b/examples/demo/Services/DotEnv.cs
new file mode 100644
index 00000000..9ad501f3
--- /dev/null
+++ b/examples/demo/Services/DotEnv.cs
@@ -0,0 +1,41 @@
+namespace OneSignalDemo.Services;
+
+public static class DotEnv
+{
+    private static readonly Dictionary<string, string> _values = new();
+    private static bool _loaded;
+
+    public static async Task LoadAsync()
+    {
+        if (_loaded)
+            return;
+
+        _loaded = true;
+
+        try
+        {
+            using var stream = await FileSystem.OpenAppPackageFileAsync(".env");
+            using var reader = new StreamReader(stream);
+            var content = await reader.ReadToEndAsync();
+
+            foreach (var line in content.Split('\n', StringSplitOptions.RemoveEmptyEntries))
+            {
+                var trimmed = line.Trim();
+                if (trimmed.StartsWith('#') || !trimmed.Contains('='))
+                    continue;
+
+                var eqIndex = trimmed.IndexOf('=');
+                var key = trimmed[..eqIndex].Trim();
+                var value = trimmed[(eqIndex + 1)..].Trim();
+                _values[key] = value;
+            }
+        }
+        catch (FileNotFoundException)
+        {
+            // .env file not bundled -- keys will remain empty
+        }
+    }
+
+    public static string Get(string key) =>
+        _values.TryGetValue(key, out var value) ? value : "";
+}
diff --git a/examples/demo/Services/OneSignalApiService.cs b/examples/demo/Services/OneSignalApiService.cs
index ef9755d8..bb5bfd3b 100644
--- a/examples/demo/Services/OneSignalApiService.cs
+++ b/examples/demo/Services/OneSignalApiService.cs
@@ -14,12 +14,11 @@ public class OneSignalApiService
 
     public bool HasApiKey()
     {
-        var key = Environment.GetEnvironmentVariable("ONESIGNAL_API_KEY");
+        var key = DotEnv.Get("ONESIGNAL_API_KEY");
         return !string.IsNullOrWhiteSpace(key) && key != "your_rest_api_key";
     }
 
-    private string GetApiKey() =>
-        Environment.GetEnvironmentVariable("ONESIGNAL_API_KEY") ?? "";
+    private string GetApiKey() => DotEnv.Get("ONESIGNAL_API_KEY");
 
     public async Task<bool> SendNotificationAsync(NotificationType type, string subscriptionId)
     {
diff --git a/examples/demo/demo.csproj b/examples/demo/demo.csproj
index 5a42a758..63de24bc 100644
--- a/examples/demo/demo.csproj
+++ b/examples/demo/demo.csproj
@@ -35,6 +35,9 @@
 
     <!-- Images -->
     <MauiImage Include="Resources\Images\*" />
+
+    <!-- .env file for API keys (gitignored, copy from .env.example) -->
+    <MauiAsset Include=".env" Condition="Exists('.env')" LogicalName=".env" />
   </ItemGroup>
 
   <ItemGroup>
@@ -73,4 +76,21 @@
       <IsAppExtension>true</IsAppExtension>
     </ProjectReference>
   </ItemGroup>
+
+  <!-- Build and embed the OneSignalWidget extension (iOS only) -->
+  <Target
+    Name="BuildOneSignalWidget"
+    Condition="$(TargetFramework.Contains('-ios'))"
+    AfterTargets="_CopyAppExtensionsToBundle"
+  >
+    <PropertyGroup>
+      <_WidgetPlatform Condition="$(RuntimeIdentifier.Contains('simulator'))">iossimulator</_WidgetPlatform>
+      <_WidgetPlatform Condition="!$(RuntimeIdentifier.Contains('simulator'))">ios</_WidgetPlatform>
+      <_WidgetArch>$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant())</_WidgetArch>
+      <_WidgetArch Condition="'$(_WidgetArch)' == 'arm64' or '$(_WidgetArch)' == ''">arm64</_WidgetArch>
+    </PropertyGroup>
+    <Exec Command="bash OneSignalWidget/build-widget.sh $(Configuration) $(_WidgetPlatform) $(_WidgetArch)" />
+    <Exec Command="cp -r OneSignalWidget/build/OneSignalWidgetExtension.appex &quot;$(_AppBundlePath)PlugIns/&quot;" />
+    <Message Importance="high" Text="OneSignalWidget extension embedded into app bundle." />
+  </Target>
 </Project>

From c801e09309144993628387b2ac7279b0c633ad5a Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Mon, 6 Apr 2026 16:16:00 -0700
Subject: [PATCH 04/11] refactor(demo): replace custom build script with
 xcodegen

---
 .gitignore                                    |  1 +
 examples/demo/MauiProgram.cs                  |  6 +-
 examples/demo/OneSignalWidget/Info.plist      | 32 +++++--
 examples/demo/OneSignalWidget/build-widget.sh | 85 -------------------
 examples/demo/OneSignalWidget/project.yml     | 40 +++++++++
 examples/demo/demo.csproj                     | 20 +----
 examples/run-ios.sh                           | 28 ++++++
 7 files changed, 96 insertions(+), 116 deletions(-)
 delete mode 100755 examples/demo/OneSignalWidget/build-widget.sh
 create mode 100644 examples/demo/OneSignalWidget/project.yml

diff --git a/.gitignore b/.gitignore
index 30147aa4..de1a4c60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@ Thumbs.db
 
 # Widget extension build artifacts
 examples/demo/OneSignalWidget/build/
+examples/demo/OneSignalWidget/OneSignalWidget.xcodeproj/
diff --git a/examples/demo/MauiProgram.cs b/examples/demo/MauiProgram.cs
index 9f69b683..540fc920 100644
--- a/examples/demo/MauiProgram.cs
+++ b/examples/demo/MauiProgram.cs
@@ -86,11 +86,7 @@ public static MauiApp CreateMauiApp()
 
 #if IOS
         OneSignal.LiveActivities.SetupDefault(
-            new LiveActivitySetupOptions
-            {
-                EnablePushToStart = true,
-                EnablePushToUpdate = true,
-            }
+            new LiveActivitySetupOptions { EnablePushToStart = true, EnablePushToUpdate = true }
         );
 #endif
 
diff --git a/examples/demo/OneSignalWidget/Info.plist b/examples/demo/OneSignalWidget/Info.plist
index 906dc6c4..b4d66e99 100644
--- a/examples/demo/OneSignalWidget/Info.plist
+++ b/examples/demo/OneSignalWidget/Info.plist
@@ -2,12 +2,30 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>NSExtension</key>
-    <dict>
-        <key>NSExtensionPointIdentifier</key>
-        <string>com.apple.widgetkit-extension</string>
-    </dict>
-    <key>NSSupportsLiveActivities</key>
-    <true/>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>OneSignalWidget</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>XPC!</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>NSExtension</key>
+	<dict>
+		<key>NSExtensionPointIdentifier</key>
+		<string>com.apple.widgetkit-extension</string>
+	</dict>
+	<key>NSSupportsLiveActivities</key>
+	<true/>
 </dict>
 </plist>
diff --git a/examples/demo/OneSignalWidget/build-widget.sh b/examples/demo/OneSignalWidget/build-widget.sh
deleted file mode 100755
index 26640deb..00000000
--- a/examples/demo/OneSignalWidget/build-widget.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-DEMO_DIR="$(dirname "$SCRIPT_DIR")"
-BINDING_DIR="$DEMO_DIR/../../OneSignalSDK.DotNet.iOS.Binding"
-WIDGET_SOURCES="$SCRIPT_DIR/OneSignalWidgetBundle.swift $SCRIPT_DIR/OneSignalWidgetLiveActivity.swift"
-
-CONFIGURATION="${1:-Debug}"
-PLATFORM="${2:-iossimulator}"  # iossimulator or ios
-ARCH="${3:-arm64}"
-
-BUILD_DIR="$SCRIPT_DIR/build"
-APPEX_NAME="OneSignalWidgetExtension"
-APPEX_DIR="$BUILD_DIR/$APPEX_NAME.appex"
-BUNDLE_ID="com.onesignal.example.OneSignalWidget"
-
-rm -rf "$BUILD_DIR"
-mkdir -p "$APPEX_DIR"
-
-if [ "$PLATFORM" = "iossimulator" ]; then
-    SDK="iphonesimulator"
-    TARGET="$ARCH-apple-ios16.2-simulator"
-    FRAMEWORK_SLICE="ios-arm64_x86_64-simulator"
-else
-    SDK="iphoneos"
-    TARGET="$ARCH-apple-ios16.2"
-    FRAMEWORK_SLICE="ios-arm64"
-fi
-
-SDK_PATH=$(xcrun --sdk "$SDK" --show-sdk-path)
-MIN_IOS="16.2"
-
-FW_DIRS=""
-FW_FLAGS=""
-for fw in OneSignalLiveActivities OneSignalCore OneSignalOSCore OneSignalFramework OneSignalUser OneSignalNotifications OneSignalOutcomes OneSignalExtension OneSignalInAppMessages OneSignalLocation; do
-    FW_PATH="$BINDING_DIR/$fw.xcframework/$FRAMEWORK_SLICE"
-    if [ -d "$FW_PATH" ]; then
-        FW_DIRS="$FW_DIRS -F $FW_PATH"
-        FW_FLAGS="$FW_FLAGS -framework $fw"
-    fi
-done
-
-echo "Building OneSignalWidget extension ($PLATFORM/$ARCH/$CONFIGURATION)..."
-
-swiftc \
-    -target "$TARGET" \
-    -sdk "$SDK_PATH" \
-    -O \
-    -module-name "$APPEX_NAME" \
-    $FW_DIRS \
-    $FW_FLAGS \
-    -framework WidgetKit \
-    -framework SwiftUI \
-    -framework ActivityKit \
-    -Xlinker -rpath -Xlinker @executable_path/../../Frameworks \
-    -emit-executable \
-    -o "$APPEX_DIR/$APPEX_NAME" \
-    $WIDGET_SOURCES
-
-cp "$SCRIPT_DIR/Info.plist" "$APPEX_DIR/Info.plist"
-
-# Add CFBundleIdentifier and other required keys to the extension Info.plist
-/usr/libexec/PlistBuddy -c "Add :CFBundleIdentifier string $BUNDLE_ID" "$APPEX_DIR/Info.plist" 2>/dev/null || \
-/usr/libexec/PlistBuddy -c "Set :CFBundleIdentifier $BUNDLE_ID" "$APPEX_DIR/Info.plist"
-
-/usr/libexec/PlistBuddy -c "Add :CFBundleExecutable string $APPEX_NAME" "$APPEX_DIR/Info.plist" 2>/dev/null || \
-/usr/libexec/PlistBuddy -c "Set :CFBundleExecutable $APPEX_NAME" "$APPEX_DIR/Info.plist"
-
-/usr/libexec/PlistBuddy -c "Add :CFBundleName string $APPEX_NAME" "$APPEX_DIR/Info.plist" 2>/dev/null || \
-/usr/libexec/PlistBuddy -c "Set :CFBundleName $APPEX_NAME" "$APPEX_DIR/Info.plist"
-
-/usr/libexec/PlistBuddy -c "Add :CFBundleVersion string 1" "$APPEX_DIR/Info.plist" 2>/dev/null || \
-/usr/libexec/PlistBuddy -c "Set :CFBundleVersion 1" "$APPEX_DIR/Info.plist"
-
-/usr/libexec/PlistBuddy -c "Add :CFBundleShortVersionString string 1.0" "$APPEX_DIR/Info.plist" 2>/dev/null || \
-/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString 1.0" "$APPEX_DIR/Info.plist"
-
-/usr/libexec/PlistBuddy -c "Add :CFBundlePackageType string XPC!" "$APPEX_DIR/Info.plist" 2>/dev/null || \
-/usr/libexec/PlistBuddy -c "Set :CFBundlePackageType XPC!" "$APPEX_DIR/Info.plist"
-
-/usr/libexec/PlistBuddy -c "Add :MinimumOSVersion string $MIN_IOS" "$APPEX_DIR/Info.plist" 2>/dev/null || \
-/usr/libexec/PlistBuddy -c "Set :MinimumOSVersion $MIN_IOS" "$APPEX_DIR/Info.plist"
-
-echo "Widget extension built at: $APPEX_DIR"
diff --git a/examples/demo/OneSignalWidget/project.yml b/examples/demo/OneSignalWidget/project.yml
new file mode 100644
index 00000000..424ec76f
--- /dev/null
+++ b/examples/demo/OneSignalWidget/project.yml
@@ -0,0 +1,40 @@
+name: OneSignalWidget
+options:
+  bundleIdPrefix: com.onesignal.example
+  deploymentTarget:
+    iOS: "16.2"
+
+targets:
+  OneSignalWidgetExtension:
+    type: app-extension
+    platform: iOS
+    sources:
+      - OneSignalWidgetBundle.swift
+      - OneSignalWidgetLiveActivity.swift
+    info:
+      path: Info.plist
+      properties:
+        CFBundleDisplayName: OneSignalWidget
+        NSExtension:
+          NSExtensionPointIdentifier: com.apple.widgetkit-extension
+        NSSupportsLiveActivities: true
+    settings:
+      base:
+        PRODUCT_BUNDLE_IDENTIFIER: com.onesignal.example.OneSignalWidget
+        TARGETED_DEVICE_FAMILY: "1,2"
+        SWIFT_VERSION: "5.0"
+        CODE_SIGN_IDENTITY: "-"
+        CODE_SIGNING_REQUIRED: "NO"
+        CODE_SIGNING_ALLOWED: "NO"
+        LD_RUNPATH_SEARCH_PATHS: "@executable_path/../../Frameworks"
+    dependencies:
+      - framework: ../../../OneSignalSDK.DotNet.iOS.Binding/OneSignalLiveActivities.xcframework
+      - framework: ../../../OneSignalSDK.DotNet.iOS.Binding/OneSignalCore.xcframework
+      - framework: ../../../OneSignalSDK.DotNet.iOS.Binding/OneSignalOSCore.xcframework
+      - framework: ../../../OneSignalSDK.DotNet.iOS.Binding/OneSignalUser.xcframework
+      - framework: ../../../OneSignalSDK.DotNet.iOS.Binding/OneSignalFramework.xcframework
+      - framework: ../../../OneSignalSDK.DotNet.iOS.Binding/OneSignalNotifications.xcframework
+      - framework: ../../../OneSignalSDK.DotNet.iOS.Binding/OneSignalOutcomes.xcframework
+      - framework: ../../../OneSignalSDK.DotNet.iOS.Binding/OneSignalExtension.xcframework
+      - framework: ../../../OneSignalSDK.DotNet.iOS.Binding/OneSignalInAppMessages.xcframework
+      - framework: ../../../OneSignalSDK.DotNet.iOS.Binding/OneSignalLocation.xcframework
diff --git a/examples/demo/demo.csproj b/examples/demo/demo.csproj
index 63de24bc..29f8b8aa 100644
--- a/examples/demo/demo.csproj
+++ b/examples/demo/demo.csproj
@@ -75,22 +75,4 @@
     <ProjectReference Include="NotificationServiceExtension\NotificationServiceExtension.csproj">
       <IsAppExtension>true</IsAppExtension>
     </ProjectReference>
-  </ItemGroup>
-
-  <!-- Build and embed the OneSignalWidget extension (iOS only) -->
-  <Target
-    Name="BuildOneSignalWidget"
-    Condition="$(TargetFramework.Contains('-ios'))"
-    AfterTargets="_CopyAppExtensionsToBundle"
-  >
-    <PropertyGroup>
-      <_WidgetPlatform Condition="$(RuntimeIdentifier.Contains('simulator'))">iossimulator</_WidgetPlatform>
-      <_WidgetPlatform Condition="!$(RuntimeIdentifier.Contains('simulator'))">ios</_WidgetPlatform>
-      <_WidgetArch>$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant())</_WidgetArch>
-      <_WidgetArch Condition="'$(_WidgetArch)' == 'arm64' or '$(_WidgetArch)' == ''">arm64</_WidgetArch>
-    </PropertyGroup>
-    <Exec Command="bash OneSignalWidget/build-widget.sh $(Configuration) $(_WidgetPlatform) $(_WidgetArch)" />
-    <Exec Command="cp -r OneSignalWidget/build/OneSignalWidgetExtension.appex &quot;$(_AppBundlePath)PlugIns/&quot;" />
-    <Message Importance="high" Text="OneSignalWidget extension embedded into app bundle." />
-  </Target>
-</Project>
+  </ItemGroup></Project>
diff --git a/examples/run-ios.sh b/examples/run-ios.sh
index 7fa6a766..726480c9 100755
--- a/examples/run-ios.sh
+++ b/examples/run-ios.sh
@@ -43,4 +43,32 @@ else
   selected="${udids[$idx]}"
 fi
 
+# Build the OneSignalWidget extension if xcodegen is available
+WIDGET_DIR="$SCRIPT_DIR/demo/OneSignalWidget"
+if [ -f "$WIDGET_DIR/project.yml" ] && command -v xcodegen &>/dev/null; then
+  echo "Building OneSignalWidget extension..."
+  cd "$WIDGET_DIR"
+  xcodegen generate -q 2>/dev/null || xcodegen generate
+  xcodebuild build \
+    -project OneSignalWidget.xcodeproj \
+    -scheme OneSignalWidgetExtension \
+    -configuration Debug \
+    -sdk iphonesimulator \
+    -arch arm64 \
+    -derivedDataPath build \
+    CODE_SIGN_IDENTITY="-" \
+    CODE_SIGNING_REQUIRED=NO \
+    CODE_SIGNING_ALLOWED=NO \
+    -quiet
+  echo "OneSignalWidget extension built."
+fi
+
 dotnet build "$SCRIPT_DIR/demo/demo.csproj" -f net10.0-ios -t:Build,Run -p:_DeviceName=":v2:udid=$selected"
+
+# Copy widget extension into app bundle after MAUI build
+APPEX="$WIDGET_DIR/build/Build/Products/Debug-iphonesimulator/OneSignalWidgetExtension.appex"
+APP_BUNDLE="$SCRIPT_DIR/demo/bin/Debug/net10.0-ios/iossimulator-arm64/demo.app"
+if [ -d "$APPEX" ] && [ -d "$APP_BUNDLE/PlugIns" ]; then
+  cp -r "$APPEX" "$APP_BUNDLE/PlugIns/"
+  echo "OneSignalWidget extension embedded into app."
+fi

From 8beb2d37245712d955acbed7ab5368282cca346f Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Mon, 6 Apr 2026 16:19:55 -0700
Subject: [PATCH 05/11] refactor(demo): use pre-built widget extension

---
 .gitignore                                    |   4 --
 examples/demo/OneSignalWidget/project.yml     |  40 ------------------
 .../OneSignalWidgetExtension.appex/Info.plist | Bin 0 -> 930 bytes
 .../OneSignalWidgetExtension                  | Bin 0 -> 39656 bytes
 examples/demo/demo.csproj                     |  13 +++++-
 examples/run-ios.sh                           |  28 ------------
 6 files changed, 12 insertions(+), 73 deletions(-)
 delete mode 100644 examples/demo/OneSignalWidget/project.yml
 create mode 100644 examples/demo/Platforms/iOS/PlugIns/OneSignalWidgetExtension.appex/Info.plist
 create mode 100755 examples/demo/Platforms/iOS/PlugIns/OneSignalWidgetExtension.appex/OneSignalWidgetExtension

diff --git a/.gitignore b/.gitignore
index de1a4c60..fc5849df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,7 +44,3 @@ Thumbs.db
 
 # Environment files
 .env
-
-# Widget extension build artifacts
-examples/demo/OneSignalWidget/build/
-examples/demo/OneSignalWidget/OneSignalWidget.xcodeproj/
diff --git a/examples/demo/OneSignalWidget/project.yml b/examples/demo/OneSignalWidget/project.yml
deleted file mode 100644
index 424ec76f..00000000
--- a/examples/demo/OneSignalWidget/project.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: OneSignalWidget
-options:
-  bundleIdPrefix: com.onesignal.example
-  deploymentTarget:
-    iOS: "16.2"
-
-targets:
-  OneSignalWidgetExtension:
-    type: app-extension
-    platform: iOS
-    sources:
-      - OneSignalWidgetBundle.swift
-      - OneSignalWidgetLiveActivity.swift
-    info:
-      path: Info.plist
-      properties:
-        CFBundleDisplayName: OneSignalWidget
-        NSExtension:
-          NSExtensionPointIdentifier: com.apple.widgetkit-extension
-        NSSupportsLiveActivities: true
-    settings:
-      base:
-        PRODUCT_BUNDLE_IDENTIFIER: com.onesignal.example.OneSignalWidget
-        TARGETED_DEVICE_FAMILY: "1,2"
-        SWIFT_VERSION: "5.0"
-        CODE_SIGN_IDENTITY: "-"
-        CODE_SIGNING_REQUIRED: "NO"
-        CODE_SIGNING_ALLOWED: "NO"
-        LD_RUNPATH_SEARCH_PATHS: "@executable_path/../../Frameworks"
-    dependencies:
-      - framework: ../../../OneSignalSDK.DotNet.iOS.Binding/OneSignalLiveActivities.xcframework
-      - framework: ../../../OneSignalSDK.DotNet.iOS.Binding/OneSignalCore.xcframework
-      - framework: ../../../OneSignalSDK.DotNet.iOS.Binding/OneSignalOSCore.xcframework
-      - framework: ../../../OneSignalSDK.DotNet.iOS.Binding/OneSignalUser.xcframework
-      - framework: ../../../OneSignalSDK.DotNet.iOS.Binding/OneSignalFramework.xcframework
-      - framework: ../../../OneSignalSDK.DotNet.iOS.Binding/OneSignalNotifications.xcframework
-      - framework: ../../../OneSignalSDK.DotNet.iOS.Binding/OneSignalOutcomes.xcframework
-      - framework: ../../../OneSignalSDK.DotNet.iOS.Binding/OneSignalExtension.xcframework
-      - framework: ../../../OneSignalSDK.DotNet.iOS.Binding/OneSignalInAppMessages.xcframework
-      - framework: ../../../OneSignalSDK.DotNet.iOS.Binding/OneSignalLocation.xcframework
diff --git a/examples/demo/Platforms/iOS/PlugIns/OneSignalWidgetExtension.appex/Info.plist b/examples/demo/Platforms/iOS/PlugIns/OneSignalWidgetExtension.appex/Info.plist
new file mode 100644
index 0000000000000000000000000000000000000000..8889b7a59e61bcc35e17d338ba85e49a53f07a20
GIT binary patch
literal 930
zcmZ9KJ#W)M7{`4VURnyoZK3Zi^bN{OjpHgsu+cb`s?sLZ4k@Lob#*SuDd)3gJE37?
zU}iu9F@o5-u<-$qSUPn<u)rsP1*tP<$8JKsJa^CY{Qmd&f4A#U;`y@tOB@6+aq9G$
zvt8Zidd^?Cm=t^a`Y&A`7#tcN866uRow#y!YI<h&+RXL28#ixBcMP$AsZMBV4VhKK
za83(%hB%yAUaGSa#VT%KYC9HY{syiPn{nc}Mm&e2<~p*lA@;@D>>f7jKH8<7$(0fp
zAZ3DGLmZDgS6JCriRp7y<Tf8;*W;`0xZ09EJ}i&S8meHu>2TeVxJj$pt{;(_?-Ew&
zEY=-|mvJdikzcl5%QM7eOh(X_s%LD=AvBmQsp@fS=)+EX-<qbkooMr#x*B#rQFXoy
z8jGsFY1$>c9mU90ag8uy)vcTs!B5w<?4FNV@ZW|ww61BbiM@xUfgf;V8pJ2q+bOK@
zYak|GMi!yXf|Aap7dJ3Rk~xMoQelV|NvVQ;E^;E%p+9TdmSi*Rg@A<jkmXP;odC2&
zN!B;>nMo}r$?qrm86;ojl*T9LHrno^lp#(9QpgE#z6#y*BuX2WWKzT`Qp%7E%0ec+
z5a3RLdoivni;}`0(TQ}B<t0Tfr0!<Yik{;8!`t)xHak4Z+l2Z5J*D;>&q4!g#Gl8p
zrQILoln6v9bP4x_oKO>92ycXa;XwE<`~f{+4%`P>Py}W09J~atz+3PUd<I{@Pw*T3
z1xK(8PQz80gF4)VTaZEqU&D8BAAW*g;Q>5^-{22;lo&`1CPortLij<@ih>fwC?qES
E0mddNAOHXW

literal 0
HcmV?d00001

diff --git a/examples/demo/Platforms/iOS/PlugIns/OneSignalWidgetExtension.appex/OneSignalWidgetExtension b/examples/demo/Platforms/iOS/PlugIns/OneSignalWidgetExtension.appex/OneSignalWidgetExtension
new file mode 100755
index 0000000000000000000000000000000000000000..8aef92a4b4c4bad3ce227b461a80d0f0c075901f
GIT binary patch
literal 39656
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

literal 0
HcmV?d00001

diff --git a/examples/demo/demo.csproj b/examples/demo/demo.csproj
index 29f8b8aa..284847e0 100644
--- a/examples/demo/demo.csproj
+++ b/examples/demo/demo.csproj
@@ -75,4 +75,15 @@
     <ProjectReference Include="NotificationServiceExtension\NotificationServiceExtension.csproj">
       <IsAppExtension>true</IsAppExtension>
     </ProjectReference>
-  </ItemGroup></Project>
+  </ItemGroup>
+
+  <!-- Bundle the pre-built OneSignalWidget extension (Live Activities) -->
+  <ItemGroup Condition="$(TargetFramework.Contains('-ios'))">
+    <Content
+      Include="Platforms\iOS\PlugIns\OneSignalWidgetExtension.appex\**"
+      Condition="Exists('Platforms\iOS\PlugIns\OneSignalWidgetExtension.appex')"
+      Link="PlugIns\OneSignalWidgetExtension.appex\%(RecursiveDir)%(Filename)%(Extension)"
+      CopyToOutputDirectory="PreserveNewest"
+    />
+  </ItemGroup>
+</Project>
diff --git a/examples/run-ios.sh b/examples/run-ios.sh
index 726480c9..7fa6a766 100755
--- a/examples/run-ios.sh
+++ b/examples/run-ios.sh
@@ -43,32 +43,4 @@ else
   selected="${udids[$idx]}"
 fi
 
-# Build the OneSignalWidget extension if xcodegen is available
-WIDGET_DIR="$SCRIPT_DIR/demo/OneSignalWidget"
-if [ -f "$WIDGET_DIR/project.yml" ] && command -v xcodegen &>/dev/null; then
-  echo "Building OneSignalWidget extension..."
-  cd "$WIDGET_DIR"
-  xcodegen generate -q 2>/dev/null || xcodegen generate
-  xcodebuild build \
-    -project OneSignalWidget.xcodeproj \
-    -scheme OneSignalWidgetExtension \
-    -configuration Debug \
-    -sdk iphonesimulator \
-    -arch arm64 \
-    -derivedDataPath build \
-    CODE_SIGN_IDENTITY="-" \
-    CODE_SIGNING_REQUIRED=NO \
-    CODE_SIGNING_ALLOWED=NO \
-    -quiet
-  echo "OneSignalWidget extension built."
-fi
-
 dotnet build "$SCRIPT_DIR/demo/demo.csproj" -f net10.0-ios -t:Build,Run -p:_DeviceName=":v2:udid=$selected"
-
-# Copy widget extension into app bundle after MAUI build
-APPEX="$WIDGET_DIR/build/Build/Products/Debug-iphonesimulator/OneSignalWidgetExtension.appex"
-APP_BUNDLE="$SCRIPT_DIR/demo/bin/Debug/net10.0-ios/iossimulator-arm64/demo.app"
-if [ -d "$APPEX" ] && [ -d "$APP_BUNDLE/PlugIns" ]; then
-  cp -r "$APPEX" "$APP_BUNDLE/PlugIns/"
-  echo "OneSignalWidget extension embedded into app."
-fi

From e4882883edc267d609ad0bd755749378148b9a73 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Mon, 6 Apr 2026 16:35:34 -0700
Subject: [PATCH 06/11] refactor(demo): simplify DotEnv and add button styles

---
 examples/demo/MauiProgram.cs               |  2 +-
 examples/demo/Resources/Styles/Colors.xaml |  1 +
 examples/demo/Resources/Styles/Styles.xaml | 27 ++++++++++++++++++++++
 examples/demo/Services/DotEnv.cs           |  9 +++++---
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/examples/demo/MauiProgram.cs b/examples/demo/MauiProgram.cs
index 540fc920..bf8ddbbc 100644
--- a/examples/demo/MauiProgram.cs
+++ b/examples/demo/MauiProgram.cs
@@ -72,7 +72,7 @@ public static MauiApp CreateMauiApp()
         var app = builder.Build();
 
         // Load .env file for API keys
-        DotEnv.LoadAsync().GetAwaiter().GetResult();
+        DotEnv.Load();
 
         // Initialize OneSignal SDK before building the app
         var prefs = app.Services.GetRequiredService<PreferencesService>();
diff --git a/examples/demo/Resources/Styles/Colors.xaml b/examples/demo/Resources/Styles/Colors.xaml
index 32256b08..738dde35 100644
--- a/examples/demo/Resources/Styles/Colors.xaml
+++ b/examples/demo/Resources/Styles/Colors.xaml
@@ -8,6 +8,7 @@
   <Color x:Key="OsGrey700">#616161</Color>
   <Color x:Key="OsGrey600">#757575</Color>
   <Color x:Key="OsGrey500">#9E9E9E</Color>
+  <Color x:Key="OsGrey400">#BDBDBD</Color>
   <Color x:Key="OsLightBackground">#F8F9FA</Color>
   <Color x:Key="OsCardBackground">#FFFFFF</Color>
   <Color x:Key="OsCardBorder">#1A000000</Color>
diff --git a/examples/demo/Resources/Styles/Styles.xaml b/examples/demo/Resources/Styles/Styles.xaml
index 9dc7a609..83a538d4 100644
--- a/examples/demo/Resources/Styles/Styles.xaml
+++ b/examples/demo/Resources/Styles/Styles.xaml
@@ -18,6 +18,19 @@
     <Setter Property="FontAttributes" Value="Bold" />
     <Setter Property="HeightRequest" Value="48" />
     <Setter Property="HorizontalOptions" Value="Fill" />
+    <Setter Property="VisualStateManager.VisualStateGroups">
+      <VisualStateGroupList>
+        <VisualStateGroup x:Name="CommonStates">
+          <VisualState x:Name="Normal" />
+          <VisualState x:Name="Disabled">
+            <VisualState.Setters>
+              <Setter Property="BackgroundColor" Value="{StaticResource OsGrey400}" />
+              <Setter Property="TextColor" Value="White" />
+            </VisualState.Setters>
+          </VisualState>
+        </VisualStateGroup>
+      </VisualStateGroupList>
+    </Setter>
   </Style>
 
   <Style TargetType="Button" x:Key="OutlineButtonStyle">
@@ -29,6 +42,20 @@
     <Setter Property="FontAttributes" Value="Bold" />
     <Setter Property="HeightRequest" Value="48" />
     <Setter Property="HorizontalOptions" Value="Fill" />
+    <Setter Property="VisualStateManager.VisualStateGroups">
+      <VisualStateGroupList>
+        <VisualStateGroup x:Name="CommonStates">
+          <VisualState x:Name="Normal" />
+          <VisualState x:Name="Disabled">
+            <VisualState.Setters>
+              <Setter Property="BackgroundColor" Value="Transparent" />
+              <Setter Property="TextColor" Value="{StaticResource OsGrey400}" />
+              <Setter Property="BorderColor" Value="{StaticResource OsGrey400}" />
+            </VisualState.Setters>
+          </VisualState>
+        </VisualStateGroup>
+      </VisualStateGroupList>
+    </Setter>
   </Style>
 
   <Style TargetType="Button">
diff --git a/examples/demo/Services/DotEnv.cs b/examples/demo/Services/DotEnv.cs
index 9ad501f3..5f56be78 100644
--- a/examples/demo/Services/DotEnv.cs
+++ b/examples/demo/Services/DotEnv.cs
@@ -5,7 +5,7 @@ public static class DotEnv
     private static readonly Dictionary<string, string> _values = new();
     private static bool _loaded;
 
-    public static async Task LoadAsync()
+    public static void Load()
     {
         if (_loaded)
             return;
@@ -14,9 +14,12 @@ public static async Task LoadAsync()
 
         try
         {
-            using var stream = await FileSystem.OpenAppPackageFileAsync(".env");
+            using var stream = FileSystem.OpenAppPackageFileAsync(".env")
+                .ConfigureAwait(false)
+                .GetAwaiter()
+                .GetResult();
             using var reader = new StreamReader(stream);
-            var content = await reader.ReadToEndAsync();
+            var content = reader.ReadToEnd();
 
             foreach (var line in content.Split('\n', StringSplitOptions.RemoveEmptyEntries))
             {

From 11198efa36f1a14e1d1c1ee0a099ddea2a17cf2d Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Mon, 6 Apr 2026 16:36:18 -0700
Subject: [PATCH 07/11] chore: remove GitHub workflow files

---
 .github/workflows/asana-add-comment.yml  |  47 -------
 .github/workflows/asana-create-task.yml  | 119 ----------------
 .github/workflows/asana-update-issue.yml | 172 -----------------------
 .github/workflows/claude-code-review.yml |  44 ------
 .github/workflows/claude.yml             |  50 -------
 5 files changed, 432 deletions(-)
 delete mode 100644 .github/workflows/asana-add-comment.yml
 delete mode 100644 .github/workflows/asana-create-task.yml
 delete mode 100644 .github/workflows/asana-update-issue.yml
 delete mode 100644 .github/workflows/claude-code-review.yml
 delete mode 100644 .github/workflows/claude.yml

diff --git a/.github/workflows/asana-add-comment.yml b/.github/workflows/asana-add-comment.yml
deleted file mode 100644
index 1235c8f1..00000000
--- a/.github/workflows/asana-add-comment.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-name: Github --> Asana Add Comment Workflow
-
-on:
-  issue_comment:
-    types: [created]
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: read
-    steps:
-        - name: Get Asana Task Corresponding to Issue
-          env:
-            ISSUE_ID: ${{ github.event.issue.id }}
-            REPO_FULL_NAME: ${{ github.event.repository.full_name }}
-            WORKSPACE_ID: "780103692902078"
-          run: |
-            REPO_SCOPED_ISSUE_ID="$REPO_FULL_NAME#$ISSUE_ID"
-
-            curl --request GET \
-                 --url "https://app.asana.com/api/1.0/workspaces/$WORKSPACE_ID/tasks/search?opt_fields=notes&text=$REPO_SCOPED_ISSUE_ID&sort_by=modified_at&sort_ascending=false" \
-                 --header 'accept: application/json' \
-                 --header 'authorization: Bearer ${{ secrets.ASANA_PAT }}' \
-                 --output response.json
-            TASK_GID=$(jq -r '.data[0].gid' response.json)
-            echo "TASK_GID=$TASK_GID" >> $GITHUB_ENV
-        - name: Comment on Asana Task
-          env:
-            ISSUE_COMMENT: ${{ github.event.comment.body }}
-            COMMENTER_NAME: ${{ github.event.comment.user.login }}
-          run: |
-            BODY_DATA=$(jq -n \
-              --arg text "$ISSUE_COMMENT" \
-              --arg commenter_name "$COMMENTER_NAME" \
-              '{
-                "data": {
-                  "text": "\($commenter_name) left a comment:\n\n\($text)",
-                }
-              }')
-            curl --request POST \
-                 --url https://app.asana.com/api/1.0/tasks/$TASK_GID/stories \
-                 --header 'accept: application/json' \
-                 --header 'authorization: Bearer ${{ secrets.ASANA_PAT }}' \
-                 --header 'content-type: application/json' \
-                 --data "$BODY_DATA"
\ No newline at end of file
diff --git a/.github/workflows/asana-create-task.yml b/.github/workflows/asana-create-task.yml
deleted file mode 100644
index a1eb59b1..00000000
--- a/.github/workflows/asana-create-task.yml
+++ /dev/null
@@ -1,119 +0,0 @@
-name: Github --> Asana Create Task Workflow
-
-on:
-  issues:
-    types: [opened]
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: read
-    steps:
-        - name: Create Asana task
-          env:
-            ISSUE_TITLE: ${{ github.event.issue.title }}
-            ISSUE_BODY: ${{ github.event.issue.body }}
-            ISSUE_HTML_URL: ${{ github.event.issue.html_url }}
-            ISSUE_ID: ${{ github.event.issue.id }}
-            ISSUE_NUMBER: ${{ github.event.issue.number }}
-            REPO_FULL_NAME: ${{ github.event.repository.full_name }}
-            SDK_PLATFORM_GROUP: "1208961704779581"
-            SDK_PLATFORM_GROUP_CROSS_PLATFORM: "1208961704779584"
-            SDK_PLATFORM: "1208961704779592"
-            SDK_PLATFORM_DOTNET_SDK: "1208961704779608"
-            DSA_PRIORITY: "1208779519954980"
-            DSA_PRIORITY_NO_PRIORITY: "1208779521616959"
-            DSA_STATUS: "1210103546117753"
-            DSA_STATUS_TRIAGE: "1210103546117756"
-            DSA_REPO_TICKET_URL: "1210347857768758"
-            WORKSPACE_ID: "780103692902078"
-            PROJECT_ID_GITHUB_AND_IMPORTANT_SDK_ISSUES: "1208970714650308"
-            PROJECT_ID_SDK_BACKLOG: "1208777198342772"
-          run: |
-            DATA_BODY=$(jq -n \
-              --arg title "$ISSUE_TITLE" \
-              --arg body "$ISSUE_BODY" \
-              --arg url "$ISSUE_HTML_URL" \
-              --arg id "$ISSUE_ID" \
-              --arg number "$ISSUE_NUMBER" \
-              --arg repo_full_name "$REPO_FULL_NAME" \
-              --arg sdk_platform_group "$SDK_PLATFORM_GROUP" \
-              --arg sdk_platform_group_cross_platform "$SDK_PLATFORM_GROUP_CROSS_PLATFORM" \
-              --arg sdk_platform "$SDK_PLATFORM" \
-              --arg sdk_platform_dotnet_sdk "$SDK_PLATFORM_DOTNET_SDK" \
-              --arg dsa_priority "$DSA_PRIORITY" \
-              --arg dsa_priority_no_priority "$DSA_PRIORITY_NO_PRIORITY" \
-              --arg dsa_status "$DSA_STATUS" \
-              --arg dsa_status_triage "$DSA_STATUS_TRIAGE" \
-              --arg dsa_repo_ticket_url "$DSA_REPO_TICKET_URL" \
-              --arg workspace_id "$WORKSPACE_ID" \
-              --arg project_id_github_and_important_sdk_issues "$PROJECT_ID_GITHUB_AND_IMPORTANT_SDK_ISSUES" \
-              --arg project_id_sdk_backlog "$PROJECT_ID_SDK_BACKLOG" \
-              '{
-                "data": {
-                  "custom_fields": {
-                    $sdk_platform_group: $sdk_platform_group_cross_platform,
-                    $sdk_platform: $sdk_platform_dotnet_sdk,
-                    $dsa_priority: $dsa_priority_no_priority,
-                    $dsa_status: $dsa_status_triage,
-                    $dsa_repo_ticket_url: $url
-                  },
-                  "name": $title,
-                  "workspace": $workspace_id,
-                  "projects": [$project_id_github_and_important_sdk_issues, $project_id_sdk_backlog],
-                  "notes": "Issue ID: \($repo_full_name)#\($id)\nIssue number: \($number)\nCreated via GitHub Actions\n----\n\n\($body)"
-                }
-              }')
-
-            curl --request POST \
-                 --url https://app.asana.com/api/1.0/tasks?opt_pretty=true \
-                 --header 'accept: application/json' \
-                 --header 'authorization: Bearer ${{ secrets.ASANA_PAT }}' \
-                 --header 'content-type: application/json' \
-                 --data "$DATA_BODY" \
-                 --output response.json
-
-            TASK_GID=$(jq -r '.data.gid' response.json)
-            echo "TASK_GID=$TASK_GID" >> $GITHUB_ENV
-        - name: Move to "0 Unclassified" section in "Github & Important SDK Issues" project
-          env:
-            SECTION_ID_GITHUB_AND_IMPORTANT_SDK_ISSUES: "1208970755434051"
-          run: |
-              DATA_BODY=$(jq -n \
-                --arg task_gid "$TASK_GID" \
-                --arg section_id "$SECTION_ID_GITHUB_AND_IMPORTANT_SDK_ISSUES" \
-                '{
-                  "data": {
-                    "task": $task_gid,
-                    "insert_after": "null"
-                  }
-                }')
-
-              curl --request POST \
-              --url https://app.asana.com/api/1.0/sections/$section_id/addTask \
-              --header 'accept: application/json' \
-              --header 'authorization: Bearer ${{ secrets.ASANA_PAT }}' \
-              --header 'content-type: application/json' \
-              --data "$DATA_BODY"
-        - name: Move to "Untriaged" section in "SDK / Backlog" project
-          env:
-            SECTION_ID_SDK_BACKLOG: "1208899729378982"
-          run: |
-              DATA_BODY=$(jq -n \
-                --arg task_gid "$TASK_GID" \
-                --arg section_id "$SECTION_ID_SDK_BACKLOG" \
-                '{
-                  "data": {
-                    "task": $task_gid,
-                    "insert_after": "null"
-                  }
-                }')
-
-              curl --request POST \
-              --url https://app.asana.com/api/1.0/sections/$section_id/addTask \
-              --header 'accept: application/json' \
-              --header 'authorization: Bearer ${{ secrets.ASANA_PAT }}' \
-              --header 'content-type: application/json' \
-              --data "$DATA_BODY"
\ No newline at end of file
diff --git a/.github/workflows/asana-update-issue.yml b/.github/workflows/asana-update-issue.yml
deleted file mode 100644
index d9dcebe9..00000000
--- a/.github/workflows/asana-update-issue.yml
+++ /dev/null
@@ -1,172 +0,0 @@
-name: Github --> Asana Issue Updates Workflow
-
-on:
-  issues:
-    types: [edited, deleted, closed, reopened, assigned, unassigned, labeled, unlabeled, milestoned, demilestoned, pinned, unpinned, locked, unlocked, transferred]
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: read
-    steps:
-        - name: Get Asana Task Corresponding to Issue
-          env:
-            ISSUE_ID: ${{ github.event.issue.id }}
-            REPO_FULL_NAME: ${{ github.event.repository.full_name }}
-            WORKSPACE_ID: "780103692902078"
-          run: |
-            REPO_SCOPED_ISSUE_ID="$REPO_FULL_NAME#$ISSUE_ID"
-
-            curl --request GET \
-                 --url "https://app.asana.com/api/1.0/workspaces/$WORKSPACE_ID/tasks/search?opt_fields=notes&text=$REPO_SCOPED_ISSUE_ID&sort_by=modified_at&sort_ascending=false" \
-                 --header 'accept: application/json' \
-                 --header 'authorization: Bearer ${{ secrets.ASANA_PAT }}' \
-                 --output response.json
-            TASK_GID=$(jq -r '.data[0].gid' response.json)
-            echo "TASK_GID=$TASK_GID" >> $GITHUB_ENV
-        - name: Determine Action and Post to Asana
-          env:
-            ACTION_TYPE: ${{ github.event.action }}
-            ACTOR_NAME: ${{ github.event.sender.login }}
-            ISSUE_TITLE: ${{ github.event.issue.title }}
-            ISSUE_NUMBER: ${{ github.event.issue.number }}
-            ISSUE_STATE: ${{ github.event.issue.state }}
-          run: |
-            # Map GitHub action types to human-readable descriptions
-            case "$ACTION_TYPE" in
-              "edited")
-                ACTION_DESC="edited the issue"
-                ;;
-              "deleted")
-                ACTION_DESC="deleted the issue"
-                ;;
-              "closed")
-                ACTION_DESC="closed the issue"
-                ;;
-              "reopened")
-                ACTION_DESC="reopened the issue"
-                ;;
-              "assigned")
-                ACTION_DESC="assigned the issue"
-                ;;
-              "unassigned")
-                ACTION_DESC="unassigned the issue"
-                ;;
-              "labeled")
-                ACTION_DESC="added labels to the issue"
-                ;;
-              "unlabeled")
-                ACTION_DESC="removed labels from the issue"
-                ;;
-              "milestoned")
-                ACTION_DESC="added the issue to a milestone"
-                ;;
-              "demilestoned")
-                ACTION_DESC="removed the issue from a milestone"
-                ;;
-              "pinned")
-                ACTION_DESC="pinned the issue"
-                ;;
-              "unpinned")
-                ACTION_DESC="unpinned the issue"
-                ;;
-              "locked")
-                ACTION_DESC="locked the issue"
-                ;;
-              "unlocked")
-                ACTION_DESC="unlocked the issue"
-                ;;
-              "transferred")
-                ACTION_DESC="transferred the issue"
-                ;;
-              *)
-                ACTION_DESC="performed an action on the issue"
-                ;;
-            esac
-
-            # Add additional context for specific actions based on webhook payload
-            if [ "$ACTION_TYPE" = "assigned" ] && [ -n "${{ github.event.assignee.login }}" ]; then
-              ACTION_DESC="assigned the issue to ${{ github.event.assignee.login }}"
-            fi
-
-            if [ "$ACTION_TYPE" = "unassigned" ] && [ -n "${{ github.event.assignee.login }}" ]; then
-              ACTION_DESC="unassigned the issue from ${{ github.event.assignee.login }}"
-            fi
-
-            if [ "$ACTION_TYPE" = "labeled" ] && [ -n "${{ github.event.label.name }}" ]; then
-              LABEL_COLOR="${{ github.event.label.color }}"
-              ACTION_DESC="added label '${{ github.event.label.name }}' to the issue"
-              if [ -n "$LABEL_COLOR" ]; then
-                ACTION_DESC="$ACTION_DESC (color: #$LABEL_COLOR)"
-              fi
-            fi
-
-            if [ "$ACTION_TYPE" = "unlabeled" ] && [ -n "${{ github.event.label.name }}" ]; then
-              LABEL_COLOR="${{ github.event.label.color }}"
-              ACTION_DESC="removed label '${{ github.event.label.name }}' from the issue"
-              if [ -n "$LABEL_COLOR" ]; then
-                ACTION_DESC="$ACTION_DESC (color: #$LABEL_COLOR)"
-              fi
-            fi
-
-            if [ "$ACTION_TYPE" = "milestoned" ] && [ -n "${{ github.event.milestone.title }}" ]; then
-              MILESTONE_DUE_DATE="${{ github.event.milestone.due_on }}"
-              ACTION_DESC="added the issue to milestone '${{ github.event.milestone.title }}'"
-              if [ -n "$MILESTONE_DUE_DATE" ] && [ "$MILESTONE_DUE_DATE" != "null" ]; then
-                ACTION_DESC="$ACTION_DESC (due: $MILESTONE_DUE_DATE)"
-              fi
-            fi
-
-            if [ "$ACTION_TYPE" = "demilestoned" ] && [ -n "${{ github.event.milestone.title }}" ]; then
-              ACTION_DESC="removed the issue from milestone '${{ github.event.milestone.title }}'"
-            fi
-
-            if [ "$ACTION_TYPE" = "transferred" ] && [ -n "${{ github.event.changes.new_repository.full_name }}" ]; then
-              ACTION_DESC="transferred the issue to repository ${{ github.event.changes.new_repository.full_name }}"
-            fi
-
-            if [ "$ACTION_TYPE" = "edited" ] && [ -n "${{ github.event.changes.title.from }}" ]; then
-              OLD_TITLE="${{ github.event.changes.title.from }}"
-              NEW_TITLE="${{ github.event.issue.title }}"
-              ACTION_DESC="edited the issue title from '$OLD_TITLE' to '$NEW_TITLE'"
-            fi
-
-            echo "ACTION_DESC=$ACTION_DESC" >> $GITHUB_ENV
-
-            # Only proceed if we found a task
-            if [ "$TASK_GID" != "null" ] && [ -n "$TASK_GID" ]; then
-              # Create a more detailed message with additional context
-              MESSAGE_TEXT="$ACTOR_NAME performed an action: $ACTION_DESC"
-              
-              # Add issue state information for state changes
-              if [ "$ACTION_TYPE" = "closed" ] || [ "$ACTION_TYPE" = "reopened" ]; then
-                MESSAGE_TEXT=$(printf "%s\nIssue state: %s" "$MESSAGE_TEXT" "$ISSUE_STATE")
-              fi
-              
-              # Add repository information for transferred issues
-              if [ "$ACTION_TYPE" = "transferred" ]; then
-                REPO_NAME="${{ github.event.repository.full_name }}"
-                MESSAGE_TEXT=$(printf "%s\nFrom repository: %s" "$MESSAGE_TEXT" "$REPO_NAME")
-              fi
-              
-              MESSAGE_TEXT=$(printf "%s\n\nIssue: #%s - %s" "$MESSAGE_TEXT" "$ISSUE_NUMBER" "$ISSUE_TITLE")
-
-              BODY_DATA=$(jq -n \
-                --arg text "$MESSAGE_TEXT" \
-                '{
-                  "data": {
-                    "text": $text
-                  }
-                }')
-
-              curl --request POST \
-                   --url https://app.asana.com/api/1.0/tasks/$TASK_GID/stories \
-                   --header 'accept: application/json' \
-                   --header 'authorization: Bearer ${{ secrets.ASANA_PAT }}' \
-                   --header 'content-type: application/json' \
-                   --data "$BODY_DATA"
-            else
-              echo "No corresponding Asana task found for issue ID: $ISSUE_ID"
-            fi
\ No newline at end of file
diff --git a/.github/workflows/claude-code-review.yml b/.github/workflows/claude-code-review.yml
deleted file mode 100644
index 4f6145be..00000000
--- a/.github/workflows/claude-code-review.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Claude Code Review
-
-on:
-  pull_request:
-    types: [opened, synchronize, ready_for_review, reopened]
-    # Optional: Only run on specific file changes
-    # paths:
-    #   - "src/**/*.ts"
-    #   - "src/**/*.tsx"
-    #   - "src/**/*.js"
-    #   - "src/**/*.jsx"
-
-jobs:
-  claude-review:
-    # Optional: Filter by PR author
-    # if: |
-    #   github.event.pull_request.user.login == 'external-contributor' ||
-    #   github.event.pull_request.user.login == 'new-developer' ||
-    #   github.event.pull_request.author_association == 'FIRST_TIME_CONTRIBUTOR'
-
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: read
-      issues: read
-      id-token: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Run Claude Code Review
-        id: claude-review
-        uses: anthropics/claude-code-action@v1
-        with:
-          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
-          plugin_marketplaces: 'https://github.com/anthropics/claude-code.git'
-          plugins: 'code-review@claude-code-plugins'
-          prompt: '/code-review:code-review ${{ github.repository }}/pull/${{ github.event.pull_request.number }}'
-          # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
-          # or https://code.claude.com/docs/en/cli-reference for available options
-
diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml
deleted file mode 100644
index 79fe0564..00000000
--- a/.github/workflows/claude.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: Claude Code
-
-on:
-  issue_comment:
-    types: [created]
-  pull_request_review_comment:
-    types: [created]
-  issues:
-    types: [opened, assigned]
-  pull_request_review:
-    types: [submitted]
-
-jobs:
-  claude:
-    if: |
-      (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
-      (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
-      (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
-      (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: read
-      issues: read
-      id-token: write
-      actions: read # Required for Claude to read CI results on PRs
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Run Claude Code
-        id: claude
-        uses: anthropics/claude-code-action@v1
-        with:
-          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
-
-          # This is an optional setting that allows Claude to read CI results on PRs
-          additional_permissions: |
-            actions: read
-
-          # Optional: Give a custom prompt to Claude. If this is not specified, Claude will perform the instructions specified in the comment that tagged it.
-          # prompt: 'Update the pull request description to include a summary of changes.'
-
-          # Optional: Add claude_args to customize behavior and configuration
-          # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
-          # or https://code.claude.com/docs/en/cli-reference for available options
-          # claude_args: '--allowed-tools Bash(gh pr:*)'
-

From ce68b63ba52eaca59c6a530ae9672fb2656b3722 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Mon, 6 Apr 2026 16:42:10 -0700
Subject: [PATCH 08/11] style(demo): format long conditional expressions

---
 .../Sections/LiveActivitiesSection.xaml.cs       | 16 ++++++++++++----
 examples/demo/Services/DotEnv.cs                 |  6 +++---
 examples/demo/Services/OneSignalApiService.cs    |  6 ++----
 examples/demo/ViewModels/AppViewModel.cs         | 11 ++---------
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/examples/demo/Controls/Sections/LiveActivitiesSection.xaml.cs b/examples/demo/Controls/Sections/LiveActivitiesSection.xaml.cs
index d76f0b4d..c7bfc3ab 100644
--- a/examples/demo/Controls/Sections/LiveActivitiesSection.xaml.cs
+++ b/examples/demo/Controls/Sections/LiveActivitiesSection.xaml.cs
@@ -49,9 +49,13 @@ public void Initialize(AppViewModel viewModel)
 
             if (e.PropertyName == nameof(AppViewModel.IsLiveActivityUpdating))
             {
-                UpdateButton.IsEnabled = !viewModel.IsLiveActivityUpdating && viewModel.HasApiKey()
+                UpdateButton.IsEnabled =
+                    !viewModel.IsLiveActivityUpdating
+                    && viewModel.HasApiKey()
                     && !string.IsNullOrWhiteSpace(ActivityIdEntry.Text);
-                EndButton.IsEnabled = !viewModel.IsLiveActivityUpdating && viewModel.HasApiKey()
+                EndButton.IsEnabled =
+                    !viewModel.IsLiveActivityUpdating
+                    && viewModel.HasApiKey()
                     && !string.IsNullOrWhiteSpace(ActivityIdEntry.Text);
             }
         };
@@ -64,9 +68,13 @@ private void OnActivityIdChanged(object? sender, TextChangedEventArgs e)
 
         var hasText = !string.IsNullOrWhiteSpace(e.NewTextValue);
         StartButton.IsEnabled = hasText;
-        UpdateButton.IsEnabled = hasText && _viewModel?.HasApiKey() == true
+        UpdateButton.IsEnabled =
+            hasText
+            && _viewModel?.HasApiKey() == true
             && _viewModel?.IsLiveActivityUpdating != true;
-        EndButton.IsEnabled = hasText && _viewModel?.HasApiKey() == true
+        EndButton.IsEnabled =
+            hasText
+            && _viewModel?.HasApiKey() == true
             && _viewModel?.IsLiveActivityUpdating != true;
     }
 
diff --git a/examples/demo/Services/DotEnv.cs b/examples/demo/Services/DotEnv.cs
index 5f56be78..6f670441 100644
--- a/examples/demo/Services/DotEnv.cs
+++ b/examples/demo/Services/DotEnv.cs
@@ -14,7 +14,8 @@ public static void Load()
 
         try
         {
-            using var stream = FileSystem.OpenAppPackageFileAsync(".env")
+            using var stream = FileSystem
+                .OpenAppPackageFileAsync(".env")
                 .ConfigureAwait(false)
                 .GetAwaiter()
                 .GetResult();
@@ -39,6 +40,5 @@ public static void Load()
         }
     }
 
-    public static string Get(string key) =>
-        _values.TryGetValue(key, out var value) ? value : "";
+    public static string Get(string key) => _values.TryGetValue(key, out var value) ? value : "";
 }
diff --git a/examples/demo/Services/OneSignalApiService.cs b/examples/demo/Services/OneSignalApiService.cs
index bb5bfd3b..e352d627 100644
--- a/examples/demo/Services/OneSignalApiService.cs
+++ b/examples/demo/Services/OneSignalApiService.cs
@@ -162,10 +162,8 @@ public async Task<bool> UpdateLiveActivityAsync(
                 payload["dismissal_date"] = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
                 payload["event_updates"] = new Dictionary<string, object>
                 {
-                    ["data"] = eventUpdates ?? new Dictionary<string, object>
-                    {
-                        ["message"] = "Ended",
-                    },
+                    ["data"] =
+                        eventUpdates ?? new Dictionary<string, object> { ["message"] = "Ended" },
                 };
             }
 
diff --git a/examples/demo/ViewModels/AppViewModel.cs b/examples/demo/ViewModels/AppViewModel.cs
index 117ed11b..39e2c33e 100644
--- a/examples/demo/ViewModels/AppViewModel.cs
+++ b/examples/demo/ViewModels/AppViewModel.cs
@@ -514,11 +514,7 @@ public async Task UpdateLiveActivityAsync()
             ["estimatedTime"] = nextStatus.EstimatedTime,
         };
 
-        var success = await _repository.UpdateLiveActivityAsync(
-            activityId,
-            "update",
-            eventUpdates
-        );
+        var success = await _repository.UpdateLiveActivityAsync(activityId, "update", eventUpdates);
 
         if (success)
         {
@@ -542,10 +538,7 @@ public async Task EndLiveActivityAsync()
 
         IsLiveActivityUpdating = true;
 
-        var eventUpdates = new Dictionary<string, object>
-        {
-            ["message"] = "Ended",
-        };
+        var eventUpdates = new Dictionary<string, object> { ["message"] = "Ended" };
 
         var success = await _repository.UpdateLiveActivityAsync(activityId, "end", eventUpdates);
 

From cae14123ec7acc418b1f10d9f553b1c28dc73836 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Mon, 6 Apr 2026 17:00:34 -0700
Subject: [PATCH 09/11] fix(demo): address PR review comments

- Strip surrounding quotes from .env values (standard dotenv convention)
- Move _loaded flag to finally block so exceptions don't leave DotEnv
  permanently broken; broaden catch to Exception
- Restructure UpdateLiveActivityAsync as if/else-if to eliminate dead
  code when eventType is "end"

Made-with: Cursor
---
 examples/demo/Services/DotEnv.cs              | 18 ++++++++++++++----
 examples/demo/Services/OneSignalApiService.cs | 13 ++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/examples/demo/Services/DotEnv.cs b/examples/demo/Services/DotEnv.cs
index 6f670441..b64c1564 100644
--- a/examples/demo/Services/DotEnv.cs
+++ b/examples/demo/Services/DotEnv.cs
@@ -10,8 +10,6 @@ public static void Load()
         if (_loaded)
             return;
 
-        _loaded = true;
-
         try
         {
             using var stream = FileSystem
@@ -31,12 +29,24 @@ public static void Load()
                 var eqIndex = trimmed.IndexOf('=');
                 var key = trimmed[..eqIndex].Trim();
                 var value = trimmed[(eqIndex + 1)..].Trim();
+
+                if (
+                    value.Length >= 2
+                    && ((value[0] == '"' && value[^1] == '"')
+                        || (value[0] == '\'' && value[^1] == '\''))
+                )
+                    value = value[1..^1];
+
                 _values[key] = value;
             }
         }
-        catch (FileNotFoundException)
+        catch (Exception)
+        {
+            // .env file not bundled or unreadable -- keys will remain empty
+        }
+        finally
         {
-            // .env file not bundled -- keys will remain empty
+            _loaded = true;
         }
     }
 
diff --git a/examples/demo/Services/OneSignalApiService.cs b/examples/demo/Services/OneSignalApiService.cs
index e352d627..62d1d73f 100644
--- a/examples/demo/Services/OneSignalApiService.cs
+++ b/examples/demo/Services/OneSignalApiService.cs
@@ -149,21 +149,20 @@ public async Task<bool> UpdateLiveActivityAsync(
                 ["priority"] = 10,
             };
 
-            if (eventUpdates != null)
+            if (eventType == "end")
             {
+                payload["dismissal_date"] = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
                 payload["event_updates"] = new Dictionary<string, object>
                 {
-                    ["data"] = eventUpdates,
+                    ["data"] =
+                        eventUpdates ?? new Dictionary<string, object> { ["message"] = "Ended" },
                 };
             }
-
-            if (eventType == "end")
+            else if (eventUpdates != null)
             {
-                payload["dismissal_date"] = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
                 payload["event_updates"] = new Dictionary<string, object>
                 {
-                    ["data"] =
-                        eventUpdates ?? new Dictionary<string, object> { ["message"] = "Ended" },
+                    ["data"] = eventUpdates,
                 };
             }
 

From c48cf0e89a360d282f3500001bb4fd72d23e3296 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Mon, 6 Apr 2026 17:10:59 -0700
Subject: [PATCH 10/11] refactor(demo): reorganize script files

---
 examples/demo/Services/DotEnv.cs   | 6 ++++--
 examples/{ => demo}/run-android.sh | 2 +-
 examples/{ => demo}/run-ios.sh     | 2 +-
 examples/setup-devapp.sh           | 3 ---
 4 files changed, 6 insertions(+), 7 deletions(-)
 rename examples/{ => demo}/run-android.sh (90%)
 rename examples/{ => demo}/run-ios.sh (90%)
 delete mode 100755 examples/setup-devapp.sh

diff --git a/examples/demo/Services/DotEnv.cs b/examples/demo/Services/DotEnv.cs
index b64c1564..39367e8a 100644
--- a/examples/demo/Services/DotEnv.cs
+++ b/examples/demo/Services/DotEnv.cs
@@ -32,8 +32,10 @@ public static void Load()
 
                 if (
                     value.Length >= 2
-                    && ((value[0] == '"' && value[^1] == '"')
-                        || (value[0] == '\'' && value[^1] == '\''))
+                    && (
+                        (value[0] == '"' && value[^1] == '"')
+                        || (value[0] == '\'' && value[^1] == '\'')
+                    )
                 )
                     value = value[1..^1];
 
diff --git a/examples/run-android.sh b/examples/demo/run-android.sh
similarity index 90%
rename from examples/run-android.sh
rename to examples/demo/run-android.sh
index 1e4d7399..c30885fd 100755
--- a/examples/run-android.sh
+++ b/examples/demo/run-android.sh
@@ -38,4 +38,4 @@ else
   selected="${devices[$idx]}"
 fi
 
-dotnet build "$SCRIPT_DIR/demo/demo.csproj" -f net10.0-android -t:Run -p:AdbTarget="-s $selected"
\ No newline at end of file
+dotnet build "$SCRIPT_DIR/demo.csproj" -f net10.0-android -t:Run -p:AdbTarget="-s $selected"
\ No newline at end of file
diff --git a/examples/run-ios.sh b/examples/demo/run-ios.sh
similarity index 90%
rename from examples/run-ios.sh
rename to examples/demo/run-ios.sh
index 7fa6a766..2257508f 100755
--- a/examples/run-ios.sh
+++ b/examples/demo/run-ios.sh
@@ -43,4 +43,4 @@ else
   selected="${udids[$idx]}"
 fi
 
-dotnet build "$SCRIPT_DIR/demo/demo.csproj" -f net10.0-ios -t:Build,Run -p:_DeviceName=":v2:udid=$selected"
+dotnet build "$SCRIPT_DIR/demo.csproj" -f net10.0-ios -t:Build,Run -p:_DeviceName=":v2:udid=$selected"
diff --git a/examples/setup-devapp.sh b/examples/setup-devapp.sh
deleted file mode 100755
index ef223c6a..00000000
--- a/examples/setup-devapp.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-cp "$SCRIPT_DIR/../../google-services.json" "$SCRIPT_DIR/demo/Platforms/Android/"
\ No newline at end of file

From f42249fc74cdc61803b6e24bc142d732c730ecb3 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Mon, 6 Apr 2026 17:40:59 -0700
Subject: [PATCH 11/11] fix(demo): improve live activity button state logic

---
 .../Sections/LiveActivitiesSection.xaml.cs    | 35 +++++++------------
 examples/demo/Services/DotEnv.cs              |  4 +--
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/examples/demo/Controls/Sections/LiveActivitiesSection.xaml.cs b/examples/demo/Controls/Sections/LiveActivitiesSection.xaml.cs
index c7bfc3ab..ba8a5203 100644
--- a/examples/demo/Controls/Sections/LiveActivitiesSection.xaml.cs
+++ b/examples/demo/Controls/Sections/LiveActivitiesSection.xaml.cs
@@ -37,10 +37,7 @@ private static void RemoveEntryBorder(Entry entry)
     public void Initialize(AppViewModel viewModel)
     {
         _viewModel = viewModel;
-
-        var hasApiKey = viewModel.HasApiKey();
-        UpdateButton.IsEnabled = hasApiKey;
-        EndButton.IsEnabled = hasApiKey;
+        RefreshUpdateEndButtons();
 
         viewModel.PropertyChanged += (s, e) =>
         {
@@ -48,16 +45,7 @@ public void Initialize(AppViewModel viewModel)
                 UpdateButton.Text = viewModel.LiveActivityUpdateButtonText;
 
             if (e.PropertyName == nameof(AppViewModel.IsLiveActivityUpdating))
-            {
-                UpdateButton.IsEnabled =
-                    !viewModel.IsLiveActivityUpdating
-                    && viewModel.HasApiKey()
-                    && !string.IsNullOrWhiteSpace(ActivityIdEntry.Text);
-                EndButton.IsEnabled =
-                    !viewModel.IsLiveActivityUpdating
-                    && viewModel.HasApiKey()
-                    && !string.IsNullOrWhiteSpace(ActivityIdEntry.Text);
-            }
+                RefreshUpdateEndButtons();
         };
     }
 
@@ -66,16 +54,18 @@ private void OnActivityIdChanged(object? sender, TextChangedEventArgs e)
         if (_viewModel != null)
             _viewModel.LiveActivityId = e.NewTextValue;
 
-        var hasText = !string.IsNullOrWhiteSpace(e.NewTextValue);
-        StartButton.IsEnabled = hasText;
-        UpdateButton.IsEnabled =
-            hasText
-            && _viewModel?.HasApiKey() == true
-            && _viewModel?.IsLiveActivityUpdating != true;
-        EndButton.IsEnabled =
-            hasText
+        StartButton.IsEnabled = !string.IsNullOrWhiteSpace(e.NewTextValue);
+        RefreshUpdateEndButtons();
+    }
+
+    private void RefreshUpdateEndButtons()
+    {
+        bool canInteract =
+            !string.IsNullOrWhiteSpace(ActivityIdEntry.Text)
             && _viewModel?.HasApiKey() == true
             && _viewModel?.IsLiveActivityUpdating != true;
+        UpdateButton.IsEnabled = canInteract;
+        EndButton.IsEnabled = canInteract;
     }
 
     private void OnOrderNumberChanged(object? sender, TextChangedEventArgs e)
@@ -87,6 +77,7 @@ private void OnOrderNumberChanged(object? sender, TextChangedEventArgs e)
     private void OnStartClicked(object? sender, EventArgs e)
     {
         _viewModel?.StartLiveActivity();
+        RefreshUpdateEndButtons();
     }
 
     private async void OnUpdateClicked(object? sender, EventArgs e)
diff --git a/examples/demo/Services/DotEnv.cs b/examples/demo/Services/DotEnv.cs
index 39367e8a..b95523c5 100644
--- a/examples/demo/Services/DotEnv.cs
+++ b/examples/demo/Services/DotEnv.cs
@@ -12,9 +12,7 @@ public static void Load()
 
         try
         {
-            using var stream = FileSystem
-                .OpenAppPackageFileAsync(".env")
-                .ConfigureAwait(false)
+            using var stream = Task.Run(() => FileSystem.OpenAppPackageFileAsync(".env"))
                 .GetAwaiter()
                 .GetResult();
             using var reader = new StreamReader(stream);