Skip to content

Commit 2f627d7

Browse files
jayfuncjayfunc
committed
feat: add credit list in settings
1 parent caed76e commit 2f627d7

File tree

12 files changed

+544
-87
lines changed

12 files changed

+544
-87
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.1.174.0" />
15+
Version="1.1.175.0" />
1616

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

‎BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/App.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
public static class App
44
{
55
public const string AppAuthor = "Zhe Fang";
6+
public const string AppAuthorNicknameEN = "jayfunc";
7+
public const string AppAuthorNicknameZH = "摘叶飞镖";
68
public const string AppName = "BetterLyrics";
79

810
public const string AutoStartupTaskId = "AutoStartup";

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,23 @@ public static class Link
44
{
55
public const string MicrosoftStore = "https://apps.microsoft.com/detail/9p1wcd1p597r";
66

7-
public const string GitHub = "https://github.com/jayfunc/BetterLyrics";
8-
public const string ShareHub = $"{GitHub}/blob/dev/ShareHub/index.md";
9-
public const string TermsOfService = $"{GitHub}/blob/dev/TermsofService.md";
10-
public const string PrivacyPolicy = $"{GitHub}/blob/dev/PrivacyPolicy.md";
11-
public const string UserGuide = $"{GitHub}/wiki/User-Guide";
7+
public const string AuthorGitHub = "https://github.com/jayfunc";
8+
9+
public const string BetterLyricsGitHub = $"{AuthorGitHub}/BetterLyrics";
10+
11+
public const string ShareHub = $"{BetterLyricsGitHub}/blob/dev/ShareHub/index.md";
12+
public const string TermsOfService = $"{BetterLyricsGitHub}/blob/dev/TermsofService.md";
13+
public const string PrivacyPolicy = $"{BetterLyricsGitHub}/blob/dev/PrivacyPolicy.md";
14+
public const string UserGuide = $"{BetterLyricsGitHub}/wiki/User-Guide";
15+
1216
public const string AppleMusicCfg = $"{UserGuide}#lyrics-source-configuration";
1317

1418
public const string QQGroup = "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";
1519
public const string Discord = "https://discord.gg/5yAQPnyCKv";
1620
public const string Telegram = "https://t.me/+svhSLZ7awPsxNGY1";
21+
22+
public const string BuyMeACoffee = "https://buymeacoffee.com/founchoo";
23+
public const string PayPal = "https://paypal.me/zhefangpay";
24+
public const string Afdian = "https://afdian.com/a/jayfunc";
1725
}
1826
}

‎BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AboutControl.xaml‎

Lines changed: 372 additions & 49 deletions
Large diffs are not rendered by default.

‎BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AboutControl.xaml.cs‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
using BetterLyrics.WinUI3.ViewModels;
22
using CommunityToolkit.Mvvm.DependencyInjection;
33
using Microsoft.UI.Xaml.Controls;
4+
using Microsoft.UI.Xaml.Media;
5+
using System.Threading.Tasks;
6+
using Windows.UI.ApplicationSettings;
47

58
// To learn more about WinUI, the WinUI project structure,
69
// and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -9,12 +12,64 @@ namespace BetterLyrics.WinUI3.Controls
912
{
1013
public sealed partial class AboutControl : UserControl
1114
{
15+
private bool _isCreditsScrolling = false;
1216
public AboutControlViewModel ViewModel => (AboutControlViewModel)DataContext;
1317

1418
public AboutControl()
1519
{
1620
InitializeComponent();
1721
DataContext = Ioc.Default.GetRequiredService<AboutControlViewModel>();
1822
}
23+
24+
private async void Patron_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
25+
{
26+
CompositionTarget.Rendering += CompositionTarget_Rendering;
27+
CreditsReel.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
28+
CreditsReel.Opacity = 1;
29+
_isCreditsScrolling = true;
30+
}
31+
32+
private void CompositionTarget_Rendering(object? sender, object e)
33+
{
34+
if (_isCreditsScrolling)
35+
{
36+
CreditsReelScrollViewer.ChangeView(null, CreditsReelScrollViewer.VerticalOffset + 0.5, null);
37+
}
38+
}
39+
40+
private async void CreditsReel_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
41+
{
42+
CreditsReel.Opacity = 0;
43+
await Task.Delay(Constants.Time.AnimationDuration);
44+
CreditsReel.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
45+
CompositionTarget.Rendering -= CompositionTarget_Rendering;
46+
CreditsReelScrollViewer.ChangeView(null, 0, null);
47+
}
48+
49+
private void CreditsReel_SizeChanged(object sender, Microsoft.UI.Xaml.SizeChangedEventArgs e)
50+
{
51+
CreditsReelHeader.LineHeight = e.NewSize.Height;
52+
CreditsReelFooter.LineHeight = e.NewSize.Height / 2;
53+
}
54+
55+
private void RichTextBlock_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
56+
{
57+
_isCreditsScrolling = false;
58+
}
59+
60+
private void RichTextBlock_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
61+
{
62+
_isCreditsScrolling = true;
63+
}
64+
65+
private void WeChat_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
66+
{
67+
WeChatFlyout.ShowAt(WeChatButton);
68+
}
69+
70+
private void AlipayButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
71+
{
72+
AlipayFlyout.ShowAt(AlipayButton);
73+
}
1974
}
2075
}

‎BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public LyricsSearchService(ISettingsService settingsService, ILogger<LyricsSearc
4040
_lrcLibHttpClient = new();
4141
_lrcLibHttpClient.DefaultRequestHeaders.Add(
4242
"User-Agent",
43-
$"{Constants.App.AppName} {MetadataHelper.AppVersion} ({Constants.Link.GitHub})"
43+
$"{Constants.App.AppName} {MetadataHelper.AppVersion} ({Constants.Link.BetterLyricsGitHub})"
4444
);
4545
_amllTtmlDbHttpClient = new();
4646
_appleMusic = new AppleMusic();

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

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,6 @@
153153
<data name="DemoWindowControlDefault.Text" xml:space="preserve">
154154
<value>Default</value>
155155
</data>
156-
<data name="DependenciesSettingsExpander.Header" xml:space="preserve">
157-
<value>Dependencies</value>
158-
</data>
159156
<data name="DesktopMode" xml:space="preserve">
160157
<value>Desktop mode (transparent)</value>
161158
</data>
@@ -546,6 +543,9 @@
546543
<data name="SetingsPageContributors.Text" xml:space="preserve">
547544
<value>Contributors</value>
548545
</data>
546+
<data name="SetingsPageDeps.Text" xml:space="preserve">
547+
<value>Dependent package</value>
548+
</data>
549549
<data name="SetingsPageDonation.Text" xml:space="preserve">
550550
<value>Donation</value>
551551
</data>
@@ -915,6 +915,9 @@
915915
<data name="SettingsPageHeight.Header" xml:space="preserve">
916916
<value>Height</value>
917917
</data>
918+
<data name="SettingsPageHello.Text" xml:space="preserve">
919+
<value>Hello</value>
920+
</data>
918921
<data name="SettingsPageHideWindow.Description" xml:space="preserve">
919922
<value>Automatically hide/show lyric window when music is not playing</value>
920923
</data>
@@ -1293,6 +1296,9 @@
12931296
<data name="SettingsPagePathNotFound.Text" xml:space="preserve">
12941297
<value>The path cannot be found on your computer</value>
12951298
</data>
1299+
<data name="SettingsPagePatrons.Text" xml:space="preserve">
1300+
<value>Special Thanks</value>
1301+
</data>
12961302
<data name="SettingsPagePhonetic.Text" xml:space="preserve">
12971303
<value>Lyric annotation</value>
12981304
</data>
@@ -1506,6 +1512,12 @@
15061512
<data name="SettingsPageTelegram.Content" xml:space="preserve">
15071513
<value>Telegram</value>
15081514
</data>
1515+
<data name="SettingsPageThanksForPurchasing.Text" xml:space="preserve">
1516+
<value>Thank you for purchasing BetterLyrics</value>
1517+
</data>
1518+
<data name="SettingsPageThanksList.Header" xml:space="preserve">
1519+
<value>Credits</value>
1520+
</data>
15091521
<data name="SettingsPageTheme.Header" xml:space="preserve">
15101522
<value>Lyrics background theme</value>
15111523
</data>
@@ -1575,6 +1587,9 @@
15751587
<data name="SettingsPageWorkAreaHeight.Header" xml:space="preserve">
15761588
<value>Work area height</value>
15771589
</data>
1590+
<data name="SettingsPageYouNowUsing.Text" xml:space="preserve">
1591+
<value>You who are using the software</value>
1592+
</data>
15781593
<data name="StandardMode" xml:space="preserve">
15791594
<value>Standard mode</value>
15801595
</data>

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

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,6 @@
153153
<data name="DemoWindowControlDefault.Text" xml:space="preserve">
154154
<value>デフォルト</value>
155155
</data>
156-
<data name="DependenciesSettingsExpander.Header" xml:space="preserve">
157-
<value>依存関係</value>
158-
</data>
159156
<data name="DesktopMode" xml:space="preserve">
160157
<value>デスクトップモード（透明） </value>
161158
</data>
@@ -546,6 +543,9 @@
546543
<data name="SetingsPageContributors.Text" xml:space="preserve">
547544
<value>投稿者</value>
548545
</data>
546+
<data name="SetingsPageDeps.Text" xml:space="preserve">
547+
<value>依存パッケージ</value>
548+
</data>
549549
<data name="SetingsPageDonation.Text" xml:space="preserve">
550550
<value>寄付</value>
551551
</data>
@@ -915,6 +915,9 @@
915915
<data name="SettingsPageHeight.Header" xml:space="preserve">
916916
<value>高さ</value>
917917
</data>
918+
<data name="SettingsPageHello.Text" xml:space="preserve">
919+
<value>こんにちは</value>
920+
</data>
918921
<data name="SettingsPageHideWindow.Description" xml:space="preserve">
919922
<value>音楽が再生されていないときに、自動的に歌詞ウィンドウを非表示/表示します</value>
920923
</data>
@@ -1293,6 +1296,9 @@
12931296
<data name="SettingsPagePathNotFound.Text" xml:space="preserve">
12941297
<value>パスはコンピューターでは見つかりません</value>
12951298
</data>
1299+
<data name="SettingsPagePatrons.Text" xml:space="preserve">
1300+
<value>スペシャルサンクス</value>
1301+
</data>
12961302
<data name="SettingsPagePhonetic.Text" xml:space="preserve">
12971303
<value>リリックアノテーション</value>
12981304
</data>
@@ -1506,6 +1512,12 @@
15061512
<data name="SettingsPageTelegram.Content" xml:space="preserve">
15071513
<value>Telegram</value>
15081514
</data>
1515+
<data name="SettingsPageThanksForPurchasing.Text" xml:space="preserve">
1516+
<value>BetterLyrics をご購入いただきありがとうございます</value>
1517+
</data>
1518+
<data name="SettingsPageThanksList.Header" xml:space="preserve">
1519+
<value>ありがとうございました</value>
1520+
</data>
15091521
<data name="SettingsPageTheme.Header" xml:space="preserve">
15101522
<value>歌詞の背景テーマ</value>
15111523
</data>
@@ -1575,6 +1587,9 @@
15751587
<data name="SettingsPageWorkAreaHeight.Header" xml:space="preserve">
15761588
<value>作業エリアの高さ</value>
15771589
</data>
1590+
<data name="SettingsPageYouNowUsing.Text" xml:space="preserve">
1591+
<value>ソフトウェアを使用しているあなた</value>
1592+
</data>
15781593
<data name="StandardMode" xml:space="preserve">
15791594
<value>標準モード</value>
15801595
</data>

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

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,6 @@
153153
<data name="DemoWindowControlDefault.Text" xml:space="preserve">
154154
<value>기본</value>
155155
</data>
156-
<data name="DependenciesSettingsExpander.Header" xml:space="preserve">
157-
<value>의존성</value>
158-
</data>
159156
<data name="DesktopMode" xml:space="preserve">
160157
<value>데스크톱 모드 (투명)</value>
161158
</data>
@@ -546,6 +543,9 @@
546543
<data name="SetingsPageContributors.Text" xml:space="preserve">
547544
<value>기여자</value>
548545
</data>
546+
<data name="SetingsPageDeps.Text" xml:space="preserve">
547+
<value>종속 패키지</value>
548+
</data>
549549
<data name="SetingsPageDonation.Text" xml:space="preserve">
550550
<value>기부</value>
551551
</data>
@@ -915,6 +915,9 @@
915915
<data name="SettingsPageHeight.Header" xml:space="preserve">
916916
<value>신장</value>
917917
</data>
918+
<data name="SettingsPageHello.Text" xml:space="preserve">
919+
<value>안녕</value>
920+
</data>
918921
<data name="SettingsPageHideWindow.Description" xml:space="preserve">
919922
<value>음악이 재생되지 않을 때 자동으로 가사 창 숨기기/표시</value>
920923
</data>
@@ -1293,6 +1296,9 @@
12931296
<data name="SettingsPagePathNotFound.Text" xml:space="preserve">
12941297
<value>경로는 컴퓨터에서 찾을 수 없습니다</value>
12951298
</data>
1299+
<data name="SettingsPagePatrons.Text" xml:space="preserve">
1300+
<value>특별 감사 인사</value>
1301+
</data>
12961302
<data name="SettingsPagePhonetic.Text" xml:space="preserve">
12971303
<value>가사 주석</value>
12981304
</data>
@@ -1506,6 +1512,12 @@
15061512
<data name="SettingsPageTelegram.Content" xml:space="preserve">
15071513
<value>Telegram</value>
15081514
</data>
1515+
<data name="SettingsPageThanksForPurchasing.Text" xml:space="preserve">
1516+
<value>BetterLyrics 를 구매해 주셔서 감사합니다</value>
1517+
</data>
1518+
<data name="SettingsPageThanksList.Header" xml:space="preserve">
1519+
<value>감사합니다</value>
1520+
</data>
15091521
<data name="SettingsPageTheme.Header" xml:space="preserve">
15101522
<value>가사 배경 테마</value>
15111523
</data>
@@ -1575,6 +1587,9 @@
15751587
<data name="SettingsPageWorkAreaHeight.Header" xml:space="preserve">
15761588
<value>작업 영역 높이</value>
15771589
</data>
1590+
<data name="SettingsPageYouNowUsing.Text" xml:space="preserve">
1591+
<value>소프트웨어를 사용하는 여러분</value>
1592+
</data>
15781593
<data name="StandardMode" xml:space="preserve">
15791594
<value>표준 모드</value>
15801595
</data>

0 commit comments

Comments
 (0)