Updated with lazy and initmanager option

Author: Bang0123

flic2lib.Maui.Sample/MauiProgram.cs

@@ -7,7 +7,7 @@ public static MauiApp CreateMauiApp()
         var builder = MauiApp.CreateBuilder();
         builder
             .UseMauiApp<App>()
-            .UseFlic2lib()
+            .UseFlic2lib(initManager: true)
             .ConfigureFonts(fonts =>
             {
                 fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
@@ -18,8 +18,6 @@ public static MauiApp CreateMauiApp()
             .AddTransient<MainPage>()
             .AddTransient<Bluetooth>();
 
-        FlicManager.Init();
-
         return builder.Build();
     }
 }

flic2lib.Maui/Configure.cs

@@ -2,12 +2,17 @@
 
 public static class Configure
 {
-    public static MauiAppBuilder UseFlic2lib(this MauiAppBuilder builder)
+    public static MauiAppBuilder UseFlic2lib(this MauiAppBuilder builder, bool initManager = false)
     {
          builder.Services
             .AddSingleton<IFlicManager>(FlicManager.Instance)
             .AddSingleton<IFlicButtonHandler>(FlicButtonHandler.Instance);
 
+        if (initManager)
+        {
+            FlicManager.Init();
+        }
+
         return builder;
     }
 }

flic2lib.Maui/FlicButtonHandler.cs

@@ -2,6 +2,7 @@
 
 public partial class FlicButtonHandler : IFlicButtonHandler
 {
+    private readonly static Lazy<FlicButtonHandler> _lazyInstance = new(() => new FlicButtonHandler(), LazyThreadSafetyMode.ExecutionAndPublication);
     public event EventHandler<FlicButtonConnectedEvent>? Connected;
     public event EventHandler<FlicButtonDisconnectedEvent>? Disconnected;
     public event EventHandler<FlicButtonUnpairedEvent>? Unparied;
@@ -14,8 +15,7 @@ public partial class FlicButtonHandler : IFlicButtonHandler
     public event EventHandler<FlicButtonClickEvent>? ButtonClick;
     public event EventHandler<FlicButtonDoubleClickEvent>? ButtonDoubleClick;
     public event EventHandler<FlicButtonHoldEvent>? ButtonHold;
-
-    public static FlicButtonHandler Instance { get; } = new FlicButtonHandler();
+    internal static FlicButtonHandler Instance => _lazyInstance.Value;
     private FlicButtonHandler() { }
 
     private static FlicButton? GetFlicButton(string? uuid)

flic2lib.Maui/FlicManager.android.cs

@@ -101,7 +101,8 @@ public partial void StopScan()
 
     public class ScanCallbacks : Java.Lang.Object, IFlic2ScanCallback
     {
-        public static ScanCallbacks Instance { get; } = new ScanCallbacks();
+        private readonly static Lazy<ScanCallbacks> _lazyInstance = new(() => new ScanCallbacks(), LazyThreadSafetyMode.ExecutionAndPublication);
+        internal static ScanCallbacks Instance => _lazyInstance.Value;
         private ScanCallbacks() { }
 
         public void OnComplete(int result, int subCode, Flic2Button? button)

flic2lib.Maui/FlicManager.cs

@@ -3,16 +3,21 @@
 public partial class FlicManager : IFlicManager
 {
     private readonly IList<FlicButton> _cachedButtons;
-
+    private readonly static Lazy<FlicManager> _lazyInstance = new(() => new FlicManager(), LazyThreadSafetyMode.ExecutionAndPublication);
     public static bool IsInitialized { get; private set; }
-    public static FlicManager Instance { get; } = new FlicManager();
+    internal static FlicManager Instance => _lazyInstance.Value;
     public IEnumerable<FlicButton>? Buttons => GetButtons();
 
     private FlicManager()
     {
         _cachedButtons = new List<FlicButton>();
     }
 
+    public void ClearCache()
+    {
+        _cachedButtons.Clear();
+    }
+
     public static partial void Init();
     public partial void StartScan();
     public partial void StopScan();