Skip to content

Commit 1eb1d2d

Browse files
jayfuncjayfunc
committed
feat: track stop; chores: ui/ux adjustments, bump version code.
1 parent 252b7e4 commit 1eb1d2d

File tree

13 files changed

+341
-77
lines changed

13 files changed

+341
-77
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Identity
1313
Name="37412.BetterLyrics"
1414
Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
15-
Version="1.0.98.0" />
15+
Version="1.0.99.0" />
1616

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public static class Link
1010
{
1111
public const string GitHubUrl = "https://github.com/jayfunc/BetterLyrics";
1212
public const string WikiUrl = "https://github.com/jayfunc/BetterLyrics/wiki";
13-
public const string AppleMusicCfgUrl = $"{WikiUrl}/Lyrics-provider-configuration#apple-music";
13+
public const string AppleMusicCfgUrl = $"{WikiUrl}/%5BEN%5D-Lyrics-provider-configuration#apple-music";
1414
public const string FAQUrl = $"{GitHubUrl}/blob/dev/FAQ/index.md";
1515
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";
1616
public const string DiscordUrl = "https://discord.gg/5yAQPnyCKv";

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
using BetterLyrics.WinUI3.Enums;
2+
using BetterLyrics.WinUI3.Models.Settings;
3+
using System;
4+
using System.Collections.Generic;
5+
using System.Linq;
6+
using System.Text;
7+
using System.Threading.Tasks;
8+
9+
namespace BetterLyrics.WinUI3.Helper
10+
{
11+
public static class EnumExtensions
12+
{
13+
public static T GetNext<T>(this T value) where T : struct, Enum
14+
{
15+
T[] values = Enum.GetValues<T>();
16+
int currentIndex = Array.IndexOf(values, value);
17+
int nextIndex = (currentIndex + 1) % values.Length;
18+
return values[nextIndex];
19+
}
20+
}
21+
}

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

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
<data name="HostWindowMusicGalleryButtonToolTip.Content" xml:space="preserve">
178178
<value>Music gallery</value>
179179
</data>
180-
<data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
180+
<data name="HostWindowSettingsButtonToolTip.Text" xml:space="preserve">
181181
<value>Settings</value>
182182
</data>
183183
<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
367367
<data name="MusicGalleryPageAllSongs" xml:space="preserve">
368368
<value>All songs</value>
369369
</data>
370-
<data name="MusicGalleryPageEmptyPlayingQueue.Content" xml:space="preserve">
370+
<data name="MusicGalleryPageEmptyPlayingQueue.Text" xml:space="preserve">
371371
<value>Clear play queue</value>
372372
</data>
373373
<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
427427
<data name="MusicGalleryPagePlayingQueueEmpty.Text" xml:space="preserve">
428428
<value>Play queue is empty</value>
429429
</data>
430-
<data name="MusicGalleryPageQueueLoop.Content" xml:space="preserve">
430+
<data name="MusicGalleryPagePlaylist.Text" xml:space="preserve">
431+
<value>Playlists</value>
432+
</data>
433+
<data name="MusicGalleryPageQueueLoop.Text" xml:space="preserve">
431434
<value>List loop</value>
432435
</data>
433-
<data name="MusicGalleryPageQueueRandom.Content" xml:space="preserve">
436+
<data name="MusicGalleryPageQueueRandom.Text" xml:space="preserve">
434437
<value>Random</value>
435438
</data>
439+
<data name="MusicGalleryPageRemoveFromCustomList.Text" xml:space="preserve">
440+
<value>Remove from playlists</value>
441+
</data>
436442
<data name="MusicGalleryPageRemoveFromPlayingQueue.Text" xml:space="preserve">
437443
<value>Remove from play queue</value>
438444
</data>
439-
<data name="MusicGalleryPageScrollToPlayingItem.Content" xml:space="preserve">
445+
<data name="MusicGalleryPageScrollToPlayingItem.Text" xml:space="preserve">
440446
<value>Scroll to playing item</value>
441447
</data>
442448
<data name="MusicGalleryPageSelectAll.Content" xml:space="preserve">
443449
<value>Select all</value>
444450
</data>
445-
<data name="MusicGalleryPageSingleLoop.Content" xml:space="preserve">
451+
<data name="MusicGalleryPageSingleLoop.Text" xml:space="preserve">
446452
<value>Single loop</value>
447453
</data>
448454
<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
466472
<data name="MusicGalleryPageStarredPlaylist.Content" xml:space="preserve">
467473
<value>Starred playlists</value>
468474
</data>
475+
<data name="MusicGalleryPageStopTrack.Text" xml:space="preserve">
476+
<value>Stop</value>
477+
</data>
469478
<data name="MusicGalleryPageTitle" xml:space="preserve">
470479
<value>Music gallery - BetterLyrics</value>
471480
</data>

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

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
<data name="HostWindowMusicGalleryButtonToolTip.Content" xml:space="preserve">
178178
<value>ミュージックギャラリー</value>
179179
</data>
180-
<data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
180+
<data name="HostWindowSettingsButtonToolTip.Text" xml:space="preserve">
181181
<value>設定</value>
182182
</data>
183183
<data name="ImportPlaylistSuccessfully" xml:space="preserve">
@@ -353,7 +353,7 @@
353353
<value>BetterLyrics へようこそ</value>
354354
</data>
355355
<data name="MusicGalleryPageAddToCustomList.Text" xml:space="preserve">
356-
<value>プレイリストに追加します</value>
356+
<value>プレイリストに追加</value>
357357
</data>
358358
<data name="MusicGalleryPageAddToEnd.Text" xml:space="preserve">
359359
<value>リストの終わり</value>
@@ -367,7 +367,7 @@
367367
<data name="MusicGalleryPageAllSongs" xml:space="preserve">
368368
<value>すべての曲</value>
369369
</data>
370-
<data name="MusicGalleryPageEmptyPlayingQueue.Content" xml:space="preserve">
370+
<data name="MusicGalleryPageEmptyPlayingQueue.Text" xml:space="preserve">
371371
<value>クリアプレイキュー</value>
372372
</data>
373373
<data name="MusicGalleryPageFileAlbum.Text" xml:space="preserve">
@@ -416,7 +416,7 @@
416416
<value>ファイルからのインポート</value>
417417
</data>
418418
<data name="MusicGalleryPageNewPlaylist.Text" xml:space="preserve">
419-
<value>プレイリストを作成します</value>
419+
<value>プレイリストを作成しましょう</value>
420420
</data>
421421
<data name="MusicGalleryPagePlayAll.Content" xml:space="preserve">
422422
<value>すべてを再生します</value>
@@ -427,22 +427,28 @@
427427
<data name="MusicGalleryPagePlayingQueueEmpty.Text" xml:space="preserve">
428428
<value>キューを再生するのは空です</value>
429429
</data>
430-
<data name="MusicGalleryPageQueueLoop.Content" xml:space="preserve">
430+
<data name="MusicGalleryPagePlaylist.Text" xml:space="preserve">
431+
<value>プレイリスト</value>
432+
</data>
433+
<data name="MusicGalleryPageQueueLoop.Text" xml:space="preserve">
431434
<value>ループをリストします</value>
432435
</data>
433-
<data name="MusicGalleryPageQueueRandom.Content" xml:space="preserve">
436+
<data name="MusicGalleryPageQueueRandom.Text" xml:space="preserve">
434437
<value>ランダム</value>
435438
</data>
439+
<data name="MusicGalleryPageRemoveFromCustomList.Text" xml:space="preserve">
440+
<value>プレイリストから削除</value>
441+
</data>
436442
<data name="MusicGalleryPageRemoveFromPlayingQueue.Text" xml:space="preserve">
437443
<value>プレイリストから取り外します</value>
438444
</data>
439-
<data name="MusicGalleryPageScrollToPlayingItem.Content" xml:space="preserve">
445+
<data name="MusicGalleryPageScrollToPlayingItem.Text" xml:space="preserve">
440446
<value>アイテムを再生するための位置</value>
441447
</data>
442448
<data name="MusicGalleryPageSelectAll.Content" xml:space="preserve">
443449
<value>すべてを選択します</value>
444450
</data>
445-
<data name="MusicGalleryPageSingleLoop.Content" xml:space="preserve">
451+
<data name="MusicGalleryPageSingleLoop.Text" xml:space="preserve">
446452
<value>シングルループ</value>
447453
</data>
448454
<data name="MusicGalleryPageSongSearchBox.PlaceholderText" xml:space="preserve">
@@ -466,6 +472,9 @@
466472
<data name="MusicGalleryPageStarredPlaylist.Content" xml:space="preserve">
467473
<value>スター付きプレイリスト</value>
468474
</data>
475+
<data name="MusicGalleryPageStopTrack.Text" xml:space="preserve">
476+
<value>立ち止まる</value>
477+
</data>
469478
<data name="MusicGalleryPageTitle" xml:space="preserve">
470479
<value>音楽ギャラリー - BetterLyrics</value>
471480
</data>

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

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
<data name="HostWindowMusicGalleryButtonToolTip.Content" xml:space="preserve">
178178
<value>음악 갤러리</value>
179179
</data>
180-
<data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
180+
<data name="HostWindowSettingsButtonToolTip.Text" xml:space="preserve">
181181
<value>설정</value>
182182
</data>
183183
<data name="ImportPlaylistSuccessfully" xml:space="preserve">
@@ -353,7 +353,7 @@
353353
<value>Betterlyrics에 오신 것을 환영합니다</value>
354354
</data>
355355
<data name="MusicGalleryPageAddToCustomList.Text" xml:space="preserve">
356-
<value>재생 목록에 추가하십시오</value>
356+
<value>재생 목록에 추가</value>
357357
</data>
358358
<data name="MusicGalleryPageAddToEnd.Text" xml:space="preserve">
359359
<value>목록의 끝</value>
@@ -367,7 +367,7 @@
367367
<data name="MusicGalleryPageAllSongs" xml:space="preserve">
368368
<value>모든 노래</value>
369369
</data>
370-
<data name="MusicGalleryPageEmptyPlayingQueue.Content" xml:space="preserve">
370+
<data name="MusicGalleryPageEmptyPlayingQueue.Text" xml:space="preserve">
371371
<value>플레이 대기열을 클리어합니다</value>
372372
</data>
373373
<data name="MusicGalleryPageFileAlbum.Text" xml:space="preserve">
@@ -416,7 +416,7 @@
416416
<value>파일에서 가져오기</value>
417417
</data>
418418
<data name="MusicGalleryPageNewPlaylist.Text" xml:space="preserve">
419-
<value>재생 목록을 만듭니다</value>
419+
<value>재생목록을 만드세요</value>
420420
</data>
421421
<data name="MusicGalleryPagePlayAll.Content" xml:space="preserve">
422422
<value>모두 재생하십시오</value>
@@ -427,22 +427,28 @@
427427
<data name="MusicGalleryPagePlayingQueueEmpty.Text" xml:space="preserve">
428428
<value>플레이 대기열이 비어 있습니다</value>
429429
</data>
430-
<data name="MusicGalleryPageQueueLoop.Content" xml:space="preserve">
430+
<data name="MusicGalleryPagePlaylist.Text" xml:space="preserve">
431+
<value>재생 목록</value>
432+
</data>
433+
<data name="MusicGalleryPageQueueLoop.Text" xml:space="preserve">
431434
<value>목록 루프</value>
432435
</data>
433-
<data name="MusicGalleryPageQueueRandom.Content" xml:space="preserve">
436+
<data name="MusicGalleryPageQueueRandom.Text" xml:space="preserve">
434437
<value>무작위의</value>
435438
</data>
439+
<data name="MusicGalleryPageRemoveFromCustomList.Text" xml:space="preserve">
440+
<value>재생 목록에서 제거</value>
441+
</data>
436442
<data name="MusicGalleryPageRemoveFromPlayingQueue.Text" xml:space="preserve">
437443
<value>재생 목록에서 제거하십시오</value>
438444
</data>
439-
<data name="MusicGalleryPageScrollToPlayingItem.Content" xml:space="preserve">
445+
<data name="MusicGalleryPageScrollToPlayingItem.Text" xml:space="preserve">
440446
<value>아이템을 재생하기위한 포지셔닝</value>
441447
</data>
442448
<data name="MusicGalleryPageSelectAll.Content" xml:space="preserve">
443449
<value>모두를 선택하십시오</value>
444450
</data>
445-
<data name="MusicGalleryPageSingleLoop.Content" xml:space="preserve">
451+
<data name="MusicGalleryPageSingleLoop.Text" xml:space="preserve">
446452
<value>단일 루프</value>
447453
</data>
448454
<data name="MusicGalleryPageSongSearchBox.PlaceholderText" xml:space="preserve">
@@ -466,6 +472,9 @@
466472
<data name="MusicGalleryPageStarredPlaylist.Content" xml:space="preserve">
467473
<value>별표 표시된 재생 목록</value>
468474
</data>
475+
<data name="MusicGalleryPageStopTrack.Text" xml:space="preserve">
476+
<value>멈추기</value>
477+
</data>
469478
<data name="MusicGalleryPageTitle" xml:space="preserve">
470479
<value>음악 갤러리 - BetterLyrics</value>
471480
</data>

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

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
<data name="HostWindowMusicGalleryButtonToolTip.Content" xml:space="preserve">
178178
<value>音乐库</value>
179179
</data>
180-
<data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
180+
<data name="HostWindowSettingsButtonToolTip.Text" xml:space="preserve">
181181
<value>设置</value>
182182
</data>
183183
<data name="ImportPlaylistSuccessfully" xml:space="preserve">
@@ -353,7 +353,7 @@
353353
<value>欢迎使用 BetterLyrics</value>
354354
</data>
355355
<data name="MusicGalleryPageAddToCustomList.Text" xml:space="preserve">
356-
<value>添加到歌单</value>
356+
<value>添加到播放列表</value>
357357
</data>
358358
<data name="MusicGalleryPageAddToEnd.Text" xml:space="preserve">
359359
<value>列表的结尾</value>
@@ -367,7 +367,7 @@
367367
<data name="MusicGalleryPageAllSongs" xml:space="preserve">
368368
<value>所有歌曲</value>
369369
</data>
370-
<data name="MusicGalleryPageEmptyPlayingQueue.Content" xml:space="preserve">
370+
<data name="MusicGalleryPageEmptyPlayingQueue.Text" xml:space="preserve">
371371
<value>清除播放队列</value>
372372
</data>
373373
<data name="MusicGalleryPageFileAlbum.Text" xml:space="preserve">
@@ -416,7 +416,7 @@
416416
<value>从文件导入</value>
417417
</data>
418418
<data name="MusicGalleryPageNewPlaylist.Text" xml:space="preserve">
419-
<value>创建歌单</value>
419+
<value>创建播放列表</value>
420420
</data>
421421
<data name="MusicGalleryPagePlayAll.Content" xml:space="preserve">
422422
<value>播放全部</value>
@@ -427,22 +427,28 @@
427427
<data name="MusicGalleryPagePlayingQueueEmpty.Text" xml:space="preserve">
428428
<value>播放队列是空的</value>
429429
</data>
430-
<data name="MusicGalleryPageQueueLoop.Content" xml:space="preserve">
430+
<data name="MusicGalleryPagePlaylist.Text" xml:space="preserve">
431+
<value>播放列表</value>
432+
</data>
433+
<data name="MusicGalleryPageQueueLoop.Text" xml:space="preserve">
431434
<value>列表循环</value>
432435
</data>
433-
<data name="MusicGalleryPageQueueRandom.Content" xml:space="preserve">
436+
<data name="MusicGalleryPageQueueRandom.Text" xml:space="preserve">
434437
<value>随机</value>
435438
</data>
439+
<data name="MusicGalleryPageRemoveFromCustomList.Text" xml:space="preserve">
440+
<value>从播放列表中删除</value>
441+
</data>
436442
<data name="MusicGalleryPageRemoveFromPlayingQueue.Text" xml:space="preserve">
437443
<value>从播放列表移除</value>
438444
</data>
439-
<data name="MusicGalleryPageScrollToPlayingItem.Content" xml:space="preserve">
445+
<data name="MusicGalleryPageScrollToPlayingItem.Text" xml:space="preserve">
440446
<value>定位到播放项</value>
441447
</data>
442448
<data name="MusicGalleryPageSelectAll.Content" xml:space="preserve">
443449
<value>选择全部</value>
444450
</data>
445-
<data name="MusicGalleryPageSingleLoop.Content" xml:space="preserve">
451+
<data name="MusicGalleryPageSingleLoop.Text" xml:space="preserve">
446452
<value>单曲循环</value>
447453
</data>
448454
<data name="MusicGalleryPageSongSearchBox.PlaceholderText" xml:space="preserve">
@@ -466,6 +472,9 @@
466472
<data name="MusicGalleryPageStarredPlaylist.Content" xml:space="preserve">
467473
<value>已加星标的歌单</value>
468474
</data>
475+
<data name="MusicGalleryPageStopTrack.Text" xml:space="preserve">
476+
<value>停止</value>
477+
</data>
469478
<data name="MusicGalleryPageTitle" xml:space="preserve">
470479
<value>音乐库 - BetterLyrics</value>
471480
</data>

0 commit comments

Comments
 (0)