From 08d4f4ce90cd6b08bbf22265de68c9b2843a53b7 Mon Sep 17 00:00:00 2001
From: Zhe Fang <founchoo@outlook.com>
Date: Thu, 20 Nov 2025 12:30:06 -0500
Subject: [PATCH] fix: clear all media props when switching tracks (local
 player)

---
 .../BetterLyrics.WinUI3/App.xaml              |   1 +
 .../Controls/PropertyRow.xaml                 |   7 +-
 .../PictureInfosToImageSourceConverter.cs     |  33 ++++
 .../BetterLyrics.WinUI3/Helper/ImageHelper.cs |   6 +
 .../Strings/en-US/Resources.resw              |  24 +--
 .../Strings/ja-JP/Resources.resw              |  24 +--
 .../Strings/ko-KR/Resources.resw              |  24 +--
 .../Strings/zh-CN/Resources.resw              |  24 +--
 .../Strings/zh-TW/Resources.resw              |  24 +--
 .../ViewModels/MusicGalleryViewModel.cs       |   9 +-
 .../Views/MusicGalleryPage.xaml               | 176 +++++-------------
 11 files changed, 157 insertions(+), 195 deletions(-)
 create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/PictureInfosToImageSourceConverter.cs

diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml
index 087df47..ef08c4b 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml
@@ -69,6 +69,7 @@
             <converter:IndexToDisplayConverter x:Key="IndexToDisplayConverter" />
             <converter:IntToDoubleConverter x:Key="IntToDoubleConverter" />
             <converter:MillisecondsToSecondsConverter x:Key="MillisecondsToSecondsConverter" />
+            <converter:PictureInfosToImageSourceConverter x:Key="PictureInfosToImageSourceConverter" />
 
             <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
             <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PropertyRow.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PropertyRow.xaml
index 3353386..8758e3b 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PropertyRow.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PropertyRow.xaml
@@ -9,7 +9,7 @@
     xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
-    <Grid HorizontalAlignment="Left" ColumnSpacing="12">
+    <Grid HorizontalAlignment="Left" ColumnSpacing="6">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="*" />
@@ -43,8 +43,9 @@
                     Padding="0"
                     HorizontalContentAlignment="Left"
                     Click="OnLinkClicked"
-                    Content="{x:Bind Value, Mode=OneWay}"
-                    Visibility="{x:Bind LinkVisibility, Mode=OneWay}" />
+                    Visibility="{x:Bind LinkVisibility, Mode=OneWay}">
+                    <TextBlock Text="{x:Bind Value, Mode=OneWay}" TextWrapping="Wrap" />
+                </HyperlinkButton>
             </Grid>
 
             <Button
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/PictureInfosToImageSourceConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/PictureInfosToImageSourceConverter.cs
new file mode 100644
index 0000000..63e63f9
--- /dev/null
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/PictureInfosToImageSourceConverter.cs
@@ -0,0 +1,33 @@
+using ATL;
+using BetterLyrics.WinUI3.Helper;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Media.Imaging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public partial class PictureInfosToImageSourceConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            BitmapImage bitmapImage = new();
+            if (value is IList<PictureInfo> list && list.FirstOrDefault()?.PictureData is byte[] pictureData)
+            {
+                bitmapImage.SetSource(ImageHelper.ToIRandomAccessStream(pictureData));
+            }
+            else
+            {
+                bitmapImage.UriSource = new Uri(PathHelper.AlbumArtPlaceholderPath);
+            }
+            return bitmapImage;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ImageHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ImageHelper.cs
index b0329ba..90ad87b 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ImageHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ImageHelper.cs
@@ -185,5 +185,11 @@ namespace BetterLyrics.WinUI3.Helper
         {
             return buffer.AsStream().AsRandomAccessStream();
         }
+
+        public static IRandomAccessStream ToIRandomAccessStream(byte[] arr)
+        {
+            MemoryStream stream = new MemoryStream(arr);
+            return stream.AsRandomAccessStream();
+        }
     }
 }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
index a535d7a..c3daadd 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
@@ -400,43 +400,43 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="MusicGalleryPageEmptyPlayingQueue.Text" xml:space="preserve">
     <value>Clear play queue</value>
   </data>
-  <data name="MusicGalleryPageFileAlbum.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileAlbum.Header" xml:space="preserve">
     <value>Album</value>
   </data>
-  <data name="MusicGalleryPageFileArtist.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileArtist.Header" xml:space="preserve">
     <value>Artist</value>
   </data>
   <data name="MusicGalleryPageFileInfo.Text" xml:space="preserve">
     <value>File info</value>
   </data>
-  <data name="MusicGalleryPageFileInfoBitDepth.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoBitDepth.Header" xml:space="preserve">
     <value>Bit depth</value>
   </data>
-  <data name="MusicGalleryPageFileInfoBitrate.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoBitrate.Header" xml:space="preserve">
     <value>Bitrate</value>
   </data>
-  <data name="MusicGalleryPageFileInfoDuration.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoDuration.Header" xml:space="preserve">
     <value>Duration</value>
   </data>
-  <data name="MusicGalleryPageFileInfoEncoder.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoEncoder.Header" xml:space="preserve">
     <value>Encoder</value>
   </data>
-  <data name="MusicGalleryPageFileInfoFormat.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoFormat.Header" xml:space="preserve">
     <value>Format</value>
   </data>
-  <data name="MusicGalleryPageFileInfoLyrics.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoLyrics.Header" xml:space="preserve">
     <value>Lyrics</value>
   </data>
-  <data name="MusicGalleryPageFileInfoPath.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoPath.Header" xml:space="preserve">
     <value>Path</value>
   </data>
-  <data name="MusicGalleryPageFileInfoSampleRate.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoSampleRate.Header" xml:space="preserve">
     <value>Sample rate</value>
   </data>
-  <data name="MusicGalleryPageFileInfoTitle.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoTitle.Header" xml:space="preserve">
     <value>Title</value>
   </data>
-  <data name="MusicGalleryPageFileInfoYear.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoYear.Header" xml:space="preserve">
     <value>Year</value>
   </data>
   <data name="MusicGalleryPageFileNotFound.Text" xml:space="preserve">
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
index 7ba6e73..824a220 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
@@ -400,43 +400,43 @@
   <data name="MusicGalleryPageEmptyPlayingQueue.Text" xml:space="preserve">
     <value>クリアプレイキュー</value>
   </data>
-  <data name="MusicGalleryPageFileAlbum.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileAlbum.Header" xml:space="preserve">
     <value>アルバム</value>
   </data>
-  <data name="MusicGalleryPageFileArtist.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileArtist.Header" xml:space="preserve">
     <value>アーティスト</value>
   </data>
   <data name="MusicGalleryPageFileInfo.Text" xml:space="preserve">
     <value>ファイル情報</value>
   </data>
-  <data name="MusicGalleryPageFileInfoBitDepth.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoBitDepth.Header" xml:space="preserve">
     <value>ビットの深さ</value>
   </data>
-  <data name="MusicGalleryPageFileInfoBitrate.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoBitrate.Header" xml:space="preserve">
     <value>ビットレート</value>
   </data>
-  <data name="MusicGalleryPageFileInfoDuration.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoDuration.Header" xml:space="preserve">
     <value>間隔</value>
   </data>
-  <data name="MusicGalleryPageFileInfoEncoder.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoEncoder.Header" xml:space="preserve">
     <value>エンコーダー</value>
   </data>
-  <data name="MusicGalleryPageFileInfoFormat.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoFormat.Header" xml:space="preserve">
     <value>形式</value>
   </data>
-  <data name="MusicGalleryPageFileInfoLyrics.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoLyrics.Header" xml:space="preserve">
     <value>歌詞</value>
   </data>
-  <data name="MusicGalleryPageFileInfoPath.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoPath.Header" xml:space="preserve">
     <value>パス</value>
   </data>
-  <data name="MusicGalleryPageFileInfoSampleRate.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoSampleRate.Header" xml:space="preserve">
     <value>サンプルレート</value>
   </data>
-  <data name="MusicGalleryPageFileInfoTitle.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoTitle.Header" xml:space="preserve">
     <value>タイトル</value>
   </data>
-  <data name="MusicGalleryPageFileInfoYear.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoYear.Header" xml:space="preserve">
     <value>年</value>
   </data>
   <data name="MusicGalleryPageFileNotFound.Text" xml:space="preserve">
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
index 4a52a92..01c931c 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
@@ -400,43 +400,43 @@
   <data name="MusicGalleryPageEmptyPlayingQueue.Text" xml:space="preserve">
     <value>플레이 대기열을 클리어합니다</value>
   </data>
-  <data name="MusicGalleryPageFileAlbum.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileAlbum.Header" xml:space="preserve">
     <value>앨범</value>
   </data>
-  <data name="MusicGalleryPageFileArtist.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileArtist.Header" xml:space="preserve">
     <value>아티스트</value>
   </data>
   <data name="MusicGalleryPageFileInfo.Text" xml:space="preserve">
     <value>파일 정보</value>
   </data>
-  <data name="MusicGalleryPageFileInfoBitDepth.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoBitDepth.Header" xml:space="preserve">
     <value>비트 깊이</value>
   </data>
-  <data name="MusicGalleryPageFileInfoBitrate.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoBitrate.Header" xml:space="preserve">
     <value>비트 레이트</value>
   </data>
-  <data name="MusicGalleryPageFileInfoDuration.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoDuration.Header" xml:space="preserve">
     <value>지속</value>
   </data>
-  <data name="MusicGalleryPageFileInfoEncoder.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoEncoder.Header" xml:space="preserve">
     <value>인코더</value>
   </data>
-  <data name="MusicGalleryPageFileInfoFormat.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoFormat.Header" xml:space="preserve">
     <value>체재</value>
   </data>
-  <data name="MusicGalleryPageFileInfoLyrics.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoLyrics.Header" xml:space="preserve">
     <value>가사</value>
   </data>
-  <data name="MusicGalleryPageFileInfoPath.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoPath.Header" xml:space="preserve">
     <value>길</value>
   </data>
-  <data name="MusicGalleryPageFileInfoSampleRate.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoSampleRate.Header" xml:space="preserve">
     <value>샘플 속도</value>
   </data>
-  <data name="MusicGalleryPageFileInfoTitle.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoTitle.Header" xml:space="preserve">
     <value>제목</value>
   </data>
-  <data name="MusicGalleryPageFileInfoYear.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoYear.Header" xml:space="preserve">
     <value>년도</value>
   </data>
   <data name="MusicGalleryPageFileNotFound.Text" xml:space="preserve">
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
index 27cd47e..2ee764d 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
@@ -400,43 +400,43 @@
   <data name="MusicGalleryPageEmptyPlayingQueue.Text" xml:space="preserve">
     <value>清除播放队列</value>
   </data>
-  <data name="MusicGalleryPageFileAlbum.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileAlbum.Header" xml:space="preserve">
     <value>专辑</value>
   </data>
-  <data name="MusicGalleryPageFileArtist.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileArtist.Header" xml:space="preserve">
     <value>艺术家</value>
   </data>
   <data name="MusicGalleryPageFileInfo.Text" xml:space="preserve">
     <value>文件信息</value>
   </data>
-  <data name="MusicGalleryPageFileInfoBitDepth.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoBitDepth.Header" xml:space="preserve">
     <value>位深度</value>
   </data>
-  <data name="MusicGalleryPageFileInfoBitrate.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoBitrate.Header" xml:space="preserve">
     <value>比特率</value>
   </data>
-  <data name="MusicGalleryPageFileInfoDuration.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoDuration.Header" xml:space="preserve">
     <value>期间</value>
   </data>
-  <data name="MusicGalleryPageFileInfoEncoder.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoEncoder.Header" xml:space="preserve">
     <value>编码器</value>
   </data>
-  <data name="MusicGalleryPageFileInfoFormat.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoFormat.Header" xml:space="preserve">
     <value>格式</value>
   </data>
-  <data name="MusicGalleryPageFileInfoLyrics.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoLyrics.Header" xml:space="preserve">
     <value>歌词</value>
   </data>
-  <data name="MusicGalleryPageFileInfoPath.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoPath.Header" xml:space="preserve">
     <value>路径</value>
   </data>
-  <data name="MusicGalleryPageFileInfoSampleRate.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoSampleRate.Header" xml:space="preserve">
     <value>样本率</value>
   </data>
-  <data name="MusicGalleryPageFileInfoTitle.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoTitle.Header" xml:space="preserve">
     <value>标题</value>
   </data>
-  <data name="MusicGalleryPageFileInfoYear.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoYear.Header" xml:space="preserve">
     <value>年</value>
   </data>
   <data name="MusicGalleryPageFileNotFound.Text" xml:space="preserve">
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
index 98fb8e6..d546747 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
@@ -400,43 +400,43 @@
   <data name="MusicGalleryPageEmptyPlayingQueue.Text" xml:space="preserve">
     <value>清除播放隊列</value>
   </data>
-  <data name="MusicGalleryPageFileAlbum.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileAlbum.Header" xml:space="preserve">
     <value>專輯</value>
   </data>
-  <data name="MusicGalleryPageFileArtist.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileArtist.Header" xml:space="preserve">
     <value>藝術家</value>
   </data>
   <data name="MusicGalleryPageFileInfo.Text" xml:space="preserve">
     <value>文件信息</value>
   </data>
-  <data name="MusicGalleryPageFileInfoBitDepth.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoBitDepth.Header" xml:space="preserve">
     <value>位深度</value>
   </data>
-  <data name="MusicGalleryPageFileInfoBitrate.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoBitrate.Header" xml:space="preserve">
     <value>比特率</value>
   </data>
-  <data name="MusicGalleryPageFileInfoDuration.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoDuration.Header" xml:space="preserve">
     <value>期間</value>
   </data>
-  <data name="MusicGalleryPageFileInfoEncoder.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoEncoder.Header" xml:space="preserve">
     <value>編碼器</value>
   </data>
-  <data name="MusicGalleryPageFileInfoFormat.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoFormat.Header" xml:space="preserve">
     <value>格式</value>
   </data>
-  <data name="MusicGalleryPageFileInfoLyrics.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoLyrics.Header" xml:space="preserve">
     <value>歌词</value>
   </data>
-  <data name="MusicGalleryPageFileInfoPath.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoPath.Header" xml:space="preserve">
     <value>路徑</value>
   </data>
-  <data name="MusicGalleryPageFileInfoSampleRate.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoSampleRate.Header" xml:space="preserve">
     <value>樣本率</value>
   </data>
-  <data name="MusicGalleryPageFileInfoTitle.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoTitle.Header" xml:space="preserve">
     <value>標題</value>
   </data>
-  <data name="MusicGalleryPageFileInfoYear.Text" xml:space="preserve">
+  <data name="MusicGalleryPageFileInfoYear.Header" xml:space="preserve">
     <value>年</value>
   </data>
   <data name="MusicGalleryPageFileNotFound.Text" xml:space="preserve">
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryViewModel.cs
index 8c958f2..6cff7bb 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryViewModel.cs
@@ -1,5 +1,6 @@
 using ATL;
 using BetterLyrics.WinUI3.Collections;
+using BetterLyrics.WinUI3.Constants;
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Extensions;
 using BetterLyrics.WinUI3.Helper;
@@ -440,15 +441,19 @@ namespace BetterLyrics.WinUI3.ViewModels
             else
             {
                 var track = playQueueItem.Track;
+                
                 var updater = _smtc.DisplayUpdater;
+                updater.ClearAll();
+
                 _smtc.IsEnabled = true;
                 _mediaPlayer.Source = MediaSource.CreateFromUri(new Uri(track.Path));
-                updater.AppMediaId = Package.Current.Id.FullName;
 
                 var storageFile = await StorageFile.GetFileFromPathAsync(track.Path);
+
                 await updater.CopyFromFileAsync(MediaPlaybackType.Music, storageFile);
+                updater.AppMediaId = Package.Current.Id.FullName;
                 updater.MusicProperties.AlbumTitle = track.Album;
-                updater.MusicProperties.Genres.Add($"FILENAME-{Path.GetFileNameWithoutExtension(track.Path)}");
+                updater.MusicProperties.Genres.Add($"{ExtendedGenreFiled.FileName}{Path.GetFileNameWithoutExtension(track.Path)}");
                 updater.Update();
             }
         }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml
index 3f6e89b..659e098 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml
@@ -8,6 +8,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dev="using:DevWinUI"
     xmlns:ext="using:BetterLyrics.WinUI3.Extensions"
+    xmlns:helper="using:BetterLyrics.WinUI3.Helper"
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
     xmlns:labs="using:CommunityToolkit.Labs.WinUI"
     xmlns:local="using:BetterLyrics.WinUI3.Views"
@@ -15,6 +16,7 @@
     xmlns:media="using:CommunityToolkit.WinUI.Media"
     xmlns:models="using:BetterLyrics.WinUI3.Models"
     xmlns:muxm="using:Microsoft.UI.Xaml.Media"
+    xmlns:uc="using:BetterLyrics.WinUI3.Controls"
     xmlns:ui="using:CommunityToolkit.WinUI"
     Loaded="Page_Loaded"
     Unloaded="Page_Unloaded"
@@ -45,7 +47,11 @@
                         ShouldConstrainToRootBounds="False">
                         <ScrollViewer MaxWidth="300" MaxHeight="600">
                             <Grid>
-                                <controls:OpacityMaskView MaxHeight="300" VerticalAlignment="Top">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="*" />
+                                </Grid.RowDefinitions>
+                                <controls:OpacityMaskView Grid.Row="0" MaxHeight="300">
                                     <controls:OpacityMaskView.OpacityMask>
                                         <Rectangle>
                                             <Rectangle.Fill>
@@ -56,117 +62,27 @@
                                             </Rectangle.Fill>
                                         </Rectangle>
                                     </controls:OpacityMaskView.OpacityMask>
-                                    <FlipView ItemsSource="{x:Bind ViewModel.TrackRightTapped.EmbeddedPictures, Mode=OneWay}">
-                                        <FlipView.ItemTemplate>
-                                            <DataTemplate>
-                                                <Image Source="{Binding PictureData, Converter={StaticResource ByteArrayToImageConverter}}" />
-                                            </DataTemplate>
-                                        </FlipView.ItemTemplate>
-                                    </FlipView>
+                                    <Image Source="{x:Bind ViewModel.TrackRightTapped.EmbeddedPictures, Mode=OneWay, Converter={StaticResource PictureInfosToImageSourceConverter}}" Stretch="Uniform" />
                                 </controls:OpacityMaskView>
                                 <StackPanel
-                                    Margin="0,200,0,0"
+                                    Grid.Row="1"
                                     Padding="12"
-                                    Spacing="12">
-                                    <StackPanel>
-                                        <TextBlock x:Uid="MusicGalleryPageFileInfoTitle" />
-                                        <TextBlock
-                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            IsTextSelectionEnabled="True"
-                                            Text="{x:Bind ViewModel.TrackRightTapped.Title, Mode=OneWay}"
-                                            TextWrapping="Wrap" />
-                                    </StackPanel>
-                                    <StackPanel>
-                                        <TextBlock x:Uid="MusicGalleryPageFileArtist" />
-                                        <TextBlock
-                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            IsTextSelectionEnabled="True"
-                                            Text="{x:Bind ViewModel.TrackRightTapped.Artist, Mode=OneWay}"
-                                            TextWrapping="Wrap" />
-                                    </StackPanel>
-                                    <StackPanel>
-                                        <TextBlock x:Uid="MusicGalleryPageFileAlbum" />
-                                        <TextBlock
-                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            IsTextSelectionEnabled="True"
-                                            Text="{x:Bind ViewModel.TrackRightTapped.Album, Mode=OneWay}"
-                                            TextWrapping="Wrap" />
-                                    </StackPanel>
-                                    <StackPanel>
-                                        <TextBlock x:Uid="MusicGalleryPageFileInfoYear" />
-                                        <TextBlock
-                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            IsTextSelectionEnabled="True"
-                                            Text="{x:Bind ViewModel.TrackRightTapped.Year, Mode=OneWay}"
-                                            TextWrapping="Wrap" />
-                                    </StackPanel>
-                                    <StackPanel>
-                                        <TextBlock x:Uid="MusicGalleryPageFileInfoDuration" />
-                                        <TextBlock
-                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            IsTextSelectionEnabled="True"
-                                            Text="{x:Bind ViewModel.TrackRightTapped.Duration, Converter={StaticResource SecondsToFormattedTimeConverter}, Mode=OneWay}"
-                                            TextWrapping="Wrap" />
-                                    </StackPanel>
-                                    <StackPanel>
-                                        <TextBlock x:Uid="MusicGalleryPageFileInfoBitrate" TextWrapping="Wrap" />
-                                        <TextBlock
-                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            IsTextSelectionEnabled="True"
-                                            Text="{x:Bind ViewModel.TrackRightTapped.Bitrate, Mode=OneWay}"
-                                            TextWrapping="Wrap" />
-                                    </StackPanel>
-                                    <StackPanel>
-                                        <TextBlock x:Uid="MusicGalleryPageFileInfoSampleRate" />
-                                        <TextBlock
-                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            IsTextSelectionEnabled="True"
-                                            Text="{x:Bind ViewModel.TrackRightTapped.SampleRate, Mode=OneWay}"
-                                            TextWrapping="Wrap" />
-                                    </StackPanel>
-                                    <StackPanel>
-                                        <TextBlock x:Uid="MusicGalleryPageFileInfoBitDepth" />
-                                        <TextBlock
-                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            IsTextSelectionEnabled="True"
-                                            Text="{x:Bind ViewModel.TrackRightTapped.BitDepth, Mode=OneWay}"
-                                            TextWrapping="Wrap" />
-                                    </StackPanel>
-                                    <StackPanel>
-                                        <TextBlock x:Uid="MusicGalleryPageFileInfoFormat" />
-                                        <TextBlock
-                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            IsTextSelectionEnabled="True"
-                                            Text="{x:Bind ViewModel.TrackRightTapped.AudioFormat.Name, Mode=OneWay}"
-                                            TextWrapping="Wrap" />
-                                    </StackPanel>
-                                    <StackPanel>
-                                        <TextBlock x:Uid="MusicGalleryPageFileInfoEncoder" />
-                                        <TextBlock
-                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            IsTextSelectionEnabled="True"
-                                            Text="{x:Bind ViewModel.TrackRightTapped.Encoder, Mode=OneWay}"
-                                            TextWrapping="Wrap" />
-                                    </StackPanel>
-                                    <StackPanel>
-                                        <TextBlock x:Uid="MusicGalleryPageFileInfoPath" />
-                                        <HyperlinkButton Padding="0" Click="SongPathHyperlinkButton_Click">
-                                            <HyperlinkButton.Content>
-                                                <TextBlock
-                                                    IsTextSelectionEnabled="True"
-                                                    Text="{x:Bind ViewModel.TrackRightTapped.Path, Mode=OneWay}"
-                                                    TextWrapping="Wrap" />
-                                            </HyperlinkButton.Content>
-                                        </HyperlinkButton>
-                                    </StackPanel>
-                                    <StackPanel>
-                                        <TextBlock x:Uid="MusicGalleryPageFileInfoLyrics" />
-                                        <TextBlock
-                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            IsTextSelectionEnabled="True"
-                                            Text="{x:Bind ViewModel.TrackRightTapped, Converter={StaticResource TrackToLyricsConverter}, Mode=OneWay}"
-                                            TextWrapping="Wrap" />
-                                    </StackPanel>
+                                    Spacing="6">
+                                    <uc:PropertyRow x:Uid="MusicGalleryPageFileInfoTitle" Value="{x:Bind ViewModel.TrackRightTapped.Title, Mode=OneWay}" />
+                                    <uc:PropertyRow x:Uid="MusicGalleryPageFileArtist" Value="{x:Bind ViewModel.TrackRightTapped.Artist, Mode=OneWay}" />
+                                    <uc:PropertyRow x:Uid="MusicGalleryPageFileAlbum" Value="{x:Bind ViewModel.TrackRightTapped.Album, Mode=OneWay}" />
+                                    <uc:PropertyRow x:Uid="MusicGalleryPageFileInfoYear" Value="{x:Bind ViewModel.TrackRightTapped.Year, Mode=OneWay}" />
+                                    <uc:PropertyRow x:Uid="MusicGalleryPageFileInfoDuration" Value="{x:Bind ViewModel.TrackRightTapped.Duration, Converter={StaticResource SecondsToFormattedTimeConverter}, Mode=OneWay}" />
+                                    <uc:PropertyRow x:Uid="MusicGalleryPageFileInfoBitrate" Value="{x:Bind ViewModel.TrackRightTapped.Bitrate, Mode=OneWay}" />
+                                    <uc:PropertyRow x:Uid="MusicGalleryPageFileInfoSampleRate" Value="{x:Bind ViewModel.TrackRightTapped.SampleRate, Mode=OneWay}" />
+                                    <uc:PropertyRow x:Uid="MusicGalleryPageFileInfoBitDepth" Value="{x:Bind ViewModel.TrackRightTapped.BitDepth, Mode=OneWay}" />
+                                    <uc:PropertyRow x:Uid="MusicGalleryPageFileInfoFormat" Value="{x:Bind ViewModel.TrackRightTapped.AudioFormat.Name, Mode=OneWay}" />
+                                    <uc:PropertyRow x:Uid="MusicGalleryPageFileInfoEncoder" Value="{x:Bind ViewModel.TrackRightTapped.Encoder, Mode=OneWay}" />
+                                    <uc:PropertyRow
+                                        x:Uid="MusicGalleryPageFileInfoPath"
+                                        Link="{x:Bind ViewModel.TrackRightTapped.Path, Mode=OneWay}"
+                                        Value="{x:Bind ViewModel.TrackRightTapped.Path, Mode=OneWay}" />
+                                    <uc:PropertyRow x:Uid="MusicGalleryPageFileInfoLyrics" Value="{x:Bind ViewModel.TrackRightTapped, Converter={StaticResource TrackToLyricsConverter}, Mode=OneWay}" />
                                 </StackPanel>
                             </Grid>
                         </ScrollViewer>
@@ -353,8 +269,8 @@
                                             Grid.Column="2"
                                             Click="PlaylistCloseButton_Click"
                                             Content="{ui:FontIcon FontSize=16,
-                                            FontFamily={StaticResource IconFontFamily},
-                                            Glyph=&#xE711;}"
+                                                                  FontFamily={StaticResource IconFontFamily},
+                                                                  Glyph=&#xE711;}"
                                             Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                                             Style="{StaticResource GhostButtonStyle}"
                                             Visibility="{x:Bind IsClosable, Converter={StaticResource BoolToVisibilityConverter}}" />
@@ -482,29 +398,29 @@
                                         </Grid.ColumnDefinitions>
 
                                         <Grid Grid.Column="0" CornerRadius="6">
-                                            <Image Source="{Binding EmbeddedPictures[0].PictureData, Mode=OneWay, Converter={StaticResource ByteArrayToImageConverter}}" Stretch="Uniform" />
+                                            <Image Source="{x:Bind EmbeddedPictures, Mode=OneWay, Converter={StaticResource PictureInfosToImageSourceConverter}}" Stretch="Uniform" />
                                         </Grid>
 
                                         <!--  基本信息  -->
                                         <Grid Grid.Column="1">
                                             <StackPanel VerticalAlignment="Center" Spacing="6">
-                                                <TextBlock Text="{Binding Title}" TextWrapping="Wrap" />
+                                                <TextBlock Text="{x:Bind Title}" TextWrapping="Wrap" />
                                                 <StackPanel Orientation="Horizontal" Spacing="6">
                                                     <Grid Background="{ThemeResource AccentAcrylicBackgroundFillColorBaseBrush}" CornerRadius="4">
                                                         <TextBlock
                                                             Margin="4,2"
                                                             FontSize="12"
-                                                            Text="{Binding AudioFormat.ShortName}" />
+                                                            Text="{x:Bind AudioFormat.ShortName}" />
                                                     </Grid>
                                                     <HyperlinkButton Padding="0" Click="ArtistHyperlibkButton_Click">
-                                                        <TextBlock Text="{Binding Artist}" TextWrapping="Wrap" />
+                                                        <TextBlock Text="{x:Bind Artist}" TextWrapping="Wrap" />
                                                     </HyperlinkButton>
                                                 </StackPanel>
                                             </StackPanel>
                                         </Grid>
 
                                         <HyperlinkButton Grid.Column="2" Click="AlbumHyperlibkButton_Click">
-                                            <TextBlock Text="{Binding Album}" TextWrapping="Wrap" />
+                                            <TextBlock Text="{x:Bind Album}" TextWrapping="Wrap" />
                                         </HyperlinkButton>
 
                                         <!--  年份  -->
@@ -512,7 +428,7 @@
                                             Grid.Column="3"
                                             VerticalAlignment="Center"
                                             Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            Text="{Binding Year}"
+                                            Text="{x:Bind Year}"
                                             TextWrapping="Wrap" />
 
                                         <!--  歌曲时长  -->
@@ -520,7 +436,7 @@
                                             Grid.Column="4"
                                             VerticalAlignment="Center"
                                             Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            Text="{Binding Duration, Converter={StaticResource SecondsToFormattedTimeConverter}}"
+                                            Text="{x:Bind Duration, Converter={StaticResource SecondsToFormattedTimeConverter}}"
                                             TextWrapping="Wrap" />
 
                                         <!--  歌曲时长  -->
@@ -528,14 +444,14 @@
                                             Grid.Column="5"
                                             VerticalAlignment="Center"
                                             Click="PathHyperlibkButton_Click"
-                                            Content="{Binding Path, Converter={StaticResource PathToParentFolderConverter}}" />
+                                            Content="{x:Bind Path, Converter={StaticResource PathToParentFolderConverter}}" />
 
                                         <Button
                                             Grid.Column="6"
                                             Click="SongListViewItemMoreButton_Click"
                                             Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                            FontSize=12,
-                                            Glyph=&#xE712;}"
+                                                                  FontSize=12,
+                                                                  Glyph=&#xE712;}"
                                             Style="{StaticResource GhostButtonStyle}" />
 
                                     </Grid>
@@ -554,7 +470,7 @@
                                                 <TextBlock
                                                     AutomationProperties.AccessibilityView="Raw"
                                                     Style="{ThemeResource SubtitleTextBlockStyle}"
-                                                    Text="{Binding}" />
+                                                    Text="{x:Bind}" />
                                             </Border>
                                         </DataTemplate>
                                     </GroupStyle.HeaderTemplate>
@@ -632,8 +548,8 @@
                             HorizontalAlignment="Right"
                             Command="{x:Bind ViewModel.StopTrackCommand}"
                             Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                            FontSize=16,
-                            Glyph=&#xE71A;}"
+                                                  FontSize=16,
+                                                  Glyph=&#xE71A;}"
                             Style="{StaticResource GhostButtonStyle}">
                             <ToolTipService.ToolTip>
                                 <TextBlock x:Uid="MusicGalleryPageStopTrack" />
@@ -699,8 +615,8 @@
                             HorizontalAlignment="Right"
                             Click="ScrollToPlayingItemButton_Click"
                             Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                            FontSize=16,
-                            Glyph=&#xE7B7;}"
+                                                  FontSize=16,
+                                                  Glyph=&#xE7B7;}"
                             Style="{StaticResource GhostButtonStyle}">
                             <ToolTipService.ToolTip>
                                 <TextBlock x:Uid="MusicGalleryPageScrollToPlayingItem" />
@@ -713,8 +629,8 @@
                             HorizontalAlignment="Right"
                             Click="EmptyPlayingQueueButton_Click"
                             Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                            FontSize=16,
-                            Glyph=&#xE738;}"
+                                                  FontSize=16,
+                                                  Glyph=&#xE738;}"
                             Style="{StaticResource GhostButtonStyle}">
                             <ToolTipService.ToolTip>
                                 <TextBlock x:Uid="MusicGalleryPageEmptyPlayingQueue" />
@@ -745,8 +661,8 @@
                                     <Button
                                         Click="RemoveFromPlayingQueueButton_Click"
                                         Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                        FontSize=12,
-                                        Glyph=&#xE738;}"
+                                                              FontSize=12,
+                                                              Glyph=&#xE738;}"
                                         Style="{StaticResource GhostButtonStyle}">
                                         <ToolTipService.ToolTip>
                                             <TextBlock x:Uid="MusicGalleryPageRemoveFromPlayingQueue" />