Merge pull request #2735 from onesounds/240518Adjusthemes

Adjust Themes

Author: taooceros

Flow.Launcher.Core/Resource/Theme.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Xml;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Controls;
@@ -17,6 +18,10 @@ namespace Flow.Launcher.Core.Resource
 {
     public class Theme
     {
+        private const string ThemeMetadataNamePrefix = "Name:";
+        private const string ThemeMetadataIsDarkPrefix = "IsDark:";
+        private const string ThemeMetadataHasBlurPrefix = "HasBlur:";
+
         private const int ShadowExtraMargin = 32;
 
         private readonly List<string> _themeDirectories = new List<string>();
@@ -79,14 +84,14 @@ public bool ChangeTheme(string theme)
             {
                 if (string.IsNullOrEmpty(path))
                     throw new DirectoryNotFoundException("Theme path can't be found <{path}>");
-                
+
                 // reload all resources even if the theme itself hasn't changed in order to pickup changes
                 // to things like fonts
                 UpdateResourceDictionary(GetResourceDictionary(theme));
-                
+
                 Settings.Theme = theme;
 
-                
+
                 //always allow re-loading default theme, in case of failure of switching to a new theme from default theme
                 if (_oldTheme != theme || theme == defaultTheme)
                 {
@@ -148,7 +153,7 @@ private ResourceDictionary GetThemeResourceDictionary(string theme)
         public ResourceDictionary GetResourceDictionary(string theme)
         {
             var dict = GetThemeResourceDictionary(theme);
-            
+
             if (dict["QueryBoxStyle"] is Style queryBoxStyle &&
                 dict["QuerySuggestionBoxStyle"] is Style querySuggestionBoxStyle)
             {
@@ -187,7 +192,7 @@ public ResourceDictionary GetResourceDictionary(string theme)
 
                 Setter[] setters = { fontFamily, fontStyle, fontWeight, fontStretch };
                 Array.ForEach(
-                    new[] { resultItemStyle, resultItemSelectedStyle, resultHotkeyItemStyle, resultHotkeyItemSelectedStyle }, o 
+                    new[] { resultItemStyle, resultItemSelectedStyle, resultHotkeyItemStyle, resultHotkeyItemSelectedStyle }, o
                     => Array.ForEach(setters, p => o.Setters.Add(p)));
             }
 
@@ -219,17 +224,53 @@ private ResourceDictionary GetCurrentResourceDictionary( )
             return  GetResourceDictionary(Settings.Theme);
         }
 
-        public List<string> LoadAvailableThemes()
+        public List<ThemeData> LoadAvailableThemes()
         {
-            List<string> themes = new List<string>();
+            List<ThemeData> themes = new List<ThemeData>();
             foreach (var themeDirectory in _themeDirectories)
             {
-                themes.AddRange(
-                    Directory.GetFiles(themeDirectory)
-                        .Where(filePath => filePath.EndsWith(Extension) && !filePath.EndsWith("Base.xaml"))
-                        .ToList());
+                var filePaths = Directory
+                    .GetFiles(themeDirectory)
+                    .Where(filePath => filePath.EndsWith(Extension) && !filePath.EndsWith("Base.xaml"))
+                    .Select(GetThemeDataFromPath);
+                themes.AddRange(filePaths);
             }
-            return themes.OrderBy(o => o).ToList();
+
+            return themes.OrderBy(o => o.Name).ToList();
+        }
+
+        private ThemeData GetThemeDataFromPath(string path)
+        {
+            using var reader = XmlReader.Create(path);
+            reader.Read();
+
+            var extensionlessName = Path.GetFileNameWithoutExtension(path);
+
+            if (reader.NodeType is not XmlNodeType.Comment)
+                return new ThemeData(extensionlessName, extensionlessName);
+
+            var commentLines = reader.Value.Trim().Split('\n').Select(v => v.Trim());
+
+            var name = extensionlessName;
+            bool? isDark = null;
+            bool? hasBlur = null;
+            foreach (var line in commentLines)
+            {
+                if (line.StartsWith(ThemeMetadataNamePrefix, StringComparison.OrdinalIgnoreCase))
+                {
+                    name = line.Remove(0, ThemeMetadataNamePrefix.Length).Trim();
+                }
+                else if (line.StartsWith(ThemeMetadataIsDarkPrefix, StringComparison.OrdinalIgnoreCase))
+                {
+                    isDark = bool.Parse(line.Remove(0, ThemeMetadataIsDarkPrefix.Length).Trim());
+                }
+                else if (line.StartsWith(ThemeMetadataHasBlurPrefix, StringComparison.OrdinalIgnoreCase))
+                {
+                    hasBlur = bool.Parse(line.Remove(0, ThemeMetadataHasBlurPrefix.Length).Trim());
+                }
+            }
+
+            return new ThemeData(extensionlessName, name, isDark, hasBlur);
         }
 
         private string GetThemePath(string themeName)
@@ -407,5 +448,7 @@ private void SetWindowAccent(Window w, AccentState state)
             Marshal.FreeHGlobal(accentPtr);
         }
         #endregion
+
+        public record ThemeData(string FileNameWithoutExtension, string Name, bool? IsDark = null, bool? HasBlur = null);
     }
 }

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -55,7 +55,7 @@ public string Theme
                 OnPropertyChanged(nameof(MaxResultsToShow));
             }
         }
-        public bool UseDropShadowEffect { get; set; } = false;
+        public bool UseDropShadowEffect { get; set; } = true;
 
         /* Appearance Settings. It should be separated from the setting later.*/
         public double WindowHeightSize { get; set; } = 42;

Flow.Launcher/App.xaml

@@ -25,7 +25,7 @@
                 <ui:XamlControlsResources />
                 <ResourceDictionary Source="pack://application:,,,/Resources/CustomControlTemplate.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Resources/SettingWindowStyle.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/Themes/Win11System.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/Themes/Win11Light.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Languages/en.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>