feat: track stop; chores: ui/ux adjustments, bump version code.

chores: bump version code
fix: thread access issue related to ISettingsService
2026-01-13 03:34:55 +08:00 · 2025-11-08 11:41:59 -05:00 · 2025-11-08 08:45:27 -05:00 · 2025-11-08 08:21:31 -05:00 · 2025-11-07 21:06:37 -05:00
15 changed files with 371 additions and 116 deletions
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3
@@ -12,7 +12,7 @@
 	<Identity
 	  Name="37412.BetterLyrics"
 	  Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
-	  Version="1.0.97.0" />
+	  Version="1.0.99.0" />

 	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>

--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs
+++ b/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>();
            }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Link.cs
+++ b/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";
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/EnumHelper.cs
+++ b/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];
+        }
+    }
+}
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
+++ b/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>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
+++ b/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>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
+++ b/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>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
+++ b/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>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
+++ b/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>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryViewModel.cs
+++ b/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);
+        }
    }
 }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml
@@ -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}"
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml
+++ b/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>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml.cs
+++ b/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)
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml
@@ -24,14 +24,22 @@
                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                      FontSize=12,
                                      Glyph=&#xE90B;}"
-                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>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsWindow.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsWindow.xaml
@@ -23,7 +23,11 @@
                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                      FontSize=12,
                                      Glyph=&#xE90B;}"
-                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},
Author	SHA1	Message	Date
Zhe Fang	1eb1d2d72b	feat: track stop; chores: ui/ux adjustments, bump version code.	2025-11-08 11:41:59 -05:00
Zhe Fang	252b7e4b25	chores: bump version code	2025-11-08 08:45:27 -05:00
Zhe Fang	bebcfa7819	fix: thread access issue related to `ISettingsService`	2025-11-08 08:21:31 -05:00
Zhe Fang	073ddfcaee	fix: player fail to pass thumbnails	2025-11-07 21:06:37 -05:00