Simplify Windows theme watcher to easy resource check

Much simpler, but probs not faster.

Author: Odotocodot

Flow.Launcher.Plugin.OneNote/Icons/IconProvider.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Concurrent;
-using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Windows;
@@ -11,7 +10,7 @@
 
 namespace Flow.Launcher.Plugin.OneNote.Icons
 {
-    public class IconProvider : BaseModel, IDisposable
+    public class IconProvider : BaseModel
     {
         public const string Logo = IC.ImagesDirectory + IC.Logo;
         public string Sync => GetIconLocal(IC.Sync);
@@ -36,8 +35,6 @@ public class IconProvider : BaseModel, IDisposable
         public int CachedIconCount => iconCache.Keys.Count(k => char.IsDigit(k.Split('.')[1][1]));
 
         private readonly PluginInitContext context;
-        
-        private readonly WindowsThemeWatcher windowsThemeWatcher = new ();
 
         public IconProvider(PluginInitContext context, Settings settings)
         {
@@ -48,44 +45,35 @@ public IconProvider(PluginInitContext context, Settings settings)
             this.context = context;
             this.settings = settings;
 
-            if (settings.IconTheme == IconTheme.System)
-            {
-                windowsThemeWatcher.StartWatching();
-            }
-
-            settings.PropertyChanged += OnIconThemeChanged;
-
             foreach (var image in GeneratedImagesDirectoryInfo.EnumerateFiles())
             {
                 iconCache.TryAdd(image.Name, BitmapImageFromPath(image.FullName));
             }
         }
-
-        private void OnIconThemeChanged(object sender, PropertyChangedEventArgs args)
-        {
-            if (args.PropertyName != nameof(Settings.IconTheme)) 
-                return;
-            
-            if (settings.IconTheme == IconTheme.System)
-            {
-                windowsThemeWatcher.StartWatching();
-            }
-            else
-            {
-                windowsThemeWatcher.StopWatching();
-            }
-        }
-
+        
         private string GetIconLocal(string icon) => $"{IC.ImagesDirectory}{icon}.{GetIconThemeString(settings.IconTheme)}.png";
 
         private string GetIconThemeString(IconTheme iconTheme)
         {
             if (iconTheme == IconTheme.System)
             {
-                iconTheme = windowsThemeWatcher.CurrentWindowsTheme.ToIconTheme();
+                iconTheme = FlowLauncherThemeToIconTheme();
             }
             return Enum.GetName(iconTheme).ToLower();
         }
+        
+        private static IconTheme FlowLauncherThemeToIconTheme()
+        {
+            var color05B = (SolidColorBrush)Application.Current.TryFindResource("Color05B"); //Alt key "SystemControlPageTextBaseHighBrush"
+            if (color05B == null)
+                return IconTheme.Light;
+
+            var color = color05B.Color;
+            return 5 * color.G + 2 * color.R + color.B > 8 * 128 //Is the color light?
+                ? IconTheme.Light 
+                : IconTheme.Dark;
+        }
+        
         private static BitmapImage BitmapImageFromPath(string path) => new BitmapImage(new Uri(path));
 
         public Result.IconDelegate GetIcon(IconGeneratorInfo info)
@@ -177,11 +165,5 @@ public void ClearCachedIcons()
             }
             OnPropertyChanged(nameof(CachedIconCount));
         }
-
-        public void Dispose()
-        {
-            settings.PropertyChanged -= OnIconThemeChanged;
-            windowsThemeWatcher.Dispose();
-        }
     }
 }

Flow.Launcher.Plugin.OneNote/Icons/IconTheme.cs

@@ -1,6 +1,3 @@
-using System;
-using Flow.Launcher.Plugin.OneNote.UI;
-
 namespace Flow.Launcher.Plugin.OneNote.Icons
 {
 	public enum IconTheme
@@ -10,18 +7,5 @@ public enum IconTheme
 		Dark,
 		Color
 	}
-	
-	public static class IconThemeExtensions
-	{
-		public static IconTheme ToIconTheme(this WindowsThemeWatcher.WindowsTheme theme)
-		{
-			return theme switch
-			{
-				WindowsThemeWatcher.WindowsTheme.Light => IconTheme.Dark,
-				WindowsThemeWatcher.WindowsTheme.Dark => IconTheme.Light,
-				_ => throw new ArgumentOutOfRangeException(nameof(theme))
-			};
-		}
-	}
 }
 

Flow.Launcher.Plugin.OneNote/Icons/WindowsThemeWatcher.cs

@@ -73,7 +73,6 @@ public void Dispose()
         {
             context.API.VisibilityChanged -= OnVisibilityChanged;
             semaphore.Dispose();
-            iconProvider.Dispose();
             OneNoteApplication.ReleaseComObject();
         }
     }