fix: ListViewItem styles

Author: jayfunc

BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml

@@ -224,16 +224,14 @@
                                         Grid.Row="1"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
+                                        Opacity="{x:Bind IsSearching, Converter={StaticResource BoolNegationToOpacityConverter}, Mode=OneWay}"
                                         Spacing="6"
                                         Visibility="{x:Bind IsFound, Converter={StaticResource BoolNegationToVisibilityConverter}, Mode=OneWay}">
                                         <Image MaxWidth="48" Source="/Assets/Empty.png" />
                                         <TextBlock x:Uid="LyricsSearchControlNotFound" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
                                     </StackPanel>
                                     <!--  Searching  -->
-                                    <Grid
-                                        Grid.Row="1"
-                                        Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}"
-                                        Visibility="{x:Bind IsSearching, Mode=OneWay}">
+                                    <Grid Grid.Row="1" Visibility="{x:Bind IsSearching, Mode=OneWay}">
                                         <ProgressRing VerticalAlignment="Center" IsActive="{x:Bind IsSearching, Mode=OneWay}" />
                                     </Grid>
                                 </Grid>

BetterLyrics.WinUI3/Services/SettingsService/SettingsService.cs

@@ -168,27 +168,40 @@ private void AppSettings_PropertyChanged(object? sender, System.ComponentModel.P
             {
                 ApplicationLanguages.PrimaryLanguageOverride = AppSettings.GeneralSettings.LanguageCode;
             }
+            //else if (e.PropertyName == nameof(GeneralSettings.EnhanceControlInteractiveAnimations))
+            //{
+            //    UpdateGlobalStyles(AppSettings.GeneralSettings.EnhanceControlInteractiveAnimations);
+            //}
             WriteAppSettings();
         }
 
         public void UpdateGlobalStyles(bool useCustom)
         {
             var mergedDicts = Application.Current.Resources.MergedDictionaries;
 
-            var customDict = mergedDicts.FirstOrDefault(d => d.Source != null && d.Source.OriginalString.Contains("FluentStyles.xaml"));
+            var fluentDict = mergedDicts.FirstOrDefault(d => d.Source != null && d.Source.OriginalString.Contains("FluentStyles.xaml"));
+            var defaultDict = mergedDicts.FirstOrDefault(d => d.Source != null && d.Source.OriginalString.Contains("DefaultStyles.xaml"));
 
             if (useCustom)
             {
-                if (customDict == null)
+                if (fluentDict == null)
                 {
                     mergedDicts.Add(new ResourceDictionary { Source = new System.Uri("ms-appx:///Themes/FluentStyles.xaml") });
                 }
+                if (defaultDict != null)
+                {
+                    mergedDicts.Remove(defaultDict);
+                }
             }
             else
             {
-                if (customDict != null)
+                if (defaultDict == null)
+                {
+                    mergedDicts.Add(new ResourceDictionary { Source = new System.Uri("ms-appx:///Themes/DefaultStyles.xaml") });
+                }
+                if (fluentDict != null)
                 {
-                    mergedDicts.Remove(customDict);
+                    mergedDicts.Remove(fluentDict);
                 }
             }
         }

BetterLyrics.WinUI3/Themes/DefaultListViewItemStyle.xaml

@@ -55,10 +55,9 @@
                         <Rectangle
                             x:Name="SelectionIndicator"
                             Width="3"
-                            Height="16"
-                            Margin="4,0,0,0"
+                            Margin="0,8"
                             HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
+                            VerticalAlignment="Stretch"
                             Fill="{ThemeResource ListViewItemSelectionIndicatorBrush}"
                             Opacity="0"
                             RadiusX="1.5"

BetterLyrics.WinUI3/Themes/DefaultStyles.xaml

@@ -50,6 +50,7 @@
     </Style>
 
     <!--  ListViewItem Styles  -->
+    <Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem" />
     <Style
         x:Key="ListViewStretchedItemContainerStyle"
         BasedOn="{StaticResource DefaultListViewItemStyle}"

BetterLyrics.WinUI3/Themes/FluentListViewItemStyle.xaml

@@ -55,10 +55,9 @@
                         <Rectangle
                             x:Name="SelectionIndicator"
                             Width="3"
-                            Height="16"
-                            Margin="4,0,0,0"
+                            Margin="0,8"
                             HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
+                            VerticalAlignment="Stretch"
                             Fill="{ThemeResource ListViewItemSelectionIndicatorBrush}"
                             Opacity="0"
                             RadiusX="1.5"

BetterLyrics.WinUI3/Views/SettingsWindow.xaml

@@ -34,7 +34,7 @@
                 Content="{ui:FontIcon FontFamily={StaticResource SegoeFluentIcons},
                                       FontSize=12,
                                       Glyph=}"
-                Style="{StaticResource TitleBarButtonStyle}">
+                Style="{ThemeResource TitleBarButtonStyle}">
                 <ToolTipService.ToolTip>
                     <ToolTip x:Uid="HostWindowMusicGalleryButtonToolTip" />
                 </ToolTipService.ToolTip>