v5 updates

Author: aritchie

Shiny.Push.FirebaseMessaging/Platforms/iOS/FirebasePushProvider.cs

@@ -2,15 +2,22 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Shiny.Extensions.Stores;
 using Shiny.Firebase.Analytics.iOS.Binding;
 using Shiny.Firebase.Messaging.iOS.Binding;
 using Foundation;
 
 namespace Shiny.Push;
 
 
-public class FirebasePushProvider(FirebaseConfiguration config) : NotifyPropertyChanged, IPushProvider, IPushTagSupport
+public class FirebasePushProvider(
+    FirebaseConfiguration config,
+    [FromKeyedServices(StoreKeys.Default)] IKeyValueStore store
+) : IPushProvider, IPushTagSupport
 {
+    static string Key(string prop) => $"Shiny.Push.FirebasePushProvider.{prop}";
+
 
     public async Task<string> Register(NSData nativeToken)
     {
@@ -30,11 +37,18 @@ public Task UnRegister()
     }
 
 
-    string[]? registeredTags;
+    string[]? registeredTags = store.Get<string[]>(Key(nameof(RegisteredTags)));
     public string[]? RegisteredTags
     {
         get => this.registeredTags;
-        set => this.Set(ref this.registeredTags, value);
+        set
+        {
+            if (this.registeredTags != value)
+            {
+                this.registeredTags = value;
+                store.SetOrRemove(Key(nameof(RegisteredTags)), value);
+            }
+        }
     }
 
 

…ms/Shared/ServiceCollectionExtensions.cs …Messaging/ServiceCollectionExtensions.csShiny.Push.FirebaseMessaging/Platforms/Shared/ServiceCollectionExtensions.cs renamed to Shiny.Push.FirebaseMessaging/ServiceCollectionExtensions.cs Shiny.Push.FirebaseMessaging/Platforms/Shared/ServiceCollectionExtensions.cs renamed to Shiny.Push.FirebaseMessaging/ServiceCollectionExtensions.cs

@@ -4,13 +4,13 @@
 namespace Shiny;
 
 
-public static class ServiceCollectionExtensions
+public static class FirebaseServiceCollectionExtensions
 {
     public static IServiceCollection AddPushFirebaseMessaging(this IServiceCollection services, FirebaseConfiguration? config = null)
     {
 #if IOS
         services.AddSingleton(config ?? new(true));
-        services.AddShinyService<FirebasePushProvider>();
+        services.AddSingletonAsImplementedInterfaces<FirebasePushProvider>();
         services.AddPush();
 #endif
 #if ANDROID
@@ -38,7 +38,7 @@ public static IServiceCollection AddPushFirebaseMessaging(this IServiceCollectio
     public static IServiceCollection AddPushFirebaseMessaging<TPushDelegate>(this IServiceCollection services, FirebaseConfiguration? config = null)
          where TPushDelegate : class, IPushDelegate
     {
-        services.AddShinyService<TPushDelegate>();
+        services.AddSingletonAsImplementedInterfaces<TPushDelegate>();
         services.AddPushFirebaseMessaging(config);
         return services;
     }