fix #79 fix #80

BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest

@@ -12,7 +12,7 @@
 	<Identity
 	  Name="37412.BetterLyrics"
 	  Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
-	  Version="1.0.46.0" />
+	  Version="1.0.48.0" />
 
 	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSettingsControl.xaml

@@ -29,7 +29,7 @@
                     </controls:SettingsCard>
 
                     <controls:SettingsCard x:Uid="SettingsPageLyricsFontFamily" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8D2;}">
-                        <ComboBox ItemsSource="{x:Bind SystemFontNames, Mode=OneWay}" SelectedIndex="{x:Bind LyricsStyleSettings.SelectedFontFamilyIndex, Mode=TwoWay}">
+                        <ComboBox ItemsSource="{x:Bind SystemFontNames, Mode=OneWay}" SelectedItem="{x:Bind LyricsStyleSettings.LyricsFontFamily, Mode=TwoWay}">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate>
                                     <TextBlock Text="{Binding}" />

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml

@@ -18,31 +18,6 @@
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
         <Grid Grid.Column="0">
-            <NavigationView
-                VerticalAlignment="Top"
-                Background="Transparent"
-                IsBackButtonVisible="Collapsed"
-                IsBackEnabled="False"
-                IsSettingsVisible="False"
-                MenuItemsSource="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo, Mode=OneWay}"
-                PaneDisplayMode="Top"
-                SelectedItem="{x:Bind ViewModel.SelectedMediaSourceProvider, Mode=TwoWay}">
-                <NavigationView.MenuItemTemplate>
-                    <DataTemplate x:DataType="models:MediaSourceProviderInfo">
-                        <NavigationViewItem>
-                            <NavigationViewItem.Icon>
-                                <ImageIcon Source="{Binding Provider, Converter={StaticResource MediaSourceProviderToLogoUriConverter}, Mode=OneWay}" />
-                            </NavigationViewItem.Icon>
-                            <NavigationViewItem.Content>
-                                <TextBlock
-                                    MaxWidth="200"
-                                    Text="{Binding Provider, Converter={StaticResource MediaSourceProviderToDisplayedNameConverter}, Mode=OneWay}"
-                                    TextWrapping="Wrap" />
-                            </NavigationViewItem.Content>
-                        </NavigationViewItem>
-                    </DataTemplate>
-                </NavigationView.MenuItemTemplate>
-            </NavigationView>
             <ScrollViewer Margin="0,72,0,0" Style="{StaticResource SettingsScrollViewerStyle}">
                 <Grid Style="{StaticResource SettingsGridStyle}">
                     <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
@@ -143,6 +118,31 @@
                     </StackPanel>
                 </Grid>
             </ScrollViewer>
+            <ListView
+                VerticalAlignment="Top"
+                ItemsSource="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo, Mode=OneWay}"
+                ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                ScrollViewer.HorizontalScrollMode="Enabled"
+                ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                ScrollViewer.VerticalScrollMode="Disabled"
+                SelectedItem="{x:Bind ViewModel.SelectedMediaSourceProvider, Mode=TwoWay}">
+                <ListView.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <ItemsStackPanel Orientation="Horizontal" />
+                    </ItemsPanelTemplate>
+                </ListView.ItemsPanel>
+                <ListView.ItemTemplate>
+                    <DataTemplate x:DataType="models:MediaSourceProviderInfo">
+                        <StackPanel Orientation="Horizontal" Spacing="6">
+                            <ImageIcon Height="16" Source="{Binding Provider, Converter={StaticResource MediaSourceProviderToLogoUriConverter}, Mode=OneWay}" />
+                            <TextBlock
+                                MaxWidth="200"
+                                Text="{Binding Provider, Converter={StaticResource MediaSourceProviderToDisplayedNameConverter}, Mode=OneWay}"
+                                TextWrapping="Wrap" />
+                        </StackPanel>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
             <interactivity:Interaction.Behaviors>
                 <interactivity:DataTriggerBehavior
                     Binding="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo.Count, Mode=OneWay}"

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FontHelper.cs

@@ -11,10 +11,6 @@ namespace BetterLyrics.WinUI3.Helper
 {
     public static class FontHelper
     {
-        private static readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
-
         public static string[] SystemFontFamilies => CanvasTextFormat.GetSystemFontFamilies();
-
-        public static string GetUserPreferredFontFamily() => SystemFontFamilies.ElementAtOrDefault(_settingsService.AppSettings.StandardLyricsStyleSettings.SelectedFontFamilyIndex) ?? "Segoe UI";
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsStyleSettings.cs

@@ -27,7 +27,6 @@ namespace BetterLyrics.WinUI3.Models.Settings
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial double LyricsLineSpacingFactor { get; set; } = 0.5;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LyricsTranslationSeparator { get; set; } = StringHelper.NewLine;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LyricsFontFamily { get; set; } = FontHelper.SystemFontFamilies.FirstOrDefault() ?? "";
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int SelectedFontFamilyIndex { get; set; } = 0;
 
         public LyricsStyleSettings() { }
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/LyricsRenderer.xaml

@@ -14,6 +14,7 @@
         <canvas:CanvasAnimatedControl
             x:Name="LyricsCanvas"
             Draw="LyricsCanvas_Draw"
+            Paused="{x:Bind ViewModel.IsPlaying, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
             Update="LyricsCanvas_Update" />
         <Grid
             Margin="36"

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SettingsService/SettingsService.cs

@@ -53,6 +53,8 @@ namespace BetterLyrics.WinUI3.Services.SettingsService
             AppSettings.LocalMediaFolders.CollectionChanged += AppSettings_CollectionChanged;
             AppSettings.LocalMediaFolders.ItemPropertyChanged += AppSettings_ItemPropertyChanged;
 
+            AppSettings.Version = MetadataHelper.AppVersion;
+
             EnsureMediaSourceProvidersInfo();
         }
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Ctor.cs

@@ -55,7 +55,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             _mediaSessionsService.AlbumArtChangedChanged += PlaybackService_AlbumArtChangedChanged;
             _mediaSessionsService.TimelineChanged += PlaybackService_TimelineChanged;
 
-            _isPlaying = _mediaSessionsService.IsPlaying;
+            IsPlaying = _mediaSessionsService.IsPlaying;
 
             UpdateColorConfig();
         }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Update.cs

@@ -44,7 +44,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
         {
             _elapsedTime = args.Timing.ElapsedTime;
 
-            if (_isPlaying)
+            if (IsPlaying)
             {
                 TotalTime += _elapsedTime;
                 _totalPlayingTime += _elapsedTime;
@@ -305,6 +305,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
             _lyricsTextFormat.FontSize = _lyricsStyleSettings.LyricsFontSize;
             _lyricsTextFormat.FontWeight = _lyricsStyleSettings.LyricsFontWeight.ToFontWeight();
+            // TODO：FontFamily 无法设置
             _lyricsTextFormat.FontFamily = _artistTextFormat.FontFamily = _titleTextFormat.FontFamily = _lyricsStyleSettings.LyricsFontFamily;
 
             _canvasYScrollTransition.SetDuration(_lyricsEffectSettings.LyricsScrollDuration / 1000.0);

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.cs

@@ -132,7 +132,8 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
         private bool _isDesktopMode = false;
         private bool _isDockMode = false;
 
-        private bool _isPlaying = true;
+        [ObservableProperty]
+        public partial bool IsPlaying { get; set; } = false;
 
         private bool _isLyricsWindowLocked = false;
         private bool _isMouseWithinWindow = false;
@@ -330,7 +331,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
         private void PlaybackService_IsPlayingChanged(object? sender, IsPlayingChangedEventArgs e)
         {
-            _isPlaying = e.IsPlaying;
+            IsPlaying = e.IsPlaying;
         }
 
         private void PlaybackService_TimelineChanged(object? sender, TimelineChangedEventArgs e)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml

@@ -234,7 +234,7 @@
                                     ShouldConstrainToRootBounds="False">
                                     <Flyout.FlyoutPresenterStyle>
                                         <Style TargetType="FlyoutPresenter">
-                                            <Setter Property="MinWidth" Value="800" />
+                                            <Setter Property="MinWidth" Value="850" />
                                             <Setter Property="Padding" Value="0" />
                                             <Setter Property="CornerRadius" Value="12" />
                                             <Setter Property="ScrollViewer.VerticalScrollMode" Value="Disabled" />
@@ -242,7 +242,7 @@
                                             <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
                                         </Style>
                                     </Flyout.FlyoutPresenterStyle>
-                                    <uc:PlaybackSettingsControl MaxWidth="800" MaxHeight="500" />
+                                    <uc:PlaybackSettingsControl MaxWidth="850" MaxHeight="500" />
                                 </Flyout>
                             </Button.ContextFlyout>
                         </Button>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs

@@ -115,21 +115,18 @@ namespace BetterLyrics.WinUI3.Views
                 }
                 else
                 {
-                    App.DispatcherQueueTimer?.Debounce(() =>
+                    if (ViewModel.IsDesktopMode)
+                    {
+                        _settingsService.AppSettings.DesktopModeSettings.WindowBounds = new Windows.Foundation.Rect(rect.X, rect.Y, size.Width, size.Height);
+                    }
+                    else if (ViewModel.IsDockMode)
                     {
-                        if (ViewModel.IsDesktopMode)
-                        {
-                            _settingsService.AppSettings.DesktopModeSettings.WindowBounds = new Windows.Foundation.Rect(rect.X, rect.Y, size.Width, size.Height);
-                        }
-                        else if (ViewModel.IsDockMode)
-                        {
 
-                        }
-                        else
-                        {
-                            _settingsService.AppSettings.StandardModeSettings.WindowBounds = new Windows.Foundation.Rect(rect.X, rect.Y, size.Width, size.Height);
-                        }
-                    }, Constants.Time.DebounceTimeout);
+                    }
+                    else
+                    {
+                        _settingsService.AppSettings.StandardModeSettings.WindowBounds = new Windows.Foundation.Rect(rect.X, rect.Y, size.Width, size.Height);
+                    }
                 }
             }
         }