chores: bump version code

BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/BetterLyrics.WinUI3 (Package).wapproj

@@ -44,7 +44,7 @@
     <EntryPointProjectUniqueName>..\BetterLyrics.WinUI3\BetterLyrics.WinUI3.csproj</EntryPointProjectUniqueName>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
+    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
     <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>

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.97.0" />
+	  Version="1.0.106.0" />
 
 	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs

@@ -37,7 +37,6 @@ namespace BetterLyrics.WinUI3
     {
 
         private readonly ILogger<App> _logger;
-        private readonly ISettingsService _settingsService;
 
         public static new App Current => (App)Application.Current;
 
@@ -54,7 +53,6 @@ namespace BetterLyrics.WinUI3
             ConfigureServices();
 
             _logger = Ioc.Default.GetRequiredService<ILogger<App>>();
-            _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
 
             UnhandledException += App_UnhandledException;
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
@@ -76,7 +74,7 @@ namespace BetterLyrics.WinUI3
         protected override void OnLaunched(LaunchActivatedEventArgs args)
         {
             WindowHelper.OpenOrShowWindow<LyricsWindow>();
-            if (_settingsService.AppSettings.MusicGallerySettings.AutoOpen)
+            if (Ioc.Default.GetRequiredService<ISettingsService>().AppSettings.MusicGallerySettings.AutoOpen)
             {
                 WindowHelper.OpenOrShowWindow<MusicGalleryWindow>();
             }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Link.cs

@@ -10,7 +10,7 @@ namespace BetterLyrics.WinUI3.Constants
     {
         public const string GitHubUrl = "https://github.com/jayfunc/BetterLyrics";
         public const string WikiUrl = "https://github.com/jayfunc/BetterLyrics/wiki";
-        public const string AppleMusicCfgUrl = $"{WikiUrl}/Lyrics-provider-configuration#apple-music";
+        public const string AppleMusicCfgUrl = $"{WikiUrl}/%5BEN%5D-Lyrics-provider-configuration#apple-music";
         public const string FAQUrl = $"{GitHubUrl}/blob/dev/FAQ/index.md";
         public const string QQGroupUrl = "https://qun.qq.com/universal-share/share?ac=1&authKey=4Q%2BYTq3wZldYpF5SbS5c19ECFsiYoLZFAIcBNNzYpBUtiEjaZ8sZ%2F%2BnFN0qw3lad&busi_data=eyJncm91cENvZGUiOiIxMDU0NzAwMzg4IiwidG9rZW4iOiJiVnhqemVYN0N5QVc3b1ZkR24wWmZOTUtvUkJoWm1JRWlaWW5iZnlBcXJtZUtGc2FFTHNlUlFZMi9iRm03cWF5IiwidWluIjoiMTM5NTczOTY2MCJ9&data=39UmAihyH_o6CZaOs7nk2mO_lz2ruODoDou6pxxh7utcxP4WF5sbDBDOPvZ_Wqfzeey4441anegsLYQJxkrBAA&svctype=4&tempid=h5_group_info";
         public const string DiscordUrl = "https://discord.gg/5yAQPnyCKv";

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/EnumHelper.cs

@@ -0,0 +1,21 @@
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Models.Settings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public static class EnumExtensions
+    {
+        public static T GetNext<T>(this T value) where T : struct, Enum
+        {
+            T[] values = Enum.GetValues<T>();
+            int currentIndex = Array.IndexOf(values, value);
+            int nextIndex = (currentIndex + 1) % values.Length;
+            return values[nextIndex];
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsWindowStatus.cs

@@ -73,6 +73,16 @@ namespace BetterLyrics.WinUI3.Models
             newValue.PropertyChanged += OldAlbumArtLayoutSettings_PropertyChanged;
         }
 
+        partial void OnWindowBoundsChanged(Rect value)
+        {
+            UpdateMonitorNameAndBounds();
+            UpdateDemoWindowAndMonitorBounds();
+            WindowX = WindowBounds.X;
+            WindowY = WindowBounds.Y;
+            WindowWidth = WindowBounds.Width;
+            WindowHeight = WindowBounds.Height;
+        }
+
         private void OldLyricsStyleSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
             this.OnPropertyChanged(nameof(LyricsStyleSettings));
@@ -135,6 +145,26 @@ namespace BetterLyrics.WinUI3.Models
             );
         }
 
+        public Rect GetWindowBoundsWhenWorkArea()
+        {
+            return new Rect(
+                MonitorBounds.X,
+                DockPlacement switch
+                {
+                    DockPlacement.Top => MonitorBounds.Top,
+                    DockPlacement.Bottom => MonitorBounds.Bottom - DockHeight,
+                    _ => MonitorBounds.Top,
+                } - 1,
+                MonitorBounds.Width,
+                DockPlacement switch
+                {
+                    DockPlacement.Top => DockHeight,
+                    DockPlacement.Bottom => DockHeight,
+                    _ => DockHeight,
+                } + 1
+            );
+        }
+
         public object Clone()
         {
             return new LyricsWindowStatus
@@ -191,7 +221,6 @@ namespace BetterLyrics.WinUI3.Models
                 EnvironmentSampleMode = WindowPixelSampleMode.WindowEdge,
                 LyricsStyleSettings = new()
                 {
-                    OriginalLyricsFontSize = 20,
                     LyricsAlignmentType = TextAlignmentType.Center,
                 },
                 LyricsBackgroundSettings = new LyricsBackgroundSettings
@@ -203,7 +232,7 @@ namespace BetterLyrics.WinUI3.Models
 
         public static LyricsWindowStatus DockedMode()
         {
-            return new LyricsWindowStatus
+            var status = new LyricsWindowStatus
             {
                 Name = _resourceService.GetLocalizedString("DockedMode"),
                 IsWorkArea = true,
@@ -218,7 +247,6 @@ namespace BetterLyrics.WinUI3.Models
                 LyricsStyleSettings = new LyricsStyleSettings
                 {
                     LyricsAlignmentType = TextAlignmentType.Center,
-                    OriginalLyricsFontSize = 18,
                 },
                 LyricsBackgroundSettings = new LyricsBackgroundSettings
                 {
@@ -226,31 +254,25 @@ namespace BetterLyrics.WinUI3.Models
                     IsPureColorOverlayEnabled = true,
                 }
             };
+            status.WindowBounds = status.GetWindowBoundsWhenWorkArea();
+            return status;
         }
 
-        public static LyricsWindowStatus FullscreenMode(Rect monitorBounds)
+        public static LyricsWindowStatus FullscreenMode()
         {
-            return new LyricsWindowStatus
+            var status = new LyricsWindowStatus
             {
                 Name = _resourceService.GetLocalizedString("FullscreenMode"),
-                WindowBounds = monitorBounds,
-                IsAlwaysOnTop = true,
                 IsBorderless = true,
-                IsShownInSwitchers = false,
-                TitleBarArea = Enums.TitleBarArea.None,
-                LyricsLayoutOrientation = Enums.LyricsLayoutOrientation.Vertical,
+                TitleBarArea = TitleBarArea.None,
+                LyricsLayoutOrientation = LyricsLayoutOrientation.Vertical,
                 LyricsStyleSettings = new LyricsStyleSettings
                 {
-                    OriginalLyricsFontSize = 72,
-                    LyricsAlignmentType = Enums.TextAlignmentType.Center,
+                    LyricsAlignmentType = TextAlignmentType.Center,
                 },
-                AlbumArtLayoutSettings = new AlbumArtLayoutSettings
-                {
-                    AutoAlbumArtSize = false,
-                    AlbumArtSize = 128,
-                    SongInfoFontSize = 36,
-                }
             };
+            status.WindowBounds = status.MonitorBounds;
+            return status;
         }
 
         public static LyricsWindowStatus StandardMode()

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LiveStatesService/LiveStatesService.cs

@@ -44,7 +44,7 @@ namespace BetterLyrics.WinUI3.Services.LiveStatesService
                     if (LiveStates.LyricsWindowStatus.IsWorkArea)
                     {
                         await Task.Delay(300);
-                        WindowHelper.MoveAndResize<LyricsWindow>(GetWindowBoundsWhenWorkArea());
+                        WindowHelper.MoveAndResize<LyricsWindow>(LiveStates.LyricsWindowStatus.GetWindowBoundsWhenWorkArea());
                     }
                     break;
                 case nameof(LyricsWindowStatus.DockHeight):
@@ -55,7 +55,7 @@ namespace BetterLyrics.WinUI3.Services.LiveStatesService
                     {
                         WindowHelper.UpdateWorkArea<LyricsWindow>();
                         await Task.Delay(300);
-                        WindowHelper.MoveAndResize<LyricsWindow>(GetWindowBoundsWhenWorkArea());
+                        WindowHelper.MoveAndResize<LyricsWindow>(LiveStates.LyricsWindowStatus.GetWindowBoundsWhenWorkArea());
                     }
                     break;
                 case nameof(LyricsWindowStatus.IsShownInSwitchers):
@@ -82,14 +82,6 @@ namespace BetterLyrics.WinUI3.Services.LiveStatesService
                 case nameof(LyricsWindowStatus.WindowHeight):
                     WindowHelper.MoveAndResize<LyricsWindow>(LiveStates.LyricsWindowStatus.WindowBounds.WithHeight(LiveStates.LyricsWindowStatus.WindowHeight));
                     break;
-                case nameof(LyricsWindowStatus.WindowBounds):
-                    LiveStates.LyricsWindowStatus.UpdateMonitorNameAndBounds();
-                    LiveStates.LyricsWindowStatus.UpdateDemoWindowAndMonitorBounds();
-                    LiveStates.LyricsWindowStatus.WindowX = LiveStates.LyricsWindowStatus.WindowBounds.X;
-                    LiveStates.LyricsWindowStatus.WindowY = LiveStates.LyricsWindowStatus.WindowBounds.Y;
-                    LiveStates.LyricsWindowStatus.WindowWidth = LiveStates.LyricsWindowStatus.WindowBounds.Width;
-                    LiveStates.LyricsWindowStatus.WindowHeight = LiveStates.LyricsWindowStatus.WindowBounds.Height;
-                    break;
                 case nameof(LyricsWindowStatus.TitleBarArea):
                     WindowHelper.SetTitleBarArea<LyricsWindow>(LiveStates.LyricsWindowStatus.TitleBarArea);
                     break;
@@ -100,7 +92,7 @@ namespace BetterLyrics.WinUI3.Services.LiveStatesService
                     break;
             }
 
-            LiveStates.IsLyricsWindowStatusRefreshing = true;
+            LiveStates.IsLyricsWindowStatusRefreshing = false;
         }
 
         private void LiveStates_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
@@ -135,41 +127,29 @@ namespace BetterLyrics.WinUI3.Services.LiveStatesService
 
             WindowHelper.SetIsShowInSwitchers<LyricsWindow>(LiveStates.LyricsWindowStatus.IsShownInSwitchers);
             WindowHelper.SetIsAlwaysOnTop<LyricsWindow>(LiveStates.LyricsWindowStatus.IsAlwaysOnTop);
+
             WindowHelper.SetIsClickThrough<LyricsWindow>(LiveStates.LyricsWindowStatus.IsClickThrough);
             WindowHelper.SetIsBorderless<LyricsWindow>(LiveStates.LyricsWindowStatus.IsBorderless);
+
             WindowHelper.SetLyricsWindowVisibilityByPlayingStatus(_dispatcherQueue);
             WindowHelper.SetTitleBarArea<LyricsWindow>(LiveStates.LyricsWindowStatus.TitleBarArea);
 
+            // 下述代码可以删除，但是为了避免给用户造成操作上的疑虑，暂时保留
             if (LiveStates.LyricsWindowStatus.IsWorkArea)
             {
-                LiveStates.LyricsWindowStatus.WindowBounds = GetWindowBoundsWhenWorkArea();
+                LiveStates.LyricsWindowStatus.WindowBounds = LiveStates.LyricsWindowStatus.GetWindowBoundsWhenWorkArea();
             }
 
             WindowHelper.MoveAndResize<LyricsWindow>(LiveStates.LyricsWindowStatus.WindowBounds);
+            LiveStates.LyricsWindowStatus.WindowX = LiveStates.LyricsWindowStatus.WindowBounds.X;
+            LiveStates.LyricsWindowStatus.WindowY = LiveStates.LyricsWindowStatus.WindowBounds.Y;
+            LiveStates.LyricsWindowStatus.WindowWidth = LiveStates.LyricsWindowStatus.WindowBounds.Width;
+            LiveStates.LyricsWindowStatus.WindowHeight = LiveStates.LyricsWindowStatus.WindowBounds.Height;
 
             LiveStates.LyricsWindowStatus.UpdateDemoWindowAndMonitorBounds();
 
             LiveStates.IsLyricsWindowStatusRefreshing = false;
         }
 
-        private Rect GetWindowBoundsWhenWorkArea()
-        {
-            return new Rect(
-                LiveStates.LyricsWindowStatus.MonitorBounds.X,
-                LiveStates.LyricsWindowStatus.DockPlacement switch
-                {
-                    Enums.DockPlacement.Top => LiveStates.LyricsWindowStatus.MonitorBounds.Top,
-                    Enums.DockPlacement.Bottom => LiveStates.LyricsWindowStatus.MonitorBounds.Bottom - LiveStates.LyricsWindowStatus.DockHeight - 1,
-                    _ => LiveStates.LyricsWindowStatus.MonitorBounds.Top,
-                },
-                LiveStates.LyricsWindowStatus.MonitorBounds.Width,
-                LiveStates.LyricsWindowStatus.DockPlacement switch
-                {
-                    Enums.DockPlacement.Top => LiveStates.LyricsWindowStatus.DockHeight,
-                    Enums.DockPlacement.Bottom => LiveStates.LyricsWindowStatus.DockHeight + 1,
-                    _ => LiveStates.LyricsWindowStatus.DockHeight,
-                }
-            );
-        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw

@@ -177,7 +177,7 @@
   <data name="HostWindowMusicGalleryButtonToolTip.Content" xml:space="preserve">
     <value>Music gallery</value>
   </data>
-  <data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
+  <data name="HostWindowSettingsButtonToolTip.Text" xml:space="preserve">
     <value>Settings</value>
   </data>
   <data name="ImportPlaylistSuccessfully" xml:space="preserve">
@@ -367,7 +367,7 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="MusicGalleryPageAllSongs" xml:space="preserve">
     <value>All songs</value>
   </data>
-  <data name="MusicGalleryPageEmptyPlayingQueue.Content" xml:space="preserve">
+  <data name="MusicGalleryPageEmptyPlayingQueue.Text" xml:space="preserve">
     <value>Clear play queue</value>
   </data>
   <data name="MusicGalleryPageFileAlbum.Text" xml:space="preserve">
@@ -427,22 +427,28 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="MusicGalleryPagePlayingQueueEmpty.Text" xml:space="preserve">
     <value>Play queue is empty</value>
   </data>
-  <data name="MusicGalleryPageQueueLoop.Content" xml:space="preserve">
+  <data name="MusicGalleryPagePlaylist.Text" xml:space="preserve">
+    <value>Playlists</value>
+  </data>
+  <data name="MusicGalleryPageQueueLoop.Text" xml:space="preserve">
     <value>List loop</value>
   </data>
-  <data name="MusicGalleryPageQueueRandom.Content" xml:space="preserve">
+  <data name="MusicGalleryPageQueueRandom.Text" xml:space="preserve">
     <value>Random</value>
   </data>
+  <data name="MusicGalleryPageRemoveFromCustomList.Text" xml:space="preserve">
+    <value>Remove from playlists</value>
+  </data>
   <data name="MusicGalleryPageRemoveFromPlayingQueue.Text" xml:space="preserve">
     <value>Remove from play queue</value>
   </data>
-  <data name="MusicGalleryPageScrollToPlayingItem.Content" xml:space="preserve">
+  <data name="MusicGalleryPageScrollToPlayingItem.Text" xml:space="preserve">
     <value>Scroll to playing item</value>
   </data>
   <data name="MusicGalleryPageSelectAll.Content" xml:space="preserve">
     <value>Select all</value>
   </data>
-  <data name="MusicGalleryPageSingleLoop.Content" xml:space="preserve">
+  <data name="MusicGalleryPageSingleLoop.Text" xml:space="preserve">
     <value>Single loop</value>
   </data>
   <data name="MusicGalleryPageSongSearchBox.PlaceholderText" xml:space="preserve">
@@ -466,6 +472,9 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="MusicGalleryPageStarredPlaylist.Content" xml:space="preserve">
     <value>Starred playlists</value>
   </data>
+  <data name="MusicGalleryPageStopTrack.Text" xml:space="preserve">
+    <value>Stop</value>
+  </data>
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>Music gallery - BetterLyrics</value>
   </data>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw

@@ -177,7 +177,7 @@
   <data name="HostWindowMusicGalleryButtonToolTip.Content" xml:space="preserve">
     <value>ミュージックギャラリー</value>
   </data>
-  <data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
+  <data name="HostWindowSettingsButtonToolTip.Text" xml:space="preserve">
     <value>設定</value>
   </data>
   <data name="ImportPlaylistSuccessfully" xml:space="preserve">
@@ -353,7 +353,7 @@
     <value>BetterLyrics へようこそ</value>
   </data>
   <data name="MusicGalleryPageAddToCustomList.Text" xml:space="preserve">
-    <value>プレイリストに追加します</value>
+    <value>プレイリストに追加</value>
   </data>
   <data name="MusicGalleryPageAddToEnd.Text" xml:space="preserve">
     <value>リストの終わり</value>
@@ -367,7 +367,7 @@
   <data name="MusicGalleryPageAllSongs" xml:space="preserve">
     <value>すべての曲</value>
   </data>
-  <data name="MusicGalleryPageEmptyPlayingQueue.Content" xml:space="preserve">
+  <data name="MusicGalleryPageEmptyPlayingQueue.Text" xml:space="preserve">
     <value>クリアプレイキュー</value>
   </data>
   <data name="MusicGalleryPageFileAlbum.Text" xml:space="preserve">
@@ -416,7 +416,7 @@
     <value>ファイルからのインポート</value>
   </data>
   <data name="MusicGalleryPageNewPlaylist.Text" xml:space="preserve">
-    <value>プレイリストを作成します</value>
+    <value>プレイリストを作成しましょう</value>
   </data>
   <data name="MusicGalleryPagePlayAll.Content" xml:space="preserve">
     <value>すべてを再生します</value>
@@ -427,22 +427,28 @@
   <data name="MusicGalleryPagePlayingQueueEmpty.Text" xml:space="preserve">
     <value>キューを再生するのは空です</value>
   </data>
-  <data name="MusicGalleryPageQueueLoop.Content" xml:space="preserve">
+  <data name="MusicGalleryPagePlaylist.Text" xml:space="preserve">
+    <value>プレイリスト</value>
+  </data>
+  <data name="MusicGalleryPageQueueLoop.Text" xml:space="preserve">
     <value>ループをリストします</value>
   </data>
-  <data name="MusicGalleryPageQueueRandom.Content" xml:space="preserve">
+  <data name="MusicGalleryPageQueueRandom.Text" xml:space="preserve">
     <value>ランダム</value>
   </data>
+  <data name="MusicGalleryPageRemoveFromCustomList.Text" xml:space="preserve">
+    <value>プレイリストから削除</value>
+  </data>
   <data name="MusicGalleryPageRemoveFromPlayingQueue.Text" xml:space="preserve">
     <value>プレイリストから取り外します</value>
   </data>
-  <data name="MusicGalleryPageScrollToPlayingItem.Content" xml:space="preserve">
+  <data name="MusicGalleryPageScrollToPlayingItem.Text" xml:space="preserve">
     <value>アイテムを再生するための位置</value>
   </data>
   <data name="MusicGalleryPageSelectAll.Content" xml:space="preserve">
     <value>すべてを選択します</value>
   </data>
-  <data name="MusicGalleryPageSingleLoop.Content" xml:space="preserve">
+  <data name="MusicGalleryPageSingleLoop.Text" xml:space="preserve">
     <value>シングルループ</value>
   </data>
   <data name="MusicGalleryPageSongSearchBox.PlaceholderText" xml:space="preserve">
@@ -466,6 +472,9 @@
   <data name="MusicGalleryPageStarredPlaylist.Content" xml:space="preserve">
     <value>スター付きプレイリスト</value>
   </data>
+  <data name="MusicGalleryPageStopTrack.Text" xml:space="preserve">
+    <value>立ち止まる</value>
+  </data>
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>音楽ギャラリー - BetterLyrics</value>
   </data>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw

@@ -177,7 +177,7 @@
   <data name="HostWindowMusicGalleryButtonToolTip.Content" xml:space="preserve">
     <value>음악 갤러리</value>
   </data>
-  <data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
+  <data name="HostWindowSettingsButtonToolTip.Text" xml:space="preserve">
     <value>설정</value>
   </data>
   <data name="ImportPlaylistSuccessfully" xml:space="preserve">
@@ -353,7 +353,7 @@
     <value>Betterlyrics에 오신 것을 환영합니다</value>
   </data>
   <data name="MusicGalleryPageAddToCustomList.Text" xml:space="preserve">
-    <value>재생 목록에 추가하십시오</value>
+    <value>재생 목록에 추가</value>
   </data>
   <data name="MusicGalleryPageAddToEnd.Text" xml:space="preserve">
     <value>목록의 끝</value>
@@ -367,7 +367,7 @@
   <data name="MusicGalleryPageAllSongs" xml:space="preserve">
     <value>모든 노래</value>
   </data>
-  <data name="MusicGalleryPageEmptyPlayingQueue.Content" xml:space="preserve">
+  <data name="MusicGalleryPageEmptyPlayingQueue.Text" xml:space="preserve">
     <value>플레이 대기열을 클리어합니다</value>
   </data>
   <data name="MusicGalleryPageFileAlbum.Text" xml:space="preserve">
@@ -416,7 +416,7 @@
     <value>파일에서 가져오기</value>
   </data>
   <data name="MusicGalleryPageNewPlaylist.Text" xml:space="preserve">
-    <value>재생 목록을 만듭니다</value>
+    <value>재생목록을 만드세요</value>
   </data>
   <data name="MusicGalleryPagePlayAll.Content" xml:space="preserve">
     <value>모두 재생하십시오</value>
@@ -427,22 +427,28 @@
   <data name="MusicGalleryPagePlayingQueueEmpty.Text" xml:space="preserve">
     <value>플레이 대기열이 비어 있습니다</value>
   </data>
-  <data name="MusicGalleryPageQueueLoop.Content" xml:space="preserve">
+  <data name="MusicGalleryPagePlaylist.Text" xml:space="preserve">
+    <value>재생 목록</value>
+  </data>
+  <data name="MusicGalleryPageQueueLoop.Text" xml:space="preserve">
     <value>목록 루프</value>
   </data>
-  <data name="MusicGalleryPageQueueRandom.Content" xml:space="preserve">
+  <data name="MusicGalleryPageQueueRandom.Text" xml:space="preserve">
     <value>무작위의</value>
   </data>
+  <data name="MusicGalleryPageRemoveFromCustomList.Text" xml:space="preserve">
+    <value>재생 목록에서 제거</value>
+  </data>
   <data name="MusicGalleryPageRemoveFromPlayingQueue.Text" xml:space="preserve">
     <value>재생 목록에서 제거하십시오</value>
   </data>
-  <data name="MusicGalleryPageScrollToPlayingItem.Content" xml:space="preserve">
+  <data name="MusicGalleryPageScrollToPlayingItem.Text" xml:space="preserve">
     <value>아이템을 재생하기위한 포지셔닝</value>
   </data>
   <data name="MusicGalleryPageSelectAll.Content" xml:space="preserve">
     <value>모두를 선택하십시오</value>
   </data>
-  <data name="MusicGalleryPageSingleLoop.Content" xml:space="preserve">
+  <data name="MusicGalleryPageSingleLoop.Text" xml:space="preserve">
     <value>단일 루프</value>
   </data>
   <data name="MusicGalleryPageSongSearchBox.PlaceholderText" xml:space="preserve">
@@ -466,6 +472,9 @@
   <data name="MusicGalleryPageStarredPlaylist.Content" xml:space="preserve">
     <value>별표 표시된 재생 목록</value>
   </data>
+  <data name="MusicGalleryPageStopTrack.Text" xml:space="preserve">
+    <value>멈추기</value>
+  </data>
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>음악 갤러리 - BetterLyrics</value>
   </data>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw

@@ -177,7 +177,7 @@
   <data name="HostWindowMusicGalleryButtonToolTip.Content" xml:space="preserve">
     <value>音乐库</value>
   </data>
-  <data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
+  <data name="HostWindowSettingsButtonToolTip.Text" xml:space="preserve">
     <value>设置</value>
   </data>
   <data name="ImportPlaylistSuccessfully" xml:space="preserve">
@@ -353,7 +353,7 @@
     <value>欢迎使用 BetterLyrics</value>
   </data>
   <data name="MusicGalleryPageAddToCustomList.Text" xml:space="preserve">
-    <value>添加到歌单</value>
+    <value>添加到播放列表</value>
   </data>
   <data name="MusicGalleryPageAddToEnd.Text" xml:space="preserve">
     <value>列表的结尾</value>
@@ -367,7 +367,7 @@
   <data name="MusicGalleryPageAllSongs" xml:space="preserve">
     <value>所有歌曲</value>
   </data>
-  <data name="MusicGalleryPageEmptyPlayingQueue.Content" xml:space="preserve">
+  <data name="MusicGalleryPageEmptyPlayingQueue.Text" xml:space="preserve">
     <value>清除播放队列</value>
   </data>
   <data name="MusicGalleryPageFileAlbum.Text" xml:space="preserve">
@@ -416,7 +416,7 @@
     <value>从文件导入</value>
   </data>
   <data name="MusicGalleryPageNewPlaylist.Text" xml:space="preserve">
-    <value>创建歌单</value>
+    <value>创建播放列表</value>
   </data>
   <data name="MusicGalleryPagePlayAll.Content" xml:space="preserve">
     <value>播放全部</value>
@@ -427,22 +427,28 @@
   <data name="MusicGalleryPagePlayingQueueEmpty.Text" xml:space="preserve">
     <value>播放队列是空的</value>
   </data>
-  <data name="MusicGalleryPageQueueLoop.Content" xml:space="preserve">
+  <data name="MusicGalleryPagePlaylist.Text" xml:space="preserve">
+    <value>播放列表</value>
+  </data>
+  <data name="MusicGalleryPageQueueLoop.Text" xml:space="preserve">
     <value>列表循环</value>
   </data>
-  <data name="MusicGalleryPageQueueRandom.Content" xml:space="preserve">
+  <data name="MusicGalleryPageQueueRandom.Text" xml:space="preserve">
     <value>随机</value>
   </data>
+  <data name="MusicGalleryPageRemoveFromCustomList.Text" xml:space="preserve">
+    <value>从播放列表中删除</value>
+  </data>
   <data name="MusicGalleryPageRemoveFromPlayingQueue.Text" xml:space="preserve">
     <value>从播放列表移除</value>
   </data>
-  <data name="MusicGalleryPageScrollToPlayingItem.Content" xml:space="preserve">
+  <data name="MusicGalleryPageScrollToPlayingItem.Text" xml:space="preserve">
     <value>定位到播放项</value>
   </data>
   <data name="MusicGalleryPageSelectAll.Content" xml:space="preserve">
     <value>选择全部</value>
   </data>
-  <data name="MusicGalleryPageSingleLoop.Content" xml:space="preserve">
+  <data name="MusicGalleryPageSingleLoop.Text" xml:space="preserve">
     <value>单曲循环</value>
   </data>
   <data name="MusicGalleryPageSongSearchBox.PlaceholderText" xml:space="preserve">
@@ -466,6 +472,9 @@
   <data name="MusicGalleryPageStarredPlaylist.Content" xml:space="preserve">
     <value>已加星标的歌单</value>
   </data>
+  <data name="MusicGalleryPageStopTrack.Text" xml:space="preserve">
+    <value>停止</value>
+  </data>
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>音乐库 - BetterLyrics</value>
   </data>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw

@@ -177,7 +177,7 @@
   <data name="HostWindowMusicGalleryButtonToolTip.Content" xml:space="preserve">
     <value>音樂庫</value>
   </data>
-  <data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
+  <data name="HostWindowSettingsButtonToolTip.Text" xml:space="preserve">
     <value>設定</value>
   </data>
   <data name="ImportPlaylistSuccessfully" xml:space="preserve">
@@ -353,7 +353,7 @@
     <value>歡迎使用 BetterLyrics</value>
   </data>
   <data name="MusicGalleryPageAddToCustomList.Text" xml:space="preserve">
-    <value>添加到歌單</value>
+    <value>新增到播放清單</value>
   </data>
   <data name="MusicGalleryPageAddToEnd.Text" xml:space="preserve">
     <value>列表的結尾</value>
@@ -367,7 +367,7 @@
   <data name="MusicGalleryPageAllSongs" xml:space="preserve">
     <value>所有歌曲</value>
   </data>
-  <data name="MusicGalleryPageEmptyPlayingQueue.Content" xml:space="preserve">
+  <data name="MusicGalleryPageEmptyPlayingQueue.Text" xml:space="preserve">
     <value>清除播放隊列</value>
   </data>
   <data name="MusicGalleryPageFileAlbum.Text" xml:space="preserve">
@@ -416,7 +416,7 @@
     <value>從檔案匯入</value>
   </data>
   <data name="MusicGalleryPageNewPlaylist.Text" xml:space="preserve">
-    <value>建立歌單</value>
+    <value>建立播放清單</value>
   </data>
   <data name="MusicGalleryPagePlayAll.Content" xml:space="preserve">
     <value>播放全部</value>
@@ -427,22 +427,28 @@
   <data name="MusicGalleryPagePlayingQueueEmpty.Text" xml:space="preserve">
     <value>播放隊列是空的</value>
   </data>
-  <data name="MusicGalleryPageQueueLoop.Content" xml:space="preserve">
+  <data name="MusicGalleryPagePlaylist.Text" xml:space="preserve">
+    <value>播放清單</value>
+  </data>
+  <data name="MusicGalleryPageQueueLoop.Text" xml:space="preserve">
     <value>列表循環</value>
   </data>
-  <data name="MusicGalleryPageQueueRandom.Content" xml:space="preserve">
+  <data name="MusicGalleryPageQueueRandom.Text" xml:space="preserve">
     <value>隨機</value>
   </data>
+  <data name="MusicGalleryPageRemoveFromCustomList.Text" xml:space="preserve">
+    <value>從播放列表中刪除</value>
+  </data>
   <data name="MusicGalleryPageRemoveFromPlayingQueue.Text" xml:space="preserve">
     <value>從播放列表移除</value>
   </data>
-  <data name="MusicGalleryPageScrollToPlayingItem.Content" xml:space="preserve">
+  <data name="MusicGalleryPageScrollToPlayingItem.Text" xml:space="preserve">
     <value>定位到播放項</value>
   </data>
   <data name="MusicGalleryPageSelectAll.Content" xml:space="preserve">
     <value>選擇全部</value>
   </data>
-  <data name="MusicGalleryPageSingleLoop.Content" xml:space="preserve">
+  <data name="MusicGalleryPageSingleLoop.Text" xml:space="preserve">
     <value>單曲循環</value>
   </data>
   <data name="MusicGalleryPageSongSearchBox.PlaceholderText" xml:space="preserve">
@@ -466,6 +472,9 @@
   <data name="MusicGalleryPageStarredPlaylist.Content" xml:space="preserve">
     <value>已加星號的歌单</value>
   </data>
+  <data name="MusicGalleryPageStopTrack.Text" xml:space="preserve">
+    <value>停止</value>
+  </data>
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>音樂庫 - BetterLyrics</value>
   </data>

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

@@ -193,7 +193,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 _fluidEffect?.Properties["Width"] = (float)control.ConvertDipsToPixels((float)_canvasWidth, CanvasDpiRounding.Round);
                 _fluidEffect?.Properties["Height"] = (float)control.ConvertDipsToPixels((float)_canvasHeight, CanvasDpiRounding.Round);
 
-                //_topMargin = _bottomMargin = _leftMargin = _middleMargin = _rightMargin = Math.Max(_canvasWidth, _canvasHeight) / 30.0;
+                _topMargin = _bottomMargin = _leftMargin = _middleMargin = _rightMargin = Math.Max(_canvasWidth, _canvasHeight) / 30.0;
             }
 
             if (_isSongInfoFontSizeChanged || _isSongTitleVisibilityChanged || _isSongArtistsVisibilityChanged)
@@ -201,7 +201,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 _songInfoHeight = 0;
                 if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.ShowTitle)
                 {
-                    _songInfoHeight += (int)_titleTextFormat.FontSize;
+                    _songInfoHeight += (int)(_titleTextFormat.FontSize * (1.0 + 0.5));
                     if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.ShowArtists)
                     {
                         _songInfoHeight += (int)_artistTextFormat.FontSize;
@@ -260,7 +260,9 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                     case LyricsLayoutOrientation.Vertical:
                         if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.AutoAlbumArtSize)
                         {
-                            _albumArtSize = 64;
+                            _albumArtSize = Math.Min((_canvasHeight - _topMargin - _bottomMargin) * 3.0 / 16.0,
+                                (_canvasWidth - _leftMargin - _middleMargin - _rightMargin) * 4.0 / 16.0);
+                            _albumArtSize = Math.Max(0, _albumArtSize);
                         }
                         else
                         {
@@ -470,8 +472,8 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
             if (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.IsDynamicLyricsFontSize)
             {
-                _originalLyricsFontSize = (int)Math.Clamp(Math.Min(_canvasHeight, _canvasWidth) / 15, 12, 96);
-                _translatedLyricsFontSize = _phoneticLyricsFontSize = (int)(_originalLyricsFontSize * 0.6);
+                _originalLyricsFontSize = (int)Math.Clamp(Math.Min(_canvasHeight, _canvasWidth) / 15, 18, 96);
+                _translatedLyricsFontSize = _phoneticLyricsFontSize = (int)(_originalLyricsFontSize * 2.0 / 3.0);
             }
             else
             {
@@ -481,6 +483,8 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             }
 
             _originalLyricsFontWeight = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsFontWeight;
+            _titleTextFormat.FontWeight = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsFontWeight.ToFontWeight();
+            _artistTextFormat.FontWeight = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsFontWeight.ToFontWeight();
 
             if (SongInfo != null)
             {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSettingsControlViewModel.cs

@@ -80,7 +80,7 @@ namespace BetterLyrics.WinUI3.ViewModels
         [RelayCommand]
         private void CreateFullLyricsWindowStatus()
         {
-            AppSettings.WindowBoundsRecords.Add(LyricsWindowStatusExtensions.FullscreenMode(LiveStates.LyricsWindowStatus.MonitorBounds));
+            AppSettings.WindowBoundsRecords.Add(LyricsWindowStatusExtensions.FullscreenMode());
         }
 
         [RelayCommand]

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryViewModel.cs

@@ -115,10 +115,12 @@ namespace BetterLyrics.WinUI3.ViewModels
 
             _mediaPlayer.MediaOpened += MediaPlayer_MediaOpened;
             _mediaPlayer.MediaEnded += MediaPlayer_MediaEnded;
+            _mediaPlayer.CommandManager.IsEnabled = false;
+
             _timelineController = _mediaPlayer.TimelineController = new();
             _timelineController.PositionChanged += TimelineController_PositionChanged;
+
             _smtc = _mediaPlayer.SystemMediaTransportControls;
-            _mediaPlayer.CommandManager.IsEnabled = false;
             _smtc.IsPlayEnabled = true;
             _smtc.IsPauseEnabled = true;
             _smtc.IsNextEnabled = true;
@@ -131,7 +133,7 @@ namespace BetterLyrics.WinUI3.ViewModels
 
             if (AppSettings.MusicGallerySettings.AutoPlay)
             {
-                PlayTrackAt(AppSettings.MusicGallerySettings.PlayQueueIndex);
+                _ = PlayTrackAtAsync(AppSettings.MusicGallerySettings.PlayQueueIndex);
             }
         }
 
@@ -160,7 +162,7 @@ namespace BetterLyrics.WinUI3.ViewModels
             switch (AppSettings.MusicGallerySettings.PlaybackOrder)
             {
                 case PlaybackOrder.RepeatAll:
-                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, async () =>
                     {
                         if (AppSettings.MusicGallerySettings.PlayQueueIndex < TrackPlayingQueue.Count - 1)
                         {
@@ -170,20 +172,20 @@ namespace BetterLyrics.WinUI3.ViewModels
                         {
                             AppSettings.MusicGallerySettings.PlayQueueIndex = 0;
                         }
-                        PlayTrack(PlayingQueueItem);
+                        await PlayTrackAsync(PlayingQueueItem);
                     });
                     break;
                 case PlaybackOrder.RepeatOne:
                     _timelineController.Position = TimeSpan.Zero;
                     break;
                 case PlaybackOrder.Shuffle:
-                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, async () =>
                     {
                         if (TrackPlayingQueue.Count > 0)
                         {
                             AppSettings.MusicGallerySettings.PlayQueueIndex = new Random().Next(0, TrackPlayingQueue.Count);
                         }
-                        PlayTrack(PlayingQueueItem);
+                        await PlayTrackAsync(PlayingQueueItem);
                     });
                     break;
                 default:
@@ -196,7 +198,7 @@ namespace BetterLyrics.WinUI3.ViewModels
             switch (AppSettings.MusicGallerySettings.PlaybackOrder)
             {
                 case PlaybackOrder.RepeatAll:
-                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, async () =>
                     {
                         if (AppSettings.MusicGallerySettings.PlayQueueIndex > 0)
                         {
@@ -206,20 +208,20 @@ namespace BetterLyrics.WinUI3.ViewModels
                         {
                             AppSettings.MusicGallerySettings.PlayQueueIndex = TrackPlayingQueue.Count - 1;
                         }
-                        PlayTrack(PlayingQueueItem);
+                        await PlayTrackAsync(PlayingQueueItem);
                     });
                     break;
                 case PlaybackOrder.RepeatOne:
                     _timelineController.Position = TimeSpan.Zero;
                     break;
                 case PlaybackOrder.Shuffle:
-                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, async () =>
                     {
                         if (TrackPlayingQueue.Count > 0)
                         {
                             AppSettings.MusicGallerySettings.PlayQueueIndex = new Random().Next(0, TrackPlayingQueue.Count);
                         }
-                        PlayTrack(PlayingQueueItem);
+                        await PlayTrackAsync(PlayingQueueItem);
                     });
                     break;
                 default:
@@ -427,12 +429,12 @@ namespace BetterLyrics.WinUI3.ViewModels
             ApplyPlaylist();
         }
 
-        public void PlayTrackAt(int index)
+        public async Task PlayTrackAtAsync(int index)
         {
-            PlayTrack(TrackPlayingQueue.ElementAtOrDefault(index));
+            await PlayTrackAsync(TrackPlayingQueue.ElementAtOrDefault(index));
         }
 
-        public void PlayTrack(PlayQueueItem? playQueueItem)
+        public async Task PlayTrackAsync(PlayQueueItem? playQueueItem)
         {
             _timelineController.Pause();
             _mediaPlayer.Source = null;
@@ -447,18 +449,9 @@ namespace BetterLyrics.WinUI3.ViewModels
                 _smtc.IsEnabled = true;
                 _mediaPlayer.Source = MediaSource.CreateFromUri(new Uri(track.Path));
                 updater.AppMediaId = Package.Current.Id.FullName;
-                updater.Type = MediaPlaybackType.Music;
-                updater.MusicProperties.Title = track.Title;
-                updater.MusicProperties.Artist = track.Artist;
-                updater.MusicProperties.AlbumTitle = track.Album;
-                if (track.EmbeddedPictures.FirstOrDefault()?.PictureData is byte[] pictureData)
-                {
-                    updater.Thumbnail = ImageHelper.ByteArrayToRandomAccessStreamReference(pictureData);
-                }
-                else
-                {
-                    updater.Thumbnail = null;
-                }
+
+                var storageFile = await StorageFile.GetFileFromPathAsync(track.Path);
+                await updater.CopyFromFileAsync(MediaPlaybackType.Music, storageFile);
                 updater.Update();
             }
         }
@@ -530,5 +523,17 @@ namespace BetterLyrics.WinUI3.ViewModels
                 DevWinUI.Growl.Success(_resourceService.GetLocalizedString("ImportPlaylistSuccessfully"), file.Path);
             }
         }
+
+        [RelayCommand]
+        private void SwitchPlaybackOrder()
+        {
+            AppSettings.MusicGallerySettings.PlaybackOrder = AppSettings.MusicGallerySettings.PlaybackOrder.GetNext();
+        }
+
+        [RelayCommand]
+        private async Task StopTrackAsync()
+        {
+            await PlayTrackAtAsync(-1);
+        }
     }
 }

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

@@ -70,13 +70,24 @@
                             <Grid>
 
                                 <!--  Volumn: 0  -->
-                                <FontIcon
-                                    x:Name="VolumeLevel0"
-                                    FontFamily="{StaticResource IconFontFamily}"
-                                    Glyph="&#xE74F;">
+                                <FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="&#xE74F;">
                                     <FontIcon.OpacityTransition>
                                         <ScalarTransition />
                                     </FontIcon.OpacityTransition>
+                                    <interactivity:Interaction.Behaviors>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="Equal"
+                                            Value="0">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
+                                        </interactivity:DataTriggerBehavior>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="NotEqual"
+                                            Value="0">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
+                                        </interactivity:DataTriggerBehavior>
+                                    </interactivity:Interaction.Behaviors>
                                 </FontIcon>
 
                                 <!--  Volumn: 1-32  -->
@@ -87,6 +98,20 @@
                                     <FontIcon.OpacityTransition>
                                         <ScalarTransition />
                                     </FontIcon.OpacityTransition>
+                                    <interactivity:Interaction.Behaviors>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="GreaterThanOrEqual"
+                                            Value="1">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
+                                        </interactivity:DataTriggerBehavior>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="LessThan"
+                                            Value="1">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
+                                        </interactivity:DataTriggerBehavior>
+                                    </interactivity:Interaction.Behaviors>
                                 </FontIcon>
 
                                 <!--  Volumn: 33-65  -->
@@ -97,6 +122,20 @@
                                     <FontIcon.OpacityTransition>
                                         <ScalarTransition />
                                     </FontIcon.OpacityTransition>
+                                    <interactivity:Interaction.Behaviors>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="GreaterThanOrEqual"
+                                            Value="33">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
+                                        </interactivity:DataTriggerBehavior>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="LessThan"
+                                            Value="33">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
+                                        </interactivity:DataTriggerBehavior>
+                                    </interactivity:Interaction.Behaviors>
                                 </FontIcon>
 
                                 <!--  Volumn: 66-100  -->
@@ -107,6 +146,20 @@
                                     <FontIcon.OpacityTransition>
                                         <ScalarTransition />
                                     </FontIcon.OpacityTransition>
+                                    <interactivity:Interaction.Behaviors>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="GreaterThanOrEqual"
+                                            Value="66">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
+                                        </interactivity:DataTriggerBehavior>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="LessThan"
+                                            Value="66">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
+                                        </interactivity:DataTriggerBehavior>
+                                    </interactivity:Interaction.Behaviors>
                                 </FontIcon>
                             </Grid>
 
@@ -343,65 +396,5 @@
 
         <uc:SystemTray />
 
-        <VisualStateManager.VisualStateGroups>
-            <VisualStateGroup x:Name="VolumeState">
-                <VisualState x:Name="Volume0">
-                    <VisualState.StateTriggers>
-                        <ui:CompareStateTrigger
-                            Comparison="Equal"
-                            Value="{x:Bind ViewModel.Volume, Mode=OneWay}"
-                            To="0" />
-                    </VisualState.StateTriggers>
-                    <VisualState.Setters>
-                        <Setter Target="VolumeLevel0.Opacity" Value="1" />
-                        <Setter Target="VolumeLevel1.Opacity" Value="0" />
-                        <Setter Target="VolumeLevel2.Opacity" Value="0" />
-                        <Setter Target="VolumeLevel3.Opacity" Value="0" />
-                    </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="Volume1">
-                    <VisualState.StateTriggers>
-                        <ui:CompareStateTrigger
-                            Comparison="LessThanOrEqual"
-                            Value="{x:Bind ViewModel.Volume, Mode=OneWay}"
-                            To="32" />
-                    </VisualState.StateTriggers>
-                    <VisualState.Setters>
-                        <Setter Target="VolumeLevel0.Opacity" Value="0" />
-                        <Setter Target="VolumeLevel1.Opacity" Value="1" />
-                        <Setter Target="VolumeLevel2.Opacity" Value="0" />
-                        <Setter Target="VolumeLevel3.Opacity" Value="0" />
-                    </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="Volume2">
-                    <VisualState.StateTriggers>
-                        <ui:CompareStateTrigger
-                            Comparison="LessThanOrEqual"
-                            Value="{x:Bind ViewModel.Volume, Mode=OneWay}"
-                            To="65" />
-                    </VisualState.StateTriggers>
-                    <VisualState.Setters>
-                        <Setter Target="VolumeLevel0.Opacity" Value="0" />
-                        <Setter Target="VolumeLevel1.Opacity" Value="0" />
-                        <Setter Target="VolumeLevel2.Opacity" Value="1" />
-                        <Setter Target="VolumeLevel3.Opacity" Value="0" />
-                    </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="Volume3">
-                    <VisualState.StateTriggers>
-                        <ui:CompareStateTrigger
-                            Comparison="LessThanOrEqual"
-                            Value="{x:Bind ViewModel.Volume, Mode=OneWay}"
-                            To="100" />
-                    </VisualState.StateTriggers>
-                    <VisualState.Setters>
-                        <Setter Target="VolumeLevel0.Opacity" Value="0" />
-                        <Setter Target="VolumeLevel1.Opacity" Value="0" />
-                        <Setter Target="VolumeLevel2.Opacity" Value="0" />
-                        <Setter Target="VolumeLevel3.Opacity" Value="1" />
-                    </VisualState.Setters>
-                </VisualState>
-            </VisualStateGroup>
-        </VisualStateManager.VisualStateGroups>
     </Grid>
 </Page>

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

@@ -18,7 +18,7 @@
             Width="1"
             Height="1"
             HorizontalAlignment="Left"
-            VerticalAlignment="Top" />
+            VerticalAlignment="Bottom" />
 
         <local:LyricsPage />
 
@@ -56,14 +56,20 @@
                         </ToolTipService.ToolTip>
                     </Button>
 
+                    <!--  Settings  -->
                     <Button
                         x:Name="SettingsWindowButton"
                         Click="SettingsWindowButton_Click"
                         Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                               FontSize=12,
                                               Glyph=&#xE713;}"
-                        Style="{StaticResource TitleBarButtonStyle}" />
+                        Style="{StaticResource TitleBarButtonStyle}">
+                        <ToolTipService.ToolTip>
+                            <TextBlock x:Uid="HostWindowSettingsButtonToolTip" />
+                        </ToolTipService.ToolTip>
+                    </Button>
 
+                    <!--  Lyrics window switcher  -->
                     <Button Click="LyricsWindowSwitchButton_Click" Style="{StaticResource TitleBarButtonStyle}">
                         <FontIcon
                             FontFamily="{StaticResource IconFontFamily}"

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

@@ -87,7 +87,7 @@ namespace BetterLyrics.WinUI3.Views
         {
             if (_liveStatesService.LiveStates.IsLyricsWindowStatusRefreshing)
             {
-                //return;
+                return;
             }
 
             if (args.DidPositionChange || args.DidSizeChange)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml

@@ -26,15 +26,16 @@
     </Page.Resources>
 
     <Grid>
-        <Grid>
+        <Grid Padding="12,0,12,0" ColumnSpacing="12">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="3*" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
-            <Grid
-                x:Name="SongViewer"
-                Grid.Column="0"
-                Padding="12">
+            <Grid x:Name="SongViewer" Grid.Column="0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
                 <Grid.Tag>
                     <Flyout
                         x:Name="SongFileInfoFlyout"
@@ -171,7 +172,7 @@
                     </Flyout>
                 </Grid.Tag>
 
-                <StackPanel Spacing="6">
+                <StackPanel Grid.Row="0" Spacing="6">
 
                     <Grid VerticalAlignment="Top">
                         <Grid.ColumnDefinitions>
@@ -182,10 +183,16 @@
                         <Button
                             x:Name="PlaylistButton"
                             Grid.Column="0"
-                            Content="{ui:FontIcon FontSize=16,
-                                                  FontFamily={StaticResource IconFontFamily},
-                                                  Glyph=&#xE728;}"
                             Style="{StaticResource GhostButtonStyle}">
+                            <Button.Content>
+                                <StackPanel Orientation="Horizontal" Spacing="6">
+                                    <FontIcon
+                                        FontFamily="{StaticResource IconFontFamily}"
+                                        FontSize="16"
+                                        Glyph="&#xE728;" />
+                                    <TextBlock x:Uid="MusicGalleryPagePlaylist" />
+                                </StackPanel>
+                            </Button.Content>
                             <Button.Flyout>
                                 <Flyout FlyoutPresenterStyle="{StaticResource FlyoutGhostStyle}">
                                     <Grid>
@@ -291,6 +298,12 @@
                                             Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                                             Style="{StaticResource GhostButtonStyle}"
                                             Visibility="{x:Bind IsClosable, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
+                                            <ToolTipService.ToolTip>
+                                                <Grid>
+                                                    <TextBlock x:Uid="MusicGalleryPageAddToCustomList" Visibility="{x:Bind IsStarred, Converter={StaticResource BoolNegationToVisibilityConverter}, Mode=OneWay}" />
+                                                    <TextBlock x:Uid="MusicGalleryPageRemoveFromCustomList" Visibility="{x:Bind IsStarred, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" />
+                                                </Grid>
+                                            </ToolTipService.ToolTip>
                                             <Button.Content>
                                                 <Grid>
                                                     <FontIcon
@@ -353,6 +366,7 @@
                     <AutoSuggestBox
                         x:Name="SongSearchBox"
                         x:Uid="MusicGalleryPageSongSearchBox"
+                        Margin="0,-8,0,0"
                         HorizontalAlignment="Stretch"
                         QueryIcon="Find"
                         Text="{x:Bind ViewModel.SongSearchQuery, Mode=TwoWay}" />
@@ -406,7 +420,7 @@
 
                 </StackPanel>
 
-                <SemanticZoom Margin="0,120,0,0">
+                <SemanticZoom Grid.Row="1">
                     <SemanticZoom.ZoomedInView>
                         <ListView
                             x:Name="SongListView"
@@ -565,7 +579,7 @@
                     </SemanticZoom.ZoomedOutView>
                 </SemanticZoom>
 
-                <Grid Margin="0,120,0,0" Visibility="{x:Bind ViewModel.IsLocalMediaNotFound, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                <Grid Grid.Row="1" Visibility="{x:Bind ViewModel.IsLocalMediaNotFound, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
                     <StackPanel
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
@@ -580,36 +594,138 @@
 
             </Grid>
 
-            <Grid
-                x:Name="PlayQueue"
-                Grid.Column="1"
-                Margin="0,0,12,0">
+            <Grid x:Name="PlayQueue" Grid.Column="1">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
 
-                <StackPanel Margin="0,10,0,0" Spacing="6">
-                    <Grid Margin="0,6,0,0" VerticalAlignment="Top">
-                        <TextBlock x:Uid="MusicGalleryPagePlayingQueue" Style="{StaticResource BodyStrongTextBlockStyle}" />
-                        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+                <StackPanel Grid.Row="0" Spacing="6">
+                    <Grid ColumnSpacing="3">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <TextBlock
+                            x:Uid="MusicGalleryPagePlayingQueue"
+                            Grid.Column="0"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource BodyStrongTextBlockStyle}" />
+                        <StackPanel
+                            Grid.Column="1"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Center"
+                            Orientation="Horizontal">
                             <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{x:Bind ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex, Mode=OneWay, Converter={StaticResource IndexToDisplayConverter}}" />
                             <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="/" />
                             <TextBlock Text="{x:Bind ViewModel.TrackPlayingQueue.Count, Mode=OneWay}" />
                         </StackPanel>
+
+                        <!--  Stop media session  -->
+                        <Button
+                            Grid.Column="2"
+                            HorizontalAlignment="Right"
+                            Command="{x:Bind ViewModel.StopTrackCommand}"
+                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                  FontSize=16,
+                                                  Glyph=&#xE71A;}"
+                            Style="{StaticResource GhostButtonStyle}">
+                            <ToolTipService.ToolTip>
+                                <TextBlock x:Uid="MusicGalleryPageStopTrack" />
+                            </ToolTipService.ToolTip>
+                        </Button>
+
+                        <!--  Playback order  -->
+                        <Button
+                            Grid.Column="3"
+                            HorizontalAlignment="Right"
+                            Command="{x:Bind ViewModel.SwitchPlaybackOrderCommand}"
+                            Style="{StaticResource GhostButtonStyle}">
+                            <ToolTipService.ToolTip>
+                                <ToolTip>
+                                    <ToolTip.Content>
+                                        <Grid>
+                                            <TextBlock x:Name="PlaybackRepeatAllHint" x:Uid="MusicGalleryPageQueueLoop" />
+                                            <TextBlock x:Name="PlaybackRepeatOneHint" x:Uid="MusicGalleryPageSingleLoop" />
+                                            <TextBlock x:Name="PlaybackShuffleHint" x:Uid="MusicGalleryPageQueueRandom" />
+                                        </Grid>
+                                    </ToolTip.Content>
+                                </ToolTip>
+                            </ToolTipService.ToolTip>
+                            <Button.Content>
+                                <Grid>
+                                    <!--  Repeat all  -->
+                                    <FontIcon
+                                        x:Name="PlaybackRepeatAll"
+                                        FontFamily="{StaticResource IconFontFamily}"
+                                        FontSize="16"
+                                        Glyph="&#xE8EE;">
+                                        <FontIcon.OpacityTransition>
+                                            <ScalarTransition />
+                                        </FontIcon.OpacityTransition>
+                                    </FontIcon>
+                                    <!--  Repeat one  -->
+                                    <FontIcon
+                                        x:Name="PlaybackRepeatOne"
+                                        FontFamily="{StaticResource IconFontFamily}"
+                                        FontSize="16"
+                                        Glyph="&#xE8ED;">
+                                        <FontIcon.OpacityTransition>
+                                            <ScalarTransition />
+                                        </FontIcon.OpacityTransition>
+                                    </FontIcon>
+                                    <!--  Shuffle  -->
+                                    <FontIcon
+                                        x:Name="PlaybackShuffle"
+                                        FontFamily="{StaticResource IconFontFamily}"
+                                        FontSize="16"
+                                        Glyph="&#xE8B1;">
+                                        <FontIcon.OpacityTransition>
+                                            <ScalarTransition />
+                                        </FontIcon.OpacityTransition>
+                                    </FontIcon>
+                                </Grid>
+                            </Button.Content>
+                        </Button>
+
+                        <!--  Scroll to playing item  -->
+                        <Button
+                            Grid.Column="4"
+                            HorizontalAlignment="Right"
+                            Click="ScrollToPlayingItemButton_Click"
+                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                  FontSize=16,
+                                                  Glyph=&#xE7B7;}"
+                            Style="{StaticResource GhostButtonStyle}">
+                            <ToolTipService.ToolTip>
+                                <TextBlock x:Uid="MusicGalleryPageScrollToPlayingItem" />
+                            </ToolTipService.ToolTip>
+                        </Button>
+
+                        <!--  Empty play queue  -->
+                        <Button
+                            Grid.Column="5"
+                            HorizontalAlignment="Right"
+                            Click="EmptyPlayingQueueButton_Click"
+                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                  FontSize=16,
+                                                  Glyph=&#xE738;}"
+                            Style="{StaticResource GhostButtonStyle}">
+                            <ToolTipService.ToolTip>
+                                <TextBlock x:Uid="MusicGalleryPageEmptyPlayingQueue" />
+                            </ToolTipService.ToolTip>
+                        </Button>
                     </Grid>
-                    <StackPanel Orientation="Horizontal" Spacing="6">
-                        <Button x:Uid="MusicGalleryPageEmptyPlayingQueue" Click="EmptyPlayingQueueButton_Click" />
-                        <Button x:Uid="MusicGalleryPageScrollToPlayingItem" Click="ScrollToPlayingItemButton_Click" />
-                    </StackPanel>
-                    <controls:Segmented HorizontalAlignment="Stretch" SelectedIndex="{x:Bind ViewModel.AppSettings.MusicGallerySettings.PlaybackOrder, Converter={StaticResource EnumToIntConverter}, Mode=TwoWay}">
-                        <controls:Segmented.Items>
-                            <controls:SegmentedItem x:Uid="MusicGalleryPageQueueLoop" />
-                            <controls:SegmentedItem x:Uid="MusicGalleryPageSingleLoop" />
-                            <controls:SegmentedItem x:Uid="MusicGalleryPageQueueRandom" />
-                        </controls:Segmented.Items>
-                    </controls:Segmented>
+
                 </StackPanel>
 
                 <ListView
                     x:Name="PlayingQueueListView"
-                    Margin="0,136,0,0"
+                    Grid.Row="1"
                     ItemsSource="{x:Bind ViewModel.TrackPlayingQueue, Mode=OneWay}"
                     SelectedIndex="{x:Bind ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex, Mode=TwoWay}">
                     <ListView.ItemTemplate>
@@ -641,7 +757,7 @@
                     </ListView.ItemTemplate>
                 </ListView>
 
-                <Grid Margin="0,136,0,0">
+                <Grid Grid.Row="1">
                     <interactivity:Interaction.Behaviors>
                         <interactivity:DataTriggerBehavior
                             Binding="{x:Bind ViewModel.TrackPlayingQueue.Count, Mode=OneWay}"
@@ -696,5 +812,57 @@
                 dev:Growl.GrowlParent="True" />
         </ScrollViewer>
 
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="PlaybackOrderState">
+                <VisualState x:Name="RepeatAll">
+                    <VisualState.StateTriggers>
+                        <ui:CompareStateTrigger
+                            Comparison="Equal"
+                            Value="{x:Bind ViewModel.AppSettings.MusicGallerySettings.PlaybackOrder, Mode=OneWay, Converter={StaticResource EnumToIntConverter}}"
+                            To="0" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="PlaybackRepeatAll.Opacity" Value="1" />
+                        <Setter Target="PlaybackRepeatOne.Opacity" Value="0" />
+                        <Setter Target="PlaybackShuffle.Opacity" Value="0" />
+                        <Setter Target="PlaybackRepeatAllHint.Visibility" Value="Visible" />
+                        <Setter Target="PlaybackRepeatOneHint.Visibility" Value="Collapsed" />
+                        <Setter Target="PlaybackShuffleHint.Visibility" Value="Collapsed" />
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="RepeatOne">
+                    <VisualState.StateTriggers>
+                        <ui:CompareStateTrigger
+                            Comparison="Equal"
+                            Value="{x:Bind ViewModel.AppSettings.MusicGallerySettings.PlaybackOrder, Mode=OneWay, Converter={StaticResource EnumToIntConverter}}"
+                            To="1" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="PlaybackRepeatAll.Opacity" Value="0" />
+                        <Setter Target="PlaybackRepeatOne.Opacity" Value="1" />
+                        <Setter Target="PlaybackShuffle.Opacity" Value="0" />
+                        <Setter Target="PlaybackRepeatAllHint.Visibility" Value="Collapsed" />
+                        <Setter Target="PlaybackRepeatOneHint.Visibility" Value="Visible" />
+                        <Setter Target="PlaybackShuffleHint.Visibility" Value="Collapsed" />
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="Shuffle">
+                    <VisualState.StateTriggers>
+                        <ui:CompareStateTrigger
+                            Comparison="Equal"
+                            Value="{x:Bind ViewModel.AppSettings.MusicGallerySettings.PlaybackOrder, Mode=OneWay, Converter={StaticResource EnumToIntConverter}}"
+                            To="2" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="PlaybackRepeatAll.Opacity" Value="0" />
+                        <Setter Target="PlaybackRepeatOne.Opacity" Value="0" />
+                        <Setter Target="PlaybackShuffle.Opacity" Value="1" />
+                        <Setter Target="PlaybackRepeatAllHint.Visibility" Value="Collapsed" />
+                        <Setter Target="PlaybackRepeatOneHint.Visibility" Value="Collapsed" />
+                        <Setter Target="PlaybackShuffleHint.Visibility" Value="Visible" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
     </Grid>
 </Page>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml.cs

@@ -64,18 +64,18 @@ namespace BetterLyrics.WinUI3.Views
             await LauncherHelper.SelectAndShowFile(((Track)((HyperlinkButton)sender).DataContext).Path);
         }
 
-        private void PlayingQueueListVireItemGrid_Tapped(object sender, TappedRoutedEventArgs e)
+        private async void PlayingQueueListVireItemGrid_Tapped(object sender, TappedRoutedEventArgs e)
         {
             var item = (PlayQueueItem)((FrameworkElement)sender).DataContext;
-            ViewModel.PlayTrack(item);
+            await ViewModel.PlayTrackAsync(item);
             PlayingQueueListView.ScrollIntoView(item);
         }
 
-        private void EmptyPlayingQueueButton_Click(object sender, RoutedEventArgs e)
+        private async void EmptyPlayingQueueButton_Click(object sender, RoutedEventArgs e)
         {
             ViewModel.TrackPlayingQueue.Clear();
             ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex = -1;
-            ViewModel.PlayTrackAt(ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex);
+            await ViewModel.PlayTrackAtAsync(ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex);
         }
 
         private void ScrollToPlayingItemButton_Click(object sender, RoutedEventArgs e)
@@ -83,7 +83,7 @@ namespace BetterLyrics.WinUI3.Views
             ScrollToPlayingItem();
         }
 
-        private void RemoveFromPlayingQueueButton_Click(object sender, RoutedEventArgs e)
+        private async void RemoveFromPlayingQueueButton_Click(object sender, RoutedEventArgs e)
         {
             bool playNext = false;
             var item = (PlayQueueItem)((FrameworkElement)sender).DataContext;
@@ -104,29 +104,29 @@ namespace BetterLyrics.WinUI3.Views
                     index = ViewModel.TrackPlayingQueue.Count - 1;
                 }
                 ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex = index;
-                ViewModel.PlayTrackAt(ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex);
+                await ViewModel.PlayTrackAtAsync(ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex);
             }
         }
 
-        private void AddSongToQueueNextMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
+        private async void AddSongToQueueNextMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
         {
             bool startPlaying = ViewModel.TrackPlayingQueue.Count == 0;
             ViewModel.TrackPlayingQueue.InsertRange(ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex + 1, SongListView.SelectedItems.Cast<Track>().Select(x => new PlayQueueItem(x)));
             if (startPlaying)
             {
                 ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex = ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex + 1;
-                ViewModel.PlayTrackAt(ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex);
+                await ViewModel.PlayTrackAtAsync(ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex);
             }
         }
 
-        private void AddSongToQueueEndMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
+        private async void AddSongToQueueEndMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
         {
             bool startPlaying = ViewModel.TrackPlayingQueue.Count == 0;
             ViewModel.TrackPlayingQueue.AddRange(SongListView.SelectedItems.Cast<Track>().Select(x => new PlayQueueItem(x)));
             if (startPlaying)
             {
                 ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex = ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex + 1;
-                ViewModel.PlayTrackAt(ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex);
+                await ViewModel.PlayTrackAtAsync(ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex);
             }
         }
 
@@ -261,7 +261,7 @@ namespace BetterLyrics.WinUI3.Views
             }
         }
 
-        private void SongListViewItem_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
+        private async void SongListViewItem_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
         {
             var displayedTracks = SongListView.Items.Cast<Track>();
             var track = (Track)((FrameworkElement)sender).DataContext;
@@ -272,7 +272,7 @@ namespace BetterLyrics.WinUI3.Views
 
             ViewModel.TrackPlayingQueue.InsertRange(ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex + 1, displayedTracks.Select(x => new PlayQueueItem(x)));
             ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex = displayedTracks.ToList().IndexOf(track);
-            ViewModel.PlayTrackAt(ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex);
+            await ViewModel.PlayTrackAtAsync(ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex);
         }
 
         private void Page_Loaded(object sender, RoutedEventArgs e)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml

@@ -24,14 +24,22 @@
                 Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                       FontSize=12,
                                       Glyph=}"
-                Style="{StaticResource TitleBarButtonStyle}" />
+                Style="{StaticResource TitleBarButtonStyle}">
+                <ToolTipService.ToolTip>
+                    <TextBlock x:Uid="SystemTrayLyrics" />
+                </ToolTipService.ToolTip>
+            </Button>
             <Button
                 x:Name="SettingsWindowButton"
                 Click="SettingsWindowButton_Click"
                 Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                       FontSize=12,
                                       Glyph=&#xE713;}"
-                Style="{StaticResource TitleBarButtonStyle}" />
+                Style="{StaticResource TitleBarButtonStyle}">
+                <ToolTipService.ToolTip>
+                    <TextBlock x:Uid="HostWindowSettingsButtonToolTip" />
+                </ToolTipService.ToolTip>
+            </Button>
         </StackPanel>
 
     </Grid>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsWindow.xaml

@@ -23,7 +23,11 @@
                 Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                       FontSize=12,
                                       Glyph=}"
-                Style="{StaticResource TitleBarButtonStyle}" />
+                Style="{StaticResource TitleBarButtonStyle}">
+                <ToolTipService.ToolTip>
+                    <TextBlock x:Uid="SystemTrayLyrics" />
+                </ToolTipService.ToolTip>
+            </Button>
             <Button
                 Click="MusicGalleryButton_Click"
                 Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},

README.CN.md

@@ -89,7 +89,7 @@ BetterLyrics
 - 🧠 **智能化行为**
   - 根据歌曲播放状态自动显隐歌词窗口
 
-## 屏幕截图
+## 🖼️ 屏幕截图
 
 ![](Screenshots/fs2.png)
 ![](Screenshots/std.png)
@@ -104,11 +104,11 @@ BetterLyrics
 ![](Screenshots/PixPin_2025-10-24_18-13-44.gif)
 ![](Screenshots/PixPin_2025-10-24_18-17-17.gif)
 
-## 演示
+## 📹 演示
 
 在 [哔哩哔哩](https://www.bilibili.com/video/BV1QRstz1EGt/) 上观看于 2025 年 10 月 21 日上传的演示视频。
 
-## 即刻体验
+## 🧪 即刻体验
 
 <a href="https://apps.microsoft.com/detail/9P1WCD1P597R?referrer=appbadge&mode=direct">
 	<img src="https://get.microsoft.com/images/zh-cn%20dark.svg" width="200"/>
@@ -116,14 +116,33 @@ BetterLyrics
 
 **无限期**免费试用版和付费版**无任何区别**。
 
-☕ 如果喜欢该软件，请考虑 [捐赠](#捐赠) 或在 **Microsoft Store** 🧧 购买, 感谢您的支持！ 🥰
+如果喜欢该软件，请考虑 [捐赠](#-捐赠) 或在 **Microsoft Store** 购买, 感谢您的支持！ 🥰
 
 无法从 Microsoft Store 下载？点按 [此处](https://github.com/jayfunc/BetterLyrics/wiki/%5BZH%5D-%E5%85%B6%E4%BB%96%E4%B8%8B%E8%BD%BD%E5%92%8C%E5%AE%89%E8%A3%85%E6%96%B9%E5%BC%8F) 查看其他下载安装方式。
 
-## 构建
+## 🏗️ 构建
 
 在构建之前确保替换文件 `BetterLyrics\BetterLyrics.WinUI3\BetterLyrics.WinUI3\Constants\LastFMTemplate` 为 `BetterLyrics\BetterLyrics.WinUI3\BetterLyrics.WinUI3\Constants\LastFM.cs`。
 
+## 🤑 捐赠
+
+如果你喜欢本应用，请考虑捐赠支持开发者。这将有助于本应用的长远发展。
+
+通过以下途径捐赠：
+- [PayPal](https://paypal.me/zhefangpay)
+- [Buy Me a Coffee](https://buymeacoffee.com/founchoo)
+- <details><summary>支付宝</summary>
+    
+  ![](Donate/Alipay.jpg)
+  
+  </detais>
+
+- <details><summary>微信</summary>
+    
+  ![](Donate/WeChatReward.png)
+  
+  </details>
+
 ## 💖 感谢
 
 部分功能及代码引用或修改自公开资料库，包括但不限于下述开源项目/包、教程等，在此一并感谢。
@@ -169,39 +188,26 @@ BetterLyrics
 
 现在访问 https://crowdin.com/project/betterlyrics/invite?h=c9bfb28fce061484883c0891e7a26f9b2592556 即刻为本应用提供翻译，成为贡献者！
 
-## 星标记录
+## ⭐ 星标记录
 
 <div style="display: flex; justify-content: space-around; align-items: flex-start;">
   <img src="https://api.star-history.com/svg?repos=jayfunc/BetterLyrics&type=Date)](https://www.star-history.com/#jayfunc/BetterLyrics&Date" width="100%" >
 </div>
 
-## 欢迎反馈问题、提交代码
+## 🤗 欢迎反馈问题、提交代码
 
 如果发现 Bug 请在 Issues 内提出，同时也欢迎任何想法、建议。
 
-## 捐赠
-
-如果你喜欢本应用，请考虑捐赠支持开发者。这将有助于本应用的长远发展。
-
-通过以下途径捐赠：
-- [PayPal](https://paypal.me/zhefangpay)
-- [Buy Me a Coffee](https://buymeacoffee.com/founchoo)
-- <details><summary>支付宝</summary>
-    
-  ![](Donate/Alipay.jpg)
-  
-  </detais>
-
-- <details><summary>微信</summary>
-    
-  ![](Donate/WeChatReward.png)
-  
-  </details>
-
 ## ⚠️ 免责声明
 
 本项目按“原样”提供，不提供任何形式的担保。
 所有歌词、字体、图标及其他第三方资源均为其各自版权所有者的财产。
 本项目作者不主张对这些资源的所有权。
 本项目为非商业用途，不得用于侵犯任何权利。
-用户有责任确保其使用符合适用的法律和许可协议。
+用户有责任确保其使用符合适用的法律和许可协议。
+
+## 💭 社交媒体分享
+
+![BetterLyrics](https://socialify.git.ci/jayfunc/BetterLyrics/image?description=1&forks=1&issues=1&language=1&name=1&owner=1&pulls=1&stargazers=1&theme=Light)
+
+![BetterLyrics](https://opengraph.githubassets.com/<any_hash_number>/jayfunc/BetterLyrics)

README.md

@@ -95,7 +95,7 @@ Check out the article: [BetterLyrics – An immersive and smooth lyrics display
 - 🧠 **Smart Behaviors**
   - Auto hide when music paused
 
-## Screenshots
+## 🖼️ Screenshots
 
 ![](Screenshots/fs2.png)
 ![](Screenshots/std.png)
@@ -110,11 +110,11 @@ Check out the article: [BetterLyrics – An immersive and smooth lyrics display
 ![](Screenshots/PixPin_2025-10-24_18-13-44.gif)
 ![](Screenshots/PixPin_2025-10-24_18-17-17.gif)
 
-## Demonstration
+## 📹 Demonstration
 
 Watch our demo video (uploaded on 21 Oct 2025) on Bilibili [here](https://www.bilibili.com/video/BV1QRstz1EGt/).
 
-## Try it now
+## 🧪 Try it now
 
 <a href="https://apps.microsoft.com/detail/9P1WCD1P597R?referrer=appbadge&mode=direct">
 	<img src="https://get.microsoft.com/images/en-us%20dark.svg" width="200"/>
@@ -122,14 +122,33 @@ Watch our demo video (uploaded on 21 Oct 2025) on Bilibili [here](https://www.bi
 
 **Unlimited** free trail or purchase (there is **no difference** between free and paid version).
 
-☕ If you find it useful, please consider [donating](#donations) or purchasing 🧧 it in **Microsoft Store**, I'll appreciate it! 🥰
+If you find it useful, please consider [donating](#-donations) or purchasing it in **Microsoft Store**, I'll appreciate it! 🥰
 
 Having trouble downloading and installing from the MS Store? See the alternative way to install it [here](https://github.com/jayfunc/BetterLyrics/wiki/%5BEN%5D-Alternative-way-to-download-and-install). 
 
-## Build
+## 🏗️ Build
 
 Before you build, make sure that you have already replaced `BetterLyrics\BetterLyrics.WinUI3\BetterLyrics.WinUI3\Constants\LastFMTemplate` with `BetterLyrics\BetterLyrics.WinUI3\BetterLyrics.WinUI3\Constants\LastFM.cs`.
 
+## 🤑 Donations
+
+If you like this project, please consider supporting it by donating. Your support will help keep the project alive and encourage further development.
+
+You can donate via:
+- [PayPal](https://paypal.me/zhefangpay)
+- [Buy Me a Coffee](https://buymeacoffee.com/founchoo)
+- <details><summary>支付宝</summary>
+    
+  ![](Donate/Alipay.jpg)
+  
+  </detais>
+
+- <details><summary>微信</summary>
+    
+  ![](Donate/WeChatReward.png)
+  
+  </details>
+
 ## 💖 Many thanks to
 
 Some functions and code are referenced or modified from public repositories, including but not limited to the following open source projects/packages, tutorials, etc., and we would like to express our gratitude to them here.
@@ -175,35 +194,16 @@ Cannot find your language? Or have better translations? Don't worry! Start trans
 
 Visit https://crowdin.com/project/betterlyrics/invite?h=c9bfb28fce061484883c0891e7a26f9b2592556 to accept the invitation and become a valuable translator now!
 
-## Star history
+## ⭐ Star history
 
 <div style="display: flex; justify-content: space-around; align-items: flex-start;">
   <img src="https://api.star-history.com/svg?repos=jayfunc/BetterLyrics&type=Date)](https://www.star-history.com/#jayfunc/BetterLyrics&Date" width="100%" >
 </div>
 
-## Any issues and PRs are welcome
+## 🤗 Any issues and PRs are welcome
 
 If you find a bug, please file it in issues, or if you have any ideas, feel free to share them here.
 
-## Donations
-
-If you like this project, please consider supporting it by donating. Your support will help keep the project alive and encourage further development.
-
-You can donate via:
-- [PayPal](https://paypal.me/zhefangpay)
-- [Buy Me a Coffee](https://buymeacoffee.com/founchoo)
-- <details><summary>支付宝</summary>
-    
-  ![](Donate/Alipay.jpg)
-  
-  </detais>
-
-- <details><summary>微信</summary>
-    
-  ![](Donate/WeChatReward.png)
-  
-  </details>
-
 ## ⚠️ Disclaimer
 
 This project is provided "as is" without warranty of any kind.
@@ -213,3 +213,9 @@ The author of this project does not claim ownership of such resources.
 
 This project is non-commercial and should not be used to infringe any rights. 
 Users are responsible for ensuring their own use complies with applicable laws and licenses.
+
+## 💭 Share it on social media
+
+![BetterLyrics](https://socialify.git.ci/jayfunc/BetterLyrics/image?description=1&forks=1&issues=1&language=1&name=1&owner=1&pulls=1&stargazers=1&theme=Light)
+
+![BetterLyrics](https://opengraph.githubassets.com/<any_hash_number>/jayfunc/BetterLyrics)