mirror of
https://github.com/jayfunc/BetterLyrics.git
synced 2026-01-12 10:54:55 +08:00
Compare commits
335 Commits
v1.1.167.0
...
v1.2.237.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c576635af2 | ||
|
|
c8590202ec | ||
|
|
2dc8b1283f | ||
|
|
c482edea0f | ||
|
|
315722252c | ||
|
|
32ba453264 | ||
|
|
d4902329bb | ||
|
|
83aee8948b | ||
|
|
1f9fab3228 | ||
|
|
7a3a659dfc | ||
|
|
a14afd3eb5 | ||
|
|
c2af7f3186 | ||
|
|
cd026dd2bf | ||
|
|
4bc1a9975d | ||
|
|
07eecf0930 | ||
|
|
35fba5abb0 | ||
|
|
03ef231a3f | ||
|
|
f41879f4e5 | ||
|
|
bda7510ed6 | ||
|
|
5ec8c7c61f | ||
|
|
7e6bd9dade | ||
|
|
56244cb793 | ||
|
|
cb5f70ab55 | ||
|
|
3cc018bb1f | ||
|
|
c517d2b008 | ||
|
|
e79f2a0223 | ||
|
|
39122b9147 | ||
|
|
accbdc1806 | ||
|
|
de014d1ad7 | ||
|
|
cc2ce5f8cf | ||
|
|
2a2d80436e | ||
|
|
ce3f79f35c | ||
|
|
12e6000cb3 | ||
|
|
c1dc684411 | ||
|
|
69ea2cb495 | ||
|
|
e2ee03c4be | ||
|
|
c6fe33d6ae | ||
|
|
7744e145fa | ||
|
|
0284b1de81 | ||
|
|
108c2cd34b | ||
|
|
390e30f7f5 | ||
|
|
900774668d | ||
|
|
6ca2d1f897 | ||
|
|
164bd077b8 | ||
|
|
8ec71fcfb7 | ||
|
|
f39ad54df8 | ||
|
|
9b809983df | ||
|
|
8006b3a443 | ||
|
|
26a7454de2 | ||
|
|
0793a074cf | ||
|
|
125bf1682e | ||
|
|
48bdffb2fe | ||
|
|
d324a7552f | ||
|
|
78c308c393 | ||
|
|
a1bba00db6 | ||
|
|
0787f5b111 | ||
|
|
884026594b | ||
|
|
b0a777db8d | ||
|
|
83f3a3bd6d | ||
|
|
bfb2ed29e5 | ||
|
|
131a0f0eb1 | ||
|
|
ac2a7b3f7b | ||
|
|
36eea7f8f2 | ||
|
|
6b338deb55 | ||
|
|
af323ecd00 | ||
|
|
c79d01c75b | ||
|
|
b51ec1e60f | ||
|
|
7fe925bcba | ||
|
|
0626472d66 | ||
|
|
33099bc186 | ||
|
|
e653efc227 | ||
|
|
074fef3faf | ||
|
|
029cbbd343 | ||
|
|
802b2a4c1c | ||
|
|
eccc4d519c | ||
|
|
5f274ea28a | ||
|
|
aa1a1f5d58 | ||
|
|
3a56d53487 | ||
|
|
bbc5eb772c | ||
|
|
05b491052b | ||
|
|
8accbf0431 | ||
|
|
1174209c2a | ||
|
|
23ed719046 | ||
|
|
a34f00662e | ||
|
|
f783314258 | ||
|
|
215a39c5d5 | ||
|
|
16bcef5f64 | ||
|
|
fbba9a3c36 | ||
|
|
f205ab0364 | ||
|
|
10314f3c2f | ||
|
|
b4710e87d3 | ||
|
|
282a934cd2 | ||
|
|
b4c4e394ef | ||
|
|
17cfdf37bd | ||
|
|
900a8e1e7c | ||
|
|
ea9a9c2f5f | ||
|
|
0c4d02b337 | ||
|
|
d137d82ecf | ||
|
|
02551e2053 | ||
|
|
026926e9b8 | ||
|
|
4c811db16a | ||
|
|
6f83fa11db | ||
|
|
bc8e15c144 | ||
|
|
85de1eb2cd | ||
|
|
d2bf19ed3d | ||
|
|
43c205c839 | ||
|
|
9664b1ab78 | ||
|
|
08c5f6b515 | ||
|
|
260de40f81 | ||
|
|
c00d0eb005 | ||
|
|
32e761724c | ||
|
|
9fd08af582 | ||
|
|
266dcfc930 | ||
|
|
8764585f2c | ||
|
|
91ab3a48c0 | ||
|
|
80fa34d9e8 | ||
|
|
b4ca4fd990 | ||
|
|
86527f6b82 | ||
|
|
d8066bc683 | ||
|
|
b261a86791 | ||
|
|
34f2a51b74 | ||
|
|
b1e9c25e01 | ||
|
|
346de93c3f | ||
|
|
6f48cbcd16 | ||
|
|
85b3121479 | ||
|
|
94f00d1a31 | ||
|
|
be9e4bba0f | ||
|
|
2454927582 | ||
|
|
aca5f8e00d | ||
|
|
09709e8e62 | ||
|
|
98fd8b43c4 | ||
|
|
3051180eb9 | ||
|
|
d48c81cfa1 | ||
|
|
695147be9b | ||
|
|
e782944a44 | ||
|
|
01462d42ce | ||
|
|
65b7dfcc44 | ||
|
|
ec3146d4a7 | ||
|
|
9ec0bf0b1a | ||
|
|
47e4b93613 | ||
|
|
192ad4a503 | ||
|
|
091e33ae08 | ||
|
|
3b010ed674 | ||
|
|
a9f685d51b | ||
|
|
c6c31f8839 | ||
|
|
78c53760cc | ||
|
|
0bb6b5a204 | ||
|
|
dff36a5e4d | ||
|
|
0188e443db | ||
|
|
5a9cdedc0c | ||
|
|
31460fcc6d | ||
|
|
c12fc6f381 | ||
|
|
e5e0342994 | ||
|
|
061958f20c | ||
|
|
95c73d0a34 | ||
|
|
026a12ac87 | ||
|
|
da53f2166f | ||
|
|
717277e17c | ||
|
|
1dc3ea57e9 | ||
|
|
4ec2ba8b59 | ||
|
|
91d9f253f0 | ||
|
|
90cf373e50 | ||
|
|
cf2778da7a | ||
|
|
45ff7d7aa8 | ||
|
|
eb37cb1b55 | ||
|
|
45aa1d787d | ||
|
|
0b28419ab5 | ||
|
|
258bf9220e | ||
|
|
9ece9f3edc | ||
|
|
40c1f0a5ce | ||
|
|
5f75e6c63c | ||
|
|
43387ce4c8 | ||
|
|
34eda9a262 | ||
|
|
804673696f | ||
|
|
b69e3bb24b | ||
|
|
c028aa8e46 | ||
|
|
fe3e257215 | ||
|
|
eae2428d85 | ||
|
|
b078365136 | ||
|
|
1ede8dbef4 | ||
|
|
a66051b937 | ||
|
|
1eca21c285 | ||
|
|
2254a28e40 | ||
|
|
812eca369d | ||
|
|
132d3d8ac8 | ||
|
|
641a23621f | ||
|
|
6802d10142 | ||
|
|
36f43e6d54 | ||
|
|
e8298ec7bd | ||
|
|
99a21cb935 | ||
|
|
b6da7bea5d | ||
|
|
cf5bf75346 | ||
|
|
7497d7014d | ||
|
|
dd8c62ffa5 | ||
|
|
15b147ba06 | ||
|
|
85146ffc95 | ||
|
|
e9dce765e4 | ||
|
|
3b2c4477b5 | ||
|
|
9d71c4aecf | ||
|
|
7184c148c4 | ||
|
|
85f928ce3b | ||
|
|
7c5032b0c2 | ||
|
|
2c3bd056b7 | ||
|
|
9f2843b7a0 | ||
|
|
7fb6d5346e | ||
|
|
27125d9051 | ||
|
|
5b2fb8b345 | ||
|
|
d558811cb4 | ||
|
|
6e30aa7ebd | ||
|
|
15fc337944 | ||
|
|
b7ef159b9e | ||
|
|
393b33ed83 | ||
|
|
23dfda4413 | ||
|
|
fde7340f4d | ||
|
|
22330d7fe9 | ||
|
|
c64e5776e8 | ||
|
|
ffa2cd75a0 | ||
|
|
873e75a7e9 | ||
|
|
ffa4101d5f | ||
|
|
1c12b582c2 | ||
|
|
c50d31ced7 | ||
|
|
f8108151b6 | ||
|
|
2932366767 | ||
|
|
cbf643ca70 | ||
|
|
a72d0f5c28 | ||
|
|
3b4d98f9a3 | ||
|
|
d5828101d8 | ||
|
|
56051537ea | ||
|
|
6b465a09b1 | ||
|
|
450b86ebaf | ||
|
|
c0078baa13 | ||
|
|
6b28212ec3 | ||
|
|
9a3c2f5f70 | ||
|
|
31be2bd8f7 | ||
|
|
47056e07a1 | ||
|
|
f30673b9d3 | ||
|
|
d8624c49d0 | ||
|
|
72810e7440 | ||
|
|
e881d36743 | ||
|
|
aa3e79d3ff | ||
|
|
9979474ce1 | ||
|
|
2e7cd93cfe | ||
|
|
bdc31c3e0d | ||
|
|
631d079aa2 | ||
|
|
f76ef87167 | ||
|
|
76aa5ee8d0 | ||
|
|
d7f4978a66 | ||
|
|
0905c46e45 | ||
|
|
d0991c5ddb | ||
|
|
619a3ba196 | ||
|
|
13526bb85c | ||
|
|
61f4f608db | ||
|
|
f690da8501 | ||
|
|
145c13a0e6 | ||
|
|
cea4fbb54d | ||
|
|
1d489c68e9 | ||
|
|
90e7fa42d0 | ||
|
|
29a6879e45 | ||
|
|
58499a2d09 | ||
|
|
580255699b | ||
|
|
9cac7818f1 | ||
|
|
118668a457 | ||
|
|
37621dbf2a | ||
|
|
aa7d56f1cb | ||
|
|
8dbe76e790 | ||
|
|
de6410492e | ||
|
|
26df7c7f67 | ||
|
|
3c411374bd | ||
|
|
99f0b9443b | ||
|
|
a3bc148816 | ||
|
|
cea757702b | ||
|
|
8938a5c798 | ||
|
|
46f4589b64 | ||
|
|
adb02658f4 | ||
|
|
3d7e6061e9 | ||
|
|
a51220c7b9 | ||
|
|
22b813e687 | ||
|
|
fda94d5020 | ||
|
|
205cbe8fb6 | ||
|
|
816f7064db | ||
|
|
132c5267b0 | ||
|
|
4e866818df | ||
|
|
9b7b56a0ee | ||
|
|
66f2da0e4c | ||
|
|
1735c6a7e6 | ||
|
|
8c06c98068 | ||
|
|
e2ac4c166c | ||
|
|
728397cafa | ||
|
|
059787a28f | ||
|
|
4c4231b48c | ||
|
|
2412927b29 | ||
|
|
f3bdbba83e | ||
|
|
4c811b12ca | ||
|
|
933103c57f | ||
|
|
718e7bdad3 | ||
|
|
42284b4f45 | ||
|
|
7da8af7c2a | ||
|
|
a4fc457065 | ||
|
|
d3c2ee592c | ||
|
|
2eef88523c | ||
|
|
220b1063ac | ||
|
|
28bcd8ddfc | ||
|
|
5750bd3ad7 | ||
|
|
1667c701b0 | ||
|
|
160398f7ab | ||
|
|
c25ddf770f | ||
|
|
44fa3312b2 | ||
|
|
81f3d1f6bf | ||
|
|
2f627d7531 | ||
|
|
caed76e9b9 | ||
|
|
a74dc705c9 | ||
|
|
21eb8fcf9c | ||
|
|
4662d3d54d | ||
|
|
b10f108f93 | ||
|
|
2defe620c7 | ||
|
|
315c10c83c | ||
|
|
981bc3f933 | ||
|
|
88460899bd | ||
|
|
8341642658 | ||
|
|
26f4ff3a58 | ||
|
|
b1b763c6fe | ||
|
|
28323c39f6 | ||
|
|
b099965715 | ||
|
|
8f9fdc18bb | ||
|
|
5a549bd5f5 | ||
|
|
48e94f275b | ||
|
|
691071d725 | ||
|
|
591c1a6d00 | ||
|
|
4e6a2df2cb | ||
|
|
8b196e45a4 | ||
|
|
0ddeaef126 | ||
|
|
e3747c113a | ||
|
|
1b1449ce3b | ||
|
|
ea246a96be | ||
|
|
28722d325a |
291
.devin/wiki.json
Normal file
291
.devin/wiki.json
Normal file
@@ -0,0 +1,291 @@
|
|||||||
|
{
|
||||||
|
"repo_notes": [
|
||||||
|
{
|
||||||
|
"content": "Always use the latest files in the repo to generate the wiki"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"pages": [
|
||||||
|
{
|
||||||
|
"title": "Overview",
|
||||||
|
"purpose": "Introduce BetterLyrics, its purpose as a WinUI3 lyrics display application, key features, and supported music players",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Getting Started",
|
||||||
|
"purpose": "Guide users through installation, initial setup, and basic usage of BetterLyrics",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Installation and Deployment",
|
||||||
|
"purpose": "Explain how to install BetterLyrics from Microsoft Store or build from source, system requirements, and supported Windows versions",
|
||||||
|
"parent": "Getting Started",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Initial Configuration",
|
||||||
|
"purpose": "Walk through first-time setup including media player configuration, folder selection, and basic settings",
|
||||||
|
"parent": "Getting Started",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Architecture",
|
||||||
|
"purpose": "Provide technical overview of BetterLyrics' internal architecture, design patterns, and component organization",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Application Entry Point and Dependency Injection",
|
||||||
|
"purpose": "Document the App.xaml.cs entry point, service registration, and dependency injection container configuration",
|
||||||
|
"parent": "Architecture",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Service Layer Architecture",
|
||||||
|
"purpose": "Explain the service-oriented architecture, service interfaces, and their implementations including MediaSessionsService, LyricsSearchService, and SettingsService",
|
||||||
|
"parent": "Architecture",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Data Models",
|
||||||
|
"purpose": "Document core data models including LyricsLine, LyricsData, SongInfo, and configuration models",
|
||||||
|
"parent": "Architecture",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Multi-Window System",
|
||||||
|
"purpose": "Explain how BetterLyrics manages multiple simultaneous lyrics windows, window lifecycle, and state management",
|
||||||
|
"parent": "Architecture",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "User Interface",
|
||||||
|
"purpose": "Document the UI components, windows, and user interaction patterns in BetterLyrics",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Now Playing Window",
|
||||||
|
"purpose": "Detail the main lyrics display window, its components, and integration with the rendering system",
|
||||||
|
"parent": "User Interface",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Display Modes and Window Configurations",
|
||||||
|
"purpose": "Explain different display modes (Standard, Desktop, Docked, Fullscreen, Narrow, Taskbar) and how to configure them",
|
||||||
|
"parent": "User Interface",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Settings and Customization",
|
||||||
|
"purpose": "Document the settings interface, configuration options, and how to customize lyrics appearance and behavior",
|
||||||
|
"parent": "User Interface",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Music Gallery",
|
||||||
|
"purpose": "Explain the local music library management feature, including playback, playlist management, and integration with media controls",
|
||||||
|
"parent": "User Interface",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "System Tray and Global Controls",
|
||||||
|
"purpose": "Document the system tray integration, global hotkeys, and application-wide controls",
|
||||||
|
"parent": "User Interface",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Lyrics System",
|
||||||
|
"purpose": "Comprehensive documentation of the lyrics acquisition, processing, and display pipeline",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Lyrics Search and Providers",
|
||||||
|
"purpose": "Document the lyrics search system, supported providers (QQ Music, Netease, Kugou, LrcLib, Apple Music, local files), and search strategies",
|
||||||
|
"parent": "Lyrics System",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Parsing and Translation",
|
||||||
|
"purpose": "Explain how lyrics are parsed from different formats (LRC, QRC, TTML), translation system using LibreTranslate, and metadata matching",
|
||||||
|
"parent": "Lyrics System",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Rendering Pipeline",
|
||||||
|
"purpose": "Document the Win2D-based rendering system, LyricsCanvas, PlayingLineRenderer, UnplayingLineRenderer, and LyricsLayoutManager",
|
||||||
|
"parent": "Lyrics System",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Visual Effects and Animation",
|
||||||
|
"purpose": "Explain character-level effects (glow, float, scale), background effects (fluid, snow, fog, spectrum), and the animation transition system",
|
||||||
|
"parent": "Lyrics System",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Media Integration",
|
||||||
|
"purpose": "Document how BetterLyrics integrates with music players and manages media sessions",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Windows Media Transport Controls Integration",
|
||||||
|
"purpose": "Explain how BetterLyrics uses Windows SMTC to work universally with media players",
|
||||||
|
"parent": "Media Integration",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Supported Players and Special Configurations",
|
||||||
|
"purpose": "List supported media players, document special configurations (Apple Music token, LX Music SSE), and player-specific handling",
|
||||||
|
"parent": "Media Integration",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Album Art and Theme Colors",
|
||||||
|
"purpose": "Document album art retrieval from multiple sources, color palette generation (MedianCut, OctTree), and adaptive theming",
|
||||||
|
"parent": "Media Integration",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Internationalization",
|
||||||
|
"purpose": "Explain the localization system, supported languages, and how resources are managed",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Development",
|
||||||
|
"purpose": "Technical documentation for developers contributing to or extending BetterLyrics",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Build Configuration and Deployment",
|
||||||
|
"purpose": "Document the build process, publish profiles for different architectures, CI/CD pipeline, and packaging for Microsoft Store",
|
||||||
|
"parent": "Development",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Helper Utilities and Extensions",
|
||||||
|
"purpose": "Document utility classes including TaskbarHook, WindowHook, ColorHelper, ImageHelper, and various extension methods",
|
||||||
|
"parent": "Development",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "External Dependencies and Libraries",
|
||||||
|
"purpose": "List and explain third-party dependencies including Win2D, NAudio, ATL.NET, FlaUI, and their usage in the application",
|
||||||
|
"parent": "Development",
|
||||||
|
"page_notes": [
|
||||||
|
{
|
||||||
|
"content": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -53,27 +53,27 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
<AppxBundle>Always</AppxBundle>
|
<AppxBundle>Always</AppxBundle>
|
||||||
<DefaultLanguage>en-US</DefaultLanguage>
|
<DefaultLanguage>en</DefaultLanguage>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
|
||||||
<AppxBundle>Always</AppxBundle>
|
<AppxBundle>Always</AppxBundle>
|
||||||
<DefaultLanguage>en-US</DefaultLanguage>
|
<DefaultLanguage>en</DefaultLanguage>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
|
||||||
<AppxBundle>Always</AppxBundle>
|
<AppxBundle>Always</AppxBundle>
|
||||||
<DefaultLanguage>en-US</DefaultLanguage>
|
<DefaultLanguage>en</DefaultLanguage>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
<AppxBundle>Always</AppxBundle>
|
<AppxBundle>Always</AppxBundle>
|
||||||
<DefaultLanguage>en-US</DefaultLanguage>
|
<DefaultLanguage>en</DefaultLanguage>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
||||||
<AppxBundle>Always</AppxBundle>
|
<AppxBundle>Always</AppxBundle>
|
||||||
<DefaultLanguage>en-US</DefaultLanguage>
|
<DefaultLanguage>en</DefaultLanguage>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
|
||||||
<AppxBundle>Always</AppxBundle>
|
<AppxBundle>Always</AppxBundle>
|
||||||
<DefaultLanguage>en-US</DefaultLanguage>
|
<DefaultLanguage>en</DefaultLanguage>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<AppxManifest Include="Package.appxmanifest">
|
<AppxManifest Include="Package.appxmanifest">
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
<Identity
|
<Identity
|
||||||
Name="37412.BetterLyrics"
|
Name="37412.BetterLyrics"
|
||||||
Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
|
Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
|
||||||
Version="1.1.167.0" />
|
Version="1.2.236.0" />
|
||||||
|
|
||||||
<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
|
<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
|
||||||
|
|
||||||
@@ -28,11 +28,22 @@
|
|||||||
</Dependencies>
|
</Dependencies>
|
||||||
|
|
||||||
<Resources>
|
<Resources>
|
||||||
<Resource Language="en-US"/>
|
<Resource Language="ar"/>
|
||||||
<Resource Language="zh-CN"/>
|
<Resource Language="de"/>
|
||||||
<Resource Language="zh-TW"/>
|
<Resource Language="en"/>
|
||||||
<Resource Language="ja-JP"/>
|
<Resource Language="es"/>
|
||||||
<Resource Language="ko-KR"/>
|
<Resource Language="fr"/>
|
||||||
|
<Resource Language="hi"/>
|
||||||
|
<Resource Language="id"/>
|
||||||
|
<Resource Language="ja"/>
|
||||||
|
<Resource Language="ko"/>
|
||||||
|
<Resource Language="ms"/>
|
||||||
|
<Resource Language="pt"/>
|
||||||
|
<Resource Language="ru"/>
|
||||||
|
<Resource Language="th"/>
|
||||||
|
<Resource Language="vi"/>
|
||||||
|
<Resource Language="zh-Hans"/>
|
||||||
|
<Resource Language="zh-Hant"/>
|
||||||
</Resources>
|
</Resources>
|
||||||
|
|
||||||
<Applications>
|
<Applications>
|
||||||
|
|||||||
@@ -50,6 +50,7 @@
|
|||||||
<converter:CornerRadiusToDoubleConverter x:Key="CornerRadiusToDoubleConverter" />
|
<converter:CornerRadiusToDoubleConverter x:Key="CornerRadiusToDoubleConverter" />
|
||||||
<converter:LyricsSearchProviderToDisplayNameConverter x:Key="LyricsSearchProviderToDisplayNameConverter" />
|
<converter:LyricsSearchProviderToDisplayNameConverter x:Key="LyricsSearchProviderToDisplayNameConverter" />
|
||||||
<converter:TranslationSearchProviderToDisplayNameConverter x:Key="TranslationSearchProviderToDisplayNameConverter" />
|
<converter:TranslationSearchProviderToDisplayNameConverter x:Key="TranslationSearchProviderToDisplayNameConverter" />
|
||||||
|
<converter:TransliterationSearchProviderToDisplayNameConverter x:Key="TransliterationSearchProviderToDisplayNameConverter" />
|
||||||
<converter:AlbumArtSearchProviderToDisplayNameConverter x:Key="AlbumArtSearchProviderToDisplayNameConverter" />
|
<converter:AlbumArtSearchProviderToDisplayNameConverter x:Key="AlbumArtSearchProviderToDisplayNameConverter" />
|
||||||
<converter:SecondsToFormattedTimeConverter x:Key="SecondsToFormattedTimeConverter" />
|
<converter:SecondsToFormattedTimeConverter x:Key="SecondsToFormattedTimeConverter" />
|
||||||
<converter:MillisecondsToFormattedTimeConverter x:Key="MillisecondsToFormattedTimeConverter" />
|
<converter:MillisecondsToFormattedTimeConverter x:Key="MillisecondsToFormattedTimeConverter" />
|
||||||
@@ -64,7 +65,6 @@
|
|||||||
<converter:ByteArrayToImageConverter x:Key="ByteArrayToImageConverter" />
|
<converter:ByteArrayToImageConverter x:Key="ByteArrayToImageConverter" />
|
||||||
<converter:DisplayLanguageCodeToIndexConverter x:Key="DisplayLanguageCodeToIndexConverter" />
|
<converter:DisplayLanguageCodeToIndexConverter x:Key="DisplayLanguageCodeToIndexConverter" />
|
||||||
<converter:PathToParentFolderConverter x:Key="PathToParentFolderConverter" />
|
<converter:PathToParentFolderConverter x:Key="PathToParentFolderConverter" />
|
||||||
<converter:TrackToLyricsConverter x:Key="TrackToLyricsConverter" />
|
|
||||||
<converter:IntToBoolConverter x:Key="IntToBoolConverter" />
|
<converter:IntToBoolConverter x:Key="IntToBoolConverter" />
|
||||||
<converter:IndexToDisplayConverter x:Key="IndexToDisplayConverter" />
|
<converter:IndexToDisplayConverter x:Key="IndexToDisplayConverter" />
|
||||||
<converter:IntToDoubleConverter x:Key="IntToDoubleConverter" />
|
<converter:IntToDoubleConverter x:Key="IntToDoubleConverter" />
|
||||||
@@ -74,6 +74,9 @@
|
|||||||
<converter:TextAlignmentTypeToHorizontalAlignmentConverter x:Key="TextAlignmentTypeToHorizontalAlignmentConverter" />
|
<converter:TextAlignmentTypeToHorizontalAlignmentConverter x:Key="TextAlignmentTypeToHorizontalAlignmentConverter" />
|
||||||
<converter:LyricsLayoutOrientationToOrientationConverter x:Key="LyricsLayoutOrientationToOrientationConverter" />
|
<converter:LyricsLayoutOrientationToOrientationConverter x:Key="LyricsLayoutOrientationToOrientationConverter" />
|
||||||
<converter:LyricsLayoutOrientationNegationToOrientationConverter x:Key="LyricsLayoutOrientationNegationToOrientationConverter" />
|
<converter:LyricsLayoutOrientationNegationToOrientationConverter x:Key="LyricsLayoutOrientationNegationToOrientationConverter" />
|
||||||
|
<converter:FileSourceTypeToIconConverter x:Key="FileSourceTypeToIconConverter" />
|
||||||
|
<converter:PathToImageConverter x:Key="PathToImageConverter" />
|
||||||
|
<converter:DoubleToDecimalConverter x:Key="DoubleToDecimalConverter" />
|
||||||
|
|
||||||
<converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
|
<converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
|
||||||
<converters:BoolNegationConverter x:Key="BoolNegationConverter" />
|
<converters:BoolNegationConverter x:Key="BoolNegationConverter" />
|
||||||
@@ -95,8 +98,7 @@
|
|||||||
<Setter Property="VerticalAlignment" Value="Top" />
|
<Setter Property="VerticalAlignment" Value="Top" />
|
||||||
<Setter Property="CornerRadius" Value="4" />
|
<Setter Property="CornerRadius" Value="4" />
|
||||||
<Setter Property="BorderThickness" Value="0" />
|
<Setter Property="BorderThickness" Value="0" />
|
||||||
<Setter Property="Padding" Value="16,9,16,11" />
|
<Setter Property="Padding" Value="16,9,16,9" />
|
||||||
<Setter Property="Margin" Value="0" />
|
|
||||||
<Setter Property="Background" Value="Transparent" />
|
<Setter Property="Background" Value="Transparent" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style x:Key="GhostButtonStyle" TargetType="Button">
|
<Style x:Key="GhostButtonStyle" TargetType="Button">
|
||||||
@@ -110,10 +112,10 @@
|
|||||||
x:Key="TitleBarToggleButtonStyle"
|
x:Key="TitleBarToggleButtonStyle"
|
||||||
BasedOn="{StaticResource ToggleButtonRevealStyle}"
|
BasedOn="{StaticResource ToggleButtonRevealStyle}"
|
||||||
TargetType="ToggleButton">
|
TargetType="ToggleButton">
|
||||||
|
<Setter Property="VerticalAlignment" Value="Top" />
|
||||||
<Setter Property="CornerRadius" Value="4" />
|
<Setter Property="CornerRadius" Value="4" />
|
||||||
<Setter Property="VerticalAlignment" Value="Stretch" />
|
|
||||||
<Setter Property="BorderThickness" Value="0" />
|
<Setter Property="BorderThickness" Value="0" />
|
||||||
<Setter Property="Padding" Value="16,9,16,11" />
|
<Setter Property="Padding" Value="14,6,14,9" />
|
||||||
<Setter Property="Background" Value="Transparent" />
|
<Setter Property="Background" Value="Transparent" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style x:Key="GhostToggleButtonStyle" TargetType="ToggleButton">
|
<Style x:Key="GhostToggleButtonStyle" TargetType="ToggleButton">
|
||||||
|
|||||||
@@ -1,48 +1,56 @@
|
|||||||
// 2025/6/23 by Zhe Fang
|
using BetterLyrics.WinUI3.Helper;
|
||||||
|
|
||||||
using BetterLyrics.WinUI3.Helper;
|
|
||||||
using BetterLyrics.WinUI3.Hooks;
|
using BetterLyrics.WinUI3.Hooks;
|
||||||
|
using BetterLyrics.WinUI3.Models.Db;
|
||||||
using BetterLyrics.WinUI3.Services.AlbumArtSearchService;
|
using BetterLyrics.WinUI3.Services.AlbumArtSearchService;
|
||||||
using BetterLyrics.WinUI3.Services.DiscordService;
|
using BetterLyrics.WinUI3.Services.DiscordService;
|
||||||
|
using BetterLyrics.WinUI3.Services.FileSystemService;
|
||||||
using BetterLyrics.WinUI3.Services.LastFMService;
|
using BetterLyrics.WinUI3.Services.LastFMService;
|
||||||
using BetterLyrics.WinUI3.Services.LibWatcherService;
|
using BetterLyrics.WinUI3.Services.LocalizationService;
|
||||||
using BetterLyrics.WinUI3.Services.LiveStatesService;
|
|
||||||
using BetterLyrics.WinUI3.Services.LyricsSearchService;
|
using BetterLyrics.WinUI3.Services.LyricsSearchService;
|
||||||
using BetterLyrics.WinUI3.Services.MediaSessionsService;
|
using BetterLyrics.WinUI3.Services.MediaSessionsService;
|
||||||
using BetterLyrics.WinUI3.Services.ResourceService;
|
using BetterLyrics.WinUI3.Services.PlayHistoryService;
|
||||||
using BetterLyrics.WinUI3.Services.SettingsService;
|
using BetterLyrics.WinUI3.Services.SettingsService;
|
||||||
using BetterLyrics.WinUI3.Services.TranslateService;
|
using BetterLyrics.WinUI3.Services.TranslationService;
|
||||||
|
using BetterLyrics.WinUI3.Services.TransliterationService;
|
||||||
using BetterLyrics.WinUI3.ViewModels;
|
using BetterLyrics.WinUI3.ViewModels;
|
||||||
using BetterLyrics.WinUI3.Views;
|
using BetterLyrics.WinUI3.Views;
|
||||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||||
|
using Microsoft.Data.Sqlite;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
|
using Microsoft.UI.Dispatching; // 关键:用于线程调度
|
||||||
using Microsoft.UI.Xaml;
|
using Microsoft.UI.Xaml;
|
||||||
using Microsoft.Windows.ApplicationModel.Resources;
|
using Microsoft.Windows.AppLifecycle; // 关键:App生命周期管理
|
||||||
using Serilog;
|
using Serilog;
|
||||||
using System;
|
using System;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Vanara.PInvoke;
|
|
||||||
using WinUIEx;
|
|
||||||
|
|
||||||
namespace BetterLyrics.WinUI3
|
namespace BetterLyrics.WinUI3
|
||||||
{
|
{
|
||||||
public partial class App : Application
|
public partial class App : Application
|
||||||
{
|
{
|
||||||
|
private Window? m_window;
|
||||||
private readonly ILogger<App> _logger;
|
private readonly ILogger<App> _logger;
|
||||||
|
|
||||||
public static new App Current => (App)Application.Current;
|
public static new App Current => (App)Application.Current;
|
||||||
|
|
||||||
private static Mutex? _instanceMutex;
|
private readonly string _appKey = Windows.ApplicationModel.Package.Current.Id.FamilyName;
|
||||||
|
|
||||||
public App()
|
public App()
|
||||||
{
|
{
|
||||||
this.InitializeComponent();
|
// Must be done before InitializeComponent
|
||||||
|
if (!TryHandleSingleInstance())
|
||||||
|
{
|
||||||
|
// 如果移交成功直接退出当前进程
|
||||||
|
Environment.Exit(0);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
EnsureSingleInstance();
|
this.InitializeComponent();
|
||||||
|
|
||||||
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
|
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
|
||||||
PathHelper.EnsureDirectories();
|
PathHelper.EnsureDirectories();
|
||||||
@@ -50,36 +58,204 @@ namespace BetterLyrics.WinUI3
|
|||||||
|
|
||||||
_logger = Ioc.Default.GetRequiredService<ILogger<App>>();
|
_logger = Ioc.Default.GetRequiredService<ILogger<App>>();
|
||||||
|
|
||||||
|
// 注册全局异常捕获
|
||||||
UnhandledException += App_UnhandledException;
|
UnhandledException += App_UnhandledException;
|
||||||
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
|
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
|
||||||
AppDomain.CurrentDomain.FirstChanceException += CurrentDomain_FirstChanceException;
|
AppDomain.CurrentDomain.FirstChanceException += CurrentDomain_FirstChanceException;
|
||||||
TaskScheduler.UnobservedTaskException += TaskScheduler_UnobservedTaskException;
|
TaskScheduler.UnobservedTaskException += TaskScheduler_UnobservedTaskException;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void EnsureSingleInstance()
|
/// <summary>
|
||||||
|
/// 处理单实例逻辑。
|
||||||
|
/// 返回 true 表示我是主实例,继续运行。
|
||||||
|
/// 返回 false 表示我是第二个实例,已通知主实例,我应该退出。
|
||||||
|
/// </summary>
|
||||||
|
private bool TryHandleSingleInstance()
|
||||||
{
|
{
|
||||||
_instanceMutex = new Mutex(true, Constants.App.AppName, out bool createdNew);
|
// 尝试查找或注册当前实例
|
||||||
|
var mainInstance = AppInstance.FindOrRegisterForKey(_appKey);
|
||||||
|
|
||||||
if (!createdNew)
|
// 如果当前实例就是注册的那个主实例
|
||||||
|
if (mainInstance.IsCurrent)
|
||||||
{
|
{
|
||||||
User32.MessageBox(HWND.NULL, new ResourceLoader().GetString("TryRunMultipleInstance"), null, User32.MB_FLAGS.MB_APPLMODAL);
|
// 监听 "Activated" 事件。
|
||||||
Environment.Exit(0);
|
// 当第二个实例启动并重定向过来时,这个事件会被触发。
|
||||||
|
mainInstance.Activated += OnMainInstanceActivated;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// 我不是主实例,我是后来者。
|
||||||
|
// 获取当前实例的激活参数(比如是通过文件双击打开的,这里能拿到文件路径)
|
||||||
|
var args = AppInstance.GetCurrent().GetActivatedEventArgs();
|
||||||
|
|
||||||
|
// 将激活请求重定向给主实例
|
||||||
|
// 注意:这里是同步等待,确保发送成功后再退出
|
||||||
|
try
|
||||||
|
{
|
||||||
|
mainInstance.RedirectActivationToAsync(args).AsTask().Wait();
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
// 即使重定向失败,作为第二个实例也应该退出
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnLaunched(LaunchActivatedEventArgs args)
|
/// <summary>
|
||||||
|
/// 当第二个实例试图启动时,主实例会收到此回调
|
||||||
|
/// </summary>
|
||||||
|
private void OnMainInstanceActivated(object? sender, AppActivationArguments e)
|
||||||
{
|
{
|
||||||
// 设置托盘
|
// 这个事件是在后台线程触发的,必须切回 UI 线程操作窗口
|
||||||
WindowHook.OpenOrShowWindow<SystemTrayWindow>();
|
m_window?.DispatcherQueue.TryEnqueue(() =>
|
||||||
WindowHook.HideWindow<SystemTrayWindow>();
|
{
|
||||||
|
HandleActivation();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
WindowHook.OpenOrShowWindow<NowPlayingWindow>();
|
/// <summary>
|
||||||
if (Ioc.Default.GetRequiredService<ISettingsService>().AppSettings.MusicGallerySettings.AutoOpen)
|
/// 唤醒逻辑
|
||||||
|
/// </summary>
|
||||||
|
private void HandleActivation()
|
||||||
|
{
|
||||||
|
WindowHook.OpenOrShowWindow<LyricsWindowSwitchWindow>();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override async void OnLaunched(LaunchActivatedEventArgs args)
|
||||||
|
{
|
||||||
|
// 初始化数据库
|
||||||
|
await EnsureDatabasesAsync();
|
||||||
|
|
||||||
|
var settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
|
||||||
|
var fileSystemService = Ioc.Default.GetRequiredService<IFileSystemService>();
|
||||||
|
|
||||||
|
// 开始后台扫描任务
|
||||||
|
foreach (var item in settingsService.AppSettings.LocalMediaFolders)
|
||||||
|
{
|
||||||
|
if (item.LastSyncTime == null)
|
||||||
|
{
|
||||||
|
_ = Task.Run(async () => await fileSystemService.ScanMediaFolderAsync(item, CancellationToken.None));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fileSystemService.StartAllFolderTimers();
|
||||||
|
|
||||||
|
// 初始化托盘
|
||||||
|
m_window = WindowHook.OpenOrShowWindow<SystemTrayWindow>();
|
||||||
|
|
||||||
|
// 根据设置打开歌词窗口
|
||||||
|
if (settingsService.AppSettings.GeneralSettings.AutoStartLyricsWindow)
|
||||||
|
{
|
||||||
|
var defaultStatus = settingsService.AppSettings.WindowBoundsRecords.Where(x => x.IsDefault);
|
||||||
|
if (defaultStatus != null)
|
||||||
|
{
|
||||||
|
foreach (var item in defaultStatus)
|
||||||
|
{
|
||||||
|
WindowHook.OpenOrShowWindow<NowPlayingWindow>(item);
|
||||||
|
if (!settingsService.AppSettings.GeneralSettings.MultiNowPlayingWindowMode)
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 根据设置自动打开主界面
|
||||||
|
if (settingsService.AppSettings.MusicGallerySettings.AutoOpen)
|
||||||
{
|
{
|
||||||
WindowHook.OpenOrShowWindow<MusicGalleryWindow>();
|
WindowHook.OpenOrShowWindow<MusicGalleryWindow>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async Task EnsureDatabasesAsync()
|
||||||
|
{
|
||||||
|
var playHistoryFactory = Ioc.Default.GetRequiredService<IDbContextFactory<PlayHistoryDbContext>>();
|
||||||
|
var fileCacheFactory = Ioc.Default.GetRequiredService<IDbContextFactory<FilesIndexDbContext>>();
|
||||||
|
|
||||||
|
await SafeInitDatabaseAsync(
|
||||||
|
"PlayHistory",
|
||||||
|
PathHelper.PlayHistoryPath,
|
||||||
|
async () =>
|
||||||
|
{
|
||||||
|
using var db = await playHistoryFactory.CreateDbContextAsync();
|
||||||
|
await db.Database.EnsureCreatedAsync();
|
||||||
|
},
|
||||||
|
isCritical: true
|
||||||
|
);
|
||||||
|
|
||||||
|
await SafeInitDatabaseAsync(
|
||||||
|
"FileCache",
|
||||||
|
PathHelper.FilesIndexPath,
|
||||||
|
async () =>
|
||||||
|
{
|
||||||
|
using var db = await fileCacheFactory.CreateDbContextAsync();
|
||||||
|
await db.Database.EnsureCreatedAsync();
|
||||||
|
},
|
||||||
|
isCritical: false
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task SafeInitDatabaseAsync(string dbName, string dbPath, Func<Task> initAction, bool isCritical)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await initAction();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
System.Diagnostics.Debug.WriteLine($"[DB Error] {dbName} init failed: {ex.Message}");
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (File.Exists(dbPath))
|
||||||
|
{
|
||||||
|
// 尝试清理连接池
|
||||||
|
SqliteConnection.ClearAllPools();
|
||||||
|
|
||||||
|
if (isCritical)
|
||||||
|
{
|
||||||
|
var backupPath = dbPath + ".bak_" + DateTime.Now.ToString("yyyyMMddHHmmss");
|
||||||
|
File.Move(dbPath, backupPath, true);
|
||||||
|
await ShowErrorDialogAsync("Database Recovery", $"Database {dbName} is damaged, the old database has been backed up to {backupPath}, and the program will create a new database.");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
File.Delete(dbPath);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
await initAction();
|
||||||
|
System.Diagnostics.Debug.WriteLine($"[DB Info] {dbName} recovered successfully.");
|
||||||
|
}
|
||||||
|
catch (Exception fatalEx)
|
||||||
|
{
|
||||||
|
System.Diagnostics.Debug.WriteLine($"[] : {fatalEx.Message}");
|
||||||
|
await ShowErrorDialogAsync("Fatal Error", $"{dbName} recovery failed, please delete the file at {dbPath} and try again by restarting the program. ({fatalEx.Message})");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task ShowErrorDialogAsync(string title, string content)
|
||||||
|
{
|
||||||
|
// 这里假设 m_window 已经存在。如果没有显示主窗口,这个弹窗可能无法显示。
|
||||||
|
// 在 App 启动极早期的错误,可能需要退化为 Log 或者 System.Diagnostics.Process.Start 打开记事本报错
|
||||||
|
if (m_window != null)
|
||||||
|
{
|
||||||
|
m_window.DispatcherQueue.TryEnqueue(async () =>
|
||||||
|
{
|
||||||
|
var dialog = new Microsoft.UI.Xaml.Controls.ContentDialog
|
||||||
|
{
|
||||||
|
Title = title,
|
||||||
|
Content = content,
|
||||||
|
CloseButtonText = "OK",
|
||||||
|
XamlRoot = m_window.Content?.XamlRoot // 确保 Content 不为空
|
||||||
|
};
|
||||||
|
if (dialog.XamlRoot != null) await dialog.ShowAsync();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private static void ConfigureServices()
|
private static void ConfigureServices()
|
||||||
{
|
{
|
||||||
Log.Logger = new LoggerConfiguration()
|
Log.Logger = new LoggerConfiguration()
|
||||||
@@ -87,25 +263,32 @@ namespace BetterLyrics.WinUI3
|
|||||||
.WriteTo.File(PathHelper.LogFilePattern, rollingInterval: RollingInterval.Day)
|
.WriteTo.File(PathHelper.LogFilePattern, rollingInterval: RollingInterval.Day)
|
||||||
.CreateLogger();
|
.CreateLogger();
|
||||||
|
|
||||||
// Register services
|
|
||||||
Ioc.Default.ConfigureServices(
|
Ioc.Default.ConfigureServices(
|
||||||
new ServiceCollection()
|
new ServiceCollection()
|
||||||
|
// 数据库工厂
|
||||||
|
.AddDbContextFactory<PlayHistoryDbContext>(options => options.UseSqlite($"Data Source={PathHelper.PlayHistoryPath}"))
|
||||||
|
.AddDbContextFactory<FilesIndexDbContext>(options => options.UseSqlite($"Data Source={PathHelper.FilesIndexPath}"))
|
||||||
|
|
||||||
|
// 日志
|
||||||
.AddLogging(loggingBuilder =>
|
.AddLogging(loggingBuilder =>
|
||||||
{
|
{
|
||||||
loggingBuilder.ClearProviders();
|
loggingBuilder.ClearProviders();
|
||||||
loggingBuilder.AddSerilog();
|
loggingBuilder.AddSerilog();
|
||||||
})
|
})
|
||||||
|
|
||||||
// Services
|
// Services
|
||||||
.AddSingleton<ILiveStatesService, LiveStatesService>()
|
|
||||||
.AddSingleton<ISettingsService, SettingsService>()
|
.AddSingleton<ISettingsService, SettingsService>()
|
||||||
.AddSingleton<IMediaSessionsService, MediaSessionsService>()
|
.AddSingleton<IMediaSessionsService, MediaSessionsService>()
|
||||||
.AddSingleton<IAlbumArtSearchService, AlbumArtSearchService>()
|
.AddSingleton<IAlbumArtSearchService, AlbumArtSearchService>()
|
||||||
.AddSingleton<ILyricsSearchService, LyricsSearchService>()
|
.AddSingleton<ILyricsSearchService, LyricsSearchService>()
|
||||||
.AddSingleton<ILibWatcherService, LibWatcherService>()
|
.AddSingleton<ITranslationService, TranslationService>()
|
||||||
.AddSingleton<ITranslateService, TranslateService>()
|
.AddSingleton<ITransliterationService, TransliterationService>()
|
||||||
.AddSingleton<ILastFMService, LastFMService>()
|
.AddSingleton<ILastFMService, LastFMService>()
|
||||||
.AddSingleton<IResourceService, ResourceService>()
|
|
||||||
.AddSingleton<IDiscordService, DiscordService>()
|
.AddSingleton<IDiscordService, DiscordService>()
|
||||||
|
.AddSingleton<ILocalizationService, LocalizationService>()
|
||||||
|
.AddSingleton<IFileSystemService, FileSystemService>()
|
||||||
|
.AddSingleton<IPlayHistoryService, PlayHistoryService>()
|
||||||
|
|
||||||
// ViewModels
|
// ViewModels
|
||||||
.AddSingleton<AppSettingsControlViewModel>()
|
.AddSingleton<AppSettingsControlViewModel>()
|
||||||
.AddSingleton<PlaybackSettingsControlViewModel>()
|
.AddSingleton<PlaybackSettingsControlViewModel>()
|
||||||
@@ -114,15 +297,18 @@ namespace BetterLyrics.WinUI3
|
|||||||
.AddSingleton<LyricsWindowSettingsControlViewModel>()
|
.AddSingleton<LyricsWindowSettingsControlViewModel>()
|
||||||
.AddSingleton<LyricsWindowSwitchControlViewModel>()
|
.AddSingleton<LyricsWindowSwitchControlViewModel>()
|
||||||
.AddSingleton<LyricsWindowSwitchWindowViewModel>()
|
.AddSingleton<LyricsWindowSwitchWindowViewModel>()
|
||||||
|
|
||||||
.AddSingleton<NowPlayingWindowViewModel>()
|
|
||||||
.AddSingleton<NowPlayingPageViewModel>()
|
|
||||||
|
|
||||||
.AddSingleton<SettingsWindowViewModel>()
|
.AddSingleton<SettingsWindowViewModel>()
|
||||||
.AddSingleton<SystemTrayViewModel>()
|
.AddSingleton<SystemTrayViewModel>()
|
||||||
.AddSingleton<SettingsPageViewModel>()
|
.AddSingleton<SettingsPageViewModel>()
|
||||||
.AddSingleton<MusicGalleryViewModel>()
|
.AddSingleton<MusicGalleryPageViewModel>()
|
||||||
.AddSingleton<AboutControlViewModel>()
|
.AddSingleton<AboutControlViewModel>()
|
||||||
|
.AddSingleton<MusicGalleryWindowViewModel>()
|
||||||
|
.AddSingleton<StatsDashboardControlViewModel>()
|
||||||
|
|
||||||
|
.AddTransient<NowPlayingWindowViewModel>()
|
||||||
|
.AddTransient<NowPlayingPageViewModel>()
|
||||||
|
.AddTransient<NowPlayingBarViewModel>()
|
||||||
|
|
||||||
.BuildServiceProvider()
|
.BuildServiceProvider()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -135,7 +321,8 @@ namespace BetterLyrics.WinUI3
|
|||||||
|
|
||||||
private void CurrentDomain_FirstChanceException(object? sender, System.Runtime.ExceptionServices.FirstChanceExceptionEventArgs e)
|
private void CurrentDomain_FirstChanceException(object? sender, System.Runtime.ExceptionServices.FirstChanceExceptionEventArgs e)
|
||||||
{
|
{
|
||||||
_logger.LogError(e.Exception, "CurrentDomain_FirstChanceException");
|
// FirstChance 异常非常多(比如内部 try-catch 也会触发),通常建议只在 Debug 模式记录,或者过滤特定类型
|
||||||
|
// _logger.LogError(e.Exception, "CurrentDomain_FirstChanceException");
|
||||||
}
|
}
|
||||||
|
|
||||||
private void CurrentDomain_UnhandledException(object sender, System.UnhandledExceptionEventArgs e)
|
private void CurrentDomain_UnhandledException(object sender, System.UnhandledExceptionEventArgs e)
|
||||||
@@ -148,4 +335,4 @@ namespace BetterLyrics.WinUI3
|
|||||||
_logger.LogError(e.Exception, "TaskScheduler_UnobservedTaskException");
|
_logger.LogError(e.Exception, "TaskScheduler_UnobservedTaskException");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
BIN
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Assets/Folder.png
Normal file
BIN
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Assets/Folder.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 59 KiB |
@@ -10,13 +10,20 @@
|
|||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<LangVersion>preview</LangVersion>
|
<LangVersion>preview</LangVersion>
|
||||||
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
|
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
|
||||||
|
<AppxDefaultResourceQualifiers>Language=ar;de;en;es;fr;hi;id;ja;ko;ms;pt;ru;th;vi;zh-Hans;zh-Hant;</AppxDefaultResourceQualifiers>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Compile Remove="TemplateSelector\**" />
|
||||||
<Compile Remove="ViewModels\Lyrics\**" />
|
<Compile Remove="ViewModels\Lyrics\**" />
|
||||||
|
<Content Remove="TemplateSelector\**" />
|
||||||
<Content Remove="ViewModels\Lyrics\**" />
|
<Content Remove="ViewModels\Lyrics\**" />
|
||||||
|
<EmbeddedResource Remove="TemplateSelector\**" />
|
||||||
<EmbeddedResource Remove="ViewModels\Lyrics\**" />
|
<EmbeddedResource Remove="ViewModels\Lyrics\**" />
|
||||||
|
<None Remove="TemplateSelector\**" />
|
||||||
<None Remove="ViewModels\Lyrics\**" />
|
<None Remove="ViewModels\Lyrics\**" />
|
||||||
|
<Page Remove="TemplateSelector\**" />
|
||||||
<Page Remove="ViewModels\Lyrics\**" />
|
<Page Remove="ViewModels\Lyrics\**" />
|
||||||
|
<PRIResource Remove="TemplateSelector\**" />
|
||||||
<PRIResource Remove="ViewModels\Lyrics\**" />
|
<PRIResource Remove="ViewModels\Lyrics\**" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@@ -34,9 +41,12 @@
|
|||||||
<None Remove="Controls\LyricsWindowSettingsControl.xaml" />
|
<None Remove="Controls\LyricsWindowSettingsControl.xaml" />
|
||||||
<None Remove="Controls\LyricsWindowSwitchControl.xaml" />
|
<None Remove="Controls\LyricsWindowSwitchControl.xaml" />
|
||||||
<None Remove="Controls\MediaSettingsControl.xaml" />
|
<None Remove="Controls\MediaSettingsControl.xaml" />
|
||||||
|
<None Remove="Controls\NowPlayingBar.xaml" />
|
||||||
<None Remove="Controls\PlaybackSettingsControl.xaml" />
|
<None Remove="Controls\PlaybackSettingsControl.xaml" />
|
||||||
<None Remove="Controls\PropertyRow.xaml" />
|
<None Remove="Controls\PropertyRow.xaml" />
|
||||||
|
<None Remove="Controls\RemoteServerConfigControl.xaml" />
|
||||||
<None Remove="Controls\ShortcutTextBox.xaml" />
|
<None Remove="Controls\ShortcutTextBox.xaml" />
|
||||||
|
<None Remove="Controls\StatsDashboardControl.xaml" />
|
||||||
<None Remove="Controls\SystemTray.xaml" />
|
<None Remove="Controls\SystemTray.xaml" />
|
||||||
<None Remove="Controls\WindowSettingsControl.xaml" />
|
<None Remove="Controls\WindowSettingsControl.xaml" />
|
||||||
<None Remove="Views\LyricsSearchWindow.xaml" />
|
<None Remove="Views\LyricsSearchWindow.xaml" />
|
||||||
@@ -57,36 +67,43 @@
|
|||||||
<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView" Version="0.1.251021-build.2365" />
|
<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView" Version="0.1.251021-build.2365" />
|
||||||
<PackageReference Include="CommunityToolkit.Labs.WinUI.Shimmer" Version="0.1.250703-build.2173" />
|
<PackageReference Include="CommunityToolkit.Labs.WinUI.Shimmer" Version="0.1.250703-build.2173" />
|
||||||
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
|
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
|
||||||
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.250402" />
|
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.251219" />
|
||||||
<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.250402" />
|
<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.251219" />
|
||||||
<PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.2.250402" />
|
<PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.2.251219" />
|
||||||
<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.2.250402" />
|
<PackageReference Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.2.251219" />
|
||||||
<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250402" />
|
<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.2.251219" />
|
||||||
<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.2.250402" />
|
<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.2.251219" />
|
||||||
<PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.2.250402" />
|
<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.2.251219" />
|
||||||
<PackageReference Include="CommunityToolkit.WinUI.Triggers" Version="8.2.250402" />
|
<PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.2.251219" />
|
||||||
|
<PackageReference Include="CommunityToolkit.WinUI.Triggers" Version="8.2.251219" />
|
||||||
<PackageReference Include="ComputeSharp.D2D1.WinUI" Version="3.2.0" />
|
<PackageReference Include="ComputeSharp.D2D1.WinUI" Version="3.2.0" />
|
||||||
<PackageReference Include="csharp-kana" Version="1.0.2" />
|
|
||||||
<PackageReference Include="csharp-pinyin" Version="1.0.1" />
|
<PackageReference Include="csharp-pinyin" Version="1.0.1" />
|
||||||
<PackageReference Include="DevWinUI.Controls" Version="9.7.0" />
|
<PackageReference Include="DevWinUI.Controls" Version="9.8.1" />
|
||||||
<PackageReference Include="Dubya.WindowsMediaController" Version="2.5.5" />
|
<PackageReference Include="Dubya.WindowsMediaController" Version="2.5.6" />
|
||||||
<PackageReference Include="F23.StringSimilarity" Version="7.0.1" />
|
<PackageReference Include="F23.StringSimilarity" Version="7.0.1" />
|
||||||
|
<PackageReference Include="FlaUI.UIA3" Version="5.0.0" />
|
||||||
|
<PackageReference Include="FluentFTP" Version="53.0.2" />
|
||||||
<PackageReference Include="H.NotifyIcon.WinUI" Version="2.4.1" />
|
<PackageReference Include="H.NotifyIcon.WinUI" Version="2.4.1" />
|
||||||
<PackageReference Include="Hqub.Last.fm" Version="2.5.1" />
|
<PackageReference Include="Hqub.Last.fm" Version="2.5.1" />
|
||||||
|
<PackageReference Include="Interop.UIAutomationClient" Version="10.19041.0" />
|
||||||
|
<PackageReference Include="LiveChartsCore.SkiaSharpView.WinUI" Version="2.0.0-rc6.1" />
|
||||||
<PackageReference Include="Lyricify.Lyrics.Helper-NativeAot" Version="0.1.4-alpha.5" />
|
<PackageReference Include="Lyricify.Lyrics.Helper-NativeAot" Version="0.1.4-alpha.5" />
|
||||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.0" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="10.0.1" />
|
||||||
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.1" />
|
||||||
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.1" />
|
||||||
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.3.2" />
|
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.3.2" />
|
||||||
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7175" />
|
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7175" />
|
||||||
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
|
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
|
||||||
<PackageReference Include="NAudio.Wasapi" Version="2.2.1" />
|
<PackageReference Include="NAudio.Wasapi" Version="2.2.1" />
|
||||||
<PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
|
|
||||||
<PackageReference Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
|
|
||||||
<PackageReference Include="NTextCat" Version="0.3.65" />
|
<PackageReference Include="NTextCat" Version="0.3.65" />
|
||||||
<PackageReference Include="Serilog.Extensions.Logging" Version="10.0.0" />
|
<PackageReference Include="Serilog.Extensions.Logging" Version="10.0.0" />
|
||||||
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
|
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
|
||||||
<PackageReference Include="System.Drawing.Common" Version="10.0.0" />
|
<PackageReference Include="SMBLibrary" Version="1.5.5.1" />
|
||||||
<PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.0" />
|
<PackageReference Include="System.Drawing.Common" Version="10.0.1" />
|
||||||
|
<PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.1" />
|
||||||
<PackageReference Include="TagLibSharp" Version="2.3.0" />
|
<PackageReference Include="TagLibSharp" Version="2.3.0" />
|
||||||
<PackageReference Include="Ude.NetStandard" Version="1.2.0" />
|
<PackageReference Include="Ude.NetStandard" Version="1.2.0" />
|
||||||
<PackageReference Include="Vanara.PInvoke.DwmApi" Version="4.2.1" />
|
<PackageReference Include="Vanara.PInvoke.DwmApi" Version="4.2.1" />
|
||||||
@@ -95,6 +112,7 @@
|
|||||||
<PackageReference Include="Vanara.PInvoke.User32" Version="4.2.1" />
|
<PackageReference Include="Vanara.PInvoke.User32" Version="4.2.1" />
|
||||||
<PackageReference Include="Vanara.Windows.Shell" Version="4.2.1" />
|
<PackageReference Include="Vanara.Windows.Shell" Version="4.2.1" />
|
||||||
<PackageReference Include="VCollab.DiscordRichPresence" Version="1.7.0" />
|
<PackageReference Include="VCollab.DiscordRichPresence" Version="1.7.0" />
|
||||||
|
<PackageReference Include="WebDav.Client" Version="2.9.0" />
|
||||||
<PackageReference Include="WinUIEx" Version="2.9.0" />
|
<PackageReference Include="WinUIEx" Version="2.9.0" />
|
||||||
<PackageReference Include="z440.atl.core" Version="7.9.0" />
|
<PackageReference Include="z440.atl.core" Version="7.9.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
@@ -114,6 +132,12 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<!--Disable Trimming for Specific Packages-->
|
<!--Disable Trimming for Specific Packages-->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<TrimmerRootAssembly Include="FlaUI.UIA3" />
|
||||||
|
<TrimmerRootAssembly Include="Interop.UIAutomationClient" />
|
||||||
|
<TrimmerRootAssembly Include="Microsoft.EntityFrameworkCore" />
|
||||||
|
<TrimmerRootAssembly Include="Microsoft.EntityFrameworkCore.Abstractions" />
|
||||||
|
<TrimmerRootAssembly Include="Microsoft.EntityFrameworkCore.Relational" />
|
||||||
|
<TrimmerRootAssembly Include="Microsoft.EntityFrameworkCore.Sqlite" />
|
||||||
<TrimmerRootAssembly Include="NAudio.Wasapi" />
|
<TrimmerRootAssembly Include="NAudio.Wasapi" />
|
||||||
<TrimmerRootAssembly Include="TagLibSharp" />
|
<TrimmerRootAssembly Include="TagLibSharp" />
|
||||||
<TrimmerRootAssembly Include="Vanara.PInvoke.DwmApi" />
|
<TrimmerRootAssembly Include="Vanara.PInvoke.DwmApi" />
|
||||||
@@ -156,6 +180,9 @@
|
|||||||
<Content Update="Assets\EmptyState.png">
|
<Content Update="Assets\EmptyState.png">
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
<Content Update="Assets\Folder.png">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
<Content Update="Assets\foobar2000.png">
|
<Content Update="Assets\foobar2000.png">
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
@@ -198,6 +225,9 @@
|
|||||||
<Content Update="Assets\NetEaseCloudMusic.png">
|
<Content Update="Assets\NetEaseCloudMusic.png">
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
<Content Update="Assets\OriginalSoundHQPlayer.png">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
<Content Update="Assets\Page.png">
|
<Content Update="Assets\Page.png">
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
@@ -229,6 +259,11 @@
|
|||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Page Update="Controls\StatsDashboardControl.xaml">
|
||||||
|
<Generator>MSBuild:Compile</Generator>
|
||||||
|
</Page>
|
||||||
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Page Update="Controls\FontFamilyAutoSuggestBox.xaml">
|
<Page Update="Controls\FontFamilyAutoSuggestBox.xaml">
|
||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
@@ -330,12 +365,14 @@
|
|||||||
</Page>
|
</Page>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PRIResource Update="Strings\en-US\Resources.resw">
|
<Page Update="Controls\RemoteServerConfigControl.xaml">
|
||||||
<Generator></Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
</PRIResource>
|
</Page>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Folder Include="TemplateSelector\" />
|
<Page Update="Controls\NowPlayingBar.xaml">
|
||||||
|
<Generator>MSBuild:Compile</Generator>
|
||||||
|
</Page>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Page Update="Views\SystemTrayWindow.xaml">
|
<Page Update="Views\SystemTrayWindow.xaml">
|
||||||
|
|||||||
@@ -3,6 +3,8 @@
|
|||||||
public static class App
|
public static class App
|
||||||
{
|
{
|
||||||
public const string AppAuthor = "Zhe Fang";
|
public const string AppAuthor = "Zhe Fang";
|
||||||
|
public const string AppAuthorNicknameEN = "jayfunc";
|
||||||
|
public const string AppAuthorNicknameZH = "摘叶飞镖";
|
||||||
public const string AppName = "BetterLyrics";
|
public const string AppName = "BetterLyrics";
|
||||||
|
|
||||||
public const string AutoStartupTaskId = "AutoStartup";
|
public const string AutoStartupTaskId = "AutoStartup";
|
||||||
|
|||||||
@@ -4,15 +4,25 @@
|
|||||||
{
|
{
|
||||||
public const string MicrosoftStore = "https://apps.microsoft.com/detail/9p1wcd1p597r";
|
public const string MicrosoftStore = "https://apps.microsoft.com/detail/9p1wcd1p597r";
|
||||||
|
|
||||||
public const string GitHub = "https://github.com/jayfunc/BetterLyrics";
|
public const string AuthorGitHub = "https://github.com/jayfunc";
|
||||||
public const string ShareHub = $"{GitHub}/blob/dev/ShareHub/index.md";
|
|
||||||
public const string TermsOfService = $"{GitHub}/blob/dev/TermsofService.md";
|
public const string Crowdin = "https://crowdin.com/project/betterlyrics/invite?h=413bb0df7afa420247a98fefdae5e12c2647410";
|
||||||
public const string PrivacyPolicy = $"{GitHub}/blob/dev/PrivacyPolicy.md";
|
|
||||||
public const string UserGuide = $"{GitHub}/wiki/User-Guide";
|
public const string BetterLyricsGitHub = $"{AuthorGitHub}/BetterLyrics";
|
||||||
|
|
||||||
|
public const string ShareHub = $"{BetterLyricsGitHub}/blob/dev/ShareHub/index.md";
|
||||||
|
public const string TermsOfService = $"{BetterLyricsGitHub}/blob/dev/TermsofService.md";
|
||||||
|
public const string PrivacyPolicy = $"{BetterLyricsGitHub}/blob/dev/PrivacyPolicy.md";
|
||||||
|
public const string UserGuide = $"{BetterLyricsGitHub}/wiki/User-Guide";
|
||||||
|
|
||||||
public const string AppleMusicCfg = $"{UserGuide}#lyrics-source-configuration";
|
public const string AppleMusicCfg = $"{UserGuide}#lyrics-source-configuration";
|
||||||
|
|
||||||
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";
|
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";
|
||||||
public const string Discord = "https://discord.gg/5yAQPnyCKv";
|
public const string Discord = "https://discord.gg/5yAQPnyCKv";
|
||||||
public const string Telegram = "https://t.me/+svhSLZ7awPsxNGY1";
|
public const string Telegram = "https://t.me/+svhSLZ7awPsxNGY1";
|
||||||
|
|
||||||
|
public const string BuyMeACoffee = "https://buymeacoffee.com/founchoo";
|
||||||
|
public const string PayPal = "https://paypal.me/zhefangpay";
|
||||||
|
public const string Afdian = "https://afdian.com/a/jayfunc";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
namespace BetterLyrics.WinUI3.Constants
|
namespace BetterLyrics.WinUI3.Constants
|
||||||
{
|
{
|
||||||
public static class PlayerID
|
public static class PlayerId
|
||||||
{
|
{
|
||||||
public const string LXMusic = "cn.toside.music.desktop";
|
public const string LXMusic = "cn.toside.music.desktop";
|
||||||
public const string LXMusicPortable = "lx-music-desktop.exe";
|
public const string LXMusicPortable = "lx-music-desktop.exe";
|
||||||
@@ -25,5 +25,6 @@
|
|||||||
public const string MoeKoeMusic = "cn.MoeKoe.Music";
|
public const string MoeKoeMusic = "cn.MoeKoe.Music";
|
||||||
public const string MoeKoeMusicAlternative = "electron.app.MoeKoe Music";
|
public const string MoeKoeMusicAlternative = "electron.app.MoeKoe Music";
|
||||||
public const string Listen1 = "com.listen1.listen1";
|
public const string Listen1 = "com.listen1.listen1";
|
||||||
|
public const string OriginalSoundHQPlayer = "SennpaiStudio.528762A6196EF_z79ft30j24epr!App";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,5 +24,6 @@
|
|||||||
public const string SaltPlayerForWindowsSteam = "Salt Player for Windows (Steam)";
|
public const string SaltPlayerForWindowsSteam = "Salt Player for Windows (Steam)";
|
||||||
public const string MoeKoeMusic = "MoeKoe Music";
|
public const string MoeKoeMusic = "MoeKoe Music";
|
||||||
public const string Listen1 = "Listen 1";
|
public const string Listen1 = "Listen 1";
|
||||||
|
public const string OriginalSoundHQPlayer = "Original Sound HQ Player";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,30 +28,37 @@
|
|||||||
</StackPanel>
|
</StackPanel>
|
||||||
</dev:SettingsExpander.Header>
|
</dev:SettingsExpander.Header>
|
||||||
<dev:SettingsExpander.Description>
|
<dev:SettingsExpander.Description>
|
||||||
<StackPanel
|
<StackPanel Orientation="Horizontal">
|
||||||
Margin="0,2,0,0"
|
<StackPanel
|
||||||
Orientation="Horizontal"
|
Margin="0,2,0,0"
|
||||||
Spacing="2">
|
Orientation="Horizontal"
|
||||||
<TextBlock Text="©" />
|
Spacing="2">
|
||||||
<HyperlinkButton
|
<TextBlock Text="©" />
|
||||||
Margin="0,-1,0,0"
|
<HyperlinkButton
|
||||||
Content="Zhe Fang"
|
Margin="0,-1,0,0"
|
||||||
NavigateUri="https://github.com/jayfunc" />
|
Content="{x:Bind const:App.AppAuthor}"
|
||||||
<TextBlock Text="2025" />
|
NavigateUri="https://github.com/jayfunc" />
|
||||||
|
<TextBlock Text="2025" />
|
||||||
|
</StackPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</dev:SettingsExpander.Description>
|
</dev:SettingsExpander.Description>
|
||||||
<RichTextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}">
|
<StackPanel Orientation="Horizontal" Spacing="6">
|
||||||
<Paragraph>
|
<RichTextBlock
|
||||||
<Run x:Uid="SettingsPageVersion" />
|
Margin="0,-1,0,0"
|
||||||
<Run Text="{x:Bind helper:MetadataHelper.AppVersion}" />
|
VerticalAlignment="Center"
|
||||||
</Paragraph>
|
Foreground="{ThemeResource TextFillColorSecondaryBrush}">
|
||||||
</RichTextBlock>
|
<Paragraph>
|
||||||
|
<Run x:Uid="SettingsPageVersion" />
|
||||||
|
<Run Text="{x:Bind helper:MetadataHelper.AppVersion}" />
|
||||||
|
</Paragraph>
|
||||||
|
</RichTextBlock>
|
||||||
|
</StackPanel>
|
||||||
<dev:SettingsExpander.Items>
|
<dev:SettingsExpander.Items>
|
||||||
|
|
||||||
<dev:SettingsCard HorizontalContentAlignment="Left" ContentAlignment="Left">
|
<dev:SettingsCard HorizontalContentAlignment="Left" ContentAlignment="Left">
|
||||||
<StackPanel Spacing="6">
|
<StackPanel Spacing="6">
|
||||||
<StackPanel Margin="-12,0,0,0" Orientation="Horizontal">
|
<StackPanel Margin="-12,0,0,0" Orientation="Horizontal">
|
||||||
<HyperlinkButton Content="GitHub" NavigateUri="{x:Bind const:Link.GitHub}" />
|
<HyperlinkButton Content="GitHub" NavigateUri="{x:Bind const:Link.BetterLyricsGitHub}" />
|
||||||
<HyperlinkButton x:Uid="UserGuide" NavigateUri="{x:Bind const:Link.UserGuide}" />
|
<HyperlinkButton x:Uid="UserGuide" NavigateUri="{x:Bind const:Link.UserGuide}" />
|
||||||
<HyperlinkButton x:Uid="PrivacyPolicy" NavigateUri="{x:Bind const:Link.PrivacyPolicy}" />
|
<HyperlinkButton x:Uid="PrivacyPolicy" NavigateUri="{x:Bind const:Link.PrivacyPolicy}" />
|
||||||
<HyperlinkButton x:Uid="TermsOfService" NavigateUri="{x:Bind const:Link.TermsOfService}" />
|
<HyperlinkButton x:Uid="TermsOfService" NavigateUri="{x:Bind const:Link.TermsOfService}" />
|
||||||
@@ -64,9 +71,9 @@
|
|||||||
<StackPanel Spacing="6">
|
<StackPanel Spacing="6">
|
||||||
<TextBlock x:Uid="SetingsPageFeedback" />
|
<TextBlock x:Uid="SetingsPageFeedback" />
|
||||||
<StackPanel Margin="-12,0,0,0" Orientation="Horizontal">
|
<StackPanel Margin="-12,0,0,0" Orientation="Horizontal">
|
||||||
<HyperlinkButton x:Uid="SettingsPageQQGroup" NavigateUri="{x:Bind const:Link.QQGroup}" />
|
<HyperlinkButton Content="QQ 反馈交流群" NavigateUri="{x:Bind const:Link.QQGroup}" />
|
||||||
<HyperlinkButton x:Uid="SettingsPageDiscord" NavigateUri="{x:Bind const:Link.Discord}" />
|
<HyperlinkButton Content="Discord" NavigateUri="{x:Bind const:Link.Discord}" />
|
||||||
<HyperlinkButton x:Uid="SettingsPageTelegram" NavigateUri="{x:Bind const:Link.Telegram}" />
|
<HyperlinkButton Content="Telegram" NavigateUri="{x:Bind const:Link.Telegram}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
@@ -75,14 +82,14 @@
|
|||||||
<StackPanel Spacing="6">
|
<StackPanel Spacing="6">
|
||||||
<TextBlock x:Uid="SetingsPageDonation" />
|
<TextBlock x:Uid="SetingsPageDonation" />
|
||||||
<StackPanel Margin="-12,0,0,0" Orientation="Horizontal">
|
<StackPanel Margin="-12,0,0,0" Orientation="Horizontal">
|
||||||
<HyperlinkButton Content="Buy Me a Coffee" NavigateUri="https://buymeacoffee.com/founchoo" />
|
<HyperlinkButton Content="Buy Me a Coffee" NavigateUri="{x:Bind const:Link.BuyMeACoffee}" />
|
||||||
<HyperlinkButton Content="PayPal" NavigateUri="https://paypal.me/zhefangpay" />
|
<HyperlinkButton Content="PayPal" NavigateUri="{x:Bind const:Link.PayPal}" />
|
||||||
<Button
|
<HyperlinkButton
|
||||||
Content="支付宝"
|
x:Name="AlipayButton"
|
||||||
Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
|
Click="AlipayButton_Click"
|
||||||
Style="{StaticResource GhostButtonStyle}">
|
Content="支付宝">
|
||||||
<Button.Flyout>
|
<HyperlinkButton.ContextFlyout>
|
||||||
<Flyout>
|
<Flyout x:Name="AlipayFlyout">
|
||||||
<Flyout.FlyoutPresenterStyle>
|
<Flyout.FlyoutPresenterStyle>
|
||||||
<Style TargetType="FlyoutPresenter">
|
<Style TargetType="FlyoutPresenter">
|
||||||
<Setter Property="CornerRadius" Value="12" />
|
<Setter Property="CornerRadius" Value="12" />
|
||||||
@@ -91,14 +98,14 @@
|
|||||||
</Flyout.FlyoutPresenterStyle>
|
</Flyout.FlyoutPresenterStyle>
|
||||||
<Image Height="300" Source="/Assets/Alipay.jpg" />
|
<Image Height="300" Source="/Assets/Alipay.jpg" />
|
||||||
</Flyout>
|
</Flyout>
|
||||||
</Button.Flyout>
|
</HyperlinkButton.ContextFlyout>
|
||||||
</Button>
|
</HyperlinkButton>
|
||||||
<Button
|
<HyperlinkButton
|
||||||
Content="微信"
|
x:Name="WeChatButton"
|
||||||
Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
|
Click="WeChat_Click"
|
||||||
Style="{StaticResource GhostButtonStyle}">
|
Content="微信">
|
||||||
<Button.Flyout>
|
<HyperlinkButton.ContextFlyout>
|
||||||
<Flyout>
|
<Flyout x:Name="WeChatFlyout">
|
||||||
<Flyout.FlyoutPresenterStyle>
|
<Flyout.FlyoutPresenterStyle>
|
||||||
<Style TargetType="FlyoutPresenter">
|
<Style TargetType="FlyoutPresenter">
|
||||||
<Setter Property="CornerRadius" Value="12" />
|
<Setter Property="CornerRadius" Value="12" />
|
||||||
@@ -107,29 +114,35 @@
|
|||||||
</Flyout.FlyoutPresenterStyle>
|
</Flyout.FlyoutPresenterStyle>
|
||||||
<Image Height="300" Source="/Assets/WeChatReward.png" />
|
<Image Height="300" Source="/Assets/WeChatReward.png" />
|
||||||
</Flyout>
|
</Flyout>
|
||||||
</Button.Flyout>
|
</HyperlinkButton.ContextFlyout>
|
||||||
</Button>
|
</HyperlinkButton>
|
||||||
|
<HyperlinkButton Content="爱发电" NavigateUri="{x:Bind const:Link.Afdian}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Orientation="Horizontal" Spacing="6">
|
<Grid ColumnSpacing="6">
|
||||||
<TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="*" />
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="Auto" />
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<TextBlock
|
||||||
|
Grid.Column="0"
|
||||||
|
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
|
||||||
|
Text="*" />
|
||||||
<TextBlock
|
<TextBlock
|
||||||
x:Uid="SetingsPageThanks"
|
x:Uid="SetingsPageThanks"
|
||||||
|
Grid.Column="1"
|
||||||
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
|
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
|
||||||
TextWrapping="Wrap" />
|
TextWrapping="Wrap" />
|
||||||
</StackPanel>
|
</Grid>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
|
|
||||||
<dev:SettingsCard HorizontalContentAlignment="Left" ContentAlignment="Left">
|
<dev:SettingsCard x:Uid="SettingsPageThanksList">
|
||||||
<StackPanel Spacing="6">
|
<Button
|
||||||
<TextBlock x:Uid="SetingsPageContributors" />
|
Click="Patron_Click"
|
||||||
<StackPanel Margin="-12,0,0,0" Orientation="Horizontal">
|
Content="{ui:FontIcon FontSize=16,
|
||||||
<HyperlinkButton Content="jayfunc" NavigateUri="https://github.com/jayfunc" />
|
FontFamily={StaticResource IconFontFamily},
|
||||||
<HyperlinkButton Content="Raspberry-Monster" NavigateUri="https://github.com/Raspberry-Monster" />
|
Glyph=}"
|
||||||
<HyperlinkButton Content="ZHider" NavigateUri="https://github.com/ZHider" />
|
Style="{StaticResource AccentButtonStyle}" />
|
||||||
<HyperlinkButton Content="kusutori" NavigateUri="https://github.com/kusutori" />
|
|
||||||
</StackPanel>
|
|
||||||
</StackPanel>
|
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
|
|
||||||
</dev:SettingsExpander.Items>
|
</dev:SettingsExpander.Items>
|
||||||
@@ -177,8 +190,10 @@
|
|||||||
</dev:SettingsExpander.ItemsHeader>
|
</dev:SettingsExpander.ItemsHeader>
|
||||||
</dev:SettingsExpander>
|
</dev:SettingsExpander>
|
||||||
|
|
||||||
<dev:SettingsCard x:Uid="SettingsPageDebugOverlay">
|
<dev:SettingsCard x:Uid="SettingsPageSettingsPlayHistory" Visibility="Collapsed">
|
||||||
<ToggleSwitch IsOn="{x:Bind ViewModel.IsDebugOverlayEnabled, Mode=TwoWay}" />
|
<StackPanel Orientation="Horizontal" Spacing="6">
|
||||||
|
<Button x:Uid="SettingsPageExportPlayHistoryButton" Command="{x:Bind ViewModel.ExportPlayHistoryCommand}" />
|
||||||
|
</StackPanel>
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
|
|
||||||
<dev:SettingsCard x:Uid="SettingsPageFixedTimeStep" Visibility="Collapsed">
|
<dev:SettingsCard x:Uid="SettingsPageFixedTimeStep" Visibility="Collapsed">
|
||||||
@@ -198,5 +213,190 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
|
|
||||||
|
<Grid
|
||||||
|
x:Name="CreditsReel"
|
||||||
|
Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}"
|
||||||
|
Opacity="0"
|
||||||
|
SizeChanged="CreditsReel_SizeChanged"
|
||||||
|
Tapped="CreditsReel_Tapped"
|
||||||
|
Visibility="Collapsed">
|
||||||
|
<Grid.OpacityTransition>
|
||||||
|
<ScalarTransition />
|
||||||
|
</Grid.OpacityTransition>
|
||||||
|
<ScrollViewer
|
||||||
|
x:Name="CreditsReelScrollViewer"
|
||||||
|
ScrollViewer.VerticalScrollBarVisibility="Hidden"
|
||||||
|
ScrollViewer.VerticalScrollMode="Disabled">
|
||||||
|
<RichTextBlock
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
HorizontalTextAlignment="Center"
|
||||||
|
LineHeight="28"
|
||||||
|
PointerEntered="RichTextBlock_PointerEntered"
|
||||||
|
PointerExited="RichTextBlock_PointerExited">
|
||||||
|
|
||||||
|
<Paragraph x:Name="CreditsReelHeader" />
|
||||||
|
|
||||||
|
<!-- 贡献者 -->
|
||||||
|
<Paragraph Margin="0,20,0,0" FontWeight="Bold">
|
||||||
|
<Run x:Uid="SetingsPageContributors" />
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Hyperlink NavigateUri="https://github.com/jayfunc">
|
||||||
|
<Run Text="jayfunc" />
|
||||||
|
</Hyperlink>
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Hyperlink NavigateUri="https://github.com/Raspberry-Monster">
|
||||||
|
<Run Text="Raspberry-Monster" />
|
||||||
|
</Hyperlink>
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Hyperlink NavigateUri="https://github.com/ZHider">
|
||||||
|
<Run Text="ZHider" />
|
||||||
|
</Hyperlink>
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Hyperlink NavigateUri="https://github.com/kusutori">
|
||||||
|
<Run Text="kusutori" />
|
||||||
|
</Hyperlink>
|
||||||
|
</Paragraph>
|
||||||
|
|
||||||
|
<!-- 赞助 -->
|
||||||
|
<Paragraph Margin="0,20,0,0" FontWeight="Bold">
|
||||||
|
<Run x:Uid="SettingsPagePatrons" />
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Run Text="YE" />
|
||||||
|
<Run Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="Dec 3, 2025" />
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Run Text="**玄" />
|
||||||
|
<Run Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="Nov 23, 2025" />
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Run Text="**智" />
|
||||||
|
<Run Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="Nov 21, 2025" />
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Run Text="*鹤" />
|
||||||
|
<Run Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="Nov 17, 2025" />
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Run Text="借过" />
|
||||||
|
<Run Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="Nov 2, 2025" />
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Run Text="**华" />
|
||||||
|
<Run Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="Aug 28, 2025" />
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Run x:Uid="SettingsPageUserWhoPurchased" />
|
||||||
|
</Paragraph>
|
||||||
|
|
||||||
|
<!-- 特别鸣谢 -->
|
||||||
|
<Paragraph Margin="0,20,0,0" FontWeight="Bold">
|
||||||
|
<Run x:Uid="SetingsPageSpecialThanks" />
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Run x:Uid="SettingsPageYouNowUsing" />
|
||||||
|
</Paragraph>
|
||||||
|
|
||||||
|
<!-- 代码参考 -->
|
||||||
|
<Paragraph Margin="0,20,0,0" FontWeight="Bold">
|
||||||
|
<Run x:Uid="SetingsPageDeps" />
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Hyperlink NavigateUri="https://gist.github.com/mcworkaholic/82fbf203e3f1043bbe534b5b2974c0ce">
|
||||||
|
<Run Text="Get album artwork from ITunes (with Python3 or C#)" />
|
||||||
|
</Hyperlink>
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Hyperlink NavigateUri="https://stackoverflow.com/a/32013610/11048731">
|
||||||
|
<Run Text="FullyObservableCollection" />
|
||||||
|
</Hyperlink>
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Hyperlink NavigateUri="https://github.com/Storyteller-Studios/Impressionist">
|
||||||
|
<Run Text="Impressionist" />
|
||||||
|
</Hyperlink>
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Hyperlink NavigateUri="https://github.com/Storyteller-Studios/ColorThief.WinUI3">
|
||||||
|
<Run Text="ColorThief.WinUI3" />
|
||||||
|
</Hyperlink>
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Hyperlink NavigateUri="https://github.com/Johnwikix/SpectrumVisualization">
|
||||||
|
<Run Text="SpectrumVisualization" />
|
||||||
|
</Hyperlink>
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Hyperlink NavigateUri="https://www.shadertoy.com/view/Mdt3Df">
|
||||||
|
<Run Text="Snow (as shown in sweden)" />
|
||||||
|
</Hyperlink>
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Hyperlink NavigateUri="https://www.shadertoy.com/view/lllSR2">
|
||||||
|
<Run Text="w10" />
|
||||||
|
</Hyperlink>
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Hyperlink NavigateUri="https://github.com/mo-jinran/Taskbar-Lyrics">
|
||||||
|
<Run Text="Taskbar-Lyrics" />
|
||||||
|
</Hyperlink>
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Hyperlink NavigateUri="https://github.com/jayfunc/BetterLyrics/network/dependencies">
|
||||||
|
<Run Text="..." />
|
||||||
|
</Hyperlink>
|
||||||
|
</Paragraph>
|
||||||
|
|
||||||
|
<!-- UI/UX 设计参考 -->
|
||||||
|
<Paragraph Margin="0,20,0,0" FontWeight="Bold">
|
||||||
|
<Run x:Uid="SetingsPageUIUXRef" />
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Hyperlink NavigateUri="https://github.com/solstice23/refined-now-playing-netease">
|
||||||
|
<Run Text="refined-now-playing-netease" />
|
||||||
|
</Hyperlink>
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Hyperlink NavigateUri="https://github.com/WXRIW/Lyricify-App">
|
||||||
|
<Run Text="Lyricify" />
|
||||||
|
</Hyperlink>
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Hyperlink NavigateUri="https://moriafly.com/program/salt-player">
|
||||||
|
<Run Text="椒盐音乐 Salt Player" />
|
||||||
|
</Hyperlink>
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Hyperlink NavigateUri="https://github.com/TwilightLemon/MyToolBar">
|
||||||
|
<Run Text="MyToolBar" />
|
||||||
|
</Hyperlink>
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Hyperlink NavigateUri="">
|
||||||
|
<Run Text="" />
|
||||||
|
</Hyperlink>
|
||||||
|
</Paragraph>
|
||||||
|
|
||||||
|
<Paragraph Margin="0,20,0,0" FontWeight="Bold">
|
||||||
|
<Run Text="{x:Bind const:App.AppName}" />
|
||||||
|
</Paragraph>
|
||||||
|
<Paragraph>
|
||||||
|
<Run Text="Proudly built by" />
|
||||||
|
<Hyperlink NavigateUri="{x:Bind const:Link.AuthorGitHub}">
|
||||||
|
<Run Text="{x:Bind const:App.AppAuthor}" />
|
||||||
|
</Hyperlink>
|
||||||
|
</Paragraph>
|
||||||
|
|
||||||
|
<Paragraph x:Name="CreditsReelFooter" />
|
||||||
|
|
||||||
|
</RichTextBlock>
|
||||||
|
</ScrollViewer>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
using BetterLyrics.WinUI3.ViewModels;
|
using BetterLyrics.WinUI3.ViewModels;
|
||||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||||
using Microsoft.UI.Xaml.Controls;
|
using Microsoft.UI.Xaml.Controls;
|
||||||
|
using Microsoft.UI.Xaml.Media;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
// To learn more about WinUI, the WinUI project structure,
|
// To learn more about WinUI, the WinUI project structure,
|
||||||
// and more about our project templates, see: http://aka.ms/winui-project-info.
|
// and more about our project templates, see: http://aka.ms/winui-project-info.
|
||||||
@@ -9,6 +11,7 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
{
|
{
|
||||||
public sealed partial class AboutControl : UserControl
|
public sealed partial class AboutControl : UserControl
|
||||||
{
|
{
|
||||||
|
private bool _isCreditsScrolling = false;
|
||||||
public AboutControlViewModel ViewModel => (AboutControlViewModel)DataContext;
|
public AboutControlViewModel ViewModel => (AboutControlViewModel)DataContext;
|
||||||
|
|
||||||
public AboutControl()
|
public AboutControl()
|
||||||
@@ -16,5 +19,56 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
DataContext = Ioc.Default.GetRequiredService<AboutControlViewModel>();
|
DataContext = Ioc.Default.GetRequiredService<AboutControlViewModel>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async void Patron_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
CompositionTarget.Rendering += CompositionTarget_Rendering;
|
||||||
|
CreditsReel.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
|
||||||
|
CreditsReel.Opacity = 1;
|
||||||
|
_isCreditsScrolling = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void CompositionTarget_Rendering(object? sender, object e)
|
||||||
|
{
|
||||||
|
if (_isCreditsScrolling)
|
||||||
|
{
|
||||||
|
CreditsReelScrollViewer.ChangeView(null, CreditsReelScrollViewer.VerticalOffset + 0.5, null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async void CreditsReel_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
|
||||||
|
{
|
||||||
|
CreditsReel.Opacity = 0;
|
||||||
|
await Task.Delay(Constants.Time.AnimationDuration);
|
||||||
|
CreditsReel.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
|
||||||
|
CompositionTarget.Rendering -= CompositionTarget_Rendering;
|
||||||
|
CreditsReelScrollViewer.ChangeView(null, 0, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void CreditsReel_SizeChanged(object sender, Microsoft.UI.Xaml.SizeChangedEventArgs e)
|
||||||
|
{
|
||||||
|
CreditsReelHeader.LineHeight = e.NewSize.Height;
|
||||||
|
CreditsReelFooter.LineHeight = e.NewSize.Height / 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void RichTextBlock_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
|
||||||
|
{
|
||||||
|
_isCreditsScrolling = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void RichTextBlock_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
|
||||||
|
{
|
||||||
|
_isCreditsScrolling = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void WeChat_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
WeChatFlyout.ShowAt(WeChatButton);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void AlipayButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
AlipayFlyout.ShowAt(AlipayButton);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,18 +1,6 @@
|
|||||||
using BetterLyrics.WinUI3.Models.Settings;
|
using BetterLyrics.WinUI3.Models.Settings;
|
||||||
using Microsoft.UI.Xaml;
|
using Microsoft.UI.Xaml;
|
||||||
using Microsoft.UI.Xaml.Controls;
|
using Microsoft.UI.Xaml.Controls;
|
||||||
using Microsoft.UI.Xaml.Controls.Primitives;
|
|
||||||
using Microsoft.UI.Xaml.Data;
|
|
||||||
using Microsoft.UI.Xaml.Input;
|
|
||||||
using Microsoft.UI.Xaml.Media;
|
|
||||||
using Microsoft.UI.Xaml.Navigation;
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.IO;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Runtime.InteropServices.WindowsRuntime;
|
|
||||||
using Windows.Foundation;
|
|
||||||
using Windows.Foundation.Collections;
|
|
||||||
|
|
||||||
// To learn more about WinUI, the WinUI project structure,
|
// To learn more about WinUI, the WinUI project structure,
|
||||||
// and more about our project templates, see: http://aka.ms/winui-project-info.
|
// and more about our project templates, see: http://aka.ms/winui-project-info.
|
||||||
|
|||||||
@@ -40,10 +40,9 @@
|
|||||||
<ToggleSwitch IsOn="{x:Bind AlbumArtLayoutSettings.IsAutoCoverImageHeight, Mode=TwoWay}" />
|
<ToggleSwitch IsOn="{x:Bind AlbumArtLayoutSettings.IsAutoCoverImageHeight, Mode=TwoWay}" />
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
<dev:SettingsCard IsEnabled="{x:Bind AlbumArtLayoutSettings.IsAutoCoverImageHeight, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
|
<dev:SettingsCard IsEnabled="{x:Bind AlbumArtLayoutSettings.IsAutoCoverImageHeight, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
|
||||||
<local:ExtendedSlider
|
<NumberBox
|
||||||
Maximum="512"
|
|
||||||
Minimum="0"
|
Minimum="0"
|
||||||
Unit="px"
|
SpinButtonPlacementMode="Inline"
|
||||||
Value="{x:Bind AlbumArtLayoutSettings.CoverImageHeight, Mode=TwoWay}" />
|
Value="{x:Bind AlbumArtLayoutSettings.CoverImageHeight, Mode=TwoWay}" />
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
</dev:SettingsExpander.Items>
|
</dev:SettingsExpander.Items>
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
x:Class="BetterLyrics.WinUI3.Controls.AppSettingsControl"
|
x:Class="BetterLyrics.WinUI3.Controls.AppSettingsControl"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:consts="using:BetterLyrics.WinUI3.Constants"
|
||||||
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
|
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:dev="using:DevWinUI"
|
xmlns:dev="using:DevWinUI"
|
||||||
@@ -42,11 +43,19 @@
|
|||||||
<Button x:Uid="SettingsPageRestart" Command="{x:Bind ViewModel.RestartAppCommand}" />
|
<Button x:Uid="SettingsPageRestart" Command="{x:Bind ViewModel.RestartAppCommand}" />
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
</dev:SettingsExpander.Items>
|
</dev:SettingsExpander.Items>
|
||||||
|
<dev:SettingsExpander.ItemsFooter>
|
||||||
|
<InfoBar IsClosable="False" IsOpen="True">
|
||||||
|
<HyperlinkButton
|
||||||
|
x:Uid="SettingsPageHelpUsTranslate"
|
||||||
|
Padding="0"
|
||||||
|
NavigateUri="{x:Bind consts:Link.Crowdin}" />
|
||||||
|
</InfoBar>
|
||||||
|
</dev:SettingsExpander.ItemsFooter>
|
||||||
</dev:SettingsExpander>
|
</dev:SettingsExpander>
|
||||||
|
|
||||||
<!-- App behavior -->
|
<!-- Startup -->
|
||||||
|
|
||||||
<TextBlock x:Uid="SettingsPageAppBehavior" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
|
<TextBlock x:Uid="SettingsPageStartup" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
|
||||||
|
|
||||||
<dev:SettingsCard x:Uid="SettingsPageAutoStart" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
<dev:SettingsCard x:Uid="SettingsPageAutoStart" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
||||||
<ToggleSwitch
|
<ToggleSwitch
|
||||||
@@ -59,42 +68,46 @@
|
|||||||
<ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.MusicGallerySettings.AutoOpen, Mode=TwoWay}" />
|
<ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.MusicGallerySettings.AutoOpen, Mode=TwoWay}" />
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
|
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPageAutoOpenLyricsWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
||||||
|
<ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.AutoStartLyricsWindow, Mode=TwoWay}" />
|
||||||
|
</dev:SettingsCard>
|
||||||
|
|
||||||
|
<!-- Music gallery window -->
|
||||||
|
|
||||||
|
<TextBlock x:Uid="SettingsPageMusicGallery" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
|
||||||
|
|
||||||
<dev:SettingsCard x:Uid="SettingsPageAutoPlayWhenOpenMusicGalleryWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
<dev:SettingsCard x:Uid="SettingsPageAutoPlayWhenOpenMusicGalleryWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
||||||
<ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.MusicGallerySettings.AutoPlay, Mode=TwoWay}" />
|
<ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.MusicGallerySettings.AutoPlay, Mode=TwoWay}" />
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
|
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPageStopTrackOnGalleryWindowClosed" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
||||||
|
<ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.MusicGallerySettings.StopOnWindowClosed, Mode=TwoWay}" />
|
||||||
|
</dev:SettingsCard>
|
||||||
|
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPageExitOnGalleryWindowClosed" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
||||||
|
<ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.MusicGallerySettings.ExitOnWindowClosed, Mode=TwoWay}" />
|
||||||
|
</dev:SettingsCard>
|
||||||
|
|
||||||
|
<!-- Lyrics window -->
|
||||||
|
|
||||||
|
<TextBlock x:Uid="SettingsPageLyricsWindow" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
|
||||||
|
|
||||||
<dev:SettingsCard x:Uid="SettingsPageExitOnLyricsWindowClosed" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
<dev:SettingsCard x:Uid="SettingsPageExitOnLyricsWindowClosed" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
||||||
<ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.ExitOnLyricsWindowClosed, Mode=TwoWay}" />
|
<ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.ExitOnLyricsWindowClosed, Mode=TwoWay}" />
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
|
|
||||||
<dev:SettingsCard x:Uid="SettingsPageListenNewSession" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
<!-- Playback shortcut -->
|
||||||
<ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.ListenOnNewPlaybackSource, Mode=TwoWay}" />
|
|
||||||
</dev:SettingsCard>
|
|
||||||
|
|
||||||
<dev:SettingsCard x:Uid="LyricsSearchControlIgnoreCache" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
<TextBlock x:Uid="SettingsPageShortcut" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
|
||||||
<ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.IgnoreCacheWhenSearching, Mode=TwoWay}" />
|
|
||||||
</dev:SettingsCard>
|
|
||||||
|
|
||||||
<dev:SettingsCard x:Uid="SettingsPageShowHideHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
<dev:SettingsCard x:Uid="SettingsPageShowHideHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
||||||
<local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.ShowOrHideLyricsWindowShortcut, Mode=TwoWay}" />
|
<local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.ShowOrHideLyricsWindowShortcut, Mode=TwoWay}" />
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
|
|
||||||
<dev:SettingsCard x:Uid="SettingsPageBorderlessHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
|
||||||
<local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.BorderlessShortcut, Mode=TwoWay}" />
|
|
||||||
</dev:SettingsCard>
|
|
||||||
|
|
||||||
<dev:SettingsCard x:Uid="SettingsPageClickThroughHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
|
||||||
<local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.ClickThroughShortcut, Mode=TwoWay}" />
|
|
||||||
</dev:SettingsCard>
|
|
||||||
|
|
||||||
<dev:SettingsCard x:Uid="SettingsPageLyricsWindowSwitchHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
<dev:SettingsCard x:Uid="SettingsPageLyricsWindowSwitchHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
||||||
<local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.LyricsWindowSwitchShortcut, Mode=TwoWay}" />
|
<local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.LyricsWindowSwitchShortcut, Mode=TwoWay}" />
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
|
|
||||||
<!-- Playback shortcut -->
|
|
||||||
|
|
||||||
<TextBlock x:Uid="SettingsPagePlaybackShortcut" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
|
|
||||||
|
|
||||||
<dev:SettingsCard x:Uid="SettingsPagePlayOrPauseSongHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
<dev:SettingsCard x:Uid="SettingsPagePlayOrPauseSongHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
||||||
<local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.PlayOrPauseShortcut, Mode=TwoWay}" />
|
<local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.PlayOrPauseShortcut, Mode=TwoWay}" />
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
|
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
|
||||||
xmlns:local="using:BetterLyrics.WinUI3.Controls"
|
xmlns:local="using:BetterLyrics.WinUI3.Controls"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
xmlns:ui="using:CommunityToolkit.WinUI"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
|
|
||||||
<Grid
|
<Grid
|
||||||
@@ -91,6 +92,47 @@
|
|||||||
Text="{x:Bind LyricsWindowStatus.Name, Mode=OneWay}"
|
Text="{x:Bind LyricsWindowStatus.Name, Mode=OneWay}"
|
||||||
TextWrapping="Wrap" />
|
TextWrapping="Wrap" />
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
|
<Grid Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}" Opacity="0">
|
||||||
|
<Grid.OpacityTransition>
|
||||||
|
<ScalarTransition />
|
||||||
|
</Grid.OpacityTransition>
|
||||||
|
<interactivity:Interaction.Behaviors>
|
||||||
|
<interactivity:EventTriggerBehavior EventName="PointerEntered">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
|
||||||
|
</interactivity:EventTriggerBehavior>
|
||||||
|
<interactivity:EventTriggerBehavior EventName="PointerExited">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
|
||||||
|
</interactivity:EventTriggerBehavior>
|
||||||
|
</interactivity:Interaction.Behaviors>
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<Button
|
||||||
|
Grid.Column="0"
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
VerticalAlignment="Stretch"
|
||||||
|
Click="OpenButton_Click"
|
||||||
|
Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
|
||||||
|
Glyph=}">
|
||||||
|
<ToolTipService.ToolTip>
|
||||||
|
<TextBlock x:Uid="SystemTrayLyrics" />
|
||||||
|
</ToolTipService.ToolTip>
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
Grid.Column="1"
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
VerticalAlignment="Stretch"
|
||||||
|
Click="CloseButton_Click"
|
||||||
|
Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
|
||||||
|
Glyph=}"
|
||||||
|
IsEnabled="{x:Bind LyricsWindowStatus.IsOpened, Mode=OneWay}">
|
||||||
|
<ToolTipService.ToolTip>
|
||||||
|
<TextBlock x:Uid="SettingsPageCloseStatus" />
|
||||||
|
</ToolTipService.ToolTip>
|
||||||
|
</Button>
|
||||||
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|||||||
@@ -1,6 +1,11 @@
|
|||||||
|
using BetterLyrics.WinUI3.Hooks;
|
||||||
using BetterLyrics.WinUI3.Models;
|
using BetterLyrics.WinUI3.Models;
|
||||||
|
using BetterLyrics.WinUI3.Services.SettingsService;
|
||||||
|
using BetterLyrics.WinUI3.Views;
|
||||||
|
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||||
using Microsoft.UI.Xaml;
|
using Microsoft.UI.Xaml;
|
||||||
using Microsoft.UI.Xaml.Controls;
|
using Microsoft.UI.Xaml.Controls;
|
||||||
|
using System.Linq;
|
||||||
|
|
||||||
// To learn more about WinUI, the WinUI project structure,
|
// To learn more about WinUI, the WinUI project structure,
|
||||||
// and more about our project templates, see: http://aka.ms/winui-project-info.
|
// and more about our project templates, see: http://aka.ms/winui-project-info.
|
||||||
@@ -9,6 +14,8 @@ namespace BetterLyrics.WinUI3.Controls;
|
|||||||
|
|
||||||
public sealed partial class DemoWindowGrid : UserControl
|
public sealed partial class DemoWindowGrid : UserControl
|
||||||
{
|
{
|
||||||
|
private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
|
||||||
|
|
||||||
public DemoWindowGrid()
|
public DemoWindowGrid()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
@@ -22,4 +29,32 @@ public sealed partial class DemoWindowGrid : UserControl
|
|||||||
get => (LyricsWindowStatus)GetValue(LyricsWindowStatusProperty);
|
get => (LyricsWindowStatus)GetValue(LyricsWindowStatusProperty);
|
||||||
set => SetValue(LyricsWindowStatusProperty, value);
|
set => SetValue(LyricsWindowStatusProperty, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void CloseButton_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
var data = (LyricsWindowStatus)(((FrameworkElement)sender).DataContext);
|
||||||
|
var window = WindowHook.GetWindows<NowPlayingWindow>().FirstOrDefault(x => x.LyricsWindowStatus == data);
|
||||||
|
window?.CloseWindow();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OpenButton_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
var status = (LyricsWindowStatus)(((FrameworkElement)sender).DataContext);
|
||||||
|
// <20>ģʽ
|
||||||
|
if (_settingsService.AppSettings.GeneralSettings.MultiNowPlayingWindowMode)
|
||||||
|
{
|
||||||
|
WindowHook.OpenOrShowWindow<NowPlayingWindow>(status);
|
||||||
|
}
|
||||||
|
// <20><><EFBFBD><EFBFBD>ģʽ
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var openedWindows = WindowHook.GetWindows<NowPlayingWindow>();
|
||||||
|
foreach (var item in openedWindows.Where(x => x.LyricsWindowStatus != status))
|
||||||
|
{
|
||||||
|
item.CloseWindow();
|
||||||
|
}
|
||||||
|
WindowHook.OpenOrShowWindow<NowPlayingWindow>(status);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,12 +4,8 @@ using BetterLyrics.WinUI3.Services.SettingsService;
|
|||||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||||
using Microsoft.UI.Xaml;
|
using Microsoft.UI.Xaml;
|
||||||
using Microsoft.UI.Xaml.Controls;
|
using Microsoft.UI.Xaml.Controls;
|
||||||
using Microsoft.UI.Xaml.Media;
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Collections.Immutable;
|
|
||||||
using System.Collections.ObjectModel;
|
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
// To learn more about WinUI, the WinUI project structure,
|
// To learn more about WinUI, the WinUI project structure,
|
||||||
// and more about our project templates, see: http://aka.ms/winui-project-info.
|
// and more about our project templates, see: http://aka.ms/winui-project-info.
|
||||||
@@ -52,7 +48,7 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
// FontFamilies = fontFamilies;
|
// FontFamilies = fontFamilies;
|
||||||
// });
|
// });
|
||||||
//});
|
//});
|
||||||
FontFamilies = FontHelper.SystemFontFamilies.OrderBy(x => x).ToList();
|
FontFamilies = FontHelper.GetSystemFontFamilies();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void AutoSuggestBox_SuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args)
|
private void AutoSuggestBox_SuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args)
|
||||||
|
|||||||
@@ -1,19 +1,7 @@
|
|||||||
using BetterLyrics.WinUI3.Enums;
|
using BetterLyrics.WinUI3.Enums;
|
||||||
using Microsoft.UI.Xaml;
|
using Microsoft.UI.Xaml;
|
||||||
using Microsoft.UI.Xaml.Controls;
|
using Microsoft.UI.Xaml.Controls;
|
||||||
using Microsoft.UI.Xaml.Controls.Primitives;
|
|
||||||
using Microsoft.UI.Xaml.Data;
|
|
||||||
using Microsoft.UI.Xaml.Input;
|
|
||||||
using Microsoft.UI.Xaml.Media;
|
using Microsoft.UI.Xaml.Media;
|
||||||
using Microsoft.UI.Xaml.Navigation;
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.IO;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Runtime.InteropServices.WindowsRuntime;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Windows.Foundation;
|
|
||||||
using Windows.Foundation.Collections;
|
|
||||||
|
|
||||||
// To learn more about WinUI, the WinUI project structure,
|
// To learn more about WinUI, the WinUI project structure,
|
||||||
// and more about our project templates, see: http://aka.ms/winui-project-info.
|
// and more about our project templates, see: http://aka.ms/winui-project-info.
|
||||||
|
|||||||
@@ -47,6 +47,43 @@
|
|||||||
</dev:SettingsExpander.Items>
|
</dev:SettingsExpander.Items>
|
||||||
</dev:SettingsExpander>
|
</dev:SettingsExpander>
|
||||||
|
|
||||||
|
<dev:SettingsExpander
|
||||||
|
x:Uid="SettingsPageAlbumArtLayer"
|
||||||
|
HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
|
||||||
|
Glyph=}"
|
||||||
|
IsExpanded="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=OneWay}">
|
||||||
|
<ToggleSwitch IsOn="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=TwoWay}" />
|
||||||
|
<dev:SettingsExpander.Items>
|
||||||
|
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPageOpacity" IsEnabled="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=OneWay}">
|
||||||
|
<uc:ExtendedSlider
|
||||||
|
Default="100"
|
||||||
|
Maximum="100"
|
||||||
|
Minimum="0"
|
||||||
|
Unit="%"
|
||||||
|
Value="{x:Bind LyricsBackgroundSettings.CoverOverlayOpacity, Mode=TwoWay}" />
|
||||||
|
</dev:SettingsCard>
|
||||||
|
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPageSpeed" IsEnabled="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=OneWay}">
|
||||||
|
<uc:ExtendedSlider
|
||||||
|
Default="50"
|
||||||
|
Maximum="100"
|
||||||
|
Minimum="0"
|
||||||
|
Unit="%"
|
||||||
|
Value="{x:Bind LyricsBackgroundSettings.CoverOverlaySpeed, Mode=TwoWay}" />
|
||||||
|
</dev:SettingsCard>
|
||||||
|
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPageBlurAmount" IsEnabled="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=OneWay}">
|
||||||
|
<uc:ExtendedSlider
|
||||||
|
Default="100"
|
||||||
|
Maximum="200"
|
||||||
|
Minimum="0"
|
||||||
|
Value="{x:Bind LyricsBackgroundSettings.CoverOverlayBlurAmount, Mode=TwoWay}" />
|
||||||
|
</dev:SettingsCard>
|
||||||
|
|
||||||
|
</dev:SettingsExpander.Items>
|
||||||
|
</dev:SettingsExpander>
|
||||||
|
|
||||||
<dev:SettingsExpander
|
<dev:SettingsExpander
|
||||||
x:Uid="SettingsPageFluidLayer"
|
x:Uid="SettingsPageFluidLayer"
|
||||||
HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
|
HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
|
||||||
|
|||||||
@@ -8,12 +8,12 @@ using BetterLyrics.WinUI3.Models;
|
|||||||
using BetterLyrics.WinUI3.Models.Settings;
|
using BetterLyrics.WinUI3.Models.Settings;
|
||||||
using BetterLyrics.WinUI3.Renderer;
|
using BetterLyrics.WinUI3.Renderer;
|
||||||
using BetterLyrics.WinUI3.Services.LastFMService;
|
using BetterLyrics.WinUI3.Services.LastFMService;
|
||||||
using BetterLyrics.WinUI3.Services.LiveStatesService;
|
|
||||||
using BetterLyrics.WinUI3.Services.MediaSessionsService;
|
using BetterLyrics.WinUI3.Services.MediaSessionsService;
|
||||||
using BetterLyrics.WinUI3.Services.SettingsService;
|
using BetterLyrics.WinUI3.Services.SettingsService;
|
||||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||||
using CommunityToolkit.Mvvm.Messaging;
|
using CommunityToolkit.Mvvm.Messaging;
|
||||||
using CommunityToolkit.Mvvm.Messaging.Messages;
|
using CommunityToolkit.Mvvm.Messaging.Messages;
|
||||||
|
using Microsoft.Graphics.Canvas;
|
||||||
using Microsoft.Graphics.Canvas.UI.Xaml;
|
using Microsoft.Graphics.Canvas.UI.Xaml;
|
||||||
using Microsoft.UI;
|
using Microsoft.UI;
|
||||||
using Microsoft.UI.Xaml;
|
using Microsoft.UI.Xaml;
|
||||||
@@ -21,32 +21,31 @@ using Microsoft.UI.Xaml.Controls;
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Numerics;
|
using System.Threading.Tasks;
|
||||||
using Windows.Foundation;
|
using Windows.Foundation;
|
||||||
|
using Windows.Storage.Streams;
|
||||||
using Windows.UI;
|
using Windows.UI;
|
||||||
|
|
||||||
namespace BetterLyrics.WinUI3.Controls
|
namespace BetterLyrics.WinUI3.Controls
|
||||||
{
|
{
|
||||||
public sealed partial class LyricsCanvas : UserControl,
|
public sealed partial class LyricsCanvas : UserControl,
|
||||||
IRecipient<PropertyChangedMessage<int>>,
|
|
||||||
IRecipient<PropertyChangedMessage<AlbumArtThemeColors>>,
|
|
||||||
IRecipient<PropertyChangedMessage<TimeSpan>>,
|
IRecipient<PropertyChangedMessage<TimeSpan>>,
|
||||||
IRecipient<PropertyChangedMessage<LyricsData?>>,
|
IRecipient<PropertyChangedMessage<LyricsData?>>,
|
||||||
IRecipient<PropertyChangedMessage<LyricsWindowStatus>>,
|
IRecipient<PropertyChangedMessage<SongInfo?>>,
|
||||||
|
IRecipient<PropertyChangedMessage<int>>,
|
||||||
IRecipient<PropertyChangedMessage<double>>,
|
IRecipient<PropertyChangedMessage<double>>,
|
||||||
IRecipient<PropertyChangedMessage<bool>>,
|
IRecipient<PropertyChangedMessage<bool>>,
|
||||||
IRecipient<PropertyChangedMessage<TextAlignmentType>>,
|
IRecipient<PropertyChangedMessage<TextAlignmentType>>,
|
||||||
IRecipient<PropertyChangedMessage<SongInfo?>>,
|
|
||||||
IRecipient<PropertyChangedMessage<LyricsFontWeight>>,
|
IRecipient<PropertyChangedMessage<LyricsFontWeight>>,
|
||||||
IRecipient<PropertyChangedMessage<string>>
|
IRecipient<PropertyChangedMessage<string>>,
|
||||||
|
IRecipient<PropertyChangedMessage<IRandomAccessStream?>>
|
||||||
{
|
{
|
||||||
private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
|
private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
|
||||||
private readonly ILiveStatesService _liveStatesService = Ioc.Default.GetRequiredService<ILiveStatesService>();
|
|
||||||
private readonly IMediaSessionsService _mediaSessionsService = Ioc.Default.GetRequiredService<IMediaSessionsService>();
|
private readonly IMediaSessionsService _mediaSessionsService = Ioc.Default.GetRequiredService<IMediaSessionsService>();
|
||||||
private readonly ILastFMService _lastFMService = Ioc.Default.GetRequiredService<ILastFMService>();
|
|
||||||
|
|
||||||
private readonly LyricsRenderer _lyricsRenderer = new();
|
private readonly LyricsRenderer _lyricsRenderer = new();
|
||||||
private readonly FluidBackgroundRenderer _fluidRenderer = new();
|
private readonly FluidBackgroundRenderer _fluidRenderer = new();
|
||||||
|
private readonly CoverBackgroundRenderer _coverRenderer = new();
|
||||||
private readonly PureColorBackgroundRenderer _pureColorRenderer = new();
|
private readonly PureColorBackgroundRenderer _pureColorRenderer = new();
|
||||||
private readonly SnowRenderer _snowRenderer = new();
|
private readonly SnowRenderer _snowRenderer = new();
|
||||||
private readonly FogRenderer _fogRenderer = new();
|
private readonly FogRenderer _fogRenderer = new();
|
||||||
@@ -108,6 +107,9 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
private double _renderLyricsHeight = 0;
|
private double _renderLyricsHeight = 0;
|
||||||
private double _renderLyricsOpacity = 0;
|
private double _renderLyricsOpacity = 0;
|
||||||
|
|
||||||
|
private LyricsWindowStatus? _lyricsWindowStatus = null;
|
||||||
|
private AlbumArtThemeColors _albumArtThemeColors = new();
|
||||||
|
|
||||||
private Point _mousePosition = new(0, 0);
|
private Point _mousePosition = new(0, 0);
|
||||||
private int _mouseHoverLineIndex = -1;
|
private int _mouseHoverLineIndex = -1;
|
||||||
private bool _isMouseInLyricsArea = false;
|
private bool _isMouseInLyricsArea = false;
|
||||||
@@ -128,6 +130,24 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
public double ActualLyricsHeight => LyricsLayoutManager.CalculateActualHeight(_renderLyricsLines);
|
public double ActualLyricsHeight => LyricsLayoutManager.CalculateActualHeight(_renderLyricsLines);
|
||||||
public int CurrentHoveringLineIndex => _mouseHoverLineIndex;
|
public int CurrentHoveringLineIndex => _mouseHoverLineIndex;
|
||||||
|
|
||||||
|
public LyricsWindowStatus? LyricsWindowStatus
|
||||||
|
{
|
||||||
|
get { return (LyricsWindowStatus?)GetValue(LyricsWindowStatusProperty); }
|
||||||
|
set { SetValue(LyricsWindowStatusProperty, value); }
|
||||||
|
}
|
||||||
|
|
||||||
|
public static readonly DependencyProperty LyricsWindowStatusProperty =
|
||||||
|
DependencyProperty.Register(nameof(LyricsWindowStatus), typeof(LyricsWindowStatus), typeof(LyricsCanvas), new PropertyMetadata(null, OnDependencyPropertyChanged));
|
||||||
|
|
||||||
|
public AlbumArtThemeColors AlbumArtThemeColors
|
||||||
|
{
|
||||||
|
get { return (AlbumArtThemeColors)GetValue(AlbumArtThemeColorsProperty); }
|
||||||
|
set { SetValue(AlbumArtThemeColorsProperty, value); }
|
||||||
|
}
|
||||||
|
|
||||||
|
public static readonly DependencyProperty AlbumArtThemeColorsProperty =
|
||||||
|
DependencyProperty.Register(nameof(AlbumArtThemeColors), typeof(AlbumArtThemeColors), typeof(LyricsCanvas), new PropertyMetadata(new AlbumArtThemeColors(), OnDependencyPropertyChanged));
|
||||||
|
|
||||||
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ<EFBFBD><CABC> X <20><><EFBFBD><EFBFBD>
|
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ<EFBFBD><CABC> X <20><><EFBFBD><EFBFBD>
|
||||||
public double LyricsStartX
|
public double LyricsStartX
|
||||||
{
|
{
|
||||||
@@ -136,7 +156,7 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static readonly DependencyProperty LyricsStartXProperty =
|
public static readonly DependencyProperty LyricsStartXProperty =
|
||||||
DependencyProperty.Register(nameof(LyricsStartX), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
|
DependencyProperty.Register(nameof(LyricsStartX), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnDependencyPropertyChanged));
|
||||||
|
|
||||||
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ Y <20><><EFBFBD><EFBFBD>
|
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ Y <20><><EFBFBD><EFBFBD>
|
||||||
public double LyricsStartY
|
public double LyricsStartY
|
||||||
@@ -146,7 +166,7 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static readonly DependencyProperty LyricsStartYProperty =
|
public static readonly DependencyProperty LyricsStartYProperty =
|
||||||
DependencyProperty.Register(nameof(LyricsStartY), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
|
DependencyProperty.Register(nameof(LyricsStartY), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnDependencyPropertyChanged));
|
||||||
|
|
||||||
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
public double LyricsWidth
|
public double LyricsWidth
|
||||||
@@ -156,7 +176,7 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static readonly DependencyProperty LyricsWidthProperty =
|
public static readonly DependencyProperty LyricsWidthProperty =
|
||||||
DependencyProperty.Register(nameof(LyricsWidth), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
|
DependencyProperty.Register(nameof(LyricsWidth), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnDependencyPropertyChanged));
|
||||||
|
|
||||||
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߶<EFBFBD>
|
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߶<EFBFBD>
|
||||||
public double LyricsHeight
|
public double LyricsHeight
|
||||||
@@ -166,7 +186,7 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static readonly DependencyProperty LyricsHeightProperty =
|
public static readonly DependencyProperty LyricsHeightProperty =
|
||||||
DependencyProperty.Register(nameof(LyricsHeight), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
|
DependencyProperty.Register(nameof(LyricsHeight), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnDependencyPropertyChanged));
|
||||||
|
|
||||||
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><CDB8><EFBFBD><EFBFBD>
|
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><CDB8><EFBFBD><EFBFBD>
|
||||||
public double LyricsOpacity
|
public double LyricsOpacity
|
||||||
@@ -176,7 +196,7 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static readonly DependencyProperty LyricsOpacityProperty =
|
public static readonly DependencyProperty LyricsOpacityProperty =
|
||||||
DependencyProperty.Register(nameof(LyricsOpacity), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
|
DependencyProperty.Register(nameof(LyricsOpacity), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnDependencyPropertyChanged));
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// <20>û<EFBFBD><C3BB>ٿ<EFBFBD><D9BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD>ľ<EFBFBD><C4BE>루<EFBFBD><EBA3A8> 0 <20><>ʼ<EFBFBD>㣩
|
/// <20>û<EFBFBD><C3BB>ٿ<EFBFBD><D9BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD>ľ<EFBFBD><C4BE>루<EFBFBD><EBA3A8> 0 <20><>ʼ<EFBFBD>㣩
|
||||||
@@ -188,7 +208,7 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static readonly DependencyProperty MouseScrollOffsetProperty =
|
public static readonly DependencyProperty MouseScrollOffsetProperty =
|
||||||
DependencyProperty.Register(nameof(MouseScrollOffset), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
|
DependencyProperty.Register(nameof(MouseScrollOffset), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnDependencyPropertyChanged));
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// <20>û<EFBFBD><C3BB><EFBFBD><EFBFBD>굱ǰ<EAB5B1><C7B0>λ<EFBFBD>ã<EFBFBD><C3A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڸ<EFBFBD><DAB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ͻǣ<CFBD>
|
/// <20>û<EFBFBD><C3BB><EFBFBD><EFBFBD>굱ǰ<EAB5B1><C7B0>λ<EFBFBD>ã<EFBFBD><C3A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڸ<EFBFBD><DAB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ͻǣ<CFBD>
|
||||||
@@ -200,7 +220,7 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static readonly DependencyProperty MousePositionProperty =
|
public static readonly DependencyProperty MousePositionProperty =
|
||||||
DependencyProperty.Register(nameof(MousePosition), typeof(Point), typeof(LyricsCanvas), new PropertyMetadata(new Point(0, 0), OnLayoutPropChanged));
|
DependencyProperty.Register(nameof(MousePosition), typeof(Point), typeof(LyricsCanvas), new PropertyMetadata(new Point(0, 0), OnDependencyPropertyChanged));
|
||||||
|
|
||||||
public bool IsMouseInLyricsArea
|
public bool IsMouseInLyricsArea
|
||||||
{
|
{
|
||||||
@@ -209,7 +229,7 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static readonly DependencyProperty IsMouseInLyricsAreaProperty =
|
public static readonly DependencyProperty IsMouseInLyricsAreaProperty =
|
||||||
DependencyProperty.Register(nameof(IsMouseInLyricsArea), typeof(bool), typeof(LyricsCanvas), new PropertyMetadata(false, OnLayoutPropChanged));
|
DependencyProperty.Register(nameof(IsMouseInLyricsArea), typeof(bool), typeof(LyricsCanvas), new PropertyMetadata(false, OnDependencyPropertyChanged));
|
||||||
|
|
||||||
public bool IsMousePressing
|
public bool IsMousePressing
|
||||||
{
|
{
|
||||||
@@ -218,7 +238,7 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static readonly DependencyProperty IsMousePressingProperty =
|
public static readonly DependencyProperty IsMousePressingProperty =
|
||||||
DependencyProperty.Register(nameof(IsMousePressing), typeof(bool), typeof(LyricsCanvas), new PropertyMetadata(false, OnLayoutPropChanged));
|
DependencyProperty.Register(nameof(IsMousePressing), typeof(bool), typeof(LyricsCanvas), new PropertyMetadata(false, OnDependencyPropertyChanged));
|
||||||
|
|
||||||
public bool IsMouseScrolling
|
public bool IsMouseScrolling
|
||||||
{
|
{
|
||||||
@@ -227,30 +247,27 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static readonly DependencyProperty IsMouseScrollingProperty =
|
public static readonly DependencyProperty IsMouseScrollingProperty =
|
||||||
DependencyProperty.Register(nameof(IsMouseScrolling), typeof(bool), typeof(LyricsCanvas), new PropertyMetadata(false, OnLayoutPropChanged));
|
DependencyProperty.Register(nameof(IsMouseScrolling), typeof(bool), typeof(LyricsCanvas), new PropertyMetadata(false, OnDependencyPropertyChanged));
|
||||||
|
|
||||||
public LyricsCanvas()
|
public LyricsCanvas()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|
||||||
WeakReferenceMessenger.Default.Register<PropertyChangedMessage<int>>(this);
|
WeakReferenceMessenger.Default.RegisterAll(this);
|
||||||
WeakReferenceMessenger.Default.Register<PropertyChangedMessage<AlbumArtThemeColors>>(this);
|
|
||||||
WeakReferenceMessenger.Default.Register<PropertyChangedMessage<TimeSpan>>(this);
|
UpdateRenderLyricsLines();
|
||||||
WeakReferenceMessenger.Default.Register<PropertyChangedMessage<LyricsData?>>(this);
|
|
||||||
WeakReferenceMessenger.Default.Register<PropertyChangedMessage<LyricsWindowStatus>>(this);
|
|
||||||
WeakReferenceMessenger.Default.Register<PropertyChangedMessage<double>>(this);
|
|
||||||
WeakReferenceMessenger.Default.Register<PropertyChangedMessage<bool>>(this);
|
|
||||||
WeakReferenceMessenger.Default.Register<PropertyChangedMessage<TextAlignmentType>>(this);
|
|
||||||
WeakReferenceMessenger.Default.Register<PropertyChangedMessage<SongInfo?>>(this);
|
|
||||||
WeakReferenceMessenger.Default.Register<PropertyChangedMessage<LyricsFontWeight>>(this);
|
|
||||||
WeakReferenceMessenger.Default.Register<PropertyChangedMessage<string>>(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void OnLayoutPropChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
private static void OnDependencyPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||||
{
|
{
|
||||||
if (d is LyricsCanvas canvas)
|
if (d is LyricsCanvas canvas)
|
||||||
{
|
{
|
||||||
if (e.Property == LyricsStartXProperty)
|
if (e.Property == LyricsWindowStatusProperty)
|
||||||
|
{
|
||||||
|
canvas._lyricsWindowStatus = (LyricsWindowStatus)e.NewValue;
|
||||||
|
canvas._isLayoutChanged = true;
|
||||||
|
}
|
||||||
|
else if (e.Property == LyricsStartXProperty)
|
||||||
{
|
{
|
||||||
canvas._renderLyricsStartX = Convert.ToDouble(e.NewValue);
|
canvas._renderLyricsStartX = Convert.ToDouble(e.NewValue);
|
||||||
canvas._isLayoutChanged = true;
|
canvas._isLayoutChanged = true;
|
||||||
@@ -300,6 +317,18 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
}
|
}
|
||||||
canvas._isMouseScrolling = value;
|
canvas._isMouseScrolling = value;
|
||||||
}
|
}
|
||||||
|
else if (e.Property == AlbumArtThemeColorsProperty)
|
||||||
|
{
|
||||||
|
var albumArtThemeColors = (AlbumArtThemeColors)e.NewValue;
|
||||||
|
canvas._immersiveBgColorTransition.StartTransition(albumArtThemeColors.EnvColor);
|
||||||
|
canvas._accentColor1Transition.StartTransition(albumArtThemeColors.AccentColor1);
|
||||||
|
canvas._accentColor2Transition.StartTransition(albumArtThemeColors.AccentColor2);
|
||||||
|
canvas._accentColor3Transition.StartTransition(albumArtThemeColors.AccentColor3);
|
||||||
|
canvas._accentColor4Transition.StartTransition(albumArtThemeColors.AccentColor4);
|
||||||
|
|
||||||
|
canvas._albumArtThemeColors = albumArtThemeColors;
|
||||||
|
canvas._isLayoutChanged = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -307,23 +336,22 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
|
|
||||||
private void Canvas_Draw(ICanvasAnimatedControl sender, CanvasAnimatedDrawEventArgs args)
|
private void Canvas_Draw(ICanvasAnimatedControl sender, CanvasAnimatedDrawEventArgs args)
|
||||||
{
|
{
|
||||||
|
if (_lyricsWindowStatus == null) return;
|
||||||
|
|
||||||
var bounds = new Rect(0, 0, sender.Size.Width, sender.Size.Height);
|
var bounds = new Rect(0, 0, sender.Size.Width, sender.Size.Height);
|
||||||
|
|
||||||
var status = _liveStatesService.LiveStates.LyricsWindowStatus;
|
var albumArtLayout = _lyricsWindowStatus.AlbumArtLayoutSettings;
|
||||||
var albumArtLayout = status.AlbumArtLayoutSettings;
|
var lyricsBg = _lyricsWindowStatus.LyricsBackgroundSettings;
|
||||||
var lyricsBg = status.LyricsBackgroundSettings;
|
var lyricsStyle = _lyricsWindowStatus.LyricsStyleSettings;
|
||||||
var lyricsStyle = status.LyricsStyleSettings;
|
var lyricsEffect = _lyricsWindowStatus.LyricsEffectSettings;
|
||||||
var lyricsEffect = status.LyricsEffectSettings;
|
|
||||||
|
|
||||||
double songDuration = _mediaSessionsService.CurrentSongInfo?.DurationMs ?? 0;
|
double songDuration = _mediaSessionsService.CurrentSongInfo?.DurationMs ?? 0;
|
||||||
bool isForceWordByWord = _settingsService.AppSettings.GeneralSettings.IsForceWordByWordEffect;
|
bool isForceWordByWord = _settingsService.AppSettings.GeneralSettings.IsForceWordByWordEffect;
|
||||||
|
|
||||||
var lyricsThemeColors = _mediaSessionsService.AlbumArtThemeColors;
|
|
||||||
|
|
||||||
Color overlayColor;
|
Color overlayColor;
|
||||||
double finalOpacity;
|
double finalOpacity;
|
||||||
|
|
||||||
if (status.IsAdaptToEnvironment)
|
if (_lyricsWindowStatus.IsAdaptToEnvironment)
|
||||||
{
|
{
|
||||||
// <20><><EFBFBD><EFBFBD>Ӧɫ
|
// <20><><EFBFBD><EFBFBD>Ӧɫ
|
||||||
overlayColor = _immersiveBgColorTransition.Value;
|
overlayColor = _immersiveBgColorTransition.Value;
|
||||||
@@ -344,8 +372,8 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
lyricsBg.IsPureColorOverlayEnabled
|
lyricsBg.IsPureColorOverlayEnabled
|
||||||
);
|
);
|
||||||
|
|
||||||
_fluidRenderer.Opacity = lyricsBg.FluidOverlayOpacity;
|
_coverRenderer.Draw(sender, args.DrawingSession);
|
||||||
_fluidRenderer.IsEnabled = lyricsBg.IsFluidOverlayEnabled;
|
|
||||||
_fluidRenderer.Draw(sender, args.DrawingSession);
|
_fluidRenderer.Draw(sender, args.DrawingSession);
|
||||||
|
|
||||||
_snowRenderer.Draw(sender, args.DrawingSession);
|
_snowRenderer.Draw(sender, args.DrawingSession);
|
||||||
@@ -368,10 +396,10 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
userScrollOffset: _mouseYScrollTransition.Value,
|
userScrollOffset: _mouseYScrollTransition.Value,
|
||||||
lyricsOpacity: _renderLyricsOpacity,
|
lyricsOpacity: _renderLyricsOpacity,
|
||||||
playingLineTopOffsetFactor: lyricsStyle.PlayingLineTopOffset / 100.0,
|
playingLineTopOffsetFactor: lyricsStyle.PlayingLineTopOffset / 100.0,
|
||||||
windowStatus: status,
|
windowStatus: _lyricsWindowStatus,
|
||||||
strokeColor: lyricsThemeColors.StrokeFontColor,
|
strokeColor: _albumArtThemeColors.StrokeFontColor,
|
||||||
bgColor: lyricsThemeColors.BgFontColor,
|
bgColor: _albumArtThemeColors.BgFontColor,
|
||||||
fgColor: lyricsThemeColors.FgFontColor,
|
fgColor: _albumArtThemeColors.FgFontColor,
|
||||||
getPlaybackState: (lineIndex) =>
|
getPlaybackState: (lineIndex) =>
|
||||||
{
|
{
|
||||||
if (_renderLyricsLines == null) return new LinePlaybackState();
|
if (_renderLyricsLines == null) return new LinePlaybackState();
|
||||||
@@ -403,33 +431,34 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
style: lyricsBg.SpectrumStyle,
|
style: lyricsBg.SpectrumStyle,
|
||||||
canvasWidth: sender.Size.Width,
|
canvasWidth: sender.Size.Width,
|
||||||
canvasHeight: sender.Size.Height,
|
canvasHeight: sender.Size.Height,
|
||||||
fillColor: lyricsThemeColors.BgFontColor
|
fillColor: _albumArtThemeColors.BgFontColor
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
args.DrawingSession.DrawText(
|
//args.DrawingSession.DrawText(
|
||||||
$"Lyrics render start pos: ({(int)_renderLyricsStartX}, {(int)_renderLyricsStartY})\n" +
|
// $"Lyrics render start pos: ({(int)_renderLyricsStartX}, {(int)_renderLyricsStartY})\n" +
|
||||||
$"Lyrics render size: [{(int)_renderLyricsWidth} x {(int)_renderLyricsHeight}]\n" +
|
// $"Lyrics render size: [{(int)_renderLyricsWidth} x {(int)_renderLyricsHeight}]\n" +
|
||||||
$"Lyrics actual height: {LyricsLayoutManager.CalculateActualHeight(_renderLyricsLines)}\n" +
|
// $"Lyrics actual height: {LyricsLayoutManager.CalculateActualHeight(_renderLyricsLines)}\n" +
|
||||||
$"Playing line (idx): {_playingLineIndex}\n" +
|
// $"Playing line (idx): {_playingLineIndex}\n" +
|
||||||
$"Mouse hovering line (idx): {_mouseHoverLineIndex}\n" +
|
// $"Mouse hovering line (idx): {_mouseHoverLineIndex}\n" +
|
||||||
$"Visible lines range (idx): [{_visibleRange.Start}, {_visibleRange.End}]\n" +
|
// $"Visible lines range (idx): [{_visibleRange.Start}, {_visibleRange.End}]\n" +
|
||||||
$"Total line count: {LyricsLayoutManager.CalculateMaxRange(_renderLyricsLines).End + 1}\n" +
|
// $"Total line count: {LyricsLayoutManager.CalculateMaxRange(_renderLyricsLines).End + 1}\n" +
|
||||||
$"Played: {_songPosition} / {TimeSpan.FromMilliseconds(_mediaSessionsService.CurrentSongInfo?.DurationMs ?? 0)}\n" +
|
// $"Played: {_songPosition} / {TimeSpan.FromMilliseconds(_mediaSessionsService.CurrentSongInfo?.DurationMs ?? 0)}\n" +
|
||||||
$"Y offset: {_canvasYScrollTransition.Value}\n" +
|
// $"Y offset: {_canvasYScrollTransition.Value}\n" +
|
||||||
$"User scroll offset: {_mouseYScrollTransition.Value}",
|
// $"User scroll offset: {_mouseYScrollTransition.Value}",
|
||||||
new Vector2(0, 0), Colors.Red);
|
// new Vector2(0, 0), Colors.Red);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Canvas_Update(ICanvasAnimatedControl sender, CanvasAnimatedUpdateEventArgs args)
|
private void Canvas_Update(ICanvasAnimatedControl sender, CanvasAnimatedUpdateEventArgs args)
|
||||||
{
|
{
|
||||||
var lyricsBg = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings;
|
if (_lyricsWindowStatus == null) return;
|
||||||
var lyricsStyle = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings;
|
|
||||||
var lyricsEffect = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings;
|
var lyricsBg = _lyricsWindowStatus.LyricsBackgroundSettings;
|
||||||
var albumArtThemeColors = _mediaSessionsService.AlbumArtThemeColors;
|
var lyricsStyle = _lyricsWindowStatus.LyricsStyleSettings;
|
||||||
|
var lyricsEffect = _lyricsWindowStatus.LyricsEffectSettings;
|
||||||
var lyricsData = _mediaSessionsService.CurrentLyricsData;
|
var lyricsData = _mediaSessionsService.CurrentLyricsData;
|
||||||
|
|
||||||
TimeSpan elapsedTime = args.Timing.ElapsedTime;
|
TimeSpan elapsedTime = args.Timing.ElapsedTime;
|
||||||
@@ -500,10 +529,11 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
sender.Size.Height,
|
sender.Size.Height,
|
||||||
_canvasTargetScrollOffset,
|
_canvasTargetScrollOffset,
|
||||||
lyricsStyle.PlayingLineTopOffset / 100.0,
|
lyricsStyle.PlayingLineTopOffset / 100.0,
|
||||||
_liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings,
|
_lyricsWindowStatus.LyricsStyleSettings,
|
||||||
|
_lyricsWindowStatus.LyricsEffectSettings,
|
||||||
_canvasYScrollTransition,
|
_canvasYScrollTransition,
|
||||||
albumArtThemeColors.BgFontColor,
|
_albumArtThemeColors.BgFontColor,
|
||||||
albumArtThemeColors.FgFontColor,
|
_albumArtThemeColors.FgFontColor,
|
||||||
elapsedTime,
|
elapsedTime,
|
||||||
_isMouseScrolling,
|
_isMouseScrolling,
|
||||||
_isLayoutChanged,
|
_isLayoutChanged,
|
||||||
@@ -514,25 +544,31 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
_isMouseScrollingChanged = false;
|
_isMouseScrollingChanged = false;
|
||||||
|
|
||||||
_lyricsRenderer.CalculateLyrics3DMatrix(
|
_lyricsRenderer.CalculateLyrics3DMatrix(
|
||||||
|
lyricsStyle: lyricsStyle,
|
||||||
lyricsEffect: lyricsEffect,
|
lyricsEffect: lyricsEffect,
|
||||||
lyricsX: _renderLyricsStartX,
|
lyricsX: _renderLyricsStartX,
|
||||||
lyricsY: _renderLyricsStartY,
|
lyricsY: _renderLyricsStartY,
|
||||||
lyricsWidth: _renderLyricsWidth,
|
lyricsWidth: _renderLyricsWidth,
|
||||||
canvasHeight: sender.Size.Height
|
lyricsHeight: _renderLyricsHeight
|
||||||
);
|
);
|
||||||
|
|
||||||
_isLayoutChanged = false;
|
_isLayoutChanged = false;
|
||||||
|
|
||||||
if (_fluidRenderer.IsEnabled)
|
_fluidRenderer.IsEnabled = lyricsBg.IsFluidOverlayEnabled;
|
||||||
{
|
_fluidRenderer.Opacity = lyricsBg.FluidOverlayOpacity / 100.0;
|
||||||
_fluidRenderer.UpdateColors(
|
_fluidRenderer.UpdateColors(
|
||||||
_accentColor1Transition.Value,
|
_accentColor1Transition.Value,
|
||||||
_accentColor2Transition.Value,
|
_accentColor2Transition.Value,
|
||||||
_accentColor3Transition.Value,
|
_accentColor3Transition.Value,
|
||||||
_accentColor4Transition.Value
|
_accentColor4Transition.Value
|
||||||
);
|
);
|
||||||
_fluidRenderer.Update(elapsedTime);
|
_fluidRenderer.Update(elapsedTime);
|
||||||
}
|
|
||||||
|
_coverRenderer.IsEnabled = lyricsBg.IsCoverOverlayEnabled;
|
||||||
|
_coverRenderer.Opacity = lyricsBg.CoverOverlayOpacity;
|
||||||
|
_coverRenderer.BlurAmount = lyricsBg.CoverOverlayBlurAmount;
|
||||||
|
_coverRenderer.Speed = lyricsBg.CoverOverlaySpeed;
|
||||||
|
_coverRenderer.Update(elapsedTime);
|
||||||
|
|
||||||
_snowRenderer.IsEnabled = lyricsBg.IsSnowFlakeOverlayEnabled;
|
_snowRenderer.IsEnabled = lyricsBg.IsSnowFlakeOverlayEnabled;
|
||||||
_snowRenderer.Amount = lyricsBg.SnowFlakeOverlayAmount / 100f;
|
_snowRenderer.Amount = lyricsBg.SnowFlakeOverlayAmount / 100f;
|
||||||
@@ -559,19 +595,29 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
|
|
||||||
private void Canvas_Unloaded(object sender, RoutedEventArgs e)
|
private void Canvas_Unloaded(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
Canvas.RemoveFromVisualTree();
|
|
||||||
Canvas = null;
|
|
||||||
|
|
||||||
_fluidRenderer.Dispose();
|
_fluidRenderer.Dispose();
|
||||||
|
_coverRenderer.Dispose();
|
||||||
_snowRenderer.Dispose();
|
_snowRenderer.Dispose();
|
||||||
_fogRenderer.Dispose();
|
_fogRenderer.Dispose();
|
||||||
_spectrumRenderer.Dispose();
|
_spectrumRenderer.Dispose();
|
||||||
|
|
||||||
|
_renderLyricsLines = null;
|
||||||
|
|
||||||
DisposeAnalyzer();
|
DisposeAnalyzer();
|
||||||
|
|
||||||
|
Canvas.RemoveFromVisualTree();
|
||||||
|
Canvas = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async void Canvas_CreateResources(CanvasAnimatedControl sender, Microsoft.Graphics.Canvas.UI.CanvasCreateResourcesEventArgs args)
|
private async void Canvas_CreateResources(CanvasAnimatedControl sender, Microsoft.Graphics.Canvas.UI.CanvasCreateResourcesEventArgs args)
|
||||||
{
|
{
|
||||||
args.TrackAsyncAction(_fluidRenderer.LoadResourcesAsync().AsAsyncAction());
|
var tasks = new Task[]
|
||||||
|
{
|
||||||
|
_fluidRenderer.LoadResourcesAsync(),
|
||||||
|
ReloadCoverBackgroundResourcesAsync()
|
||||||
|
};
|
||||||
|
args.TrackAsyncAction(Task.WhenAll(tasks).AsAsyncAction());
|
||||||
|
|
||||||
_snowRenderer.LoadResources();
|
_snowRenderer.LoadResources();
|
||||||
_fogRenderer.LoadResources();
|
_fogRenderer.LoadResources();
|
||||||
|
|
||||||
@@ -592,12 +638,12 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
|
|
||||||
private void TriggerRelayout()
|
private void TriggerRelayout()
|
||||||
{
|
{
|
||||||
if (_renderLyricsLines == null || !_isLayoutChanged) return;
|
if (_renderLyricsLines == null || !_isLayoutChanged || _lyricsWindowStatus == null) return;
|
||||||
|
|
||||||
LyricsLayoutManager.MeasureAndArrange(
|
LyricsLayoutManager.MeasureAndArrange(
|
||||||
resourceCreator: Canvas,
|
resourceCreator: Canvas,
|
||||||
lines: _renderLyricsLines,
|
lines: _renderLyricsLines,
|
||||||
status: _liveStatesService.LiveStates.LyricsWindowStatus,
|
status: _lyricsWindowStatus,
|
||||||
appSettings: _settingsService.AppSettings,
|
appSettings: _settingsService.AppSettings,
|
||||||
canvasWidth: Canvas.Size.Width,
|
canvasWidth: Canvas.Size.Width,
|
||||||
canvasHeight: Canvas.Size.Height,
|
canvasHeight: Canvas.Size.Height,
|
||||||
@@ -613,22 +659,6 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
_songPosition += elapsedTime;
|
_songPosition += elapsedTime;
|
||||||
_totalPlayedTime += elapsedTime;
|
_totalPlayedTime += elapsedTime;
|
||||||
_songPositionWithOffset = _songPosition + TimeSpan.FromMilliseconds(_mediaSessionsService.CurrentMediaSourceProviderInfo?.PositionOffset ?? 0);
|
_songPositionWithOffset = _songPosition + TimeSpan.FromMilliseconds(_mediaSessionsService.CurrentMediaSourceProviderInfo?.PositionOffset ?? 0);
|
||||||
CheckAndScrobbleLastFM();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void CheckAndScrobbleLastFM()
|
|
||||||
{
|
|
||||||
bool isEnabled = _mediaSessionsService.CurrentMediaSourceProviderInfo?.IsLastFMTrackEnabled ?? false;
|
|
||||||
if (!isEnabled || _isLastFMTracked) return;
|
|
||||||
|
|
||||||
var songInfo = _mediaSessionsService.CurrentSongInfo;
|
|
||||||
if (songInfo == null || songInfo.Duration <= 0) return;
|
|
||||||
|
|
||||||
if (_totalPlayedTime.TotalSeconds >= songInfo.Duration * 0.5)
|
|
||||||
{
|
|
||||||
_isLastFMTracked = true;
|
|
||||||
_lastFMService.TrackAsync(songInfo);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -639,21 +669,27 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
_isLastFMTracked = false;
|
_isLastFMTracked = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Receive(PropertyChangedMessage<AlbumArtThemeColors> message)
|
private void UpdateRenderLyricsLines()
|
||||||
{
|
{
|
||||||
if (message.Sender is IMediaSessionsService)
|
_renderLyricsLines = null;
|
||||||
|
_renderLyricsLines = _mediaSessionsService.CurrentLyricsData?.LyricsLines.Select(x => new RenderLyricsLine()
|
||||||
{
|
{
|
||||||
if (message.PropertyName == nameof(IMediaSessionsService.AlbumArtThemeColors))
|
LyricsSyllables = x.LyricsSyllables,
|
||||||
{
|
StartMs = x.StartMs,
|
||||||
var lyricsThemeColors = message.NewValue;
|
EndMs = x.EndMs,
|
||||||
_immersiveBgColorTransition.StartTransition(lyricsThemeColors.EnvColor);
|
PhoneticText = x.PhoneticText,
|
||||||
_accentColor1Transition.StartTransition(lyricsThemeColors.AccentColor1);
|
OriginalText = x.OriginalText,
|
||||||
_accentColor2Transition.StartTransition(lyricsThemeColors.AccentColor2);
|
TranslatedText = x.TranslatedText
|
||||||
_accentColor3Transition.StartTransition(lyricsThemeColors.AccentColor3);
|
}).ToList();
|
||||||
_accentColor4Transition.StartTransition(lyricsThemeColors.AccentColor4);
|
}
|
||||||
|
|
||||||
_isLayoutChanged = true;
|
private async Task ReloadCoverBackgroundResourcesAsync()
|
||||||
}
|
{
|
||||||
|
if (_mediaSessionsService.AlbumArtBitmapStream is IRandomAccessStream stream)
|
||||||
|
{
|
||||||
|
stream.Seek(0);
|
||||||
|
CanvasBitmap bitmap = await CanvasBitmap.LoadAsync(Canvas, stream);
|
||||||
|
_coverRenderer.SetCoverBitmap(bitmap);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -696,38 +732,26 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
{
|
{
|
||||||
if (message.PropertyName == nameof(IMediaSessionsService.CurrentLyricsData))
|
if (message.PropertyName == nameof(IMediaSessionsService.CurrentLyricsData))
|
||||||
{
|
{
|
||||||
_renderLyricsLines = null;
|
UpdateRenderLyricsLines();
|
||||||
if (_mediaSessionsService.CurrentLyricsData is LyricsData lyricsData)
|
|
||||||
{
|
|
||||||
_renderLyricsLines = lyricsData.LyricsLines.Select(x => new RenderLyricsLine()
|
|
||||||
{
|
|
||||||
LyricsSyllables = x.LyricsSyllables,
|
|
||||||
StartMs = x.StartMs,
|
|
||||||
EndMs = x.EndMs,
|
|
||||||
PhoneticText = x.PhoneticText,
|
|
||||||
OriginalText = x.OriginalText,
|
|
||||||
TranslatedText = x.TranslatedText
|
|
||||||
}).ToList();
|
|
||||||
}
|
|
||||||
_isLayoutChanged = true;
|
_isLayoutChanged = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Receive(PropertyChangedMessage<LyricsWindowStatus> message)
|
public void Receive(PropertyChangedMessage<SongInfo?> message)
|
||||||
{
|
{
|
||||||
if (message.Sender is LiveStates)
|
if (message.Sender is IMediaSessionsService)
|
||||||
{
|
{
|
||||||
if (message.PropertyName == nameof(LiveStates.LyricsWindowStatus))
|
if (message.PropertyName == nameof(IMediaSessionsService.CurrentSongInfo))
|
||||||
{
|
{
|
||||||
_isLayoutChanged = true;
|
ResetPlaybackState();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Receive(PropertyChangedMessage<int> message)
|
public void Receive(PropertyChangedMessage<int> message)
|
||||||
{
|
{
|
||||||
if (message.Sender is LyricsStyleSettings)
|
if (message.Sender == LyricsWindowStatus?.LyricsStyleSettings)
|
||||||
{
|
{
|
||||||
if (message.PropertyName == nameof(LyricsStyleSettings.PhoneticLyricsFontSize))
|
if (message.PropertyName == nameof(LyricsStyleSettings.PhoneticLyricsFontSize))
|
||||||
{
|
{
|
||||||
@@ -749,8 +773,20 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
{
|
{
|
||||||
_isLayoutChanged = true;
|
_isLayoutChanged = true;
|
||||||
}
|
}
|
||||||
|
else if (message.PropertyName == nameof(LyricsStyleSettings.PhoneticLyricsOpacity))
|
||||||
|
{
|
||||||
|
_isLayoutChanged = true;
|
||||||
|
}
|
||||||
|
else if (message.PropertyName == nameof(LyricsStyleSettings.OriginalLyricsOpacity))
|
||||||
|
{
|
||||||
|
_isLayoutChanged = true;
|
||||||
|
}
|
||||||
|
else if (message.PropertyName == nameof(LyricsStyleSettings.TranslatedLyricsOpacity))
|
||||||
|
{
|
||||||
|
_isLayoutChanged = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if (message.Sender is LyricsEffectSettings)
|
else if (message.Sender == LyricsWindowStatus?.LyricsEffectSettings)
|
||||||
{
|
{
|
||||||
if (message.PropertyName == nameof(LyricsEffectSettings.LyricsScrollDuration))
|
if (message.PropertyName == nameof(LyricsEffectSettings.LyricsScrollDuration))
|
||||||
{
|
{
|
||||||
@@ -781,7 +817,7 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
|
|
||||||
public void Receive(PropertyChangedMessage<double> message)
|
public void Receive(PropertyChangedMessage<double> message)
|
||||||
{
|
{
|
||||||
if (message.Sender is LyricsStyleSettings)
|
if (message.Sender == LyricsWindowStatus?.LyricsStyleSettings)
|
||||||
{
|
{
|
||||||
if (message.PropertyName == nameof(LyricsStyleSettings.LyricsLineSpacingFactor))
|
if (message.PropertyName == nameof(LyricsStyleSettings.LyricsLineSpacingFactor))
|
||||||
{
|
{
|
||||||
@@ -792,7 +828,7 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
|
|
||||||
public void Receive(PropertyChangedMessage<bool> message)
|
public void Receive(PropertyChangedMessage<bool> message)
|
||||||
{
|
{
|
||||||
if (message.Sender is LyricsEffectSettings)
|
if (message.Sender == LyricsWindowStatus?.LyricsEffectSettings)
|
||||||
{
|
{
|
||||||
if (message.PropertyName == nameof(LyricsEffectSettings.IsFanLyricsEnabled))
|
if (message.PropertyName == nameof(LyricsEffectSettings.IsFanLyricsEnabled))
|
||||||
{
|
{
|
||||||
@@ -802,8 +838,16 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
{
|
{
|
||||||
_isLayoutChanged = true;
|
_isLayoutChanged = true;
|
||||||
}
|
}
|
||||||
|
else if (message.PropertyName == nameof(LyricsEffectSettings.IsLyricsFadeOutEffectEnabled))
|
||||||
|
{
|
||||||
|
_isLayoutChanged = true;
|
||||||
|
}
|
||||||
|
else if (message.PropertyName == nameof(LyricsEffectSettings.IsLyricsOutOfSightEffectEnabled))
|
||||||
|
{
|
||||||
|
_isLayoutChanged = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if (message.Sender is LyricsStyleSettings)
|
else if (message.Sender == LyricsWindowStatus?.LyricsStyleSettings)
|
||||||
{
|
{
|
||||||
if (message.PropertyName == nameof(LyricsStyleSettings.IsDynamicLyricsFontSize))
|
if (message.PropertyName == nameof(LyricsStyleSettings.IsDynamicLyricsFontSize))
|
||||||
{
|
{
|
||||||
@@ -814,7 +858,7 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
|
|
||||||
public void Receive(PropertyChangedMessage<TextAlignmentType> message)
|
public void Receive(PropertyChangedMessage<TextAlignmentType> message)
|
||||||
{
|
{
|
||||||
if (message.Sender is LyricsStyleSettings)
|
if (message.Sender == LyricsWindowStatus?.LyricsStyleSettings)
|
||||||
{
|
{
|
||||||
if (message.PropertyName == nameof(LyricsStyleSettings.LyricsAlignmentType))
|
if (message.PropertyName == nameof(LyricsStyleSettings.LyricsAlignmentType))
|
||||||
{
|
{
|
||||||
@@ -823,20 +867,9 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Receive(PropertyChangedMessage<SongInfo?> message)
|
|
||||||
{
|
|
||||||
if (message.Sender is IMediaSessionsService)
|
|
||||||
{
|
|
||||||
if (message.PropertyName == nameof(IMediaSessionsService.CurrentSongInfo))
|
|
||||||
{
|
|
||||||
ResetPlaybackState();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Receive(PropertyChangedMessage<LyricsFontWeight> message)
|
public void Receive(PropertyChangedMessage<LyricsFontWeight> message)
|
||||||
{
|
{
|
||||||
if (message.Sender is LyricsStyleSettings)
|
if (message.Sender == LyricsWindowStatus?.LyricsStyleSettings)
|
||||||
{
|
{
|
||||||
if (message.PropertyName == nameof(LyricsStyleSettings.LyricsFontWeight))
|
if (message.PropertyName == nameof(LyricsStyleSettings.LyricsFontWeight))
|
||||||
{
|
{
|
||||||
@@ -847,7 +880,7 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
|
|
||||||
public void Receive(PropertyChangedMessage<string> message)
|
public void Receive(PropertyChangedMessage<string> message)
|
||||||
{
|
{
|
||||||
if (message.Sender is LyricsStyleSettings)
|
if (message.Sender == LyricsWindowStatus?.LyricsStyleSettings)
|
||||||
{
|
{
|
||||||
if (message.PropertyName == nameof(LyricsStyleSettings.LyricsCJKFontFamily))
|
if (message.PropertyName == nameof(LyricsStyleSettings.LyricsCJKFontFamily))
|
||||||
{
|
{
|
||||||
@@ -859,5 +892,16 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Receive(PropertyChangedMessage<IRandomAccessStream?> message)
|
||||||
|
{
|
||||||
|
if (message.Sender is IMediaSessionsService)
|
||||||
|
{
|
||||||
|
if (message.PropertyName == nameof(IMediaSessionsService.AlbumArtBitmapStream))
|
||||||
|
{
|
||||||
|
_ = ReloadCoverBackgroundResourcesAsync();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,20 +28,88 @@
|
|||||||
<ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsBlurEffectEnabled, Mode=TwoWay}" />
|
<ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsBlurEffectEnabled, Mode=TwoWay}" />
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
|
|
||||||
<!-- 辉光效果 -->
|
<!-- 淡出效果 -->
|
||||||
<dev:SettingsCard x:Uid="SettingsPageLyricsGlowEffect" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
<dev:SettingsCard x:Uid="SettingsPageLyricsFadeOutEffect" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
||||||
<ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectEnabled, Mode=TwoWay}" />
|
<ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsFadeOutEffectEnabled, Mode=TwoWay}" />
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
|
|
||||||
|
<!-- 远离视野 -->
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPageLyricsOutOfSightEffect" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
||||||
|
<ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsOutOfSightEffectEnabled, Mode=TwoWay}" />
|
||||||
|
</dev:SettingsCard>
|
||||||
|
|
||||||
|
<!-- 辉光效果 -->
|
||||||
|
<dev:SettingsExpander x:Uid="SettingsPageLyricsGlowEffect" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
||||||
|
<ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectEnabled, Mode=TwoWay}" />
|
||||||
|
<dev:SettingsExpander.Items>
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPageScope">
|
||||||
|
<ComboBox SelectedIndex="{x:Bind LyricsEffectSettings.LyricsGlowEffectScope, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
|
||||||
|
<ComboBoxItem x:Uid="SettingsPageEffectScopeLongDurationSyllable" />
|
||||||
|
<ComboBoxItem x:Uid="SettingsPageEffectLineStartToCurrentChar" />
|
||||||
|
</ComboBox>
|
||||||
|
</dev:SettingsCard>
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPageLongSyllableDuration">
|
||||||
|
<local:ExtendedSlider
|
||||||
|
Default="700"
|
||||||
|
Maximum="1000"
|
||||||
|
Minimum="0"
|
||||||
|
Unit="ms"
|
||||||
|
Value="{x:Bind LyricsEffectSettings.LyricsGlowEffectLongSyllableDuration, Mode=TwoWay}" />
|
||||||
|
</dev:SettingsCard>
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPageAutoAdjust">
|
||||||
|
<ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectAmountAutoAdjust, Mode=TwoWay}" />
|
||||||
|
</dev:SettingsCard>
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPageAmount" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectAmountAutoAdjust, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
|
||||||
|
<local:ExtendedSlider
|
||||||
|
Maximum="16"
|
||||||
|
Minimum="0"
|
||||||
|
Value="{x:Bind LyricsEffectSettings.LyricsGlowEffectAmount, Mode=TwoWay}" />
|
||||||
|
</dev:SettingsCard>
|
||||||
|
</dev:SettingsExpander.Items>
|
||||||
|
</dev:SettingsExpander>
|
||||||
|
|
||||||
<!-- 缩放效果 -->
|
<!-- 缩放效果 -->
|
||||||
<dev:SettingsCard x:Uid="SettingsPageLyricsScaleEffect" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
<dev:SettingsExpander x:Uid="SettingsPageLyricsScaleEffect" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
||||||
<ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsScaleEffectEnabled, Mode=TwoWay}" />
|
<ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsScaleEffectEnabled, Mode=TwoWay}" />
|
||||||
</dev:SettingsCard>
|
<dev:SettingsExpander.Items>
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPageLongSyllableDuration">
|
||||||
|
<local:ExtendedSlider
|
||||||
|
Default="700"
|
||||||
|
Maximum="1000"
|
||||||
|
Minimum="0"
|
||||||
|
Unit="ms"
|
||||||
|
Value="{x:Bind LyricsEffectSettings.LyricsScaleEffectLongSyllableDuration, Mode=TwoWay}" />
|
||||||
|
</dev:SettingsCard>
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPageAutoAdjust">
|
||||||
|
<ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsScaleEffectAmountAutoAdjust, Mode=TwoWay}" />
|
||||||
|
</dev:SettingsCard>
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPageAmount" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsScaleEffectAmountAutoAdjust, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
|
||||||
|
<local:ExtendedSlider
|
||||||
|
Default="115"
|
||||||
|
Maximum="200"
|
||||||
|
Minimum="100"
|
||||||
|
Unit="%"
|
||||||
|
Value="{x:Bind LyricsEffectSettings.LyricsScaleEffectAmount, Mode=TwoWay}" />
|
||||||
|
</dev:SettingsCard>
|
||||||
|
</dev:SettingsExpander.Items>
|
||||||
|
</dev:SettingsExpander>
|
||||||
|
|
||||||
<!-- 浮动动画 -->
|
<!-- 浮动动画 -->
|
||||||
<dev:SettingsCard x:Uid="SettingsPageLyricsFloatAnimation" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
<dev:SettingsExpander x:Uid="SettingsPageLyricsFloatAnimation" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
||||||
<ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsFloatAnimationEnabled, Mode=TwoWay}" />
|
<ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsFloatAnimationEnabled, Mode=TwoWay}" />
|
||||||
</dev:SettingsCard>
|
<dev:SettingsExpander.Items>
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPageAutoAdjust">
|
||||||
|
<ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsFloatAnimationAmountAutoAdjust, Mode=TwoWay}" />
|
||||||
|
</dev:SettingsCard>
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPageAmount" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsFloatAnimationAmountAutoAdjust, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
|
||||||
|
<local:ExtendedSlider
|
||||||
|
Default="4"
|
||||||
|
Maximum="16"
|
||||||
|
Minimum="0"
|
||||||
|
Value="{x:Bind LyricsEffectSettings.LyricsFloatAnimationAmount, Mode=TwoWay}" />
|
||||||
|
</dev:SettingsCard>
|
||||||
|
</dev:SettingsExpander.Items>
|
||||||
|
</dev:SettingsExpander>
|
||||||
|
|
||||||
<!-- 扇形歌词 -->
|
<!-- 扇形歌词 -->
|
||||||
<dev:SettingsExpander
|
<dev:SettingsExpander
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Grid Grid.Column="0">
|
<Grid Grid.Column="0">
|
||||||
<ScrollViewer>
|
<ScrollViewer Padding="8,0">
|
||||||
<StackPanel Spacing="{StaticResource SettingsCardSpacing}">
|
<StackPanel Spacing="{StaticResource SettingsCardSpacing}">
|
||||||
|
|
||||||
<TextBlock x:Uid="LyricsSearchControlSongInfoMapping" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
|
<TextBlock x:Uid="LyricsSearchControlSongInfoMapping" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
|
||||||
@@ -105,14 +105,6 @@
|
|||||||
<Run Text="*" />
|
<Run Text="*" />
|
||||||
<Run x:Uid="ArtistsSplitHint" />
|
<Run x:Uid="ArtistsSplitHint" />
|
||||||
</Paragraph>
|
</Paragraph>
|
||||||
</RichTextBlock>
|
|
||||||
|
|
||||||
<RichTextBlock
|
|
||||||
FontSize="12"
|
|
||||||
FontWeight="Bold"
|
|
||||||
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
|
|
||||||
Loaded="ArtistsSplitHintRichTextBlock_Loaded"
|
|
||||||
TextWrapping="Wrap">
|
|
||||||
<Paragraph>
|
<Paragraph>
|
||||||
<Run Text="; , / ; 、 ," />
|
<Run Text="; , / ; 、 ," />
|
||||||
</Paragraph>
|
</Paragraph>
|
||||||
@@ -161,11 +153,14 @@
|
|||||||
<CheckBox x:Uid="LyricsSearchControlMarkAsPureMusic" IsChecked="{x:Bind ViewModel.MappedSongSearchQuery.IsMarkedAsPureMusic, Mode=TwoWay}" />
|
<CheckBox x:Uid="LyricsSearchControlMarkAsPureMusic" IsChecked="{x:Bind ViewModel.MappedSongSearchQuery.IsMarkedAsPureMusic, Mode=TwoWay}" />
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
|
|
||||||
<dev:SettingsCard x:Uid="LyricsSearchControlTargetSearchProvider">
|
<Button
|
||||||
<Button
|
x:Uid="LyricsSearchControlSearch"
|
||||||
x:Uid="LyricsSearchControlSearch"
|
HorizontalAlignment="Stretch"
|
||||||
Command="{x:Bind ViewModel.SearchCommand}"
|
Command="{x:Bind ViewModel.SearchCommand}"
|
||||||
Style="{StaticResource AccentButtonStyle}" />
|
Style="{StaticResource AccentButtonStyle}" />
|
||||||
|
|
||||||
|
<dev:SettingsCard x:Uid="LyricsSearchControlIgnoreCache">
|
||||||
|
<ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.IgnoreCacheWhenSearching, Mode=TwoWay}" />
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
@@ -187,10 +182,7 @@
|
|||||||
<local:PropertyRow x:Uid="SettingsPageSongTitle" Value="{x:Bind Title, TargetNullValue=N/A, Mode=OneWay}" />
|
<local:PropertyRow x:Uid="SettingsPageSongTitle" Value="{x:Bind Title, TargetNullValue=N/A, Mode=OneWay}" />
|
||||||
<local:PropertyRow x:Uid="SettingsPageArtist" Value="{x:Bind DisplayArtists, TargetNullValue=N/A, Mode=OneWay}" />
|
<local:PropertyRow x:Uid="SettingsPageArtist" Value="{x:Bind DisplayArtists, TargetNullValue=N/A, Mode=OneWay}" />
|
||||||
<local:PropertyRow x:Uid="SettingsPageAlbum" Value="{x:Bind Album, TargetNullValue=N/A, Mode=OneWay}" />
|
<local:PropertyRow x:Uid="SettingsPageAlbum" Value="{x:Bind Album, TargetNullValue=N/A, Mode=OneWay}" />
|
||||||
<local:PropertyRow
|
<local:PropertyRow x:Uid="LyricsSearchControlDurauion" Value="{x:Bind Duration, Converter={StaticResource SecondsToFormattedTimeConverter}, TargetNullValue=N/A, Mode=OneWay}" />
|
||||||
x:Uid="LyricsSearchControlDurauion"
|
|
||||||
Unit="s"
|
|
||||||
Value="{x:Bind Duration, TargetNullValue=N/A, Mode=OneWay}" />
|
|
||||||
<local:PropertyRow
|
<local:PropertyRow
|
||||||
x:Uid="LyricsPageMatchPercentage"
|
x:Uid="LyricsPageMatchPercentage"
|
||||||
Unit="%"
|
Unit="%"
|
||||||
@@ -248,8 +240,6 @@
|
|||||||
<ProgressBar
|
<ProgressBar
|
||||||
VerticalAlignment="Top"
|
VerticalAlignment="Top"
|
||||||
IsIndeterminate="True"
|
IsIndeterminate="True"
|
||||||
ShowError="False"
|
|
||||||
ShowPaused="False"
|
|
||||||
Visibility="{x:Bind ViewModel.IsSearching, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" />
|
Visibility="{x:Bind ViewModel.IsSearching, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid Grid.Column="2">
|
<Grid Grid.Column="2">
|
||||||
@@ -282,18 +272,43 @@
|
|||||||
</Pivot.HeaderTemplate>
|
</Pivot.HeaderTemplate>
|
||||||
<Pivot.ItemTemplate>
|
<Pivot.ItemTemplate>
|
||||||
<DataTemplate x:DataType="models:LyricsData">
|
<DataTemplate x:DataType="models:LyricsData">
|
||||||
<ListView ItemsSource="{x:Bind LyricsLines, Mode=OneWay}" SelectionChanged="ListView_SelectionChanged">
|
<ListView
|
||||||
|
ItemContainerStyle="{StaticResource ListViewStretchedItemContainerStyle}"
|
||||||
|
ItemsSource="{x:Bind LyricsLines, Mode=OneWay}"
|
||||||
|
SelectionMode="None">
|
||||||
<ListView.ItemTemplate>
|
<ListView.ItemTemplate>
|
||||||
<DataTemplate x:DataType="models:LyricsLine">
|
<DataTemplate x:DataType="models:LyricsLine">
|
||||||
<StackPanel Orientation="Horizontal">
|
<Grid Margin="0,6" ColumnSpacing="6">
|
||||||
<TextBlock Foreground="{ThemeResource SystemFillColorNeutralBrush}" Text="{x:Bind StartMs, Mode=OneWay, Converter={StaticResource MillisecondsToFormattedTimeConverter}}" />
|
<Grid.ColumnDefinitions>
|
||||||
<TextBlock
|
<ColumnDefinition Width="Auto" />
|
||||||
Margin="1,0"
|
<ColumnDefinition Width="*" />
|
||||||
Foreground="{ThemeResource SystemFillColorNeutralBrush}"
|
</Grid.ColumnDefinitions>
|
||||||
Text="-" />
|
<Grid Grid.Column="0">
|
||||||
<TextBlock Foreground="{ThemeResource SystemFillColorNeutralBrush}" Text="{x:Bind EndMs, Mode=OneWay, Converter={StaticResource MillisecondsToFormattedTimeConverter}}" />
|
<TextBlock Foreground="{ThemeResource SystemFillColorNeutralBrush}" Text="{x:Bind StartMs, Mode=OneWay, Converter={StaticResource MillisecondsToFormattedTimeConverter}}" />
|
||||||
<TextBlock Margin="6,0" Text="{x:Bind OriginalText, Mode=OneWay}" />
|
<Button
|
||||||
</StackPanel>
|
HorizontalAlignment="Center"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Click="PlayLyricsLineButton_Click"
|
||||||
|
Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
|
||||||
|
FontSize=16,
|
||||||
|
Glyph=}"
|
||||||
|
Opacity="0"
|
||||||
|
Style="{StaticResource AccentButtonStyle}">
|
||||||
|
<Button.OpacityTransition>
|
||||||
|
<ScalarTransition />
|
||||||
|
</Button.OpacityTransition>
|
||||||
|
<interactivity:Interaction.Behaviors>
|
||||||
|
<interactivity:EventTriggerBehavior EventName="PointerEntered">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
|
||||||
|
</interactivity:EventTriggerBehavior>
|
||||||
|
<interactivity:EventTriggerBehavior EventName="PointerExited">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
|
||||||
|
</interactivity:EventTriggerBehavior>
|
||||||
|
</interactivity:Interaction.Behaviors>
|
||||||
|
</Button>
|
||||||
|
</Grid>
|
||||||
|
<local:PropertyRow Grid.Column="1" Value="{x:Bind OriginalText, Mode=OneWay}" />
|
||||||
|
</Grid>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</ListView.ItemTemplate>
|
</ListView.ItemTemplate>
|
||||||
</ListView>
|
</ListView>
|
||||||
@@ -325,8 +340,8 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
<Grid Grid.Row="1" ColumnSpacing="6">
|
<Grid Grid.Row="1" ColumnSpacing="6">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="*" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
|
|||||||
@@ -2,8 +2,6 @@ using BetterLyrics.WinUI3.Models;
|
|||||||
using BetterLyrics.WinUI3.ViewModels;
|
using BetterLyrics.WinUI3.ViewModels;
|
||||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||||
using Microsoft.UI.Xaml.Controls;
|
using Microsoft.UI.Xaml.Controls;
|
||||||
using Microsoft.UI.Xaml.Documents;
|
|
||||||
using Microsoft.UI.Xaml.Media;
|
|
||||||
|
|
||||||
// To learn more about WinUI, the WinUI project structure,
|
// To learn more about WinUI, the WinUI project structure,
|
||||||
// and more about our project templates, see: http://aka.ms/winui-project-info.
|
// and more about our project templates, see: http://aka.ms/winui-project-info.
|
||||||
@@ -20,30 +18,10 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
DataContext = Ioc.Default.GetRequiredService<LyricsSearchControlViewModel>();
|
DataContext = Ioc.Default.GetRequiredService<LyricsSearchControlViewModel>();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
private void PlayLyricsLineButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
ViewModel.SelectedLyricsLine = e.OriginalSource as LyricsLine;
|
var lyricsLine = (LyricsLine)((Button)sender).DataContext;
|
||||||
}
|
ViewModel.PlayLyricsLine(lyricsLine);
|
||||||
|
|
||||||
private void ArtistsSplitHintRichTextBlock_Loaded(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
if (sender is RichTextBlock richTextBlock)
|
|
||||||
{
|
|
||||||
TextHighlighter highlighter = new()
|
|
||||||
{
|
|
||||||
Background = App.Current.Resources["AccentTextFillColorPrimaryBrush"] as SolidColorBrush,
|
|
||||||
Ranges =
|
|
||||||
{
|
|
||||||
new() { StartIndex = 0, Length = 1 },
|
|
||||||
new() { StartIndex = 5, Length = 1 },
|
|
||||||
new() { StartIndex = 10, Length = 1 },
|
|
||||||
new() { StartIndex = 15, Length = 1 },
|
|
||||||
new() { StartIndex = 20, Length = 1 },
|
|
||||||
new() { StartIndex = 25, Length = 1 },
|
|
||||||
}
|
|
||||||
};
|
|
||||||
richTextBlock.TextHighlighters.Add(highlighter);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,8 +32,8 @@
|
|||||||
<dev:SettingsCard x:Uid="SettingsPageLyricsCenterTopOffset" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
<dev:SettingsCard x:Uid="SettingsPageLyricsCenterTopOffset" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
||||||
<local:ExtendedSlider
|
<local:ExtendedSlider
|
||||||
Default="50"
|
Default="50"
|
||||||
Maximum="100"
|
Maximum="99"
|
||||||
Minimum="0"
|
Minimum="1"
|
||||||
Unit="%"
|
Unit="%"
|
||||||
Value="{x:Bind LyricsStyleSettings.PlayingLineTopOffset, Mode=TwoWay}" />
|
Value="{x:Bind LyricsStyleSettings.PlayingLineTopOffset, Mode=TwoWay}" />
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
@@ -227,6 +227,36 @@
|
|||||||
</dev:SettingsExpander.Items>
|
</dev:SettingsExpander.Items>
|
||||||
</dev:SettingsExpander>
|
</dev:SettingsExpander>
|
||||||
|
|
||||||
|
<!-- 字体不透明度 -->
|
||||||
|
<dev:SettingsExpander x:Uid="SettingsPageLyricsOpacity" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
||||||
|
<dev:SettingsExpander.Items>
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPagePhoneticText">
|
||||||
|
<local:ExtendedSlider
|
||||||
|
Default="60"
|
||||||
|
Frequency="1"
|
||||||
|
Maximum="100"
|
||||||
|
Minimum="0"
|
||||||
|
Value="{x:Bind LyricsStyleSettings.PhoneticLyricsOpacity, Mode=TwoWay}" />
|
||||||
|
</dev:SettingsCard>
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPageOriginalText">
|
||||||
|
<local:ExtendedSlider
|
||||||
|
Default="30"
|
||||||
|
Frequency="1"
|
||||||
|
Maximum="100"
|
||||||
|
Minimum="0"
|
||||||
|
Value="{x:Bind LyricsStyleSettings.OriginalLyricsOpacity, Mode=TwoWay}" />
|
||||||
|
</dev:SettingsCard>
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPageTranslatedText">
|
||||||
|
<local:ExtendedSlider
|
||||||
|
Default="60"
|
||||||
|
Frequency="1"
|
||||||
|
Maximum="100"
|
||||||
|
Minimum="0"
|
||||||
|
Value="{x:Bind LyricsStyleSettings.TranslatedLyricsOpacity, Mode=TwoWay}" />
|
||||||
|
</dev:SettingsCard>
|
||||||
|
</dev:SettingsExpander.Items>
|
||||||
|
</dev:SettingsExpander>
|
||||||
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:uc="using:BetterLyrics.WinUI3.Controls"
|
xmlns:uc="using:BetterLyrics.WinUI3.Controls"
|
||||||
xmlns:ui="using:CommunityToolkit.WinUI"
|
xmlns:ui="using:CommunityToolkit.WinUI"
|
||||||
|
Loaded="UserControl_Loaded"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
|
|
||||||
<Grid>
|
<Grid>
|
||||||
@@ -21,24 +22,7 @@
|
|||||||
|
|
||||||
<StackPanel Spacing="{StaticResource SettingsCardSpacing}">
|
<StackPanel Spacing="{StaticResource SettingsCardSpacing}">
|
||||||
|
|
||||||
<Grid>
|
<TextBlock x:Uid="SettingsPageRecordedWindowStatus" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="*" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<TextBlock
|
|
||||||
x:Uid="SettingsPageRecordedWindowStatus"
|
|
||||||
Grid.Column="0"
|
|
||||||
Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
|
|
||||||
<Button
|
|
||||||
Grid.Column="2"
|
|
||||||
Margin="0,30,0,0"
|
|
||||||
Command="{x:Bind ViewModel.OpenConfigPanelCommand}"
|
|
||||||
Style="{StaticResource AccentButtonStyle}">
|
|
||||||
<TextBlock x:Uid="LyricsWindowSettingsControlCurrentLyricsWindowConfig" />
|
|
||||||
</Button>
|
|
||||||
</Grid>
|
|
||||||
|
|
||||||
<StackPanel Orientation="Horizontal" Spacing="3">
|
<StackPanel Orientation="Horizontal" Spacing="3">
|
||||||
|
|
||||||
@@ -54,6 +38,7 @@
|
|||||||
<MenuFlyoutItem x:Uid="SettingsPageDockedMode" Command="{x:Bind ViewModel.CreateDockedLyricsWindowStatusCommand}" />
|
<MenuFlyoutItem x:Uid="SettingsPageDockedMode" Command="{x:Bind ViewModel.CreateDockedLyricsWindowStatusCommand}" />
|
||||||
<MenuFlyoutItem x:Uid="SettingsPageFullscreenMode" Command="{x:Bind ViewModel.CreateFullLyricsWindowStatusCommand}" />
|
<MenuFlyoutItem x:Uid="SettingsPageFullscreenMode" Command="{x:Bind ViewModel.CreateFullLyricsWindowStatusCommand}" />
|
||||||
<MenuFlyoutItem x:Uid="SettingsPageNarrowMode" Command="{x:Bind ViewModel.CreateNarrowLyricsWindowStatusCommand}" />
|
<MenuFlyoutItem x:Uid="SettingsPageNarrowMode" Command="{x:Bind ViewModel.CreateNarrowLyricsWindowStatusCommand}" />
|
||||||
|
<MenuFlyoutItem x:Uid="SettingsPageTaskbarMode" Command="{x:Bind ViewModel.CreateTaskbarLyricsWindowStatusCommand}" />
|
||||||
</MenuFlyout>
|
</MenuFlyout>
|
||||||
</Button.Flyout>
|
</Button.Flyout>
|
||||||
</Button>
|
</Button>
|
||||||
@@ -87,7 +72,7 @@
|
|||||||
Padding="0,12"
|
Padding="0,12"
|
||||||
CornerRadius="4"
|
CornerRadius="4"
|
||||||
ItemsSource="{x:Bind ViewModel.AppSettings.WindowBoundsRecords, Mode=OneWay}"
|
ItemsSource="{x:Bind ViewModel.AppSettings.WindowBoundsRecords, Mode=OneWay}"
|
||||||
SelectedItem="{x:Bind ViewModel.LiveStates.LyricsWindowStatus, Mode=TwoWay}">
|
SelectionMode="None">
|
||||||
<ItemsControl.ItemsPanel>
|
<ItemsControl.ItemsPanel>
|
||||||
<ItemsPanelTemplate>
|
<ItemsPanelTemplate>
|
||||||
<controls:WrapPanel HorizontalSpacing="0" VerticalSpacing="0" />
|
<controls:WrapPanel HorizontalSpacing="0" VerticalSpacing="0" />
|
||||||
@@ -101,10 +86,6 @@
|
|||||||
Spacing="6">
|
Spacing="6">
|
||||||
<StackPanel.ContextFlyout>
|
<StackPanel.ContextFlyout>
|
||||||
<MenuBarItemFlyout>
|
<MenuBarItemFlyout>
|
||||||
<MenuFlyoutItem
|
|
||||||
x:Uid="LyricsWindowSettingsControlSetDefault"
|
|
||||||
Click="SetDefaultMenuFlyoutItem_Click"
|
|
||||||
IsEnabled="{Binding IsDefault, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" />
|
|
||||||
<MenuFlyoutItem x:Uid="SettingsPageCreateFromCurrent" Click="CopyMenuFlyoutItem_Click" />
|
<MenuFlyoutItem x:Uid="SettingsPageCreateFromCurrent" Click="CopyMenuFlyoutItem_Click" />
|
||||||
<MenuFlyoutItem x:Uid="LyricsWindowSettingsControlShare" Click="ShareMenuFlyoutItem_Click" />
|
<MenuFlyoutItem x:Uid="LyricsWindowSettingsControlShare" Click="ShareMenuFlyoutItem_Click" />
|
||||||
<MenuFlyoutItem
|
<MenuFlyoutItem
|
||||||
@@ -113,13 +94,50 @@
|
|||||||
IsEnabled="{Binding IsDefault, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" />
|
IsEnabled="{Binding IsDefault, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" />
|
||||||
</MenuBarItemFlyout>
|
</MenuBarItemFlyout>
|
||||||
</StackPanel.ContextFlyout>
|
</StackPanel.ContextFlyout>
|
||||||
<uc:DemoWindowGrid LyricsWindowStatus="{Binding}" />
|
<Grid>
|
||||||
|
<Border
|
||||||
|
BorderBrush="{ThemeResource AccentAAFillColorDefaultBrush}"
|
||||||
|
BorderThickness="4"
|
||||||
|
CornerRadius="4"
|
||||||
|
Visibility="{Binding IsOpened, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
|
||||||
|
<uc:DemoWindowGrid Margin="4" LyricsWindowStatus="{Binding}" />
|
||||||
|
</Grid>
|
||||||
|
<Grid>
|
||||||
|
<ToggleButton
|
||||||
|
Grid.Column="0"
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
Click="SetDefaultMenuFlyoutItem_Click"
|
||||||
|
IsChecked="{Binding IsDefault, Mode=OneWay}">
|
||||||
|
<TextBlock x:Uid="LyricsWindowSettingsControlSetDefault" />
|
||||||
|
</ToggleButton>
|
||||||
|
</Grid>
|
||||||
|
<Grid ColumnSpacing="4">
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<Button
|
||||||
|
Grid.Column="0"
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
Click="ConfigButton_Click">
|
||||||
|
<TextBlock x:Uid="LyricsWindowSettingsControlLyricsWindowConfig" />
|
||||||
|
</Button>
|
||||||
|
</Grid>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</ListView.ItemTemplate>
|
</ListView.ItemTemplate>
|
||||||
</ListView>
|
</ListView>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPageMultiNowPlayingWindows">
|
||||||
|
<ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.MultiNowPlayingWindowMode, Mode=TwoWay}" />
|
||||||
|
</dev:SettingsCard>
|
||||||
|
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPageMusicGalleryLyrics">
|
||||||
|
<Button HorizontalAlignment="Stretch" Click="EmbeddedConfigButton_Click">
|
||||||
|
<TextBlock x:Uid="LyricsWindowSettingsControlLyricsWindowConfig" />
|
||||||
|
</Button>
|
||||||
|
</dev:SettingsCard>
|
||||||
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
@@ -137,8 +155,15 @@
|
|||||||
<Grid.TranslationTransition>
|
<Grid.TranslationTransition>
|
||||||
<Vector3Transition />
|
<Vector3Transition />
|
||||||
</Grid.TranslationTransition>
|
</Grid.TranslationTransition>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="*" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<Grid Padding="36,0" Style="{StaticResource SettingsGridStyle}">
|
<Grid
|
||||||
|
Grid.Row="0"
|
||||||
|
Padding="36,0"
|
||||||
|
Style="{StaticResource SettingsGridStyle}">
|
||||||
<StackPanel Spacing="{StaticResource SettingsCardSpacing}">
|
<StackPanel Spacing="{StaticResource SettingsCardSpacing}">
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
@@ -147,9 +172,9 @@
|
|||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<TextBlock
|
<TextBlock
|
||||||
x:Uid="LyricsWindowSettingsControlCurrentLyricsWindowConfig"
|
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
|
Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
|
||||||
|
Text="{x:Bind LyricsWindowStatus.Name, Mode=OneWay}" />
|
||||||
<Button
|
<Button
|
||||||
Grid.Column="2"
|
Grid.Column="2"
|
||||||
Margin="0,30,0,0"
|
Margin="0,30,0,0"
|
||||||
@@ -160,77 +185,61 @@
|
|||||||
Style="{StaticResource AccentButtonStyle}" />
|
Style="{StaticResource AccentButtonStyle}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<Pivot SelectionChanged="Pivot_SelectionChanged">
|
<controls:Segmented
|
||||||
|
x:Name="ConfigSegmented"
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
SelectionChanged="ConfigSegmented_SelectionChanged"
|
||||||
|
Style="{StaticResource PivotSegmentedStyle}">
|
||||||
|
|
||||||
<PivotItem Tag="Window">
|
<controls:SegmentedItem x:Name="WindowSegmentedItem" Tag="Window">
|
||||||
<PivotItem.Header>
|
<TextBlock
|
||||||
<TextBlock
|
x:Uid="AppSettingsControlGeneral"
|
||||||
x:Uid="AppSettingsControlGeneral"
|
MaxWidth="120"
|
||||||
VerticalAlignment="Center"
|
TextWrapping="Wrap" />
|
||||||
Style="{StaticResource BodyTextBlockStyle}" />
|
</controls:SegmentedItem>
|
||||||
</PivotItem.Header>
|
<controls:SegmentedItem x:Name="LayoutSegmentedItem" Tag="Layout">
|
||||||
</PivotItem>
|
<TextBlock
|
||||||
|
x:Uid="SettingsPageLayout"
|
||||||
|
MaxWidth="120"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</controls:SegmentedItem>
|
||||||
|
<controls:SegmentedItem x:Name="AlbumArtStyleSegmentedItem" Tag="AlbumArtStyle">
|
||||||
|
<TextBlock
|
||||||
|
x:Uid="SettingsPageAlbumStyle"
|
||||||
|
MaxWidth="120"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</controls:SegmentedItem>
|
||||||
|
<controls:SegmentedItem Tag="AlbumArtEffect">
|
||||||
|
<TextBlock
|
||||||
|
x:Uid="SettingsPageAlbumEffect"
|
||||||
|
MaxWidth="120"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</controls:SegmentedItem>
|
||||||
|
<controls:SegmentedItem Tag="LyricsStyle">
|
||||||
|
<TextBlock
|
||||||
|
x:Uid="SettingsPageLyricsStyle"
|
||||||
|
MaxWidth="120"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</controls:SegmentedItem>
|
||||||
|
<controls:SegmentedItem Tag="LyricsEffect">
|
||||||
|
<TextBlock
|
||||||
|
x:Uid="SettingsPageLyricsEffect"
|
||||||
|
MaxWidth="120"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</controls:SegmentedItem>
|
||||||
|
<controls:SegmentedItem Tag="LyricsBackground">
|
||||||
|
<TextBlock
|
||||||
|
x:Uid="SettingsPageBackgroundOverlay"
|
||||||
|
MaxWidth="120"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</controls:SegmentedItem>
|
||||||
|
|
||||||
<PivotItem Tag="Layout">
|
</controls:Segmented>
|
||||||
<PivotItem.Header>
|
|
||||||
<TextBlock
|
|
||||||
x:Uid="SettingsPageLayout"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Style="{StaticResource BodyTextBlockStyle}" />
|
|
||||||
</PivotItem.Header>
|
|
||||||
</PivotItem>
|
|
||||||
|
|
||||||
<PivotItem Tag="AlbumArtStyle">
|
|
||||||
<PivotItem.Header>
|
|
||||||
<TextBlock
|
|
||||||
x:Uid="SettingsPageAlbumStyle"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Style="{StaticResource BodyTextBlockStyle}" />
|
|
||||||
</PivotItem.Header>
|
|
||||||
</PivotItem>
|
|
||||||
|
|
||||||
<PivotItem Tag="AlbumArtEffect">
|
|
||||||
<PivotItem.Header>
|
|
||||||
<TextBlock
|
|
||||||
x:Uid="SettingsPageAlbumEffect"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Style="{StaticResource BodyTextBlockStyle}" />
|
|
||||||
</PivotItem.Header>
|
|
||||||
</PivotItem>
|
|
||||||
|
|
||||||
<PivotItem Tag="LyricsStyle">
|
|
||||||
<PivotItem.Header>
|
|
||||||
<TextBlock
|
|
||||||
x:Uid="SettingsPageLyricsStyle"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Style="{StaticResource BodyTextBlockStyle}" />
|
|
||||||
</PivotItem.Header>
|
|
||||||
</PivotItem>
|
|
||||||
|
|
||||||
<PivotItem Tag="LyricsEffect">
|
|
||||||
<PivotItem.Header>
|
|
||||||
<TextBlock
|
|
||||||
x:Uid="SettingsPageLyricsEffect"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Style="{StaticResource BodyTextBlockStyle}" />
|
|
||||||
</PivotItem.Header>
|
|
||||||
</PivotItem>
|
|
||||||
|
|
||||||
<PivotItem Tag="LyricsBackground">
|
|
||||||
<PivotItem.Header>
|
|
||||||
<TextBlock
|
|
||||||
x:Uid="SettingsPageBackgroundOverlay"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Style="{StaticResource BodyTextBlockStyle}" />
|
|
||||||
</PivotItem.Header>
|
|
||||||
</PivotItem>
|
|
||||||
|
|
||||||
</Pivot>
|
|
||||||
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<controls:SwitchPresenter Margin="0,110,0,0" Value="{x:Bind ViewModel.ListViewSelectedItemTag, Mode=OneWay}">
|
<controls:SwitchPresenter Grid.Row="1" Value="{x:Bind ViewModel.SelectorBarSelectedItemTag, Mode=OneWay}">
|
||||||
<controls:SwitchPresenter.ContentTransitions>
|
<controls:SwitchPresenter.ContentTransitions>
|
||||||
<TransitionCollection>
|
<TransitionCollection>
|
||||||
<PopupThemeTransition />
|
<PopupThemeTransition />
|
||||||
@@ -239,7 +248,7 @@
|
|||||||
|
|
||||||
<!-- Window -->
|
<!-- Window -->
|
||||||
<controls:Case Value="Window">
|
<controls:Case Value="Window">
|
||||||
<uc:WindowSettingsControl LyricsWindowStatus="{x:Bind ViewModel.LiveStates.LyricsWindowStatus, Mode=OneWay}" />
|
<uc:WindowSettingsControl LyricsWindowStatus="{x:Bind LyricsWindowStatus, Mode=OneWay}" />
|
||||||
</controls:Case>
|
</controls:Case>
|
||||||
|
|
||||||
<!-- Layout -->
|
<!-- Layout -->
|
||||||
@@ -251,14 +260,14 @@
|
|||||||
<TextBlock x:Uid="SettingsPageLayout" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
|
<TextBlock x:Uid="SettingsPageLayout" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
|
||||||
|
|
||||||
<dev:SettingsExpander x:Uid="SettingsPageDisplayTypeSwitcher" IsExpanded="True">
|
<dev:SettingsExpander x:Uid="SettingsPageDisplayTypeSwitcher" IsExpanded="True">
|
||||||
<ComboBox SelectedIndex="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsDisplayType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
|
<ComboBox SelectedIndex="{x:Bind LyricsWindowStatus.LyricsDisplayType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
|
||||||
<ComboBoxItem x:Uid="MainPageAlbumArtOnly" />
|
<ComboBoxItem x:Uid="MainPageAlbumArtOnly" />
|
||||||
<ComboBoxItem x:Uid="MainPageLyriscOnly" />
|
<ComboBoxItem x:Uid="MainPageLyriscOnly" />
|
||||||
<ComboBoxItem x:Uid="MainPageSplitView" />
|
<ComboBoxItem x:Uid="MainPageSplitView" />
|
||||||
</ComboBox>
|
</ComboBox>
|
||||||
<dev:SettingsExpander.Items>
|
<dev:SettingsExpander.Items>
|
||||||
<dev:SettingsCard x:Uid="SettingsPageLayoutOrientation">
|
<dev:SettingsCard x:Uid="SettingsPageLayoutOrientation">
|
||||||
<ComboBox SelectedIndex="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsLayoutOrientation, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
|
<ComboBox SelectedIndex="{x:Bind LyricsWindowStatus.LyricsLayoutOrientation, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
|
||||||
<ComboBoxItem x:Uid="SettingsPageLayoutOrientationHorizontal" />
|
<ComboBoxItem x:Uid="SettingsPageLayoutOrientationHorizontal" />
|
||||||
<ComboBoxItem x:Uid="SettingsPageLayoutOrientationVertical" />
|
<ComboBoxItem x:Uid="SettingsPageLayoutOrientationVertical" />
|
||||||
</ComboBox>
|
</ComboBox>
|
||||||
@@ -273,27 +282,27 @@
|
|||||||
|
|
||||||
<!-- Album art area style -->
|
<!-- Album art area style -->
|
||||||
<controls:Case Value="AlbumArtStyle">
|
<controls:Case Value="AlbumArtStyle">
|
||||||
<uc:AlbumArtAreaStyleSettingsControl AlbumArtLayoutSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings, Mode=OneWay}" />
|
<uc:AlbumArtAreaStyleSettingsControl AlbumArtLayoutSettings="{x:Bind LyricsWindowStatus.AlbumArtLayoutSettings, Mode=OneWay}" />
|
||||||
</controls:Case>
|
</controls:Case>
|
||||||
|
|
||||||
<!-- Album art area effect -->
|
<!-- Album art area effect -->
|
||||||
<controls:Case Value="AlbumArtEffect">
|
<controls:Case Value="AlbumArtEffect">
|
||||||
<uc:AlbumArtAreaEffectSettingsControl AlbumArtAreaEffectSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.AlbumArtAreaEffectSettings, Mode=OneWay}" />
|
<uc:AlbumArtAreaEffectSettingsControl AlbumArtAreaEffectSettings="{x:Bind LyricsWindowStatus.AlbumArtAreaEffectSettings, Mode=OneWay}" />
|
||||||
</controls:Case>
|
</controls:Case>
|
||||||
|
|
||||||
<!-- Lyrics style -->
|
<!-- Lyrics style -->
|
||||||
<controls:Case Value="LyricsStyle">
|
<controls:Case Value="LyricsStyle">
|
||||||
<uc:LyricsStyleSettingsControl LyricsStyleSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsStyleSettings, Mode=OneWay}" />
|
<uc:LyricsStyleSettingsControl LyricsStyleSettings="{x:Bind LyricsWindowStatus.LyricsStyleSettings, Mode=OneWay}" />
|
||||||
</controls:Case>
|
</controls:Case>
|
||||||
|
|
||||||
<!-- Lyrics effect -->
|
<!-- Lyrics effect -->
|
||||||
<controls:Case Value="LyricsEffect">
|
<controls:Case Value="LyricsEffect">
|
||||||
<uc:LyricsEffectSettingsControl LyricsEffectSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsEffectSettings, Mode=OneWay}" />
|
<uc:LyricsEffectSettingsControl LyricsEffectSettings="{x:Bind LyricsWindowStatus.LyricsEffectSettings, Mode=OneWay}" />
|
||||||
</controls:Case>
|
</controls:Case>
|
||||||
|
|
||||||
<!-- Lyrics background -->
|
<!-- Lyrics background -->
|
||||||
<controls:Case Value="LyricsBackground">
|
<controls:Case Value="LyricsBackground">
|
||||||
<uc:LyricsBackgroundSettingsControl LyricsBackgroundSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings, Mode=OneWay}" />
|
<uc:LyricsBackgroundSettingsControl LyricsBackgroundSettings="{x:Bind LyricsWindowStatus.LyricsBackgroundSettings, Mode=OneWay}" />
|
||||||
</controls:Case>
|
</controls:Case>
|
||||||
|
|
||||||
</controls:SwitchPresenter>
|
</controls:SwitchPresenter>
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
using BetterLyrics.WinUI3.Helper;
|
using BetterLyrics.WinUI3.Helper;
|
||||||
|
using BetterLyrics.WinUI3.Hooks;
|
||||||
using BetterLyrics.WinUI3.Models;
|
using BetterLyrics.WinUI3.Models;
|
||||||
using BetterLyrics.WinUI3.Serialization;
|
using BetterLyrics.WinUI3.Serialization;
|
||||||
using BetterLyrics.WinUI3.Services.LiveStatesService;
|
|
||||||
using BetterLyrics.WinUI3.Services.SettingsService;
|
using BetterLyrics.WinUI3.Services.SettingsService;
|
||||||
using BetterLyrics.WinUI3.ViewModels;
|
using BetterLyrics.WinUI3.ViewModels;
|
||||||
using BetterLyrics.WinUI3.Views;
|
using BetterLyrics.WinUI3.Views;
|
||||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||||
|
using CommunityToolkit.WinUI.Controls;
|
||||||
using Microsoft.UI.Xaml;
|
using Microsoft.UI.Xaml;
|
||||||
using Microsoft.UI.Xaml.Controls;
|
using Microsoft.UI.Xaml.Controls;
|
||||||
using Microsoft.UI.Xaml.Input;
|
using Microsoft.UI.Xaml.Input;
|
||||||
using NTextCat.Commons;
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
@@ -25,7 +25,15 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
public LyricsWindowSettingsControlViewModel ViewModel => (LyricsWindowSettingsControlViewModel)DataContext;
|
public LyricsWindowSettingsControlViewModel ViewModel => (LyricsWindowSettingsControlViewModel)DataContext;
|
||||||
|
|
||||||
private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
|
private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
|
||||||
private readonly ILiveStatesService _liveStatesService = Ioc.Default.GetRequiredService<ILiveStatesService>();
|
|
||||||
|
public LyricsWindowStatus? LyricsWindowStatus
|
||||||
|
{
|
||||||
|
get { return (LyricsWindowStatus?)GetValue(LyricsWindowStatusProperty); }
|
||||||
|
set { SetValue(LyricsWindowStatusProperty, value); }
|
||||||
|
}
|
||||||
|
|
||||||
|
public static readonly DependencyProperty LyricsWindowStatusProperty =
|
||||||
|
DependencyProperty.Register(nameof(LyricsWindowStatus), typeof(LyricsWindowStatus), typeof(LyricsWindowSettingsControl), new PropertyMetadata(null));
|
||||||
|
|
||||||
public LyricsWindowSettingsControl()
|
public LyricsWindowSettingsControl()
|
||||||
{
|
{
|
||||||
@@ -39,10 +47,9 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
{
|
{
|
||||||
if (menuFlyoutItem.DataContext is LyricsWindowStatus data)
|
if (menuFlyoutItem.DataContext is LyricsWindowStatus data)
|
||||||
{
|
{
|
||||||
if (_liveStatesService.LiveStates.LyricsWindowStatus == data)
|
var windows = WindowHook.GetWindows<NowPlayingWindow>();
|
||||||
{
|
var window = windows.FirstOrDefault(x => x.LyricsWindowStatus == data);
|
||||||
_liveStatesService.LiveStates.LyricsWindowStatus = ViewModel.AppSettings.WindowBoundsRecords.First();
|
window?.CloseWindow();
|
||||||
}
|
|
||||||
ViewModel.AppSettings.WindowBoundsRecords.Remove(data);
|
ViewModel.AppSettings.WindowBoundsRecords.Remove(data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -50,12 +57,11 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
|
|
||||||
private void SetDefaultMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
|
private void SetDefaultMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (sender is MenuFlyoutItem menuFlyoutItem)
|
if (sender is FrameworkElement element)
|
||||||
{
|
{
|
||||||
if (menuFlyoutItem.DataContext is LyricsWindowStatus data)
|
if (element.DataContext is LyricsWindowStatus data)
|
||||||
{
|
{
|
||||||
ViewModel.AppSettings.WindowBoundsRecords.ForEach(x => x.IsDefault = false);
|
data.IsDefault = !data.IsDefault;
|
||||||
data.IsDefault = true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -115,17 +121,6 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Pivot_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
|
||||||
{
|
|
||||||
if (sender is Pivot pivot)
|
|
||||||
{
|
|
||||||
if (pivot.SelectedItem is PivotItem pivotItem)
|
|
||||||
{
|
|
||||||
ViewModel?.ListViewSelectedItemTag = pivotItem.Tag;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void ImportButton_Click(object sender, RoutedEventArgs e)
|
private async void ImportButton_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
string[] fileTypeFilter = [".json"];
|
string[] fileTypeFilter = [".json"];
|
||||||
@@ -154,5 +149,31 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
{
|
{
|
||||||
ViewModel.DisplayPanelHeight = e.NewSize.Height;
|
ViewModel.DisplayPanelHeight = e.NewSize.Height;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void ConfigButton_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
WindowSegmentedItem.IsEnabled = LayoutSegmentedItem.IsEnabled = true;
|
||||||
|
ConfigSegmented.SelectedItem = WindowSegmentedItem;
|
||||||
|
LyricsWindowStatus = (LyricsWindowStatus)((Button)sender).DataContext;
|
||||||
|
ViewModel.OpenConfigPanel();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void EmbeddedConfigButton_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
WindowSegmentedItem.IsEnabled = LayoutSegmentedItem.IsEnabled = false;
|
||||||
|
ConfigSegmented.SelectedItem = AlbumArtStyleSegmentedItem;
|
||||||
|
LyricsWindowStatus = _settingsService.AppSettings.MusicGallerySettings.LyricsWindowStatus;
|
||||||
|
ViewModel.OpenConfigPanel();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ConfigSegmented_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
||||||
|
{
|
||||||
|
ViewModel.SelectorBarSelectedItemTag = (string)((SegmentedItem)((Segmented)sender).SelectedItem).Tag;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void UserControl_Loaded(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
ViewModel.CloseConfigPanelCommand.Execute(null);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,8 +44,9 @@
|
|||||||
|
|
||||||
<ListView
|
<ListView
|
||||||
Margin="48,56"
|
Margin="48,56"
|
||||||
|
ItemContainerStyle="{StaticResource ListViewStretchedItemContainerStyle}"
|
||||||
ItemsSource="{x:Bind ViewModel.AppSettings.WindowBoundsRecords, Mode=OneWay}"
|
ItemsSource="{x:Bind ViewModel.AppSettings.WindowBoundsRecords, Mode=OneWay}"
|
||||||
SelectedItem="{x:Bind ViewModel.LiveStates.LyricsWindowStatus, Mode=TwoWay}">
|
SelectionMode="None">
|
||||||
<ItemsControl.ItemsPanel>
|
<ItemsControl.ItemsPanel>
|
||||||
<ItemsPanelTemplate>
|
<ItemsPanelTemplate>
|
||||||
<controls:WrapPanel HorizontalSpacing="0" VerticalSpacing="0" />
|
<controls:WrapPanel HorizontalSpacing="0" VerticalSpacing="0" />
|
||||||
@@ -54,12 +55,14 @@
|
|||||||
<ListView.ItemTemplate>
|
<ListView.ItemTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<Grid
|
<Grid
|
||||||
Margin="0,10"
|
Margin="16"
|
||||||
Padding="5"
|
|
||||||
AllowFocusOnInteraction="True"
|
|
||||||
CornerRadius="4"
|
CornerRadius="4"
|
||||||
Tapped="Grid_Tapped">
|
Tapped="Grid_Tapped">
|
||||||
<uc:DemoWindowGrid LyricsWindowStatus="{Binding}" />
|
<Border
|
||||||
|
BorderBrush="{ThemeResource AccentAAFillColorDefaultBrush}"
|
||||||
|
BorderThickness="4"
|
||||||
|
Visibility="{Binding IsOpened, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
|
||||||
|
<uc:DemoWindowGrid Margin="4" LyricsWindowStatus="{Binding}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</ListView.ItemTemplate>
|
</ListView.ItemTemplate>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using BetterLyrics.WinUI3.Hooks;
|
using BetterLyrics.WinUI3.Hooks;
|
||||||
|
using BetterLyrics.WinUI3.Services.SettingsService;
|
||||||
using BetterLyrics.WinUI3.ViewModels;
|
using BetterLyrics.WinUI3.ViewModels;
|
||||||
using BetterLyrics.WinUI3.Views;
|
using BetterLyrics.WinUI3.Views;
|
||||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||||
@@ -16,6 +17,8 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
{
|
{
|
||||||
public LyricsWindowSwitchControlViewModel ViewModel => (LyricsWindowSwitchControlViewModel)DataContext;
|
public LyricsWindowSwitchControlViewModel ViewModel => (LyricsWindowSwitchControlViewModel)DataContext;
|
||||||
|
|
||||||
|
private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
|
||||||
|
|
||||||
public LyricsWindowSwitchControl()
|
public LyricsWindowSwitchControl()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
@@ -37,7 +40,7 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
var lyricsWindowSwitchWindow = WindowHook.GetWindow<LyricsWindowSwitchWindow>();
|
var lyricsWindowSwitchWindow = WindowHook.GetWindow<LyricsWindowSwitchWindow>();
|
||||||
lyricsWindowSwitchWindow?.ViewModel.RootGridOpacity = 0;
|
lyricsWindowSwitchWindow?.ViewModel.RootGridOpacity = 0;
|
||||||
await Task.Delay(300);
|
await Task.Delay(300);
|
||||||
WindowHook.HideWindow<LyricsWindowSwitchWindow>();
|
lyricsWindowSwitchWindow?.HideWindow();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ShadowRect_Loaded(object sender, RoutedEventArgs e)
|
private void ShadowRect_Loaded(object sender, RoutedEventArgs e)
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" ?>
|
|
||||||
<UserControl
|
<UserControl
|
||||||
x:Class="BetterLyrics.WinUI3.Controls.MediaSettingsControl"
|
x:Class="BetterLyrics.WinUI3.Controls.MediaSettingsControl"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
@@ -6,9 +5,11 @@
|
|||||||
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
|
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:dev="using:DevWinUI"
|
xmlns:dev="using:DevWinUI"
|
||||||
|
xmlns:enums="using:BetterLyrics.WinUI3.Enums"
|
||||||
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
|
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
|
||||||
xmlns:local="using:BetterLyrics.WinUI3.Controls"
|
xmlns:local="using:BetterLyrics.WinUI3.Controls"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
xmlns:models="using:BetterLyrics.WinUI3.Models"
|
||||||
xmlns:ui="using:CommunityToolkit.WinUI"
|
xmlns:ui="using:CommunityToolkit.WinUI"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
|
|
||||||
@@ -49,42 +50,136 @@
|
|||||||
ItemsSource="{x:Bind ViewModel.AppSettings.LocalMediaFolders, Mode=OneWay}"
|
ItemsSource="{x:Bind ViewModel.AppSettings.LocalMediaFolders, Mode=OneWay}"
|
||||||
SelectionMode="None">
|
SelectionMode="None">
|
||||||
<ListView.ItemTemplate>
|
<ListView.ItemTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate x:DataType="models:MediaFolder">
|
||||||
<dev:SettingsExpander>
|
<dev:SettingsExpander IsExpanded="True">
|
||||||
|
|
||||||
|
<dev:SettingsExpander.HeaderIcon>
|
||||||
|
<FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="{x:Bind SourceType, Converter={StaticResource FileSourceTypeToIconConverter}, Mode=OneWay}" />
|
||||||
|
</dev:SettingsExpander.HeaderIcon>
|
||||||
<dev:SettingsExpander.Header>
|
<dev:SettingsExpander.Header>
|
||||||
<HyperlinkButton
|
<TextBlock IsTextSelectionEnabled="True" Text="{x:Bind Name, Mode=OneWay}" />
|
||||||
Click="LocalFolderHyperlinkButton_Click"
|
|
||||||
Content="{Binding Path, Mode=OneWay}"
|
|
||||||
Tag="{Binding Path, Mode=OneWay}" />
|
|
||||||
</dev:SettingsExpander.Header>
|
</dev:SettingsExpander.Header>
|
||||||
<ToggleSwitch IsOn="{Binding IsEnabled, Mode=TwoWay}" />
|
<dev:SettingsExpander.Description>
|
||||||
|
<TextBlock IsTextSelectionEnabled="True" Text="{x:Bind ConnectionSummary, Mode=OneWay}" />
|
||||||
|
</dev:SettingsExpander.Description>
|
||||||
|
|
||||||
|
<ToggleSwitch IsOn="{x:Bind IsEnabled, Mode=TwoWay}" />
|
||||||
|
|
||||||
<dev:SettingsExpander.Items>
|
<dev:SettingsExpander.Items>
|
||||||
<dev:SettingsCard>
|
<dev:SettingsCard x:Uid="MediaSettingsControlNameSetting">
|
||||||
<dev:SettingsCard.Header>
|
<TextBox VerticalAlignment="Center" Text="{x:Bind Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
|
||||||
<HyperlinkButton
|
|
||||||
x:Uid="SettingsPageRemovePath"
|
|
||||||
Click="SettingsPageRemovePathButton_Click"
|
|
||||||
Tag="{Binding}" />
|
|
||||||
</dev:SettingsCard.Header>
|
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
<dev:SettingsCard x:Uid="SettingsPageMusicLibRealTimeWatch">
|
<dev:SettingsCard x:Uid="MediaSettingsControlLastSyncTime" Description="{x:Bind LastSyncTime.ToString(), Mode=OneWay, TargetNullValue=N/A}">
|
||||||
<ToggleSwitch IsOn="{Binding IsRealTimeWatchEnabled, Mode=TwoWay}" />
|
<Button
|
||||||
|
x:Uid="MediaSettingsControlSyncNow"
|
||||||
|
Click="SyncNowButton_Click"
|
||||||
|
IsEnabled="{x:Bind IsEnabled, Mode=OneWay}" />
|
||||||
|
</dev:SettingsCard>
|
||||||
|
<dev:SettingsCard x:Uid="MusicSettingsControlAutoSyncInterval">
|
||||||
|
<ComboBox IsEnabled="{x:Bind IsEnabled, Mode=OneWay}" SelectedIndex="{x:Bind ScanInterval, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
|
||||||
|
<ComboBoxItem x:Uid="MusicSettingsControlAutoSyncIntervalDisabled" />
|
||||||
|
<ComboBoxItem x:Uid="MusicSettingsControlAutoSyncIntervalEveryFifteenMin" />
|
||||||
|
<ComboBoxItem x:Uid="MusicSettingsControlAutoSyncIntervalEveryHour" />
|
||||||
|
<ComboBoxItem x:Uid="MusicSettingsControlAutoSyncIntervalEverySixHrs" />
|
||||||
|
<ComboBoxItem x:Uid="MusicSettingsControlAutoSyncIntervalEveryDay" />
|
||||||
|
</ComboBox>
|
||||||
|
</dev:SettingsCard>
|
||||||
|
<dev:SettingsCard>
|
||||||
|
<Button x:Uid="SettingsPageRemovePath" Click="SettingsPageRemovePathButton_Click" />
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
</dev:SettingsExpander.Items>
|
</dev:SettingsExpander.Items>
|
||||||
|
|
||||||
|
<dev:SettingsExpander.ItemsHeader>
|
||||||
|
<StackPanel>
|
||||||
|
<!-- Index info -->
|
||||||
|
<InfoBar
|
||||||
|
IsClosable="False"
|
||||||
|
IsOpen="True"
|
||||||
|
Message="{x:Bind StatusText, Mode=OneWay}"
|
||||||
|
Severity="{x:Bind StatusSeverity, Mode=OneWay}" />
|
||||||
|
<ProgressBar
|
||||||
|
Background="Transparent"
|
||||||
|
Visibility="{x:Bind IsProcessing, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
|
||||||
|
Value="{x:Bind IndexingProgress, Mode=OneWay}">
|
||||||
|
<interactivity:Interaction.Behaviors>
|
||||||
|
<interactivity:DataTriggerBehavior
|
||||||
|
Binding="{x:Bind IndexingProgress, Mode=OneWay}"
|
||||||
|
ComparisonCondition="Equal"
|
||||||
|
Value="0">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="IsIndeterminate" Value="True" />
|
||||||
|
</interactivity:DataTriggerBehavior>
|
||||||
|
<interactivity:DataTriggerBehavior
|
||||||
|
Binding="{x:Bind IndexingProgress, Mode=OneWay}"
|
||||||
|
ComparisonCondition="NotEqual"
|
||||||
|
Value="0">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="IsIndeterminate" Value="False" />
|
||||||
|
</interactivity:DataTriggerBehavior>
|
||||||
|
</interactivity:Interaction.Behaviors>
|
||||||
|
</ProgressBar>
|
||||||
|
</StackPanel>
|
||||||
|
</dev:SettingsExpander.ItemsHeader>
|
||||||
|
|
||||||
</dev:SettingsExpander>
|
</dev:SettingsExpander>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</ListView.ItemTemplate>
|
</ListView.ItemTemplate>
|
||||||
</ListView>
|
</ListView>
|
||||||
|
|
||||||
<dev:SettingsCard x:Uid="SettingsPageAddFolder" Style="{StaticResource DefaultSettingsExpanderItemStyle}">
|
<StackPanel
|
||||||
<Button
|
Margin="0,6,0,0"
|
||||||
x:Uid="SettingsPageAddFolderButton"
|
HorizontalAlignment="Right"
|
||||||
Command="{x:Bind ViewModel.SelectAndAddFolderCommand}"
|
Orientation="Horizontal"
|
||||||
CommandParameter="{Binding ElementName=RootGrid}" />
|
Spacing="6">
|
||||||
</dev:SettingsCard>
|
<Button Command="{x:Bind ViewModel.OpenMusicGalleryWindowCommand}">
|
||||||
|
<TextBlock x:Uid="SystemTrayMusicGallery" />
|
||||||
|
</Button>
|
||||||
|
<DropDownButton x:Uid="SettingsPageAddFolderButton">
|
||||||
|
<DropDownButton.Flyout>
|
||||||
|
<MenuFlyout>
|
||||||
|
<MenuFlyoutItem
|
||||||
|
x:Uid="SettingsPageLocalFolder"
|
||||||
|
Command="{x:Bind ViewModel.AddMediaSourceCommand}"
|
||||||
|
CommandParameter="Local">
|
||||||
|
<MenuFlyoutItem.Icon>
|
||||||
|
<FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="" />
|
||||||
|
</MenuFlyoutItem.Icon>
|
||||||
|
</MenuFlyoutItem>
|
||||||
|
|
||||||
|
<MenuFlyoutSeparator />
|
||||||
|
|
||||||
|
<MenuFlyoutItem
|
||||||
|
Command="{x:Bind ViewModel.AddMediaSourceCommand}"
|
||||||
|
CommandParameter="SMB"
|
||||||
|
Text="SMB">
|
||||||
|
<MenuFlyoutItem.Icon>
|
||||||
|
<FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="" />
|
||||||
|
</MenuFlyoutItem.Icon>
|
||||||
|
</MenuFlyoutItem>
|
||||||
|
|
||||||
|
<MenuFlyoutItem
|
||||||
|
Command="{x:Bind ViewModel.AddMediaSourceCommand}"
|
||||||
|
CommandParameter="FTP"
|
||||||
|
Text="FTP">
|
||||||
|
<MenuFlyoutItem.Icon>
|
||||||
|
<FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="" />
|
||||||
|
</MenuFlyoutItem.Icon>
|
||||||
|
</MenuFlyoutItem>
|
||||||
|
|
||||||
|
<MenuFlyoutItem
|
||||||
|
Command="{x:Bind ViewModel.AddMediaSourceCommand}"
|
||||||
|
CommandParameter="WebDAV"
|
||||||
|
Text="WebDAV">
|
||||||
|
<MenuFlyoutItem.Icon>
|
||||||
|
<FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="" />
|
||||||
|
</MenuFlyoutItem.Icon>
|
||||||
|
</MenuFlyoutItem>
|
||||||
|
|
||||||
|
</MenuFlyout>
|
||||||
|
</DropDownButton.Flyout>
|
||||||
|
</DropDownButton>
|
||||||
|
</StackPanel>
|
||||||
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
</Grid>
|
</Grid>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
@@ -4,6 +4,7 @@ using CommunityToolkit.Mvvm.DependencyInjection;
|
|||||||
using Microsoft.UI.Xaml;
|
using Microsoft.UI.Xaml;
|
||||||
using Microsoft.UI.Xaml.Controls;
|
using Microsoft.UI.Xaml.Controls;
|
||||||
using System;
|
using System;
|
||||||
|
using System.Threading.Tasks;
|
||||||
using Windows.System;
|
using Windows.System;
|
||||||
|
|
||||||
// To learn more about WinUI, the WinUI project structure,
|
// To learn more about WinUI, the WinUI project structure,
|
||||||
@@ -22,18 +23,14 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
|
|
||||||
private void SettingsPageRemovePathButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
|
private void SettingsPageRemovePathButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
ViewModel.RemoveFolderAsync((LocalMediaFolder)(sender as HyperlinkButton)!.Tag);
|
var folder = (MediaFolder)((FrameworkElement)sender).DataContext;
|
||||||
|
ViewModel.RemoveFolder(folder);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async void LocalFolderHyperlinkButton_Click(object sender, RoutedEventArgs e)
|
private void SyncNowButton_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (sender is HyperlinkButton button && button.Tag is string uriStr)
|
var folder = (MediaFolder)((FrameworkElement)sender).DataContext;
|
||||||
{
|
ViewModel.SyncFolder(folder);
|
||||||
if (Uri.TryCreate(uriStr, UriKind.Absolute, out var uri))
|
|
||||||
{
|
|
||||||
await Launcher.LaunchUriAsync(uri);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,541 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
|
<UserControl
|
||||||
|
x:Class="BetterLyrics.WinUI3.Controls.NowPlayingBar"
|
||||||
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
|
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
|
||||||
|
xmlns:local="using:BetterLyrics.WinUI3.Controls"
|
||||||
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
xmlns:ui="using:CommunityToolkit.WinUI"
|
||||||
|
mc:Ignorable="d">
|
||||||
|
|
||||||
|
<Grid x:Name="RootGrid">
|
||||||
|
<Grid
|
||||||
|
x:Name="BottomCommandGrid"
|
||||||
|
Background="{ThemeResource LayerOnMicaBaseAltFillColorDefaultBrush}"
|
||||||
|
Opacity="{x:Bind ViewModel.BottomCommandGridOpacity, Mode=OneWay}"
|
||||||
|
PointerEntered="BottomCommandGrid_PointerEntered"
|
||||||
|
PointerExited="BottomCommandGrid_PointerExited">
|
||||||
|
<Grid.OpacityTransition>
|
||||||
|
<ScalarTransition />
|
||||||
|
</Grid.OpacityTransition>
|
||||||
|
|
||||||
|
<Grid x:Name="BottomCommandContent">
|
||||||
|
|
||||||
|
<Grid HorizontalAlignment="Left">
|
||||||
|
<StackPanel
|
||||||
|
x:Name="BottomLeftCommandStackPanel"
|
||||||
|
Orientation="Horizontal"
|
||||||
|
Spacing="3">
|
||||||
|
|
||||||
|
<StackPanel
|
||||||
|
x:Name="SongInfoStackPanel"
|
||||||
|
Margin="8"
|
||||||
|
Padding="8"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
CornerRadius="4"
|
||||||
|
Opacity="{x:Bind ShowSongInfo, Mode=OneWay, Converter={StaticResource BoolToOpacityConverter}}"
|
||||||
|
Orientation="Horizontal"
|
||||||
|
Spacing="12"
|
||||||
|
Tapped="SongInfoStackPanel_Tapped"
|
||||||
|
Visibility="{x:Bind ShowSongInfo, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
|
||||||
|
<StackPanel.OpacityTransition>
|
||||||
|
<ScalarTransition />
|
||||||
|
</StackPanel.OpacityTransition>
|
||||||
|
<interactivity:Interaction.Behaviors>
|
||||||
|
<interactivity:EventTriggerBehavior EventName="PointerEntered">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Background" Value="{ThemeResource SubtleFillColorSecondaryBrush}" />
|
||||||
|
</interactivity:EventTriggerBehavior>
|
||||||
|
<interactivity:EventTriggerBehavior EventName="PointerExited">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Background" Value="Transparent" />
|
||||||
|
</interactivity:EventTriggerBehavior>
|
||||||
|
<interactivity:EventTriggerBehavior EventName="PointerPressed">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Background" Value="{ThemeResource SubtleFillColorTertiaryBrush}" />
|
||||||
|
</interactivity:EventTriggerBehavior>
|
||||||
|
<interactivity:EventTriggerBehavior EventName="PointerReleased">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Background" Value="{ThemeResource SubtleFillColorSecondaryBrush}" />
|
||||||
|
</interactivity:EventTriggerBehavior>
|
||||||
|
</interactivity:Interaction.Behaviors>
|
||||||
|
<Grid VerticalAlignment="Center" CornerRadius="4">
|
||||||
|
<local:ImageSwitcher
|
||||||
|
x:Name="AlbumArtImageSwitcher"
|
||||||
|
Width="36"
|
||||||
|
Height="36" />
|
||||||
|
</Grid>
|
||||||
|
<StackPanel VerticalAlignment="Center">
|
||||||
|
<TextBlock x:Name="TitleTextBlock" />
|
||||||
|
<TextBlock
|
||||||
|
x:Name="ArtistsTextBlock"
|
||||||
|
FontSize="12"
|
||||||
|
Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
|
||||||
|
</StackPanel>
|
||||||
|
</StackPanel>
|
||||||
|
|
||||||
|
<StackPanel
|
||||||
|
x:Name="TimeStackPanel"
|
||||||
|
Margin="8"
|
||||||
|
Padding="8"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Opacity="{x:Bind ShowTime, Mode=OneWay, Converter={StaticResource BoolToOpacityConverter}}"
|
||||||
|
Orientation="Horizontal"
|
||||||
|
Spacing="2"
|
||||||
|
Tapped="TimeStackPanel_Tapped"
|
||||||
|
Visibility="{x:Bind ShowTime, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
|
||||||
|
<StackPanel.OpacityTransition>
|
||||||
|
<ScalarTransition />
|
||||||
|
</StackPanel.OpacityTransition>
|
||||||
|
<interactivity:Interaction.Behaviors>
|
||||||
|
<interactivity:EventTriggerBehavior EventName="PointerEntered">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Background" Value="{ThemeResource SubtleFillColorSecondaryBrush}" />
|
||||||
|
</interactivity:EventTriggerBehavior>
|
||||||
|
<interactivity:EventTriggerBehavior EventName="PointerExited">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Background" Value="Transparent" />
|
||||||
|
</interactivity:EventTriggerBehavior>
|
||||||
|
<interactivity:EventTriggerBehavior EventName="PointerPressed">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Background" Value="{ThemeResource SubtleFillColorTertiaryBrush}" />
|
||||||
|
</interactivity:EventTriggerBehavior>
|
||||||
|
<interactivity:EventTriggerBehavior EventName="PointerReleased">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Background" Value="{ThemeResource SubtleFillColorSecondaryBrush}" />
|
||||||
|
</interactivity:EventTriggerBehavior>
|
||||||
|
</interactivity:Interaction.Behaviors>
|
||||||
|
<TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{Binding ElementName=TimelineSlider, Path=Value, Converter={StaticResource SecondsToFormattedTimeConverter}}" />
|
||||||
|
<TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="/" />
|
||||||
|
<TextBlock Text="{Binding ElementName=TimelineSlider, Path=Maximum, Converter={StaticResource SecondsToFormattedTimeConverter}}" />
|
||||||
|
</StackPanel>
|
||||||
|
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<Grid HorizontalAlignment="Center">
|
||||||
|
<StackPanel
|
||||||
|
x:Name="BottomCenterCommandStackPanel"
|
||||||
|
Padding="16"
|
||||||
|
Orientation="Horizontal"
|
||||||
|
Spacing="12">
|
||||||
|
<!-- Playback order -->
|
||||||
|
<Button
|
||||||
|
Grid.Column="2"
|
||||||
|
Click="PlaybackOrderButton_Click"
|
||||||
|
Style="{StaticResource GhostButtonStyle}"
|
||||||
|
Visibility="{x:Bind ShowPlaybackOrderButton, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
|
||||||
|
<ToolTipService.ToolTip>
|
||||||
|
<ToolTip>
|
||||||
|
<Grid>
|
||||||
|
<TextBlock x:Name="PlaybackRepeatAllHint" x:Uid="MusicGalleryPageQueueLoop" />
|
||||||
|
<TextBlock x:Name="PlaybackRepeatOneHint" x:Uid="MusicGalleryPageSingleLoop" />
|
||||||
|
<TextBlock x:Name="PlaybackShuffleHint" x:Uid="MusicGalleryPageQueueRandom" />
|
||||||
|
</Grid>
|
||||||
|
</ToolTip>
|
||||||
|
</ToolTipService.ToolTip>
|
||||||
|
<Button.Content>
|
||||||
|
<Grid>
|
||||||
|
<!-- Repeat all -->
|
||||||
|
<FontIcon
|
||||||
|
x:Name="PlaybackRepeatAll"
|
||||||
|
FontFamily="{StaticResource IconFontFamily}"
|
||||||
|
FontSize="16"
|
||||||
|
Glyph="">
|
||||||
|
<FontIcon.OpacityTransition>
|
||||||
|
<ScalarTransition />
|
||||||
|
</FontIcon.OpacityTransition>
|
||||||
|
</FontIcon>
|
||||||
|
<!-- Repeat one -->
|
||||||
|
<FontIcon
|
||||||
|
x:Name="PlaybackRepeatOne"
|
||||||
|
FontFamily="{StaticResource IconFontFamily}"
|
||||||
|
FontSize="16"
|
||||||
|
Glyph="">
|
||||||
|
<FontIcon.OpacityTransition>
|
||||||
|
<ScalarTransition />
|
||||||
|
</FontIcon.OpacityTransition>
|
||||||
|
</FontIcon>
|
||||||
|
<!-- Shuffle -->
|
||||||
|
<FontIcon
|
||||||
|
x:Name="PlaybackShuffle"
|
||||||
|
FontFamily="{StaticResource IconFontFamily}"
|
||||||
|
FontSize="16"
|
||||||
|
Glyph="">
|
||||||
|
<FontIcon.OpacityTransition>
|
||||||
|
<ScalarTransition />
|
||||||
|
</FontIcon.OpacityTransition>
|
||||||
|
</FontIcon>
|
||||||
|
</Grid>
|
||||||
|
</Button.Content>
|
||||||
|
</Button>
|
||||||
|
<!-- 上一曲目 -->
|
||||||
|
<Button
|
||||||
|
Command="{x:Bind ViewModel.PreviousSongCommand}"
|
||||||
|
Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
|
||||||
|
Glyph=}"
|
||||||
|
Style="{StaticResource GhostButtonStyle}" />
|
||||||
|
<Button
|
||||||
|
Command="{x:Bind ViewModel.PauseSongCommand}"
|
||||||
|
Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
|
||||||
|
Glyph=}"
|
||||||
|
Style="{StaticResource GhostButtonStyle}">
|
||||||
|
<interactivity:Interaction.Behaviors>
|
||||||
|
<interactivity:DataTriggerBehavior
|
||||||
|
Binding="{x:Bind ViewModel.MediaSessionsService.CurrentIsPlaying, Mode=OneWay}"
|
||||||
|
ComparisonCondition="Equal"
|
||||||
|
Value="True">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
|
||||||
|
</interactivity:DataTriggerBehavior>
|
||||||
|
<interactivity:DataTriggerBehavior
|
||||||
|
Binding="{x:Bind ViewModel.MediaSessionsService.CurrentIsPlaying, Mode=OneWay}"
|
||||||
|
ComparisonCondition="Equal"
|
||||||
|
Value="False">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
|
||||||
|
</interactivity:DataTriggerBehavior>
|
||||||
|
</interactivity:Interaction.Behaviors>
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
Command="{x:Bind ViewModel.PlaySongCommand}"
|
||||||
|
Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
|
||||||
|
Glyph=}"
|
||||||
|
Style="{StaticResource GhostButtonStyle}">
|
||||||
|
<interactivity:Interaction.Behaviors>
|
||||||
|
<interactivity:DataTriggerBehavior
|
||||||
|
Binding="{x:Bind ViewModel.MediaSessionsService.CurrentIsPlaying, Mode=OneWay}"
|
||||||
|
ComparisonCondition="Equal"
|
||||||
|
Value="True">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
|
||||||
|
</interactivity:DataTriggerBehavior>
|
||||||
|
<interactivity:DataTriggerBehavior
|
||||||
|
Binding="{x:Bind ViewModel.MediaSessionsService.CurrentIsPlaying, Mode=OneWay}"
|
||||||
|
ComparisonCondition="Equal"
|
||||||
|
Value="False">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
|
||||||
|
</interactivity:DataTriggerBehavior>
|
||||||
|
</interactivity:Interaction.Behaviors>
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
Command="{x:Bind ViewModel.NextSongCommand}"
|
||||||
|
Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
|
||||||
|
Glyph=}"
|
||||||
|
Style="{StaticResource GhostButtonStyle}" />
|
||||||
|
<!-- 播放队列按钮 -->
|
||||||
|
<ToggleButton
|
||||||
|
Click="PlayingQueueButton_Click"
|
||||||
|
Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
|
||||||
|
Glyph=}"
|
||||||
|
Style="{StaticResource GhostToggleButtonStyle}"
|
||||||
|
Visibility="{x:Bind ShowPlayingQueueButton, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" />
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<Grid HorizontalAlignment="Right">
|
||||||
|
<StackPanel
|
||||||
|
x:Name="BottomRightCommandStackPanel"
|
||||||
|
Padding="16"
|
||||||
|
Orientation="Horizontal"
|
||||||
|
Spacing="3">
|
||||||
|
|
||||||
|
<!-- Volume -->
|
||||||
|
<Button Click="VolumeButton_Click" Style="{StaticResource GhostButtonStyle}">
|
||||||
|
<Grid>
|
||||||
|
|
||||||
|
<!-- Volumn: 0 -->
|
||||||
|
<FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="">
|
||||||
|
<FontIcon.OpacityTransition>
|
||||||
|
<ScalarTransition />
|
||||||
|
</FontIcon.OpacityTransition>
|
||||||
|
<interactivity:Interaction.Behaviors>
|
||||||
|
<interactivity:DataTriggerBehavior
|
||||||
|
Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
|
||||||
|
ComparisonCondition="Equal"
|
||||||
|
Value="0">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
|
||||||
|
</interactivity:DataTriggerBehavior>
|
||||||
|
<interactivity:DataTriggerBehavior
|
||||||
|
Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
|
||||||
|
ComparisonCondition="NotEqual"
|
||||||
|
Value="0">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
|
||||||
|
</interactivity:DataTriggerBehavior>
|
||||||
|
</interactivity:Interaction.Behaviors>
|
||||||
|
</FontIcon>
|
||||||
|
|
||||||
|
<!-- Volumn: 1-32 -->
|
||||||
|
<FontIcon
|
||||||
|
x:Name="VolumeLevel1"
|
||||||
|
FontFamily="{StaticResource IconFontFamily}"
|
||||||
|
Glyph="">
|
||||||
|
<FontIcon.OpacityTransition>
|
||||||
|
<ScalarTransition />
|
||||||
|
</FontIcon.OpacityTransition>
|
||||||
|
<interactivity:Interaction.Behaviors>
|
||||||
|
<interactivity:DataTriggerBehavior
|
||||||
|
Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
|
||||||
|
ComparisonCondition="GreaterThanOrEqual"
|
||||||
|
Value="1">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
|
||||||
|
</interactivity:DataTriggerBehavior>
|
||||||
|
<interactivity:DataTriggerBehavior
|
||||||
|
Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
|
||||||
|
ComparisonCondition="LessThan"
|
||||||
|
Value="1">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
|
||||||
|
</interactivity:DataTriggerBehavior>
|
||||||
|
</interactivity:Interaction.Behaviors>
|
||||||
|
</FontIcon>
|
||||||
|
|
||||||
|
<!-- Volumn: 33-65 -->
|
||||||
|
<FontIcon
|
||||||
|
x:Name="VolumeLevel2"
|
||||||
|
FontFamily="{StaticResource IconFontFamily}"
|
||||||
|
Glyph="">
|
||||||
|
<FontIcon.OpacityTransition>
|
||||||
|
<ScalarTransition />
|
||||||
|
</FontIcon.OpacityTransition>
|
||||||
|
<interactivity:Interaction.Behaviors>
|
||||||
|
<interactivity:DataTriggerBehavior
|
||||||
|
Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
|
||||||
|
ComparisonCondition="GreaterThanOrEqual"
|
||||||
|
Value="33">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
|
||||||
|
</interactivity:DataTriggerBehavior>
|
||||||
|
<interactivity:DataTriggerBehavior
|
||||||
|
Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
|
||||||
|
ComparisonCondition="LessThan"
|
||||||
|
Value="33">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
|
||||||
|
</interactivity:DataTriggerBehavior>
|
||||||
|
</interactivity:Interaction.Behaviors>
|
||||||
|
</FontIcon>
|
||||||
|
|
||||||
|
<!-- Volumn: 66-100 -->
|
||||||
|
<FontIcon
|
||||||
|
x:Name="VolumeLevel3"
|
||||||
|
FontFamily="{StaticResource IconFontFamily}"
|
||||||
|
Glyph="">
|
||||||
|
<FontIcon.OpacityTransition>
|
||||||
|
<ScalarTransition />
|
||||||
|
</FontIcon.OpacityTransition>
|
||||||
|
<interactivity:Interaction.Behaviors>
|
||||||
|
<interactivity:DataTriggerBehavior
|
||||||
|
Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
|
||||||
|
ComparisonCondition="GreaterThanOrEqual"
|
||||||
|
Value="66">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
|
||||||
|
</interactivity:DataTriggerBehavior>
|
||||||
|
<interactivity:DataTriggerBehavior
|
||||||
|
Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
|
||||||
|
ComparisonCondition="LessThan"
|
||||||
|
Value="66">
|
||||||
|
<interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
|
||||||
|
</interactivity:DataTriggerBehavior>
|
||||||
|
</interactivity:Interaction.Behaviors>
|
||||||
|
</FontIcon>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<Button.ContextFlyout>
|
||||||
|
<Flyout x:Name="VolumeFlyout" ShouldConstrainToRootBounds="False">
|
||||||
|
<local:ExtendedSlider
|
||||||
|
Frequency="10"
|
||||||
|
IsSliderEnabled="False"
|
||||||
|
Maximum="100"
|
||||||
|
Minimum="0"
|
||||||
|
ResetButtonVisibility="Collapsed"
|
||||||
|
Unit="%"
|
||||||
|
ValueChangedByUser="ExtendedSlider_ValueChangedByUser"
|
||||||
|
Value="{x:Bind ViewModel.Volume, Mode=TwoWay}" />
|
||||||
|
</Flyout>
|
||||||
|
</Button.ContextFlyout>
|
||||||
|
</Button>
|
||||||
|
|
||||||
|
<!-- More -->
|
||||||
|
<Button Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}" Style="{StaticResource GhostButtonStyle}">
|
||||||
|
<Button.Flyout>
|
||||||
|
<MenuFlyout>
|
||||||
|
<!-- Lyrics search window -->
|
||||||
|
<MenuFlyoutItem
|
||||||
|
x:Uid="LyricsPageLyricsSearch"
|
||||||
|
Command="{x:Bind ViewModel.OpenLyricsSearchWindowCommand}"
|
||||||
|
Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
|
||||||
|
Glyph=}" />
|
||||||
|
<!-- Lyrics window manager shortcut settings -->
|
||||||
|
<MenuFlyoutItem
|
||||||
|
x:Uid="LyricsPageLyricsSettings"
|
||||||
|
Click="LyricsSettingsShortcutMenuFlyoutItem_Click"
|
||||||
|
Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
|
||||||
|
Glyph=}">
|
||||||
|
<MenuFlyoutItem.ContextFlyout>
|
||||||
|
<Flyout
|
||||||
|
x:Name="LyricsSettingsFlyout"
|
||||||
|
Closed="LyricsSettingsFlyout_Closed"
|
||||||
|
FlyoutPresenterStyle="{StaticResource FlyoutPageStyle}"
|
||||||
|
Placement="Right"
|
||||||
|
ShouldConstrainToRootBounds="False" />
|
||||||
|
</MenuFlyoutItem.ContextFlyout>
|
||||||
|
</MenuFlyoutItem>
|
||||||
|
<!-- Playback shortcut settings -->
|
||||||
|
<MenuFlyoutItem
|
||||||
|
x:Uid="LyricsPagePlaybackSource"
|
||||||
|
Click="PlaybackSettingsShortcutMenuFlyoutItem_Click"
|
||||||
|
Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
|
||||||
|
Glyph=}">
|
||||||
|
<MenuFlyoutItem.ContextFlyout>
|
||||||
|
<Flyout
|
||||||
|
x:Name="PlaybackSettingsFlyout"
|
||||||
|
Closed="PlaybackSettingsFlyout_Closed"
|
||||||
|
FlyoutPresenterStyle="{StaticResource FlyoutPageStyle}"
|
||||||
|
Placement="Right"
|
||||||
|
ShouldConstrainToRootBounds="False" />
|
||||||
|
</MenuFlyoutItem.ContextFlyout>
|
||||||
|
</MenuFlyoutItem>
|
||||||
|
<!-- Settings -->
|
||||||
|
<MenuFlyoutItem
|
||||||
|
x:Uid="LyricsPageSettings"
|
||||||
|
Command="{x:Bind ViewModel.OpenSettingsWindowCommand}"
|
||||||
|
Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
|
||||||
|
Glyph=}" />
|
||||||
|
</MenuFlyout>
|
||||||
|
</Button.Flyout>
|
||||||
|
</Button>
|
||||||
|
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<Slider
|
||||||
|
x:Name="TimelineSlider"
|
||||||
|
Margin="0,-14,0,0"
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
Maximum="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.DurationMs, Mode=OneWay, Converter={StaticResource MillisecondsToSecondsConverter}}"
|
||||||
|
Minimum="0"
|
||||||
|
Style="{StaticResource GhostSliderStyle}"
|
||||||
|
ThumbToolTipValueConverter="{StaticResource SecondsToFormattedTimeConverter}" />
|
||||||
|
|
||||||
|
<Grid
|
||||||
|
x:Name="TimelineSliderLyricsLineInfo"
|
||||||
|
Margin="0,-32,0,0"
|
||||||
|
Padding="8,4"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
Background="{ThemeResource LayerOnMicaBaseAltFillColorDefaultBrush}"
|
||||||
|
CornerRadius="6"
|
||||||
|
Opacity="{x:Bind ViewModel.TimelineSliderThumbOpacity, Mode=OneWay}">
|
||||||
|
<Grid.OpacityTransition>
|
||||||
|
<ScalarTransition />
|
||||||
|
</Grid.OpacityTransition>
|
||||||
|
<Grid.TranslationTransition>
|
||||||
|
<Vector3Transition />
|
||||||
|
</Grid.TranslationTransition>
|
||||||
|
<StackPanel Orientation="Horizontal" Spacing="6">
|
||||||
|
<TextBlock
|
||||||
|
Margin="0,0,0,2"
|
||||||
|
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
|
||||||
|
Text="{x:Bind ViewModel.TimelineSliderThumbLyricsLine.StartMs, Converter={StaticResource MillisecondsToFormattedTimeConverter}, Mode=OneWay}" />
|
||||||
|
<!-- TODO 原文翻译共同显示 -->
|
||||||
|
<TextBlock Margin="0,0,0,2" Text="{x:Bind ViewModel.TimelineSliderThumbLyricsLine.OriginalText, Mode=OneWay}" />
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
<Grid
|
||||||
|
Height="32"
|
||||||
|
Margin="0,-12,0,0"
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
Background="Transparent"
|
||||||
|
PointerEntered="TimelineSliderOverlay_PointerEntered"
|
||||||
|
PointerExited="TimelineSliderOverlay_PointerExited"
|
||||||
|
PointerMoved="TimelineSliderOverlay_PointerMoved"
|
||||||
|
PointerPressed="TimelineSliderOverlay_PointerPressed" />
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<!-- Bottom command flyout trigger -->
|
||||||
|
<Grid
|
||||||
|
x:Name="BottomCommandFlyoutTrigger"
|
||||||
|
Height="12"
|
||||||
|
VerticalAlignment="Bottom"
|
||||||
|
Background="Transparent"
|
||||||
|
CornerRadius="3,3,0,0"
|
||||||
|
Opacity="{x:Bind ViewModel.BottomCommandFlyoutTriggerOpacity, Mode=OneWay}"
|
||||||
|
PointerEntered="BottomCommandFlyoutTrigger_PointerEntered"
|
||||||
|
PointerExited="BottomCommandFlyoutTrigger_PointerExited"
|
||||||
|
Tapped="BottomCommandFlyoutTrigger_Tapped">
|
||||||
|
<Grid.OpacityTransition>
|
||||||
|
<ScalarTransition />
|
||||||
|
</Grid.OpacityTransition>
|
||||||
|
<Grid
|
||||||
|
x:Name="BottomCommandFlyoutTriggerHint"
|
||||||
|
Width="150"
|
||||||
|
Margin="4"
|
||||||
|
Background="{ThemeResource TextFillColorPrimaryBrush}"
|
||||||
|
CornerRadius="2"
|
||||||
|
Translation="0,0,0">
|
||||||
|
<Grid.TranslationTransition>
|
||||||
|
<Vector3Transition />
|
||||||
|
</Grid.TranslationTransition>
|
||||||
|
</Grid>
|
||||||
|
<Grid.ContextFlyout>
|
||||||
|
<Flyout x:Name="BottomCommandFlyout" ShouldConstrainToRootBounds="False">
|
||||||
|
<Flyout.FlyoutPresenterStyle>
|
||||||
|
<Style TargetType="FlyoutPresenter">
|
||||||
|
<Setter Property="Padding" Value="0" />
|
||||||
|
<Setter Property="MinWidth" Value="400" />
|
||||||
|
<Setter Property="MinHeight" Value="100" />
|
||||||
|
<Setter Property="CornerRadius" Value="12" />
|
||||||
|
</Style>
|
||||||
|
</Flyout.FlyoutPresenterStyle>
|
||||||
|
<Grid x:Name="BottomCommandFlyoutContainer" VerticalAlignment="Bottom" />
|
||||||
|
</Flyout>
|
||||||
|
</Grid.ContextFlyout>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<VisualStateManager.VisualStateGroups>
|
||||||
|
<VisualStateGroup x:Name="PlaybackOrderState">
|
||||||
|
<VisualState x:Name="RepeatAll">
|
||||||
|
<VisualState.StateTriggers>
|
||||||
|
<ui:CompareStateTrigger
|
||||||
|
Comparison="Equal"
|
||||||
|
Value="{x:Bind 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 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 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>
|
||||||
|
|
||||||
|
</UserControl>
|
||||||
@@ -0,0 +1,347 @@
|
|||||||
|
using BetterLyrics.WinUI3.Enums;
|
||||||
|
using BetterLyrics.WinUI3.Hooks;
|
||||||
|
using BetterLyrics.WinUI3.Models;
|
||||||
|
using BetterLyrics.WinUI3.Models.Settings;
|
||||||
|
using BetterLyrics.WinUI3.Services.MediaSessionsService;
|
||||||
|
using BetterLyrics.WinUI3.ViewModels;
|
||||||
|
using BetterLyrics.WinUI3.Views;
|
||||||
|
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||||
|
using CommunityToolkit.Mvvm.Messaging;
|
||||||
|
using CommunityToolkit.Mvvm.Messaging.Messages;
|
||||||
|
using Microsoft.UI.Xaml;
|
||||||
|
using Microsoft.UI.Xaml.Controls;
|
||||||
|
using Microsoft.UI.Xaml.Input;
|
||||||
|
using Microsoft.UI.Xaml.Media.Imaging;
|
||||||
|
using System;
|
||||||
|
using System.Numerics;
|
||||||
|
using BetterLyrics.WinUI3.Extensions;
|
||||||
|
|
||||||
|
// To learn more about WinUI, the WinUI project structure,
|
||||||
|
// and more about our project templates, see: http://aka.ms/winui-project-info.
|
||||||
|
|
||||||
|
namespace BetterLyrics.WinUI3.Controls;
|
||||||
|
|
||||||
|
public sealed partial class NowPlayingBar : UserControl,
|
||||||
|
IRecipient<PropertyChangedMessage<SongInfo?>>,
|
||||||
|
IRecipient<PropertyChangedMessage<BitmapImage?>>,
|
||||||
|
IRecipient<PropertyChangedMessage<TimeSpan>>
|
||||||
|
{
|
||||||
|
public NowPlayingBarViewModel ViewModel => (NowPlayingBarViewModel)DataContext;
|
||||||
|
|
||||||
|
public event EventHandler? SongInfoTapped;
|
||||||
|
public event EventHandler? TimeTapped;
|
||||||
|
|
||||||
|
public bool ShowTime
|
||||||
|
{
|
||||||
|
get { return (bool)GetValue(ShowTimeProperty); }
|
||||||
|
set { SetValue(ShowTimeProperty, value); }
|
||||||
|
}
|
||||||
|
|
||||||
|
public static readonly DependencyProperty ShowTimeProperty =
|
||||||
|
DependencyProperty.Register(nameof(ShowTime), typeof(bool), typeof(NowPlayingBar), new PropertyMetadata(false));
|
||||||
|
|
||||||
|
public bool ShowSongInfo
|
||||||
|
{
|
||||||
|
get { return (bool)GetValue(ShowSongInfoProperty); }
|
||||||
|
set { SetValue(ShowSongInfoProperty, value); }
|
||||||
|
}
|
||||||
|
|
||||||
|
public static readonly DependencyProperty ShowSongInfoProperty =
|
||||||
|
DependencyProperty.Register(nameof(ShowSongInfo), typeof(bool), typeof(NowPlayingBar), new PropertyMetadata(false));
|
||||||
|
|
||||||
|
public bool ShowPlayingQueueButton
|
||||||
|
{
|
||||||
|
get { return (bool)GetValue(ShowPlayingQueueButtonProperty); }
|
||||||
|
set { SetValue(ShowPlayingQueueButtonProperty, value); }
|
||||||
|
}
|
||||||
|
|
||||||
|
public static readonly DependencyProperty ShowPlayingQueueButtonProperty =
|
||||||
|
DependencyProperty.Register(nameof(ShowPlayingQueueButton), typeof(bool), typeof(NowPlayingBar), new PropertyMetadata(false));
|
||||||
|
|
||||||
|
public bool ShowPlaybackOrderButton
|
||||||
|
{
|
||||||
|
get { return (bool)GetValue(ShowPlaybackOrderButtonProperty); }
|
||||||
|
set { SetValue(ShowPlaybackOrderButtonProperty, value); }
|
||||||
|
}
|
||||||
|
|
||||||
|
public static readonly DependencyProperty ShowPlaybackOrderButtonProperty =
|
||||||
|
DependencyProperty.Register(nameof(ShowPlaybackOrderButton), typeof(bool), typeof(NowPlayingBar), new PropertyMetadata(false));
|
||||||
|
|
||||||
|
public PlaybackOrder PlaybackOrder
|
||||||
|
{
|
||||||
|
get { return (PlaybackOrder)GetValue(PlaybackOrderProperty); }
|
||||||
|
set { SetValue(PlaybackOrderProperty, value); }
|
||||||
|
}
|
||||||
|
|
||||||
|
public static readonly DependencyProperty PlaybackOrderProperty =
|
||||||
|
DependencyProperty.Register(nameof(PlaybackOrder), typeof(PlaybackOrder), typeof(NowPlayingBar), new PropertyMetadata(PlaybackOrder.RepeatAll));
|
||||||
|
|
||||||
|
public bool IsPlayingQueueOpened
|
||||||
|
{
|
||||||
|
get { return (bool)GetValue(IsPlayingQueueOpenedProperty); }
|
||||||
|
set { SetValue(IsPlayingQueueOpenedProperty, value); }
|
||||||
|
}
|
||||||
|
|
||||||
|
public static readonly DependencyProperty IsPlayingQueueOpenedProperty =
|
||||||
|
DependencyProperty.Register(nameof(IsPlayingQueueOpened), typeof(bool), typeof(NowPlayingBar), new PropertyMetadata(false));
|
||||||
|
|
||||||
|
public bool IsCompactMode
|
||||||
|
{
|
||||||
|
get { return (bool)GetValue(IsCompactModeProperty); }
|
||||||
|
set { SetValue(IsCompactModeProperty, value); }
|
||||||
|
}
|
||||||
|
|
||||||
|
public static readonly DependencyProperty IsCompactModeProperty =
|
||||||
|
DependencyProperty.Register(nameof(IsCompactMode), typeof(bool), typeof(NowPlayingBar), new PropertyMetadata(false, OnDependencyPropertyChanged));
|
||||||
|
|
||||||
|
public bool IsAutoHideEnabled
|
||||||
|
{
|
||||||
|
get { return (bool)GetValue(IsAutoHideEnabledProperty); }
|
||||||
|
set { SetValue(IsAutoHideEnabledProperty, value); }
|
||||||
|
}
|
||||||
|
|
||||||
|
public static readonly DependencyProperty IsAutoHideEnabledProperty =
|
||||||
|
DependencyProperty.Register(nameof(IsAutoHideEnabled), typeof(bool), typeof(NowPlayingBar), new PropertyMetadata(false, OnDependencyPropertyChanged));
|
||||||
|
|
||||||
|
private bool _isPointerInBottomCommandGrid = false;
|
||||||
|
|
||||||
|
public NowPlayingBar()
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
DataContext = Ioc.Default.GetRequiredService<NowPlayingBarViewModel>();
|
||||||
|
|
||||||
|
WeakReferenceMessenger.Default.RegisterAll(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void OnDependencyPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||||
|
{
|
||||||
|
if (d is NowPlayingBar self)
|
||||||
|
{
|
||||||
|
if (e.Property == IsCompactModeProperty)
|
||||||
|
{
|
||||||
|
self.OnIsCompactModeChanged();
|
||||||
|
}
|
||||||
|
else if (e.Property == IsAutoHideEnabledProperty)
|
||||||
|
{
|
||||||
|
self.OnIsAutoHideEnabledChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnIsAutoHideEnabledChanged()
|
||||||
|
{
|
||||||
|
if (IsAutoHideEnabled)
|
||||||
|
{
|
||||||
|
if (!_isPointerInBottomCommandGrid)
|
||||||
|
{
|
||||||
|
ViewModel.BottomCommandGridOpacity = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ViewModel.BottomCommandGridOpacity = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnIsCompactModeChanged()
|
||||||
|
{
|
||||||
|
if (IsCompactMode)
|
||||||
|
{
|
||||||
|
if (BottomCommandGrid.Children.Count != 0)
|
||||||
|
{
|
||||||
|
BottomCommandGrid.Children.Remove(BottomCommandContent);
|
||||||
|
BottomCommandFlyoutContainer.Children.Add(BottomCommandContent);
|
||||||
|
}
|
||||||
|
BottomCommandFlyoutTriggerHint.Translation = new Vector3(0, 0, 0);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (BottomCommandFlyoutContainer.Children.Count != 0)
|
||||||
|
{
|
||||||
|
BottomCommandFlyout.Hide();
|
||||||
|
BottomCommandFlyoutContainer.Children.Remove(BottomCommandContent);
|
||||||
|
BottomCommandGrid.Children.Add(BottomCommandContent);
|
||||||
|
}
|
||||||
|
BottomCommandFlyoutTriggerHint.Translation = new Vector3(0, 12, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void PlaybackSettingsShortcutMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
PlaybackSettingsFlyout.Content = new PlaybackSettingsControl
|
||||||
|
{
|
||||||
|
MaxHeight = 500,
|
||||||
|
MaxWidth = 850,
|
||||||
|
};
|
||||||
|
PlaybackSettingsFlyout.ShowAt(BottomRightCommandStackPanel);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void VolumeButton_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
VolumeFlyout.ShowAt(BottomRightCommandStackPanel);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void PlaybackSettingsFlyout_Closed(object sender, object e)
|
||||||
|
{
|
||||||
|
PlaybackSettingsFlyout.Content = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void LyricsSettingsFlyout_Closed(object sender, object e)
|
||||||
|
{
|
||||||
|
LyricsSettingsFlyout.Content = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void LyricsSettingsShortcutMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
LyricsSettingsFlyout.Content = new LyricsWindowSettingsControl
|
||||||
|
{
|
||||||
|
MaxHeight = 500,
|
||||||
|
MaxWidth = 850,
|
||||||
|
};
|
||||||
|
LyricsSettingsFlyout.ShowAt(BottomRightCommandStackPanel);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void TimelineSliderOverlay_PointerPressed(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
|
||||||
|
{
|
||||||
|
var grid = (Grid)sender;
|
||||||
|
var pos = e.GetCurrentPoint(grid).Position;
|
||||||
|
var ratio = pos.X / grid.ActualWidth;
|
||||||
|
ViewModel.MediaSessionsService.ChangePosition(TimelineSlider.Maximum * ratio);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void TimelineSliderOverlay_PointerMoved(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
|
||||||
|
{
|
||||||
|
float targetX;
|
||||||
|
var grid = (Grid)sender;
|
||||||
|
var pos = e.GetCurrentPoint(grid).Position;
|
||||||
|
var ratio = pos.X / grid.ActualWidth;
|
||||||
|
ViewModel.TimelineSliderThumbSeconds = TimelineSlider.Maximum * ratio;
|
||||||
|
if (pos.X + TimelineSliderLyricsLineInfo.ActualWidth > grid.ActualWidth)
|
||||||
|
{
|
||||||
|
targetX = (float)(grid.ActualWidth - TimelineSliderLyricsLineInfo.ActualWidth);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
targetX = (float)pos.X;
|
||||||
|
}
|
||||||
|
TimelineSliderLyricsLineInfo.Translation = new Vector3(targetX, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void TimelineSliderOverlay_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
|
||||||
|
{
|
||||||
|
ViewModel.TimelineSliderThumbOpacity = 1f;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void TimelineSliderOverlay_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
|
||||||
|
{
|
||||||
|
ViewModel.TimelineSliderThumbOpacity = 0f;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ExtendedSlider_ValueChangedByUser(object sender, Events.ExtendedSliderValueChangedByUserEventArgs e)
|
||||||
|
{
|
||||||
|
SystemVolumeHook.MasterVolume = ViewModel.Volume;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void LyricsSearchShortcutButton_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
WindowHook.OpenOrShowWindow<LyricsSearchWindow>();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SongInfoStackPanel_Tapped(object sender, TappedRoutedEventArgs e)
|
||||||
|
{
|
||||||
|
SongInfoTapped?.Invoke(sender, EventArgs.Empty);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void TimeStackPanel_Tapped(object sender, TappedRoutedEventArgs e)
|
||||||
|
{
|
||||||
|
TimeTapped?.Invoke(sender, EventArgs.Empty);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void BottomCommandGrid_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
|
||||||
|
{
|
||||||
|
_isPointerInBottomCommandGrid = true;
|
||||||
|
if (IsAutoHideEnabled && BottomCommandGrid.Children.Count != 0)
|
||||||
|
{
|
||||||
|
ViewModel.BottomCommandGridOpacity = 1f;
|
||||||
|
}
|
||||||
|
e.Handled = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void BottomCommandGrid_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
|
||||||
|
{
|
||||||
|
_isPointerInBottomCommandGrid = false;
|
||||||
|
if (IsAutoHideEnabled && BottomCommandGrid.Children.Count != 0)
|
||||||
|
{
|
||||||
|
ViewModel.BottomCommandGridOpacity = 0f;
|
||||||
|
}
|
||||||
|
e.Handled = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void BottomCommandFlyoutTrigger_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if (BottomCommandFlyoutContainer.Children.Count != 0)
|
||||||
|
{
|
||||||
|
ViewModel.BottomCommandFlyoutTriggerOpacity = 1f;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void BottomCommandFlyoutTrigger_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if (BottomCommandFlyoutContainer.Children.Count != 0)
|
||||||
|
{
|
||||||
|
ViewModel.BottomCommandFlyoutTriggerOpacity = 0f;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void BottomCommandFlyoutTrigger_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if (BottomCommandFlyoutContainer.Children.Count != 0)
|
||||||
|
{
|
||||||
|
BottomCommandFlyout.ShowAt(BottomCommandFlyoutTrigger);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void PlayingQueueButton_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
IsPlayingQueueOpened = !IsPlayingQueueOpened;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void PlaybackOrderButton_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
PlaybackOrder = PlaybackOrder.GetNext();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Receive(PropertyChangedMessage<SongInfo?> message)
|
||||||
|
{
|
||||||
|
if (message.Sender is IMediaSessionsService)
|
||||||
|
{
|
||||||
|
if (message.PropertyName == nameof(IMediaSessionsService.CurrentSongInfo))
|
||||||
|
{
|
||||||
|
TitleTextBlock.Text = message.NewValue?.Title;
|
||||||
|
ArtistsTextBlock.Text = message.NewValue?.DisplayArtists;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public void Receive(PropertyChangedMessage<BitmapImage?> message)
|
||||||
|
{
|
||||||
|
if (message.Sender is IMediaSessionsService)
|
||||||
|
{
|
||||||
|
if (message.PropertyName == nameof(IMediaSessionsService.AlbumArtBitmapImage))
|
||||||
|
{
|
||||||
|
AlbumArtImageSwitcher.Source = message.NewValue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Receive(PropertyChangedMessage<TimeSpan> message)
|
||||||
|
{
|
||||||
|
if (message.Sender is IMediaSessionsService)
|
||||||
|
{
|
||||||
|
if (message.PropertyName == nameof(IMediaSessionsService.CurrentPosition))
|
||||||
|
{
|
||||||
|
TimelineSlider.Value = message.NewValue.TotalSeconds;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -22,8 +22,9 @@
|
|||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
<Grid Grid.Column="0" RowSpacing="18">
|
<Grid Grid.Column="0">
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="*" />
|
<RowDefinition Height="*" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
@@ -42,51 +43,53 @@
|
|||||||
</interactivity:DataTriggerBehavior>
|
</interactivity:DataTriggerBehavior>
|
||||||
</interactivity:Interaction.Behaviors>
|
</interactivity:Interaction.Behaviors>
|
||||||
|
|
||||||
<!-- 播放源列表 -->
|
<InfoBar
|
||||||
<ListView
|
x:Uid="SettingsPageMusicGalleryOpened"
|
||||||
x:Name="MediaSourceProvidersListView"
|
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
AllowDrop="True"
|
IsClosable="False"
|
||||||
CanDragItems="True"
|
IsOpen="{x:Bind ViewModel.AppSettings.MusicGallerySettings.LyricsWindowStatus.IsOpened, Mode=OneWay}"
|
||||||
CanReorderItems="True"
|
Severity="Informational" />
|
||||||
DragItemsCompleted="MediaSourceProvidersListView_DragItemsCompleted"
|
|
||||||
ItemsSource="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo, Mode=OneWay}"
|
|
||||||
ScrollViewer.HorizontalScrollBarVisibility="Hidden"
|
|
||||||
ScrollViewer.HorizontalScrollMode="Enabled"
|
|
||||||
ScrollViewer.VerticalScrollBarVisibility="Disabled"
|
|
||||||
ScrollViewer.VerticalScrollMode="Disabled"
|
|
||||||
SelectedItem="{x:Bind ViewModel.SelectedMediaSourceProvider, Mode=TwoWay}">
|
|
||||||
<ListView.ItemsPanel>
|
|
||||||
<ItemsPanelTemplate>
|
|
||||||
<ItemsStackPanel Orientation="Horizontal" />
|
|
||||||
</ItemsPanelTemplate>
|
|
||||||
</ListView.ItemsPanel>
|
|
||||||
<ListView.ItemTemplate>
|
|
||||||
<DataTemplate x:DataType="models:MediaSourceProviderInfo">
|
|
||||||
<StackPanel Orientation="Horizontal" Spacing="6">
|
|
||||||
<ToolTipService.ToolTip>
|
|
||||||
<ToolTip Content="{Binding Provider, Mode=OneWay}" />
|
|
||||||
</ToolTipService.ToolTip>
|
|
||||||
<FontIcon
|
|
||||||
FontFamily="Segoe UI Symbol"
|
|
||||||
FontSize="12"
|
|
||||||
Glyph="⠿" />
|
|
||||||
<Grid
|
|
||||||
Width="16"
|
|
||||||
Height="16"
|
|
||||||
CornerRadius="4">
|
|
||||||
<ImageIcon Source="{Binding LogoPath}" />
|
|
||||||
</Grid>
|
|
||||||
<TextBlock
|
|
||||||
MaxWidth="200"
|
|
||||||
Text="{Binding DisplayName, Mode=OneWay}"
|
|
||||||
TextWrapping="Wrap" />
|
|
||||||
</StackPanel>
|
|
||||||
</DataTemplate>
|
|
||||||
</ListView.ItemTemplate>
|
|
||||||
</ListView>
|
|
||||||
|
|
||||||
<ScrollViewer Grid.Row="1" Style="{StaticResource SettingsScrollViewerStyle}">
|
<!-- 播放源列表 -->
|
||||||
|
<Grid Grid.Row="1" Margin="36,0,36,4">
|
||||||
|
<StackPanel Spacing="{StaticResource SettingsCardSpacing}">
|
||||||
|
<TextBlock x:Uid="SettingsPageConfigPlaybackSource" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
|
||||||
|
<ComboBox
|
||||||
|
x:Name="MediaSourceProvidersListView"
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
ItemsSource="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo, Mode=OneWay}"
|
||||||
|
SelectedItem="{x:Bind ViewModel.SelectedMediaSourceProvider, Mode=TwoWay}">
|
||||||
|
<ComboBox.ItemTemplate>
|
||||||
|
<DataTemplate x:DataType="models:MediaSourceProviderInfo">
|
||||||
|
<Grid Padding="2,4" ColumnSpacing="12">
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="Auto" />
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<ToolTipService.ToolTip>
|
||||||
|
<ToolTip Content="{Binding Provider, Mode=OneWay}" />
|
||||||
|
</ToolTipService.ToolTip>
|
||||||
|
<Grid
|
||||||
|
Grid.Column="0"
|
||||||
|
Width="16"
|
||||||
|
Height="16"
|
||||||
|
CornerRadius="4">
|
||||||
|
<ImageIcon Source="{Binding LogoPath}" />
|
||||||
|
</Grid>
|
||||||
|
<TextBlock
|
||||||
|
Grid.Column="1"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Text="{Binding DisplayName, Mode=OneWay}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</Grid>
|
||||||
|
</DataTemplate>
|
||||||
|
</ComboBox.ItemTemplate>
|
||||||
|
</ComboBox>
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<!-- 播放源配置 -->
|
||||||
|
<ScrollViewer Grid.Row="2" Style="{StaticResource SettingsScrollViewerStyle}">
|
||||||
<Grid Style="{StaticResource SettingsGridStyle}">
|
<Grid Style="{StaticResource SettingsGridStyle}">
|
||||||
<StackPanel Spacing="{StaticResource SettingsCardSpacing}">
|
<StackPanel Spacing="{StaticResource SettingsCardSpacing}">
|
||||||
|
|
||||||
@@ -269,6 +272,7 @@
|
|||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
|
<!-- 播放源空白占位 -->
|
||||||
<StackPanel
|
<StackPanel
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
@@ -294,6 +298,8 @@
|
|||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
|
Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
|
<!-- 右侧杂项设置 -->
|
||||||
<Grid Grid.Column="1">
|
<Grid Grid.Column="1">
|
||||||
<ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
|
<ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
|
||||||
<Grid Style="{StaticResource SettingsGridStyle}">
|
<Grid Style="{StaticResource SettingsGridStyle}">
|
||||||
@@ -322,10 +328,7 @@
|
|||||||
<local:PropertyRow x:Uid="SettingsPageSongTitle" Value="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.Title, TargetNullValue=N/A, Mode=OneWay}" />
|
<local:PropertyRow x:Uid="SettingsPageSongTitle" Value="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.Title, TargetNullValue=N/A, Mode=OneWay}" />
|
||||||
<local:PropertyRow x:Uid="SettingsPageArtist" Value="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.DisplayArtists, TargetNullValue=N/A, Mode=OneWay}" />
|
<local:PropertyRow x:Uid="SettingsPageArtist" Value="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.DisplayArtists, TargetNullValue=N/A, Mode=OneWay}" />
|
||||||
<local:PropertyRow x:Uid="SettingsPageAlbum" Value="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.Album, TargetNullValue=N/A, Mode=OneWay}" />
|
<local:PropertyRow x:Uid="SettingsPageAlbum" Value="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.Album, TargetNullValue=N/A, Mode=OneWay}" />
|
||||||
<local:PropertyRow
|
<local:PropertyRow x:Uid="LyricsSearchControlDurauion" Value="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.DurationMs, TargetNullValue=N/A, Converter={StaticResource MillisecondsToFormattedTimeConverter}, Mode=OneWay}" />
|
||||||
x:Uid="LyricsSearchControlDurauion"
|
|
||||||
Unit="s"
|
|
||||||
Value="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.Duration, TargetNullValue=N/A, Mode=OneWay}" />
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Expander>
|
</Expander>
|
||||||
|
|
||||||
@@ -338,16 +341,15 @@
|
|||||||
<local:PropertyRow x:Uid="SettingsPageSongTitle" Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Title, TargetNullValue=N/A, Mode=OneWay}" />
|
<local:PropertyRow x:Uid="SettingsPageSongTitle" Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Title, TargetNullValue=N/A, Mode=OneWay}" />
|
||||||
<local:PropertyRow x:Uid="SettingsPageArtist" Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.DisplayArtists, TargetNullValue=N/A, Mode=OneWay}" />
|
<local:PropertyRow x:Uid="SettingsPageArtist" Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.DisplayArtists, TargetNullValue=N/A, Mode=OneWay}" />
|
||||||
<local:PropertyRow x:Uid="SettingsPageAlbum" Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Album, TargetNullValue=N/A, Mode=OneWay}" />
|
<local:PropertyRow x:Uid="SettingsPageAlbum" Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Album, TargetNullValue=N/A, Mode=OneWay}" />
|
||||||
<local:PropertyRow
|
<local:PropertyRow x:Uid="LyricsSearchControlDurauion" Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Duration, Converter={StaticResource SecondsToFormattedTimeConverter}, TargetNullValue=N/A, Mode=OneWay}" />
|
||||||
x:Uid="LyricsSearchControlDurauion"
|
<local:PropertyRow x:Uid="LyricsPageLanguageCode" Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsData.LanguageCode, TargetNullValue=N/A, Mode=OneWay, Converter={StaticResource LanguageCodeToDisplayedNameConverter}}" />
|
||||||
Unit="s"
|
|
||||||
Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Duration, TargetNullValue=N/A, Mode=OneWay}" />
|
|
||||||
<local:PropertyRow
|
<local:PropertyRow
|
||||||
x:Uid="LyricsPageLyricsProviderPrefix"
|
x:Uid="LyricsPageLyricsProviderPrefix"
|
||||||
Link="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Reference, Mode=OneWay}"
|
Link="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Reference, Mode=OneWay}"
|
||||||
ToolTipService.ToolTip="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Reference, TargetNullValue=N/A, Mode=OneWay}"
|
ToolTipService.ToolTip="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Reference, TargetNullValue=N/A, Mode=OneWay}"
|
||||||
Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.ProviderIfFound, Mode=OneWay, Converter={StaticResource LyricsSearchProviderToDisplayNameConverter}}" />
|
Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.ProviderIfFound, Mode=OneWay, Converter={StaticResource LyricsSearchProviderToDisplayNameConverter}}" />
|
||||||
<local:PropertyRow x:Uid="LyricsPageTranslationProviderPrefix" Value="{x:Bind ViewModel.MediaSessionsService.TranslationSearchProvider, Mode=OneWay, Converter={StaticResource TranslationSearchProviderToDisplayNameConverter}}" />
|
<local:PropertyRow x:Uid="LyricsPageTransliterationProviderPrefix" Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.TransliterationProvider, Mode=OneWay, Converter={StaticResource TransliterationSearchProviderToDisplayNameConverter}}" />
|
||||||
|
<local:PropertyRow x:Uid="LyricsPageTranslationProviderPrefix" Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.TranslationProvider, Mode=OneWay, Converter={StaticResource TranslationSearchProviderToDisplayNameConverter}}" />
|
||||||
<local:PropertyRow
|
<local:PropertyRow
|
||||||
x:Uid="LyricsPageMatchPercentage"
|
x:Uid="LyricsPageMatchPercentage"
|
||||||
Unit="%"
|
Unit="%"
|
||||||
@@ -359,6 +361,10 @@
|
|||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Expander>
|
</Expander>
|
||||||
|
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPageListenNewSession">
|
||||||
|
<ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.ListenOnNewPlaybackSource, Mode=TwoWay}" />
|
||||||
|
</dev:SettingsCard>
|
||||||
|
|
||||||
<dev:SettingsCard x:Uid="SettingsPageForceWordByWordEffect">
|
<dev:SettingsCard x:Uid="SettingsPageForceWordByWordEffect">
|
||||||
<ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.IsForceWordByWordEffect, Mode=TwoWay}" />
|
<ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.IsForceWordByWordEffect, Mode=TwoWay}" />
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
@@ -386,16 +392,23 @@
|
|||||||
<ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.TranslationSettings.IsLibreTranslateEnabled, Mode=TwoWay}" />
|
<ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.TranslationSettings.IsLibreTranslateEnabled, Mode=TwoWay}" />
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
<dev:SettingsCard x:Uid="SettingsPageLibreTranslateServer" IsEnabled="{x:Bind ViewModel.AppSettings.TranslationSettings.IsLibreTranslateEnabled, Mode=OneWay}">
|
<dev:SettingsCard x:Uid="SettingsPageLibreTranslateServer" IsEnabled="{x:Bind ViewModel.AppSettings.TranslationSettings.IsLibreTranslateEnabled, Mode=OneWay}">
|
||||||
<StackPanel Orientation="Horizontal" Spacing="12">
|
<Grid ColumnSpacing="6">
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
<ColumnDefinition Width="Auto" />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
<TextBox
|
<TextBox
|
||||||
x:Uid="LibreTranslateServerTextBox"
|
x:Uid="LibreTranslateServerTextBox"
|
||||||
|
Grid.Column="0"
|
||||||
IsEnabled="{x:Bind ViewModel.IsLibreTranslateServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
|
IsEnabled="{x:Bind ViewModel.IsLibreTranslateServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
|
||||||
Text="{x:Bind ViewModel.AppSettings.TranslationSettings.LibreTranslateServer, Mode=TwoWay}" />
|
Text="{x:Bind ViewModel.AppSettings.TranslationSettings.LibreTranslateServer, Mode=TwoWay}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
<Button
|
<Button
|
||||||
x:Uid="SettingsPageServerTestButton"
|
x:Uid="SettingsPageServerTestButton"
|
||||||
|
Grid.Column="1"
|
||||||
Command="{x:Bind ViewModel.LibreTranslateServerTestCommand}"
|
Command="{x:Bind ViewModel.LibreTranslateServerTestCommand}"
|
||||||
IsEnabled="{x:Bind ViewModel.IsLibreTranslateServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
|
IsEnabled="{x:Bind ViewModel.IsLibreTranslateServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
|
||||||
</StackPanel>
|
</Grid>
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
</dev:SettingsExpander.Items>
|
</dev:SettingsExpander.Items>
|
||||||
</dev:SettingsExpander>
|
</dev:SettingsExpander>
|
||||||
@@ -413,9 +426,33 @@
|
|||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
</dev:SettingsExpander.Items>
|
</dev:SettingsExpander.Items>
|
||||||
</dev:SettingsExpander>
|
</dev:SettingsExpander>
|
||||||
<dev:SettingsCard x:Uid="SettingsPageJapanese">
|
<dev:SettingsExpander x:Uid="SettingsPageJapanese" IsExpanded="{x:Bind ViewModel.AppSettings.TranslationSettings.IsJapaneseRomanizationEnabled, Mode=OneWay}">
|
||||||
<ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.TranslationSettings.IsJapaneseRomanizationEnabled, Mode=TwoWay}" />
|
<ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.TranslationSettings.IsJapaneseRomanizationEnabled, Mode=TwoWay}" />
|
||||||
</dev:SettingsCard>
|
<dev:SettingsExpander.Items>
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPageCutletDockerServer" IsEnabled="{x:Bind ViewModel.AppSettings.TranslationSettings.IsJapaneseRomanizationEnabled, Mode=OneWay}">
|
||||||
|
<dev:SettingsCard.Description>
|
||||||
|
<HyperlinkButton Content="https://github.com/jayfunc/cutlet-docker" NavigateUri="https://github.com/jayfunc/cutlet-docker" />
|
||||||
|
</dev:SettingsCard.Description>
|
||||||
|
<Grid ColumnSpacing="6">
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
<ColumnDefinition Width="Auto" />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<TextBox
|
||||||
|
x:Uid="CutletServerTextBox"
|
||||||
|
Grid.Column="0"
|
||||||
|
IsEnabled="{x:Bind ViewModel.IsCutletDockerServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
|
||||||
|
Text="{x:Bind ViewModel.AppSettings.TranslationSettings.CutletDockerServer, Mode=TwoWay}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
<Button
|
||||||
|
x:Uid="SettingsPageServerTestButton"
|
||||||
|
Grid.Column="1"
|
||||||
|
Command="{x:Bind ViewModel.CutletDockerServerTestCommand}"
|
||||||
|
IsEnabled="{x:Bind ViewModel.IsCutletDockerServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
|
||||||
|
</Grid>
|
||||||
|
</dev:SettingsCard>
|
||||||
|
</dev:SettingsExpander.Items>
|
||||||
|
</dev:SettingsExpander>
|
||||||
|
|
||||||
<!-- 中文简体繁体偏好 -->
|
<!-- 中文简体繁体偏好 -->
|
||||||
<TextBlock x:Uid="SettingsPageChineseLyrics" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
|
<TextBlock x:Uid="SettingsPageChineseLyrics" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
|
||||||
@@ -424,9 +461,9 @@
|
|||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
|
|
||||||
<!-- Last.fm -->
|
<!-- Last.fm -->
|
||||||
<TextBlock x:Uid="SettingsPageLastFM" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
|
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="Last.fm" />
|
||||||
<dev:SettingsExpander
|
<dev:SettingsExpander
|
||||||
x:Uid="SettingsPageLastFMManager"
|
Header="Last.fm"
|
||||||
HeaderIcon="{ui:BitmapIcon Source=ms-appx:///Assets/LastFM.png}"
|
HeaderIcon="{ui:BitmapIcon Source=ms-appx:///Assets/LastFM.png}"
|
||||||
IsExpanded="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay}">
|
IsExpanded="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay}">
|
||||||
<StackPanel Orientation="Horizontal" Spacing="6">
|
<StackPanel Orientation="Horizontal" Spacing="6">
|
||||||
@@ -514,6 +551,7 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|||||||
@@ -0,0 +1,93 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
|
<UserControl
|
||||||
|
x:Class="BetterLyrics.WinUI3.Controls.RemoteServerConfigControl"
|
||||||
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
|
xmlns:local="using:BetterLyrics.WinUI3.Controls"
|
||||||
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
mc:Ignorable="d">
|
||||||
|
|
||||||
|
<Grid>
|
||||||
|
<ScrollViewer>
|
||||||
|
<StackPanel Width="400" Spacing="16">
|
||||||
|
<ProgressBar
|
||||||
|
x:Name="ProgressBar"
|
||||||
|
IsIndeterminate="True"
|
||||||
|
Visibility="Collapsed" />
|
||||||
|
<InfoBar
|
||||||
|
x:Name="ErrorInfoBar"
|
||||||
|
IsClosable="True"
|
||||||
|
IsOpen="False"
|
||||||
|
Severity="Error" />
|
||||||
|
|
||||||
|
<TextBox
|
||||||
|
x:Name="NameBox"
|
||||||
|
x:Uid="RemoteServerConfigControlName"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
|
||||||
|
<StackPanel x:Name="RemoteFieldsPanel" Spacing="16">
|
||||||
|
<Grid ColumnDefinitions="*, Auto" ColumnSpacing="12">
|
||||||
|
<TextBox
|
||||||
|
x:Name="HostBox"
|
||||||
|
x:Uid="RemoteServerConfigControlServerAddress"
|
||||||
|
Grid.Column="0"
|
||||||
|
InputScope="Url"
|
||||||
|
PlaceholderText="192.168.1.x"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
|
||||||
|
<NumberBox
|
||||||
|
x:Name="PortBox"
|
||||||
|
x:Uid="RemoteServerConfigControlPort"
|
||||||
|
Grid.Column="1"
|
||||||
|
MinWidth="100"
|
||||||
|
LargeChange="10"
|
||||||
|
SmallChange="1"
|
||||||
|
SpinButtonPlacementMode="Inline"
|
||||||
|
ToolTipService.ToolTip="80"
|
||||||
|
Value="80" />
|
||||||
|
</Grid>
|
||||||
|
</StackPanel>
|
||||||
|
|
||||||
|
<Grid ColumnDefinitions="*, Auto" ColumnSpacing="8">
|
||||||
|
<TextBox
|
||||||
|
x:Name="PathBox"
|
||||||
|
x:Uid="RemoteServerConfigControlPath"
|
||||||
|
Grid.Column="0"
|
||||||
|
TextChanged="PathBox_TextChanged"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
x:Name="BrowseButton"
|
||||||
|
x:Uid="RemoteServerConfigControlBrowse"
|
||||||
|
Grid.Column="1"
|
||||||
|
VerticalAlignment="Bottom"
|
||||||
|
Click="BrowseButton_Click"
|
||||||
|
Visibility="Collapsed" />
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<InfoBar
|
||||||
|
x:Name="PathWarningBar"
|
||||||
|
IsClosable="False"
|
||||||
|
IsOpen="False"
|
||||||
|
Severity="Warning" />
|
||||||
|
|
||||||
|
<StackPanel x:Name="AuthFieldsPanel" Spacing="16">
|
||||||
|
<Grid ColumnDefinitions="*, *" ColumnSpacing="12">
|
||||||
|
<TextBox
|
||||||
|
x:Name="UserBox"
|
||||||
|
x:Uid="RemoteServerConfigControlUsername"
|
||||||
|
Grid.Column="0"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
|
||||||
|
<PasswordBox
|
||||||
|
x:Name="PwdBox"
|
||||||
|
x:Uid="RemoteServerConfigControlPassword"
|
||||||
|
Grid.Column="1"
|
||||||
|
PasswordRevealMode="Peek" />
|
||||||
|
</Grid>
|
||||||
|
</StackPanel>
|
||||||
|
</StackPanel>
|
||||||
|
</ScrollViewer>
|
||||||
|
</Grid>
|
||||||
|
</UserControl>
|
||||||
@@ -0,0 +1,195 @@
|
|||||||
|
using BetterLyrics.WinUI3.Enums;
|
||||||
|
using BetterLyrics.WinUI3.Helper;
|
||||||
|
using BetterLyrics.WinUI3.Models;
|
||||||
|
using BetterLyrics.WinUI3.Services.LocalizationService;
|
||||||
|
using BetterLyrics.WinUI3.Views;
|
||||||
|
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||||
|
using Microsoft.UI.Xaml;
|
||||||
|
using Microsoft.UI.Xaml.Controls;
|
||||||
|
using System;
|
||||||
|
|
||||||
|
namespace BetterLyrics.WinUI3.Controls
|
||||||
|
{
|
||||||
|
public sealed partial class RemoteServerConfigControl : UserControl
|
||||||
|
{
|
||||||
|
private readonly FileSourceType _fileSourceType;
|
||||||
|
private readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
|
||||||
|
|
||||||
|
public RemoteServerConfigControl(FileSourceType fileSourceType)
|
||||||
|
{
|
||||||
|
this.InitializeComponent();
|
||||||
|
_fileSourceType = fileSourceType;
|
||||||
|
|
||||||
|
SetupDefaults();
|
||||||
|
CheckPathForWarning();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SetupDefaults()
|
||||||
|
{
|
||||||
|
if (_fileSourceType == FileSourceType.Local)
|
||||||
|
{
|
||||||
|
RemoteFieldsPanel.Visibility = Visibility.Collapsed;
|
||||||
|
AuthFieldsPanel.Visibility = Visibility.Collapsed;
|
||||||
|
|
||||||
|
BrowseButton.Visibility = Visibility.Visible;
|
||||||
|
|
||||||
|
PathBox.PlaceholderText = @"D:\Music";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
BrowseButton.Visibility = Visibility.Collapsed;
|
||||||
|
RemoteFieldsPanel.Visibility = Visibility.Visible;
|
||||||
|
AuthFieldsPanel.Visibility = Visibility.Visible;
|
||||||
|
|
||||||
|
switch (_fileSourceType)
|
||||||
|
{
|
||||||
|
case FileSourceType.SMB:
|
||||||
|
PortBox.Value = 445;
|
||||||
|
PathBox.PlaceholderText = "SharedMusic";
|
||||||
|
break;
|
||||||
|
case FileSourceType.FTP:
|
||||||
|
PortBox.Value = 21;
|
||||||
|
PathBox.PlaceholderText = "/pub/music";
|
||||||
|
break;
|
||||||
|
case FileSourceType.WebDAV:
|
||||||
|
PortBox.Value = 80;
|
||||||
|
PathBox.PlaceholderText = "/dav/music";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private string GetScheme()
|
||||||
|
{
|
||||||
|
string scheme = string.Empty;
|
||||||
|
switch (_fileSourceType)
|
||||||
|
{
|
||||||
|
case FileSourceType.SMB:
|
||||||
|
scheme = "smb";
|
||||||
|
break;
|
||||||
|
case FileSourceType.FTP:
|
||||||
|
scheme = "ftp";
|
||||||
|
break;
|
||||||
|
case FileSourceType.WebDAV:
|
||||||
|
scheme = "https";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return scheme;
|
||||||
|
}
|
||||||
|
|
||||||
|
public MediaFolder GetConfig()
|
||||||
|
{
|
||||||
|
string finalName = HostBox.Text.Trim();
|
||||||
|
|
||||||
|
if (_fileSourceType == FileSourceType.Local)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(PathBox.Text))
|
||||||
|
throw new ArgumentException(_localizationService.GetLocalizedString("RemoteServerConfigControlPathRequired"));
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(NameBox.Text))
|
||||||
|
finalName = NameBox.Text.Trim();
|
||||||
|
else
|
||||||
|
finalName = PathBox.Text.TrimEnd(System.IO.Path.DirectorySeparatorChar);
|
||||||
|
|
||||||
|
return new MediaFolder
|
||||||
|
{
|
||||||
|
Name = finalName,
|
||||||
|
SourceType = FileSourceType.Local,
|
||||||
|
UriScheme = "file",
|
||||||
|
UriPath = PathBox.Text.Trim(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
if (string.IsNullOrWhiteSpace(HostBox.Text))
|
||||||
|
throw new ArgumentException(_localizationService.GetLocalizedString("RemoteServerConfigControlServerAddressRequired"));
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(NameBox.Text))
|
||||||
|
{
|
||||||
|
finalName = NameBox.Text.Trim();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
finalName = $"{_fileSourceType} - {HostBox.Text}";
|
||||||
|
}
|
||||||
|
|
||||||
|
string scheme = GetScheme();
|
||||||
|
|
||||||
|
var folder = new MediaFolder
|
||||||
|
{
|
||||||
|
Name = finalName,
|
||||||
|
SourceType = _fileSourceType,
|
||||||
|
|
||||||
|
UriScheme = scheme,
|
||||||
|
UriHost = HostBox.Text.Trim(), // ȥ<><C8A5><EFBFBD><EFBFBD>β<EFBFBD>ո<EFBFBD>
|
||||||
|
UriPort = (int)PortBox.Value,
|
||||||
|
|
||||||
|
UriPath = PathBox.Text.Trim(),
|
||||||
|
|
||||||
|
UserName = UserBox.Text.Trim(),
|
||||||
|
Password = PwdBox.Password,
|
||||||
|
};
|
||||||
|
|
||||||
|
return folder;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ShowError(string? message)
|
||||||
|
{
|
||||||
|
ErrorInfoBar.Message = message;
|
||||||
|
ErrorInfoBar.IsOpen = !string.IsNullOrWhiteSpace(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetProgressBarVisibility(Visibility visibility)
|
||||||
|
{
|
||||||
|
ProgressBar.Visibility = visibility;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void CheckPathForWarning()
|
||||||
|
{
|
||||||
|
string? path = PathBox.Text?.Trim();
|
||||||
|
|
||||||
|
bool isSymbolRoot = string.IsNullOrEmpty(path) ||
|
||||||
|
path == "/" ||
|
||||||
|
path == "\\";
|
||||||
|
|
||||||
|
bool isDriveRoot = false;
|
||||||
|
if (!string.IsNullOrEmpty(path))
|
||||||
|
{
|
||||||
|
var normalized = path.TrimEnd('\\', '/');
|
||||||
|
isDriveRoot = normalized.EndsWith(":") && normalized.Length == 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool isRoot = isSymbolRoot || isDriveRoot;
|
||||||
|
|
||||||
|
if (isRoot)
|
||||||
|
{
|
||||||
|
PathWarningBar.Message = _localizationService.GetLocalizedString("FileSystemServiceRootDirectoryWarning");
|
||||||
|
PathWarningBar.IsOpen = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
PathWarningBar.IsOpen = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void PathBox_TextChanged(object sender, TextChangedEventArgs e)
|
||||||
|
{
|
||||||
|
CheckPathForWarning();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async void BrowseButton_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var folder = await PickerHelper.PickSingleFolderAsync<SettingsWindow>();
|
||||||
|
if (folder != null)
|
||||||
|
{
|
||||||
|
PathBox.Text = folder.Path;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
ShowError(ex.Message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,17 +1,7 @@
|
|||||||
using Microsoft.UI.Xaml;
|
using Microsoft.UI.Xaml;
|
||||||
using Microsoft.UI.Xaml.Controls;
|
using Microsoft.UI.Xaml.Controls;
|
||||||
using Microsoft.UI.Xaml.Controls.Primitives;
|
|
||||||
using Microsoft.UI.Xaml.Data;
|
|
||||||
using Microsoft.UI.Xaml.Input;
|
|
||||||
using Microsoft.UI.Xaml.Media;
|
using Microsoft.UI.Xaml.Media;
|
||||||
using Microsoft.UI.Xaml.Navigation;
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.IO;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Runtime.InteropServices.WindowsRuntime;
|
|
||||||
using Windows.Foundation;
|
|
||||||
using Windows.Foundation.Collections;
|
|
||||||
|
|
||||||
// To learn more about WinUI, the WinUI project structure,
|
// To learn more about WinUI, the WinUI project structure,
|
||||||
// and more about our project templates, see: http://aka.ms/winui-project-info.
|
// and more about our project templates, see: http://aka.ms/winui-project-info.
|
||||||
@@ -76,13 +66,13 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
private void UpdateShadowCastGridCornerRadius()
|
private void UpdateShadowCastGridCornerRadius()
|
||||||
{
|
{
|
||||||
var minSize = Math.Min(ShadowCastGrid.ActualHeight, ShadowCastGrid.ActualWidth);
|
var minSize = Math.Min(ShadowCastGrid.ActualHeight, ShadowCastGrid.ActualWidth);
|
||||||
ShadowCastGrid.CornerRadius = new(CornerRadiusAmount / 100.0 * minSize);
|
ShadowCastGrid.CornerRadius = new(CornerRadiusAmount / 100.0 * (minSize / 2));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void UpdateShadowRectCornerRadius()
|
private void UpdateShadowRectCornerRadius()
|
||||||
{
|
{
|
||||||
var minSize = Math.Min(ShadowRect.ActualHeight, ShadowRect.ActualWidth);
|
var minSize = Math.Min(ShadowRect.ActualHeight, ShadowRect.ActualWidth);
|
||||||
ShadowRect.CornerRadius = new(CornerRadiusAmount / 100.0 * minSize);
|
ShadowRect.CornerRadius = new(CornerRadiusAmount / 100.0 * (minSize / 2));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ShadowCastGrid_SizeChanged(object sender, SizeChangedEventArgs e)
|
private void ShadowCastGrid_SizeChanged(object sender, SizeChangedEventArgs e)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
using BetterLyrics.WinUI3.Helper;
|
using BetterLyrics.WinUI3.Helper;
|
||||||
using BetterLyrics.WinUI3.Hooks;
|
using BetterLyrics.WinUI3.Hooks;
|
||||||
using BetterLyrics.WinUI3.Services.ResourceService;
|
using BetterLyrics.WinUI3.Services.LocalizationService;
|
||||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||||
using Microsoft.UI.Input;
|
using Microsoft.UI.Input;
|
||||||
using Microsoft.UI.Xaml;
|
using Microsoft.UI.Xaml;
|
||||||
@@ -16,7 +16,7 @@ namespace BetterLyrics.WinUI3.Controls
|
|||||||
{
|
{
|
||||||
public sealed partial class ShortcutTextBox : UserControl
|
public sealed partial class ShortcutTextBox : UserControl
|
||||||
{
|
{
|
||||||
private readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
|
private readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
|
||||||
|
|
||||||
public ShortcutTextBox()
|
public ShortcutTextBox()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -0,0 +1,391 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
|
<UserControl
|
||||||
|
x:Class="BetterLyrics.WinUI3.Controls.StatsDashboardControl"
|
||||||
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
|
||||||
|
xmlns:converters="using:BetterLyrics.WinUI3.Converter"
|
||||||
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
|
xmlns:dev="using:DevWinUI"
|
||||||
|
xmlns:local="using:BetterLyrics.WinUI3.Controls"
|
||||||
|
xmlns:lvc="using:LiveChartsCore.SkiaSharpView.WinUI"
|
||||||
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
xmlns:models="using:BetterLyrics.WinUI3.Models"
|
||||||
|
xmlns:statsmodels="using:BetterLyrics.WinUI3.Models.Stats"
|
||||||
|
xmlns:ui="using:CommunityToolkit.WinUI"
|
||||||
|
mc:Ignorable="d">
|
||||||
|
|
||||||
|
<UserControl.Resources>
|
||||||
|
<Style x:Key="StatsCardStyle" TargetType="Border">
|
||||||
|
<Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
|
||||||
|
<Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" />
|
||||||
|
<Setter Property="BorderThickness" Value="1" />
|
||||||
|
<Setter Property="CornerRadius" Value="8" />
|
||||||
|
<Setter Property="Padding" Value="16" />
|
||||||
|
<Setter Property="Margin" Value="0,0,12,12" />
|
||||||
|
</Style>
|
||||||
|
</UserControl.Resources>
|
||||||
|
|
||||||
|
<Grid Margin="0,20,0,0">
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="*" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
|
<Grid Grid.Row="0" Margin="36,12">
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="Auto" />
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
<ColumnDefinition Width="Auto" />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
|
<StackPanel Orientation="Horizontal" Spacing="12">
|
||||||
|
<ComboBox
|
||||||
|
x:Uid="StatsDashboardControlTimeRange"
|
||||||
|
Header="Time Range"
|
||||||
|
SelectedIndex="{x:Bind ViewModel.SelectedTimeRange, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
|
||||||
|
<ComboBoxItem x:Uid="StatsDashboardControlToday" />
|
||||||
|
<ComboBoxItem x:Uid="StatsDashboardControlThisWeek" />
|
||||||
|
<ComboBoxItem x:Uid="StatsDashboardControlThisMonth" />
|
||||||
|
<ComboBoxItem x:Uid="StatsDashboardControlThisQuarter" />
|
||||||
|
<ComboBoxItem x:Uid="StatsDashboardControlThisYear" />
|
||||||
|
<ComboBoxItem x:Uid="StatsDashboardControlCustom" />
|
||||||
|
</ComboBox>
|
||||||
|
|
||||||
|
<StackPanel
|
||||||
|
Margin="0,0,0,5"
|
||||||
|
VerticalAlignment="Bottom"
|
||||||
|
Orientation="Horizontal"
|
||||||
|
Spacing="8"
|
||||||
|
Visibility="{x:Bind ViewModel.IsCustomRangeSelected, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
|
||||||
|
<CalendarDatePicker x:Uid="StatsDashboardControlStart" Date="{x:Bind ViewModel.CustomStartDate, Mode=TwoWay}" />
|
||||||
|
<TextBlock
|
||||||
|
Margin="0,26,0,0"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Text="-" />
|
||||||
|
<CalendarDatePicker x:Uid="StatsDashboardControlEnd" Date="{x:Bind ViewModel.CustomEndDate, Mode=TwoWay}" />
|
||||||
|
</StackPanel>
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<ScrollViewer Grid.Row="1" Padding="36,0">
|
||||||
|
<Grid>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition />
|
||||||
|
<RowDefinition />
|
||||||
|
<RowDefinition />
|
||||||
|
<RowDefinition />
|
||||||
|
<RowDefinition />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
|
<Grid Grid.Row="0">
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
|
<Border Grid.Column="0" Style="{StaticResource StatsCardStyle}">
|
||||||
|
<StackPanel>
|
||||||
|
<StackPanel
|
||||||
|
Opacity="0.8"
|
||||||
|
Orientation="Horizontal"
|
||||||
|
Spacing="8">
|
||||||
|
<FontIcon FontSize="14" Glyph="" />
|
||||||
|
<TextBlock x:Uid="StatsDashboardControlTotalDuration" Style="{ThemeResource CaptionTextBlockStyle}" />
|
||||||
|
</StackPanel>
|
||||||
|
<StackPanel
|
||||||
|
Margin="0,8,0,0"
|
||||||
|
Orientation="Horizontal"
|
||||||
|
Spacing="4">
|
||||||
|
<TextBlock
|
||||||
|
Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
|
||||||
|
Style="{ThemeResource SubtitleTextBlockStyle}"
|
||||||
|
Text="{x:Bind ViewModel.TotalDuration.TotalHours, Mode=OneWay, Converter={StaticResource DoubleToDecimalConverter}}" />
|
||||||
|
<TextBlock
|
||||||
|
Margin="0,0,0,2"
|
||||||
|
VerticalAlignment="Bottom"
|
||||||
|
Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
|
||||||
|
Opacity="0.8"
|
||||||
|
Style="{ThemeResource CaptionTextBlockStyle}"
|
||||||
|
Text="Hrs" />
|
||||||
|
</StackPanel>
|
||||||
|
</StackPanel>
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
<Border Grid.Column="1" Style="{StaticResource StatsCardStyle}">
|
||||||
|
<StackPanel>
|
||||||
|
<StackPanel
|
||||||
|
Opacity="0.8"
|
||||||
|
Orientation="Horizontal"
|
||||||
|
Spacing="8">
|
||||||
|
<FontIcon FontSize="14" Glyph="" />
|
||||||
|
<TextBlock x:Uid="StatsDashboardControlTracksPlayed" Style="{ThemeResource CaptionTextBlockStyle}" />
|
||||||
|
</StackPanel>
|
||||||
|
<TextBlock
|
||||||
|
Margin="0,8,0,0"
|
||||||
|
Style="{ThemeResource SubtitleTextBlockStyle}"
|
||||||
|
Text="{x:Bind ViewModel.TotalTracksPlayed, Mode=OneWay}" />
|
||||||
|
</StackPanel>
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
<Border
|
||||||
|
Grid.Column="2"
|
||||||
|
Margin="0,0,0,12"
|
||||||
|
Style="{StaticResource StatsCardStyle}">
|
||||||
|
<StackPanel>
|
||||||
|
<StackPanel
|
||||||
|
Opacity="0.8"
|
||||||
|
Orientation="Horizontal"
|
||||||
|
Spacing="8">
|
||||||
|
<FontIcon FontSize="14" Glyph="" />
|
||||||
|
<TextBlock x:Uid="StatsDashboardControlTopSource" Style="{ThemeResource CaptionTextBlockStyle}" />
|
||||||
|
</StackPanel>
|
||||||
|
<TextBlock
|
||||||
|
Margin="0,8,0,0"
|
||||||
|
Style="{ThemeResource SubtitleTextBlockStyle}"
|
||||||
|
Text="{x:Bind ViewModel.TopPlayerName, Mode=OneWay}" />
|
||||||
|
</StackPanel>
|
||||||
|
</Border>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<!-- Activity by hour -->
|
||||||
|
<Border
|
||||||
|
Grid.Row="1"
|
||||||
|
Margin="0,0,0,12"
|
||||||
|
Style="{StaticResource StatsCardStyle}">
|
||||||
|
<Grid>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
|
<StackPanel
|
||||||
|
Margin="0,0,0,12"
|
||||||
|
Orientation="Horizontal"
|
||||||
|
Spacing="8">
|
||||||
|
<TextBlock x:Uid="StatsDashboardControlActivityByHour" Style="{ThemeResource SubtitleTextBlockStyle}" />
|
||||||
|
</StackPanel>
|
||||||
|
|
||||||
|
<Grid Grid.Row="1" Margin="0,0,0,16">
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<StackPanel>
|
||||||
|
<TextBlock
|
||||||
|
x:Uid="StatsDashboardControlMostActive"
|
||||||
|
FontSize="12"
|
||||||
|
Foreground="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
|
||||||
|
<TextBlock FontWeight="SemiBold" Text="{x:Bind ViewModel.PeakHourText, Mode=OneWay}" />
|
||||||
|
</StackPanel>
|
||||||
|
<StackPanel Grid.Column="1">
|
||||||
|
<TextBlock
|
||||||
|
x:Uid="StatsDashboardControlLeastActive"
|
||||||
|
FontSize="12"
|
||||||
|
Foreground="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
|
||||||
|
<TextBlock FontWeight="SemiBold" Text="{x:Bind ViewModel.QuietHourText, Mode=OneWay}" />
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<lvc:CartesianChart
|
||||||
|
Grid.Row="2"
|
||||||
|
Height="180"
|
||||||
|
Margin="0,8,0,0"
|
||||||
|
Background="Transparent"
|
||||||
|
TooltipPosition="Top">
|
||||||
|
|
||||||
|
<lvc:CartesianChart.XAxes>
|
||||||
|
<lvc:AxesCollection>
|
||||||
|
<lvc:XamlAxis Labels="{x:Bind ViewModel.HourlyXAxisLabels, Mode=OneWay}" TextSize="{StaticResource BodyTextBlockFontSize}" />
|
||||||
|
</lvc:AxesCollection>
|
||||||
|
</lvc:CartesianChart.XAxes>
|
||||||
|
|
||||||
|
<lvc:CartesianChart.YAxes>
|
||||||
|
<lvc:AxesCollection>
|
||||||
|
<lvc:XamlAxis
|
||||||
|
x:Uid="StatsDashboardControlTrackCountAxis"
|
||||||
|
NameTextSize="{StaticResource BodyTextBlockFontSize}"
|
||||||
|
ShowSeparatorLines="False"
|
||||||
|
TextSize="{StaticResource BodyTextBlockFontSize}" />
|
||||||
|
</lvc:AxesCollection>
|
||||||
|
</lvc:CartesianChart.YAxes>
|
||||||
|
|
||||||
|
<lvc:CartesianChart.Series>
|
||||||
|
<lvc:SeriesCollection>
|
||||||
|
<lvc:XamlColumnSeries
|
||||||
|
x:Name="HourlySeries"
|
||||||
|
Rx="4"
|
||||||
|
Ry="4"
|
||||||
|
Values="{x:Bind ViewModel.HourlySeriesValues, Mode=OneWay}" />
|
||||||
|
</lvc:SeriesCollection>
|
||||||
|
</lvc:CartesianChart.Series>
|
||||||
|
|
||||||
|
</lvc:CartesianChart>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
<!-- Top artists and sources -->
|
||||||
|
<Grid Grid.Row="2">
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
|
<!-- Top artists -->
|
||||||
|
<Border Grid.Column="0" Style="{StaticResource StatsCardStyle}">
|
||||||
|
<Grid>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition />
|
||||||
|
<RowDefinition MinHeight="250" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
<TextBlock
|
||||||
|
x:Uid="StatsDashboardControlTopArtists"
|
||||||
|
Margin="0,0,0,12"
|
||||||
|
Style="{ThemeResource SubtitleTextBlockStyle}" />
|
||||||
|
|
||||||
|
<lvc:CartesianChart
|
||||||
|
Grid.Row="1"
|
||||||
|
Margin="0,8,0,0"
|
||||||
|
Background="Transparent">
|
||||||
|
|
||||||
|
<lvc:CartesianChart.XAxes>
|
||||||
|
<lvc:AxesCollection>
|
||||||
|
<lvc:XamlAxis x:Uid="StatsDashboardControlTrackCountAxis" NameTextSize="{StaticResource BodyTextBlockFontSize}" />
|
||||||
|
</lvc:AxesCollection>
|
||||||
|
</lvc:CartesianChart.XAxes>
|
||||||
|
|
||||||
|
<lvc:CartesianChart.YAxes>
|
||||||
|
<lvc:AxesCollection>
|
||||||
|
<lvc:XamlAxis IsInverted="True" IsVisible="False" />
|
||||||
|
</lvc:AxesCollection>
|
||||||
|
</lvc:CartesianChart.YAxes>
|
||||||
|
|
||||||
|
<lvc:CartesianChart.Series>
|
||||||
|
<lvc:SeriesCollection>
|
||||||
|
<lvc:XamlRowSeries
|
||||||
|
Padding="4"
|
||||||
|
DataLabelsFormatter="{x:Bind ViewModel.ArtistsLabelsFormatter}"
|
||||||
|
DataLabelsSize="{StaticResource BodyTextBlockFontSize}"
|
||||||
|
Rx="4"
|
||||||
|
Ry="4"
|
||||||
|
ShowDataLabels="True"
|
||||||
|
Values="{x:Bind ViewModel.ArtistSeriesValues, Mode=OneWay}" />
|
||||||
|
</lvc:SeriesCollection>
|
||||||
|
</lvc:CartesianChart.Series>
|
||||||
|
|
||||||
|
</lvc:CartesianChart>
|
||||||
|
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
<!-- 播放源分布 -->
|
||||||
|
<Border
|
||||||
|
Grid.Column="1"
|
||||||
|
Margin="0,0,0,12"
|
||||||
|
Style="{StaticResource StatsCardStyle}">
|
||||||
|
<Grid>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="*" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
<TextBlock
|
||||||
|
x:Uid="StatsDashboardControlSources"
|
||||||
|
Margin="0,0,0,12"
|
||||||
|
Style="{ThemeResource SubtitleTextBlockStyle}" />
|
||||||
|
|
||||||
|
<lvc:PieChart
|
||||||
|
Grid.Row="1"
|
||||||
|
MinHeight="160"
|
||||||
|
Background="Transparent"
|
||||||
|
LegendPosition="Right"
|
||||||
|
LegendTextSize="{StaticResource BodyTextBlockFontSize}"
|
||||||
|
Series="{x:Bind ViewModel.SourceSeries, Mode=OneWay}"
|
||||||
|
TooltipPosition="Center" />
|
||||||
|
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<!-- Top tracks -->
|
||||||
|
<Border
|
||||||
|
Grid.Row="3"
|
||||||
|
Margin="0,0,0,20"
|
||||||
|
Style="{StaticResource StatsCardStyle}">
|
||||||
|
<Grid>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition />
|
||||||
|
<RowDefinition />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
<TextBlock
|
||||||
|
x:Uid="StatsDashboardControlTopSongs"
|
||||||
|
Margin="0,0,0,18"
|
||||||
|
Style="{ThemeResource SubtitleTextBlockStyle}" />
|
||||||
|
<dev:OpacityMaskView Grid.Row="1" Margin="-20,0">
|
||||||
|
<dev:OpacityMaskView.OpacityMask>
|
||||||
|
<LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
|
||||||
|
<GradientStop Offset="0" Color="Transparent" />
|
||||||
|
<GradientStop Offset="0.02" Color="#FFFFFFFF" />
|
||||||
|
<GradientStop Offset="0.98" Color="#FFFFFFFF" />
|
||||||
|
<GradientStop Offset="1" Color="Transparent" />
|
||||||
|
</LinearGradientBrush>
|
||||||
|
</dev:OpacityMaskView.OpacityMask>
|
||||||
|
<ListView
|
||||||
|
Padding="20,0"
|
||||||
|
ItemContainerStyle="{StaticResource ListViewStretchedItemContainerStyle}"
|
||||||
|
ItemsSource="{x:Bind ViewModel.TopSongs, Mode=OneWay}"
|
||||||
|
ScrollViewer.HorizontalScrollBarVisibility="Hidden"
|
||||||
|
ScrollViewer.HorizontalScrollMode="Enabled"
|
||||||
|
ScrollViewer.VerticalScrollBarVisibility="Disabled"
|
||||||
|
ScrollViewer.VerticalScrollMode="Disabled"
|
||||||
|
SelectionMode="None">
|
||||||
|
<ListView.ItemsPanel>
|
||||||
|
<ItemsPanelTemplate>
|
||||||
|
<ItemsStackPanel Orientation="Horizontal" />
|
||||||
|
</ItemsPanelTemplate>
|
||||||
|
</ListView.ItemsPanel>
|
||||||
|
<ListView.ItemTemplate>
|
||||||
|
<DataTemplate x:DataType="statsmodels:SongPlayCount">
|
||||||
|
<Grid
|
||||||
|
MinWidth="200"
|
||||||
|
Margin="6,0"
|
||||||
|
Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
|
||||||
|
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
|
||||||
|
BorderThickness="1"
|
||||||
|
CornerRadius="4">
|
||||||
|
<StackPanel Margin="20">
|
||||||
|
<TextBlock
|
||||||
|
Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
|
||||||
|
Style="{StaticResource SubtitleTextBlockStyle}"
|
||||||
|
Text="{x:Bind Title}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
<RichTextBlock>
|
||||||
|
<Paragraph>
|
||||||
|
<Run Text="{x:Bind Artist}" />
|
||||||
|
<Run Text="·" />
|
||||||
|
<Run Text="{x:Bind PlayCount}" />
|
||||||
|
<Run x:Uid="StatsDashboardControlTrackCountText" />
|
||||||
|
</Paragraph>
|
||||||
|
</RichTextBlock>
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
</DataTemplate>
|
||||||
|
</ListView.ItemTemplate>
|
||||||
|
</ListView>
|
||||||
|
</dev:OpacityMaskView>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
</Grid>
|
||||||
|
</ScrollViewer>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
Grid.Row="1"
|
||||||
|
HorizontalAlignment="Right"
|
||||||
|
VerticalAlignment="Bottom"
|
||||||
|
Command="{x:Bind ViewModel.GenerateTestDataCommand}"
|
||||||
|
Content="Generate test data"
|
||||||
|
Visibility="Collapsed" />
|
||||||
|
</Grid>
|
||||||
|
</UserControl>
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Runtime.InteropServices.WindowsRuntime;
|
||||||
|
using Windows.Foundation;
|
||||||
|
using Windows.Foundation.Collections;
|
||||||
|
using Microsoft.UI.Xaml;
|
||||||
|
using Microsoft.UI.Xaml.Controls;
|
||||||
|
using Microsoft.UI.Xaml.Controls.Primitives;
|
||||||
|
using Microsoft.UI.Xaml.Data;
|
||||||
|
using Microsoft.UI.Xaml.Input;
|
||||||
|
using Microsoft.UI.Xaml.Media;
|
||||||
|
using Microsoft.UI.Xaml.Navigation;
|
||||||
|
using BetterLyrics.WinUI3.ViewModels;
|
||||||
|
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||||
|
using BetterLyrics.WinUI3.Enums;
|
||||||
|
|
||||||
|
// To learn more about WinUI, the WinUI project structure,
|
||||||
|
// and more about our project templates, see: http://aka.ms/winui-project-info.
|
||||||
|
|
||||||
|
namespace BetterLyrics.WinUI3.Controls;
|
||||||
|
|
||||||
|
public sealed partial class StatsDashboardControl : UserControl
|
||||||
|
{
|
||||||
|
public StatsDashboardControlViewModel ViewModel => (StatsDashboardControlViewModel)DataContext;
|
||||||
|
|
||||||
|
public StatsDashboardControl()
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
DataContext = Ioc.Default.GetRequiredService<StatsDashboardControlViewModel>();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -14,9 +14,8 @@
|
|||||||
x:Name="TrayIcon"
|
x:Name="TrayIcon"
|
||||||
x:FieldModifier="public"
|
x:FieldModifier="public"
|
||||||
ContextMenuMode="SecondWindow"
|
ContextMenuMode="SecondWindow"
|
||||||
DoubleClickCommand="{x:Bind ViewModel.OpenLyricsCommand}"
|
|
||||||
IconSource="ms-appx:///Assets/Logo.ico"
|
IconSource="ms-appx:///Assets/Logo.ico"
|
||||||
LeftClickCommand="{x:Bind ViewModel.OpenLyricsCommand}"
|
LeftClickCommand="{x:Bind ViewModel.OpenLyricsWindowSwitchCommand}"
|
||||||
NoLeftClickDelay="True"
|
NoLeftClickDelay="True"
|
||||||
ToolTipText="{x:Bind ViewModel.ToolTipText, Mode=OneWay}">
|
ToolTipText="{x:Bind ViewModel.ToolTipText, Mode=OneWay}">
|
||||||
<tb:TaskbarIcon.ContextFlyout>
|
<tb:TaskbarIcon.ContextFlyout>
|
||||||
@@ -39,11 +38,6 @@
|
|||||||
Command="{x:Bind ViewModel.OpenLyricsSearchWindowCommand}"
|
Command="{x:Bind ViewModel.OpenLyricsSearchWindowCommand}"
|
||||||
Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
|
Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
|
||||||
Glyph=}" />
|
Glyph=}" />
|
||||||
<MenuFlyoutItem
|
|
||||||
x:Uid="SystemTrayLyrics"
|
|
||||||
Command="{x:Bind ViewModel.OpenLyricsCommand}"
|
|
||||||
Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
|
|
||||||
Glyph=}" />
|
|
||||||
<MenuFlyoutItem
|
<MenuFlyoutItem
|
||||||
x:Uid="SystemTrayMusicGallery"
|
x:Uid="SystemTrayMusicGallery"
|
||||||
Command="{x:Bind ViewModel.OpenMusicGalleryCommand}"
|
Command="{x:Bind ViewModel.OpenMusicGalleryCommand}"
|
||||||
|
|||||||
@@ -18,13 +18,7 @@
|
|||||||
<TextBlock x:Uid="AppSettingsControlGeneral" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
|
<TextBlock x:Uid="AppSettingsControlGeneral" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
|
||||||
|
|
||||||
<dev:SettingsCard x:Uid="SettingsPageConfigName" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
<dev:SettingsCard x:Uid="SettingsPageConfigName" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
||||||
<StackPanel
|
<TextBox Text="{x:Bind LyricsWindowStatus.Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" />
|
||||||
Margin="0,6,0,0"
|
|
||||||
Orientation="Horizontal"
|
|
||||||
Spacing="6">
|
|
||||||
<TextBox Text="{x:Bind LyricsWindowStatus.Name, Mode=TwoWay}" TextWrapping="Wrap" />
|
|
||||||
<Button Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, FontSize=12, Glyph=}" Style="{StaticResource GhostButtonStyle}" />
|
|
||||||
</StackPanel>
|
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
|
|
||||||
<dev:SettingsExpander
|
<dev:SettingsExpander
|
||||||
@@ -87,38 +81,25 @@
|
|||||||
</dev:SettingsExpander>
|
</dev:SettingsExpander>
|
||||||
|
|
||||||
<dev:SettingsExpander
|
<dev:SettingsExpander
|
||||||
x:Uid="SettingsPageWindowBounds"
|
x:Uid="SettingsPagePinToTaskbar"
|
||||||
HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
|
HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
|
||||||
Glyph=}"
|
Glyph=}"
|
||||||
IsExpanded="True">
|
IsExpanded="{x:Bind LyricsWindowStatus.IsPinToTaskbar, Mode=OneWay}">
|
||||||
|
<ToggleSwitch IsOn="{x:Bind LyricsWindowStatus.IsPinToTaskbar, Mode=TwoWay}" />
|
||||||
<dev:SettingsExpander.Items>
|
<dev:SettingsExpander.Items>
|
||||||
<dev:SettingsCard Header="X">
|
<dev:SettingsCard x:Uid="SettingsPageTaskbarPlacement">
|
||||||
<NumberBox
|
<ComboBox SelectedIndex="{x:Bind LyricsWindowStatus.TaskbarPlacement, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
|
||||||
SmallChange="10"
|
<ComboBoxItem x:Uid="SettingsPageLeft" />
|
||||||
SpinButtonPlacementMode="Inline"
|
<ComboBoxItem x:Uid="SettingsPageRight" />
|
||||||
Value="{x:Bind LyricsWindowStatus.WindowX, Mode=TwoWay}" />
|
</ComboBox>
|
||||||
</dev:SettingsCard>
|
|
||||||
<dev:SettingsCard Header="Y">
|
|
||||||
<NumberBox
|
|
||||||
SmallChange="10"
|
|
||||||
SpinButtonPlacementMode="Inline"
|
|
||||||
Value="{x:Bind LyricsWindowStatus.WindowY, Mode=TwoWay}" />
|
|
||||||
</dev:SettingsCard>
|
|
||||||
<dev:SettingsCard x:Uid="SettingsPageWidth">
|
|
||||||
<NumberBox
|
|
||||||
SmallChange="10"
|
|
||||||
SpinButtonPlacementMode="Inline"
|
|
||||||
Value="{x:Bind LyricsWindowStatus.WindowWidth, Mode=TwoWay}" />
|
|
||||||
</dev:SettingsCard>
|
|
||||||
<dev:SettingsCard x:Uid="SettingsPageHeight">
|
|
||||||
<NumberBox
|
|
||||||
SmallChange="10"
|
|
||||||
SpinButtonPlacementMode="Inline"
|
|
||||||
Value="{x:Bind LyricsWindowStatus.WindowHeight, Mode=TwoWay}" />
|
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
</dev:SettingsExpander.Items>
|
</dev:SettingsExpander.Items>
|
||||||
</dev:SettingsExpander>
|
</dev:SettingsExpander>
|
||||||
|
|
||||||
|
<dev:SettingsCard x:Uid="SettingsPageAlwaysHideUnlockButton" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
||||||
|
<ToggleSwitch IsOn="{x:Bind LyricsWindowStatus.IsAlwaysHideUnlockButton, Mode=TwoWay}" />
|
||||||
|
</dev:SettingsCard>
|
||||||
|
|
||||||
<dev:SettingsExpander
|
<dev:SettingsExpander
|
||||||
x:Uid="SettingsPageAOT"
|
x:Uid="SettingsPageAOT"
|
||||||
HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
|
HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
|
||||||
@@ -140,14 +121,6 @@
|
|||||||
<ToggleSwitch IsOn="{x:Bind LyricsWindowStatus.IsShownInSwitchers, Mode=TwoWay}" />
|
<ToggleSwitch IsOn="{x:Bind LyricsWindowStatus.IsShownInSwitchers, Mode=TwoWay}" />
|
||||||
</dev:SettingsCard>
|
</dev:SettingsCard>
|
||||||
|
|
||||||
<dev:SettingsCard x:Uid="SettingsPageClickThrough" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
|
||||||
<ToggleSwitch IsOn="{x:Bind LyricsWindowStatus.IsClickThrough, Mode=TwoWay}" />
|
|
||||||
</dev:SettingsCard>
|
|
||||||
|
|
||||||
<dev:SettingsCard x:Uid="SettingsPageBorderless" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
|
||||||
<ToggleSwitch IsOn="{x:Bind LyricsWindowStatus.IsBorderless, Mode=TwoWay}" />
|
|
||||||
</dev:SettingsCard>
|
|
||||||
|
|
||||||
<dev:SettingsCard x:Uid="SettingsPageDragArea" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
<dev:SettingsCard x:Uid="SettingsPageDragArea" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=}">
|
||||||
<ComboBox SelectedIndex="{x:Bind LyricsWindowStatus.TitleBarArea, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
|
<ComboBox SelectedIndex="{x:Bind LyricsWindowStatus.TitleBarArea, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
|
||||||
<ComboBoxItem x:Uid="SettingsPageTitleBarAreaNone" />
|
<ComboBoxItem x:Uid="SettingsPageTitleBarAreaNone" />
|
||||||
|
|||||||
@@ -1,23 +1,10 @@
|
|||||||
using BetterLyrics.WinUI3.Hooks;
|
using BetterLyrics.WinUI3.Hooks;
|
||||||
using BetterLyrics.WinUI3.Models;
|
using BetterLyrics.WinUI3.Models;
|
||||||
using BetterLyrics.WinUI3.Models.Settings;
|
using BetterLyrics.WinUI3.Models.Settings;
|
||||||
using CommunityToolkit.Mvvm.ComponentModel;
|
|
||||||
using CommunityToolkit.Mvvm.Input;
|
|
||||||
using Microsoft.UI.Xaml;
|
using Microsoft.UI.Xaml;
|
||||||
using Microsoft.UI.Xaml.Controls;
|
using Microsoft.UI.Xaml.Controls;
|
||||||
using Microsoft.UI.Xaml.Controls.Primitives;
|
|
||||||
using Microsoft.UI.Xaml.Data;
|
|
||||||
using Microsoft.UI.Xaml.Input;
|
|
||||||
using Microsoft.UI.Xaml.Media;
|
|
||||||
using Microsoft.UI.Xaml.Navigation;
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
using System.IO;
|
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Runtime.InteropServices.WindowsRuntime;
|
|
||||||
using Windows.Foundation;
|
|
||||||
using Windows.Foundation.Collections;
|
|
||||||
|
|
||||||
// To learn more about WinUI, the WinUI project structure,
|
// To learn more about WinUI, the WinUI project structure,
|
||||||
// and more about our project templates, see: http://aka.ms/winui-project-info.
|
// and more about our project templates, see: http://aka.ms/winui-project-info.
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
using BetterLyrics.WinUI3.Enums;
|
using BetterLyrics.WinUI3.Enums;
|
||||||
using BetterLyrics.WinUI3.Services.ResourceService;
|
using BetterLyrics.WinUI3.Services.LocalizationService;
|
||||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||||
using Microsoft.UI.Xaml.Data;
|
using Microsoft.UI.Xaml.Data;
|
||||||
using System;
|
using System;
|
||||||
@@ -8,7 +8,7 @@ namespace BetterLyrics.WinUI3.Converter
|
|||||||
{
|
{
|
||||||
public partial class AlbumArtSearchProviderToDisplayNameConverter : IValueConverter
|
public partial class AlbumArtSearchProviderToDisplayNameConverter : IValueConverter
|
||||||
{
|
{
|
||||||
private readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
|
private readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
|
||||||
|
|
||||||
public object Convert(object value, Type targetType, object parameter, string language)
|
public object Convert(object value, Type targetType, object parameter, string language)
|
||||||
{
|
{
|
||||||
@@ -16,8 +16,8 @@ namespace BetterLyrics.WinUI3.Converter
|
|||||||
{
|
{
|
||||||
return provider switch
|
return provider switch
|
||||||
{
|
{
|
||||||
AlbumArtSearchProvider.Local => _resourceService.GetLocalizedString("AlbumArtSearchLocalProvider"),
|
AlbumArtSearchProvider.Local => _localizationService.GetLocalizedString("AlbumArtSearchLocalProvider"),
|
||||||
AlbumArtSearchProvider.SMTC => _resourceService.GetLocalizedString("AlbumArtSearchSMTCProvider"),
|
AlbumArtSearchProvider.SMTC => _localizationService.GetLocalizedString("AlbumArtSearchSMTCProvider"),
|
||||||
AlbumArtSearchProvider.iTunes => "iTunes",
|
AlbumArtSearchProvider.iTunes => "iTunes",
|
||||||
_ => throw new Exception($"Unknown AlbumArtSearchProvider: {provider}"),
|
_ => throw new Exception($"Unknown AlbumArtSearchProvider: {provider}"),
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -17,20 +17,16 @@ namespace BetterLyrics.WinUI3.Converter
|
|||||||
using (var ms = new MemoryStream(byteArray))
|
using (var ms = new MemoryStream(byteArray))
|
||||||
{
|
{
|
||||||
var stream = ms.AsRandomAccessStream();
|
var stream = ms.AsRandomAccessStream();
|
||||||
|
|
||||||
var bitmapImage = new BitmapImage();
|
var bitmapImage = new BitmapImage();
|
||||||
|
|
||||||
bitmapImage.SetSource(stream);
|
bitmapImage.SetSource(stream);
|
||||||
|
|
||||||
return bitmapImage;
|
return bitmapImage;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch
|
catch { }
|
||||||
{
|
|
||||||
return PathHelper.AlbumArtPlaceholderPath;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return PathHelper.AlbumArtPlaceholderPath;
|
return new BitmapImage(new Uri(PathHelper.AlbumArtPlaceholderPath));
|
||||||
}
|
}
|
||||||
|
|
||||||
public object ConvertBack(object value, Type targetType, object parameter, string language)
|
public object ConvertBack(object value, Type targetType, object parameter, string language)
|
||||||
|
|||||||
@@ -11,7 +11,8 @@ namespace BetterLyrics.WinUI3.Converter
|
|||||||
{
|
{
|
||||||
if (value is string langCode)
|
if (value is string langCode)
|
||||||
{
|
{
|
||||||
return LanguageHelper.SupportedDisplayLanguages.FindIndex(x => x.LanguageCode == langCode);
|
var found = LanguageHelper.SupportedDisplayLanguages.FindIndex(x => x.LanguageCode == langCode);
|
||||||
|
return found == -1 ? 0 : found;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
using Microsoft.UI.Xaml.Data;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
namespace BetterLyrics.WinUI3.Converter
|
||||||
|
{
|
||||||
|
public partial class DoubleToDecimalConverter : IValueConverter
|
||||||
|
{
|
||||||
|
public object Convert(object value, Type targetType, object parameter, string language)
|
||||||
|
{
|
||||||
|
if (value == null) return string.Empty;
|
||||||
|
|
||||||
|
if (double.TryParse(value.ToString(), out double number))
|
||||||
|
{
|
||||||
|
int decimalPlaces = 2;
|
||||||
|
if (parameter != null && int.TryParse(parameter.ToString(), out int parsedParams))
|
||||||
|
{
|
||||||
|
decimalPlaces = parsedParams;
|
||||||
|
}
|
||||||
|
|
||||||
|
return number.ToString($"F{decimalPlaces}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return value.ToString() ?? "";
|
||||||
|
}
|
||||||
|
|
||||||
|
public object ConvertBack(object value, Type targetType, object parameter, string language)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
using BetterLyrics.WinUI3.Enums;
|
||||||
|
using Microsoft.UI.Xaml.Data;
|
||||||
|
using System;
|
||||||
|
|
||||||
|
namespace BetterLyrics.WinUI3.Converter
|
||||||
|
{
|
||||||
|
public partial class FileSourceTypeToIconConverter : IValueConverter
|
||||||
|
{
|
||||||
|
public object Convert(object value, Type targetType, object parameter, string language)
|
||||||
|
{
|
||||||
|
if (value is FileSourceType type)
|
||||||
|
{
|
||||||
|
return type switch
|
||||||
|
{
|
||||||
|
FileSourceType.Local => "\uE8B7", // Folder
|
||||||
|
FileSourceType.SMB => "\uE839", // Network
|
||||||
|
FileSourceType.FTP => "\uE838", // Globe
|
||||||
|
FileSourceType.WebDAV => "\uE753", // Cloud
|
||||||
|
_ => "\uE8B7"
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return "\uE8B7";
|
||||||
|
}
|
||||||
|
|
||||||
|
public object ConvertBack(object value, Type targetType, object parameter, string language) => throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -11,7 +11,11 @@ namespace BetterLyrics.WinUI3.Converter
|
|||||||
{
|
{
|
||||||
if (value is string langCode)
|
if (value is string langCode)
|
||||||
{
|
{
|
||||||
if (PhoneticHelper.IsPhoneticCode(langCode))
|
if (langCode == "N/A")
|
||||||
|
{
|
||||||
|
return langCode;
|
||||||
|
}
|
||||||
|
else if (PhoneticHelper.IsPhoneticCode(langCode))
|
||||||
{
|
{
|
||||||
return PhoneticHelper.GetDisplayName(langCode);
|
return PhoneticHelper.GetDisplayName(langCode);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
// 2025/6/23 by Zhe Fang
|
// 2025/6/23 by Zhe Fang
|
||||||
|
|
||||||
using BetterLyrics.WinUI3.Enums;
|
using BetterLyrics.WinUI3.Enums;
|
||||||
using BetterLyrics.WinUI3.Services.ResourceService;
|
using BetterLyrics.WinUI3.Services.LocalizationService;
|
||||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||||
using Microsoft.UI.Xaml.Data;
|
using Microsoft.UI.Xaml.Data;
|
||||||
using System;
|
using System;
|
||||||
@@ -10,7 +10,7 @@ namespace BetterLyrics.WinUI3.Converter
|
|||||||
{
|
{
|
||||||
public partial class LyricsSearchProviderToDisplayNameConverter : IValueConverter
|
public partial class LyricsSearchProviderToDisplayNameConverter : IValueConverter
|
||||||
{
|
{
|
||||||
private readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
|
private readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
|
||||||
|
|
||||||
public object Convert(object value, Type targetType, object parameter, string language)
|
public object Convert(object value, Type targetType, object parameter, string language)
|
||||||
{
|
{
|
||||||
@@ -24,10 +24,10 @@ namespace BetterLyrics.WinUI3.Converter
|
|||||||
LyricsSearchProvider.Kugou => "酷狗音乐",
|
LyricsSearchProvider.Kugou => "酷狗音乐",
|
||||||
LyricsSearchProvider.AmllTtmlDb => "amll-ttml-db",
|
LyricsSearchProvider.AmllTtmlDb => "amll-ttml-db",
|
||||||
LyricsSearchProvider.AppleMusic => "Apple Music",
|
LyricsSearchProvider.AppleMusic => "Apple Music",
|
||||||
LyricsSearchProvider.LocalLrcFile => _resourceService.GetLocalizedString("LyricsSearchProviderLocalLrcFile"),
|
LyricsSearchProvider.LocalLrcFile => _localizationService.GetLocalizedString("LyricsSearchProviderLocalLrcFile"),
|
||||||
LyricsSearchProvider.LocalMusicFile => _resourceService.GetLocalizedString("LyricsSearchProviderLocalMusicFile"),
|
LyricsSearchProvider.LocalMusicFile => _localizationService.GetLocalizedString("LyricsSearchProviderLocalMusicFile"),
|
||||||
LyricsSearchProvider.LocalEslrcFile => _resourceService.GetLocalizedString("LyricsSearchProviderEslrcFile"),
|
LyricsSearchProvider.LocalEslrcFile => _localizationService.GetLocalizedString("LyricsSearchProviderEslrcFile"),
|
||||||
LyricsSearchProvider.LocalTtmlFile => _resourceService.GetLocalizedString("LyricsSearchProviderTtmlFile"),
|
LyricsSearchProvider.LocalTtmlFile => _localizationService.GetLocalizedString("LyricsSearchProviderTtmlFile"),
|
||||||
_ => "N/A",
|
_ => "N/A",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
// 2025/6/23 by Zhe Fang
|
// 2025/6/23 by Zhe Fang
|
||||||
|
|
||||||
using BetterLyrics.WinUI3.Services.ResourceService;
|
|
||||||
|
using BetterLyrics.WinUI3.Services.LocalizationService;
|
||||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||||
using Microsoft.UI.Xaml;
|
using Microsoft.UI.Xaml;
|
||||||
using Microsoft.UI.Xaml.Data;
|
using Microsoft.UI.Xaml.Data;
|
||||||
@@ -10,13 +11,13 @@ namespace BetterLyrics.WinUI3.Converter
|
|||||||
{
|
{
|
||||||
public partial class MatchedLocalFilesPathToVisibilityConverter : IValueConverter
|
public partial class MatchedLocalFilesPathToVisibilityConverter : IValueConverter
|
||||||
{
|
{
|
||||||
private readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
|
private readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
|
||||||
|
|
||||||
public object Convert(object value, Type targetType, object parameter, string language)
|
public object Convert(object value, Type targetType, object parameter, string language)
|
||||||
{
|
{
|
||||||
if (value is string path)
|
if (value is string path)
|
||||||
{
|
{
|
||||||
if (path == _resourceService.GetLocalizedString("MainPageNoLocalFilesMatched"))
|
if (path == _localizationService.GetLocalizedString("MainPageNoLocalFilesMatched"))
|
||||||
{
|
{
|
||||||
return Visibility.Collapsed;
|
return Visibility.Collapsed;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,18 +3,37 @@ using System;
|
|||||||
|
|
||||||
namespace BetterLyrics.WinUI3.Converter
|
namespace BetterLyrics.WinUI3.Converter
|
||||||
{
|
{
|
||||||
public class MillisecondsToFormattedTimeConverter : IValueConverter
|
public partial class MillisecondsToFormattedTimeConverter : IValueConverter
|
||||||
{
|
{
|
||||||
public object Convert(object value, Type targetType, object parameter, string language)
|
public object Convert(object value, Type targetType, object parameter, string language)
|
||||||
{
|
{
|
||||||
if (value is int milliseconds)
|
double? milliseconds = null;
|
||||||
|
|
||||||
|
if (value is int iVal) milliseconds = iVal;
|
||||||
|
else if (value is double dVal) milliseconds = dVal;
|
||||||
|
else if (value is long lVal) milliseconds = lVal;
|
||||||
|
|
||||||
|
if (milliseconds.HasValue)
|
||||||
{
|
{
|
||||||
return TimeSpan.FromMilliseconds(milliseconds).ToString(@"mm\:ss\.fff");
|
var ts = TimeSpan.FromMilliseconds(milliseconds.Value);
|
||||||
}
|
|
||||||
else if (value is double doubleMilliseconds)
|
string? format = parameter?.ToString();
|
||||||
{
|
|
||||||
return TimeSpan.FromMilliseconds(doubleMilliseconds).ToString(@"mm\:ss\.fff");
|
if (string.IsNullOrEmpty(format))
|
||||||
|
{
|
||||||
|
format = @"mm\:ss\.fff";
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
return ts.ToString(format);
|
||||||
|
}
|
||||||
|
catch (FormatException)
|
||||||
|
{
|
||||||
|
return ts.ToString();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return value?.ToString() ?? "";
|
return value?.ToString() ?? "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ using System;
|
|||||||
|
|
||||||
namespace BetterLyrics.WinUI3.Converter
|
namespace BetterLyrics.WinUI3.Converter
|
||||||
{
|
{
|
||||||
public class MillisecondsToSecondsConverter : IValueConverter
|
public partial class MillisecondsToSecondsConverter : IValueConverter
|
||||||
{
|
{
|
||||||
public object Convert(object value, Type targetType, object parameter, string language)
|
public object Convert(object value, Type targetType, object parameter, string language)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
using BetterLyrics.WinUI3.Helper;
|
||||||
|
using Microsoft.UI.Xaml.Data;
|
||||||
|
using Microsoft.UI.Xaml.Media.Imaging;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
namespace BetterLyrics.WinUI3.Converter
|
||||||
|
{
|
||||||
|
public partial class PathToImageConverter : IValueConverter
|
||||||
|
{
|
||||||
|
public object Convert(object value, Type targetType, object parameter, string language)
|
||||||
|
{
|
||||||
|
string targetPath = PathHelper.AlbumArtPlaceholderPath;
|
||||||
|
if (value is string path)
|
||||||
|
{
|
||||||
|
if (File.Exists(path))
|
||||||
|
{
|
||||||
|
targetPath = path;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return new BitmapImage(new Uri(targetPath));
|
||||||
|
}
|
||||||
|
|
||||||
|
public object ConvertBack(object value, Type targetType, object parameter, string language)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
using ATL;
|
|
||||||
using BetterLyrics.WinUI3.Extensions;
|
|
||||||
using Microsoft.UI.Xaml.Data;
|
|
||||||
using System;
|
|
||||||
|
|
||||||
namespace BetterLyrics.WinUI3.Converter
|
|
||||||
{
|
|
||||||
public partial class TrackToLyricsConverter : IValueConverter
|
|
||||||
{
|
|
||||||
public object Convert(object value, Type targetType, object parameter, string language)
|
|
||||||
{
|
|
||||||
if (value is Track track)
|
|
||||||
{
|
|
||||||
return track.GetRawLyrics();
|
|
||||||
}
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
public object ConvertBack(object value, Type targetType, object parameter, string language)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
// 2025/6/23 by Zhe Fang
|
// 2025/6/23 by Zhe Fang
|
||||||
|
|
||||||
using BetterLyrics.WinUI3.Enums;
|
using BetterLyrics.WinUI3.Enums;
|
||||||
using BetterLyrics.WinUI3.Services.ResourceService;
|
using BetterLyrics.WinUI3.Services.LocalizationService;
|
||||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||||
using Microsoft.UI.Xaml.Data;
|
using Microsoft.UI.Xaml.Data;
|
||||||
using System;
|
using System;
|
||||||
@@ -10,7 +10,7 @@ namespace BetterLyrics.WinUI3.Converter
|
|||||||
{
|
{
|
||||||
public partial class TranslationSearchProviderToDisplayNameConverter : IValueConverter
|
public partial class TranslationSearchProviderToDisplayNameConverter : IValueConverter
|
||||||
{
|
{
|
||||||
private readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
|
private readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
|
||||||
|
|
||||||
public object Convert(object value, Type targetType, object parameter, string language)
|
public object Convert(object value, Type targetType, object parameter, string language)
|
||||||
{
|
{
|
||||||
@@ -24,10 +24,10 @@ namespace BetterLyrics.WinUI3.Converter
|
|||||||
TranslationSearchProvider.Kugou => "酷狗音乐",
|
TranslationSearchProvider.Kugou => "酷狗音乐",
|
||||||
TranslationSearchProvider.AmllTtmlDb => "amll-ttml-db",
|
TranslationSearchProvider.AmllTtmlDb => "amll-ttml-db",
|
||||||
TranslationSearchProvider.AppleMusic => "Apple Music",
|
TranslationSearchProvider.AppleMusic => "Apple Music",
|
||||||
TranslationSearchProvider.LocalLrcFile => _resourceService.GetLocalizedString("LyricsSearchProviderLocalLrcFile"),
|
TranslationSearchProvider.LocalLrcFile => _localizationService.GetLocalizedString("LyricsSearchProviderLocalLrcFile"),
|
||||||
TranslationSearchProvider.LocalMusicFile => _resourceService.GetLocalizedString("LyricsSearchProviderLocalMusicFile"),
|
TranslationSearchProvider.LocalMusicFile => _localizationService.GetLocalizedString("LyricsSearchProviderLocalMusicFile"),
|
||||||
TranslationSearchProvider.LocalEslrcFile => _resourceService.GetLocalizedString("LyricsSearchProviderEslrcFile"),
|
TranslationSearchProvider.LocalEslrcFile => _localizationService.GetLocalizedString("LyricsSearchProviderEslrcFile"),
|
||||||
TranslationSearchProvider.LocalTtmlFile => _resourceService.GetLocalizedString("LyricsSearchProviderTtmlFile"),
|
TranslationSearchProvider.LocalTtmlFile => _localizationService.GetLocalizedString("LyricsSearchProviderTtmlFile"),
|
||||||
TranslationSearchProvider.LibreTranslate => "LibreTranslate",
|
TranslationSearchProvider.LibreTranslate => "LibreTranslate",
|
||||||
_ => "N/A",
|
_ => "N/A",
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,42 @@
|
|||||||
|
using BetterLyrics.WinUI3.Enums;
|
||||||
|
using BetterLyrics.WinUI3.Services.LocalizationService;
|
||||||
|
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||||
|
using Microsoft.UI.Xaml.Data;
|
||||||
|
using System;
|
||||||
|
|
||||||
|
namespace BetterLyrics.WinUI3.Converter
|
||||||
|
{
|
||||||
|
public partial class TransliterationSearchProviderToDisplayNameConverter : IValueConverter
|
||||||
|
{
|
||||||
|
private readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
|
||||||
|
|
||||||
|
public object Convert(object value, Type targetType, object parameter, string language)
|
||||||
|
{
|
||||||
|
if (value is TransliterationSearchProvider provider)
|
||||||
|
{
|
||||||
|
return provider switch
|
||||||
|
{
|
||||||
|
TransliterationSearchProvider.LrcLib => "LrcLib",
|
||||||
|
TransliterationSearchProvider.QQ => "QQ 音乐",
|
||||||
|
TransliterationSearchProvider.Netease => "网易云音乐",
|
||||||
|
TransliterationSearchProvider.Kugou => "酷狗音乐",
|
||||||
|
TransliterationSearchProvider.AmllTtmlDb => "amll-ttml-db",
|
||||||
|
TransliterationSearchProvider.AppleMusic => "Apple Music",
|
||||||
|
TransliterationSearchProvider.LocalLrcFile => _localizationService.GetLocalizedString("LyricsSearchProviderLocalLrcFile"),
|
||||||
|
TransliterationSearchProvider.LocalMusicFile => _localizationService.GetLocalizedString("LyricsSearchProviderLocalMusicFile"),
|
||||||
|
TransliterationSearchProvider.LocalEslrcFile => _localizationService.GetLocalizedString("LyricsSearchProviderEslrcFile"),
|
||||||
|
TransliterationSearchProvider.LocalTtmlFile => _localizationService.GetLocalizedString("LyricsSearchProviderTtmlFile"),
|
||||||
|
TransliterationSearchProvider.BetterLyrics => "BetterLyrics",
|
||||||
|
TransliterationSearchProvider.CutletDocker => "cutlet-docker",
|
||||||
|
_ => "N/A",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return "N/A";
|
||||||
|
}
|
||||||
|
|
||||||
|
public object ConvertBack(object value, Type targetType, object parameter, string language)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
namespace BetterLyrics.WinUI3.Enums
|
||||||
|
{
|
||||||
|
public enum AutoScanInterval
|
||||||
|
{
|
||||||
|
Disabled,
|
||||||
|
Every15Minutes,
|
||||||
|
EveryHour,
|
||||||
|
Every6Hours,
|
||||||
|
Daily
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
namespace BetterLyrics.WinUI3.Enums
|
||||||
|
{
|
||||||
|
public enum FileSourceType
|
||||||
|
{
|
||||||
|
Local,
|
||||||
|
SMB,
|
||||||
|
FTP,
|
||||||
|
WebDAV
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,8 +1,4 @@
|
|||||||
using System;
|
namespace BetterLyrics.WinUI3.Enums
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Text;
|
|
||||||
|
|
||||||
namespace BetterLyrics.WinUI3.Enums
|
|
||||||
{
|
{
|
||||||
public enum ImageSwitchType
|
public enum ImageSwitchType
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
namespace BetterLyrics.WinUI3.Enums
|
|
||||||
{
|
|
||||||
public enum LineMaskType
|
|
||||||
{
|
|
||||||
Glow,
|
|
||||||
Highlight,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
// 2025/6/23 by Zhe Fang
|
|
||||||
|
|
||||||
namespace BetterLyrics.WinUI3.Enums
|
|
||||||
{
|
|
||||||
public enum LineRenderingType
|
|
||||||
{
|
|
||||||
CurrentChar,
|
|
||||||
LineStartToCurrentChar,
|
|
||||||
CurrentLine
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
namespace BetterLyrics.WinUI3.Enums
|
||||||
|
{
|
||||||
|
public enum LyricsEffectScope
|
||||||
|
{
|
||||||
|
LongDurationSyllable,
|
||||||
|
LineStartToCurrentChar,
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,8 +3,6 @@
|
|||||||
public enum ShortcutID
|
public enum ShortcutID
|
||||||
{
|
{
|
||||||
LyricsWindowShowOrHide,
|
LyricsWindowShowOrHide,
|
||||||
Borderless,
|
|
||||||
ClickThrough,
|
|
||||||
LyricsWindowSwitch,
|
LyricsWindowSwitch,
|
||||||
PlayOrPauseSong,
|
PlayOrPauseSong,
|
||||||
NextSong,
|
NextSong,
|
||||||
|
|||||||
16
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/StatsRange.cs
Normal file
16
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/StatsRange.cs
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
namespace BetterLyrics.WinUI3.Enums
|
||||||
|
{
|
||||||
|
public enum StatsRange
|
||||||
|
{
|
||||||
|
Today,
|
||||||
|
ThisWeek,
|
||||||
|
ThisMonth,
|
||||||
|
ThisQuarter,
|
||||||
|
ThisYear,
|
||||||
|
Custom
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
namespace BetterLyrics.WinUI3.Enums
|
||||||
|
{
|
||||||
|
public enum TaskbarPlacement
|
||||||
|
{
|
||||||
|
Left,
|
||||||
|
Right,
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
namespace BetterLyrics.WinUI3.Enums
|
||||||
|
{
|
||||||
|
public enum TransliterationSearchProvider
|
||||||
|
{
|
||||||
|
QQ,
|
||||||
|
Kugou,
|
||||||
|
Netease,
|
||||||
|
LrcLib,
|
||||||
|
AmllTtmlDb,
|
||||||
|
AppleMusic,
|
||||||
|
LocalMusicFile,
|
||||||
|
LocalLrcFile,
|
||||||
|
LocalEslrcFile,
|
||||||
|
LocalTtmlFile,
|
||||||
|
BetterLyrics,
|
||||||
|
CutletDocker
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
using Microsoft.UI.Xaml;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
namespace BetterLyrics.WinUI3.Events
|
||||||
|
{
|
||||||
|
public class InteractiveAreaEventArgs : EventArgs
|
||||||
|
{
|
||||||
|
public IList<FrameworkElement> Elements { get; set; }
|
||||||
|
|
||||||
|
public InteractiveAreaEventArgs(IList<FrameworkElement> elements)
|
||||||
|
{
|
||||||
|
Elements = elements;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
using System;
|
||||||
|
using Windows.Foundation;
|
||||||
|
|
||||||
|
namespace BetterLyrics.WinUI3.Events
|
||||||
|
{
|
||||||
|
public class TaskbarFreeBoundsChangedEventArgs : EventArgs
|
||||||
|
{
|
||||||
|
public Rect TaskbarFreeBounds { get; }
|
||||||
|
public TaskbarFreeBoundsChangedEventArgs(Rect taskbarBounds)
|
||||||
|
{
|
||||||
|
TaskbarFreeBounds = taskbarBounds;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,123 @@
|
|||||||
|
using BetterLyrics.WinUI3.Helper;
|
||||||
|
using BetterLyrics.WinUI3.Models;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
namespace BetterLyrics.WinUI3.Extensions
|
||||||
|
{
|
||||||
|
public static class LyricsDataExtensions
|
||||||
|
{
|
||||||
|
extension(LyricsData lyricsData)
|
||||||
|
{
|
||||||
|
public static LyricsData GetLoadingPlaceholder()
|
||||||
|
{
|
||||||
|
return new LyricsData()
|
||||||
|
{
|
||||||
|
LyricsLines = [
|
||||||
|
new LyricsLine
|
||||||
|
{
|
||||||
|
StartMs = 0,
|
||||||
|
EndMs = (int)TimeSpan.FromMinutes(99).TotalMilliseconds,
|
||||||
|
OriginalText = "● ● ●",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
LanguageCode = "N/A",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetTranslatedText(LyricsData translationData, int toleranceMs = 50)
|
||||||
|
{
|
||||||
|
foreach (var line in lyricsData.LyricsLines)
|
||||||
|
{
|
||||||
|
// 在翻译歌词中查找与当前行开始时间最接近且在容忍范围内的行
|
||||||
|
var transLine = translationData.LyricsLines
|
||||||
|
.FirstOrDefault(t => Math.Abs(t.StartMs - line.StartMs) <= toleranceMs);
|
||||||
|
|
||||||
|
if (transLine != null)
|
||||||
|
{
|
||||||
|
// 此处 transLine.OriginalText 指翻译中的“原文”属性
|
||||||
|
line.TranslatedText = transLine.OriginalText;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// 没有匹配的翻译
|
||||||
|
line.TranslatedText = "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetPhoneticText(LyricsData phoneticData, int toleranceMs = 50)
|
||||||
|
{
|
||||||
|
foreach (var line in lyricsData.LyricsLines)
|
||||||
|
{
|
||||||
|
// 在音译歌词中查找与当前行开始时间最接近且在容忍范围内的行
|
||||||
|
var transLine = phoneticData.LyricsLines
|
||||||
|
.FirstOrDefault(t => Math.Abs(t.StartMs - line.StartMs) <= toleranceMs);
|
||||||
|
|
||||||
|
if (transLine != null)
|
||||||
|
{
|
||||||
|
// 此处 transLine.OriginalText 指音译中的“原文”属性
|
||||||
|
line.PhoneticText = transLine.OriginalText;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// 没有匹配的音译
|
||||||
|
line.PhoneticText = "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetTranslation(string translation)
|
||||||
|
{
|
||||||
|
List<string> translationArr = translation.Split(StringHelper.NewLine).ToList();
|
||||||
|
int i = 0;
|
||||||
|
foreach (var line in lyricsData.LyricsLines)
|
||||||
|
{
|
||||||
|
if (i >= translationArr.Count)
|
||||||
|
{
|
||||||
|
line.TranslatedText = ""; // No translation available, keep empty
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
line.TranslatedText = translationArr[i];
|
||||||
|
}
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetTransliteration(string transliteration)
|
||||||
|
{
|
||||||
|
List<string> transliterationArr = transliteration.Split(StringHelper.NewLine).ToList();
|
||||||
|
int i = 0;
|
||||||
|
foreach (var line in lyricsData.LyricsLines)
|
||||||
|
{
|
||||||
|
if (i >= transliterationArr.Count)
|
||||||
|
{
|
||||||
|
line.PhoneticText = ""; // No transliteration available, keep empty
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
line.PhoneticText = transliterationArr[i];
|
||||||
|
}
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public LyricsLine? GetLyricsLine(double sec)
|
||||||
|
{
|
||||||
|
for (int i = 0; i < lyricsData.LyricsLines.Count; i++)
|
||||||
|
{
|
||||||
|
var line = lyricsData.LyricsLines[i];
|
||||||
|
if (line.StartMs > sec * 1000)
|
||||||
|
{
|
||||||
|
return lyricsData.LyricsLines.ElementAtOrDefault(i - 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -59,6 +59,21 @@ namespace BetterLyrics.WinUI3.Extensions
|
|||||||
LyricsSearchProvider.LocalTtmlFile => TranslationSearchProvider.LocalTtmlFile,
|
LyricsSearchProvider.LocalTtmlFile => TranslationSearchProvider.LocalTtmlFile,
|
||||||
_ => null,
|
_ => null,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
public TransliterationSearchProvider? ToTransliterationSearchProvider() => provider switch
|
||||||
|
{
|
||||||
|
LyricsSearchProvider.LrcLib => TransliterationSearchProvider.LrcLib,
|
||||||
|
LyricsSearchProvider.QQ => TransliterationSearchProvider.QQ,
|
||||||
|
LyricsSearchProvider.Kugou => TransliterationSearchProvider.Kugou,
|
||||||
|
LyricsSearchProvider.Netease => TransliterationSearchProvider.Netease,
|
||||||
|
LyricsSearchProvider.AmllTtmlDb => TransliterationSearchProvider.AmllTtmlDb,
|
||||||
|
LyricsSearchProvider.AppleMusic => TransliterationSearchProvider.AppleMusic,
|
||||||
|
LyricsSearchProvider.LocalMusicFile => TransliterationSearchProvider.LocalMusicFile,
|
||||||
|
LyricsSearchProvider.LocalLrcFile => TransliterationSearchProvider.LocalLrcFile,
|
||||||
|
LyricsSearchProvider.LocalEslrcFile => TransliterationSearchProvider.LocalEslrcFile,
|
||||||
|
LyricsSearchProvider.LocalTtmlFile => TransliterationSearchProvider.LocalTtmlFile,
|
||||||
|
_ => null,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,27 +1,30 @@
|
|||||||
using BetterLyrics.WinUI3.Enums;
|
using BetterLyrics.WinUI3.Enums;
|
||||||
|
using BetterLyrics.WinUI3.Hooks;
|
||||||
using BetterLyrics.WinUI3.Models;
|
using BetterLyrics.WinUI3.Models;
|
||||||
using BetterLyrics.WinUI3.Models.Settings;
|
using BetterLyrics.WinUI3.Models.Settings;
|
||||||
using BetterLyrics.WinUI3.Services.ResourceService;
|
using BetterLyrics.WinUI3.Services.LocalizationService;
|
||||||
|
using BetterLyrics.WinUI3.Views;
|
||||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||||
|
using Microsoft.UI.Xaml;
|
||||||
using Windows.Foundation;
|
using Windows.Foundation;
|
||||||
|
|
||||||
namespace BetterLyrics.WinUI3.Extensions
|
namespace BetterLyrics.WinUI3.Extensions
|
||||||
{
|
{
|
||||||
public static class LyricsWindowStatusExtensions
|
public static class LyricsWindowStatusExtensions
|
||||||
{
|
{
|
||||||
private static readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
|
private static readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
|
||||||
|
|
||||||
public static LyricsWindowStatus DesktopMode()
|
public static LyricsWindowStatus DesktopMode(Window? window = null)
|
||||||
{
|
{
|
||||||
return new LyricsWindowStatus
|
window ??= WindowHook.GetWindow<SystemTrayWindow>();
|
||||||
|
return new LyricsWindowStatus(window)
|
||||||
{
|
{
|
||||||
Name = _resourceService.GetLocalizedString("DesktopMode"),
|
Name = _localizationService.GetLocalizedString("DesktopMode"),
|
||||||
LyricsDisplayType = LyricsDisplayType.LyricsOnly,
|
LyricsDisplayType = LyricsDisplayType.LyricsOnly,
|
||||||
WindowBounds = new Rect(100, 100, 600, 250),
|
WindowBounds = new Rect(100, 100, 600, 250),
|
||||||
|
IsLocked = true,
|
||||||
IsAlwaysOnTop = true,
|
IsAlwaysOnTop = true,
|
||||||
IsAlwaysOnTopPolling = true,
|
IsAlwaysOnTopPolling = true,
|
||||||
IsBorderless = true,
|
|
||||||
IsClickThrough = true,
|
|
||||||
IsAdaptToEnvironment = true,
|
IsAdaptToEnvironment = true,
|
||||||
IsShownInSwitchers = false,
|
IsShownInSwitchers = false,
|
||||||
EnvironmentSampleMode = WindowPixelSampleMode.WindowEdge,
|
EnvironmentSampleMode = WindowPixelSampleMode.WindowEdge,
|
||||||
@@ -36,20 +39,19 @@ namespace BetterLyrics.WinUI3.Extensions
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LyricsWindowStatus DockedMode()
|
public static LyricsWindowStatus DockedMode(Window? window = null)
|
||||||
{
|
{
|
||||||
var status = new LyricsWindowStatus
|
window ??= WindowHook.GetWindow<SystemTrayWindow>();
|
||||||
|
var status = new LyricsWindowStatus(window)
|
||||||
{
|
{
|
||||||
Name = _resourceService.GetLocalizedString("DockedMode"),
|
Name = _localizationService.GetLocalizedString("DockedMode"),
|
||||||
IsWorkArea = true,
|
IsWorkArea = true,
|
||||||
IsAlwaysOnTop = true,
|
IsAlwaysOnTop = true,
|
||||||
IsAlwaysOnTopPolling = true,
|
IsAlwaysOnTopPolling = true,
|
||||||
IsBorderless = true,
|
|
||||||
IsAdaptToEnvironment = true,
|
IsAdaptToEnvironment = true,
|
||||||
IsShownInSwitchers = false,
|
IsShownInSwitchers = false,
|
||||||
LyricsDisplayType = LyricsDisplayType.LyricsOnly,
|
LyricsDisplayType = LyricsDisplayType.LyricsOnly,
|
||||||
EnvironmentSampleMode = WindowPixelSampleMode.BelowWindow,
|
EnvironmentSampleMode = WindowPixelSampleMode.BelowWindow,
|
||||||
TitleBarArea = TitleBarArea.None,
|
|
||||||
LyricsStyleSettings = new LyricsStyleSettings
|
LyricsStyleSettings = new LyricsStyleSettings
|
||||||
{
|
{
|
||||||
LyricsAlignmentType = TextAlignmentType.Center,
|
LyricsAlignmentType = TextAlignmentType.Center,
|
||||||
@@ -64,19 +66,18 @@ namespace BetterLyrics.WinUI3.Extensions
|
|||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LyricsWindowStatus FullscreenMode()
|
public static LyricsWindowStatus FullscreenMode(Window? window = null)
|
||||||
{
|
{
|
||||||
var status = new LyricsWindowStatus
|
window ??= WindowHook.GetWindow<SystemTrayWindow>();
|
||||||
|
var status = new LyricsWindowStatus(window)
|
||||||
{
|
{
|
||||||
Name = _resourceService.GetLocalizedString("FullscreenMode"),
|
Name = _localizationService.GetLocalizedString("FullscreenMode"),
|
||||||
IsBorderless = true,
|
|
||||||
IsAlwaysOnTop = true,
|
|
||||||
TitleBarArea = TitleBarArea.None,
|
|
||||||
LyricsLayoutOrientation = LyricsLayoutOrientation.Vertical,
|
LyricsLayoutOrientation = LyricsLayoutOrientation.Vertical,
|
||||||
LyricsStyleSettings = new LyricsStyleSettings
|
LyricsStyleSettings = new LyricsStyleSettings
|
||||||
{
|
{
|
||||||
LyricsAlignmentType = TextAlignmentType.Center,
|
LyricsAlignmentType = TextAlignmentType.Center,
|
||||||
},
|
},
|
||||||
|
IsFullscreen = true,
|
||||||
};
|
};
|
||||||
status.WindowBounds = new Rect(
|
status.WindowBounds = new Rect(
|
||||||
status.MonitorBounds.X,
|
status.MonitorBounds.X,
|
||||||
@@ -87,22 +88,49 @@ namespace BetterLyrics.WinUI3.Extensions
|
|||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LyricsWindowStatus StandardMode()
|
public static LyricsWindowStatus StandardMode(Window? window = null)
|
||||||
{
|
{
|
||||||
return new LyricsWindowStatus
|
window ??= WindowHook.GetWindow<SystemTrayWindow>();
|
||||||
|
return new LyricsWindowStatus(window)
|
||||||
{
|
{
|
||||||
Name = _resourceService.GetLocalizedString("StandardMode"),
|
Name = _localizationService.GetLocalizedString("StandardMode"),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LyricsWindowStatus NarrowMode()
|
public static LyricsWindowStatus NarrowMode(Window? window = null)
|
||||||
{
|
{
|
||||||
return new LyricsWindowStatus
|
window ??= WindowHook.GetWindow<SystemTrayWindow>();
|
||||||
|
return new LyricsWindowStatus(window)
|
||||||
{
|
{
|
||||||
Name = _resourceService.GetLocalizedString("NarrowMode"),
|
Name = _localizationService.GetLocalizedString("NarrowMode"),
|
||||||
WindowBounds = new Rect(100, 100, 400, 800),
|
WindowBounds = new Rect(100, 100, 400, 800),
|
||||||
LyricsLayoutOrientation = LyricsLayoutOrientation.Vertical,
|
LyricsLayoutOrientation = LyricsLayoutOrientation.Vertical,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static LyricsWindowStatus TaskbarMode(Window? window = null)
|
||||||
|
{
|
||||||
|
window ??= WindowHook.GetWindow<SystemTrayWindow>();
|
||||||
|
return new LyricsWindowStatus(window)
|
||||||
|
{
|
||||||
|
Name = _localizationService.GetLocalizedString("TaskbarMode"),
|
||||||
|
LyricsDisplayType = LyricsDisplayType.LyricsOnly,
|
||||||
|
IsPinToTaskbar = true,
|
||||||
|
IsLocked = true,
|
||||||
|
IsAlwaysOnTop = true,
|
||||||
|
IsAlwaysOnTopPolling = true,
|
||||||
|
IsAdaptToEnvironment = true,
|
||||||
|
IsShownInSwitchers = false,
|
||||||
|
EnvironmentSampleMode = WindowPixelSampleMode.WindowEdge,
|
||||||
|
LyricsStyleSettings = new()
|
||||||
|
{
|
||||||
|
LyricsAlignmentType = TextAlignmentType.Center,
|
||||||
|
},
|
||||||
|
LyricsBackgroundSettings = new LyricsBackgroundSettings
|
||||||
|
{
|
||||||
|
IsFluidOverlayEnabled = false,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using Windows.Foundation;
|
using Vanara.PInvoke;
|
||||||
|
using Windows.Foundation;
|
||||||
using Windows.Graphics;
|
using Windows.Graphics;
|
||||||
|
|
||||||
namespace BetterLyrics.WinUI3.Extensions
|
namespace BetterLyrics.WinUI3.Extensions
|
||||||
@@ -77,5 +78,15 @@ namespace BetterLyrics.WinUI3.Extensions
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
extension(RECT rect)
|
||||||
|
{
|
||||||
|
public Rect ToRect() => new(
|
||||||
|
rect.Left,
|
||||||
|
rect.Top,
|
||||||
|
rect.Right - rect.Left,
|
||||||
|
rect.Bottom - rect.Top
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
using System.Drawing;
|
||||||
|
using Windows.Foundation;
|
||||||
|
|
||||||
|
namespace BetterLyrics.WinUI3.Extensions
|
||||||
|
{
|
||||||
|
public static class RectangleExtensions
|
||||||
|
{
|
||||||
|
extension(Rectangle rect)
|
||||||
|
{
|
||||||
|
public Rect ToRect() => new(
|
||||||
|
rect.Left,
|
||||||
|
rect.Top,
|
||||||
|
rect.Right - rect.Left,
|
||||||
|
rect.Bottom - rect.Top
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
using BetterLyrics.WinUI3.Models;
|
using BetterLyrics.WinUI3.Models;
|
||||||
|
using System;
|
||||||
|
|
||||||
namespace BetterLyrics.WinUI3.Extensions
|
namespace BetterLyrics.WinUI3.Extensions
|
||||||
{
|
{
|
||||||
@@ -30,6 +31,22 @@ namespace BetterLyrics.WinUI3.Extensions
|
|||||||
songInfo.Album = value;
|
songInfo.Album = value;
|
||||||
return songInfo;
|
return songInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public PlayHistoryItem? ToPlayHistoryItem(double actualPlayedMs)
|
||||||
|
{
|
||||||
|
if (songInfo == null) return null;
|
||||||
|
|
||||||
|
return new PlayHistoryItem
|
||||||
|
{
|
||||||
|
Title = songInfo.Title,
|
||||||
|
Artist = songInfo.DisplayArtists,
|
||||||
|
Album = songInfo.Album,
|
||||||
|
PlayerId = songInfo.PlayerId ?? "N/A",
|
||||||
|
TotalDurationMs = songInfo.DurationMs,
|
||||||
|
DurationPlayedMs = actualPlayedMs,
|
||||||
|
StartedAt = DateTime.Now.AddMilliseconds(-actualPlayedMs)
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,31 +0,0 @@
|
|||||||
using ATL;
|
|
||||||
using System.IO;
|
|
||||||
|
|
||||||
namespace BetterLyrics.WinUI3.Extensions
|
|
||||||
{
|
|
||||||
public static class TrackExtensions
|
|
||||||
{
|
|
||||||
extension(Track track)
|
|
||||||
{
|
|
||||||
public string GetParentFolderName() => Directory.GetParent(track.Path)?.Name ?? "";
|
|
||||||
|
|
||||||
public string GetParentFolderPath() => Directory.GetParent(track.Path)?.FullName ?? "";
|
|
||||||
|
|
||||||
public string GetRawLyrics()
|
|
||||||
{
|
|
||||||
if (track.Path is string path)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return TagLib.File.Create(path).Tag.Lyrics;
|
|
||||||
}
|
|
||||||
catch (System.Exception)
|
|
||||||
{
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
using BetterLyrics.WinUI3.Enums;
|
using BetterLyrics.WinUI3.Enums;
|
||||||
using BetterLyrics.WinUI3.Helper;
|
using BetterLyrics.WinUI3.Helper;
|
||||||
using BetterLyrics.WinUI3.Services.ResourceService;
|
using BetterLyrics.WinUI3.Services.LocalizationService;
|
||||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||||
using Microsoft.UI.Windowing;
|
using Microsoft.UI.Windowing;
|
||||||
using Microsoft.UI.Xaml;
|
using Microsoft.UI.Xaml;
|
||||||
@@ -9,16 +9,24 @@ namespace BetterLyrics.WinUI3.Extensions
|
|||||||
{
|
{
|
||||||
public static class WindowExtensions
|
public static class WindowExtensions
|
||||||
{
|
{
|
||||||
private static readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
|
private static readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
|
||||||
|
|
||||||
extension(Window window)
|
extension(Window window)
|
||||||
{
|
{
|
||||||
public void Init(
|
public void Init(
|
||||||
string titleKey,
|
string titleKey = "",
|
||||||
|
string title = "",
|
||||||
TitleBarHeightOption titleBarHeightOption = TitleBarHeightOption.Standard,
|
TitleBarHeightOption titleBarHeightOption = TitleBarHeightOption.Standard,
|
||||||
BackdropType backdropType = BackdropType.DesktopAcrylic)
|
BackdropType backdropType = BackdropType.DesktopAcrylic)
|
||||||
{
|
{
|
||||||
window.Title = _resourceService.GetLocalizedString(titleKey);
|
if (titleKey != "")
|
||||||
|
{
|
||||||
|
window.Title = _localizationService.GetLocalizedString(titleKey);
|
||||||
|
}
|
||||||
|
if (title != "")
|
||||||
|
{
|
||||||
|
window.Title = title;
|
||||||
|
}
|
||||||
window.AppWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;
|
window.AppWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;
|
||||||
window.AppWindow.SetIcons();
|
window.AppWindow.SetIcons();
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ using BetterLyrics.WinUI3.Enums;
|
|||||||
using BetterLyrics.WinUI3.Hooks;
|
using BetterLyrics.WinUI3.Hooks;
|
||||||
using Microsoft.UI;
|
using Microsoft.UI;
|
||||||
using Microsoft.UI.Xaml;
|
using Microsoft.UI.Xaml;
|
||||||
|
using SkiaSharp;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Drawing.Imaging;
|
using System.Drawing.Imaging;
|
||||||
@@ -15,6 +16,16 @@ namespace BetterLyrics.WinUI3.Helper
|
|||||||
{
|
{
|
||||||
public static class ColorHelper
|
public static class ColorHelper
|
||||||
{
|
{
|
||||||
|
public static Color GetSystemAccentColor()
|
||||||
|
{
|
||||||
|
if (Application.Current.Resources.TryGetValue("SystemAccentColor", out var resource) &&
|
||||||
|
resource is Color uiColor)
|
||||||
|
{
|
||||||
|
return uiColor;
|
||||||
|
}
|
||||||
|
return Color.FromArgb(255, 0, 120, 215);
|
||||||
|
}
|
||||||
|
|
||||||
public static ElementTheme GetElementThemeFromBackgroundColor(Color backgroundColor)
|
public static ElementTheme GetElementThemeFromBackgroundColor(Color backgroundColor)
|
||||||
{
|
{
|
||||||
// 计算亮度(YIQ公式)
|
// 计算亮度(YIQ公式)
|
||||||
|
|||||||
@@ -5,8 +5,11 @@ using BetterLyrics.WinUI3.Extensions;
|
|||||||
using BetterLyrics.WinUI3.Models;
|
using BetterLyrics.WinUI3.Models;
|
||||||
using BetterLyrics.WinUI3.Serialization;
|
using BetterLyrics.WinUI3.Serialization;
|
||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
using Ude;
|
using Ude;
|
||||||
|
|
||||||
namespace BetterLyrics.WinUI3.Helper
|
namespace BetterLyrics.WinUI3.Helper
|
||||||
@@ -27,6 +30,18 @@ namespace BetterLyrics.WinUI3.Helper
|
|||||||
return Encoding.GetEncoding(encoding);
|
return Encoding.GetEncoding(encoding);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static async Task CopyFileAsync(string sourcePath, string destinationPath)
|
||||||
|
{
|
||||||
|
var dir = Path.GetDirectoryName(destinationPath);
|
||||||
|
if (!Directory.Exists(dir)) Directory.CreateDirectory(dir);
|
||||||
|
|
||||||
|
using (var sourceStream = new FileStream(sourcePath, FileMode.Open, FileAccess.Read, FileShare.Read))
|
||||||
|
using (var destinationStream = new FileStream(destinationPath, FileMode.Create, FileAccess.Write, FileShare.None))
|
||||||
|
{
|
||||||
|
await sourceStream.CopyToAsync(destinationStream);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static string SanitizeFileName(string fileName, char replacement = '_')
|
public static string SanitizeFileName(string fileName, char replacement = '_')
|
||||||
{
|
{
|
||||||
var invalidChars = Path.GetInvalidFileNameChars();
|
var invalidChars = Path.GetInvalidFileNameChars();
|
||||||
@@ -86,5 +101,15 @@ namespace BetterLyrics.WinUI3.Helper
|
|||||||
".wav", ".aiff", ".aif", ".pcm", ".cda", ".dsf", ".dff", ".au", ".snd",
|
".wav", ".aiff", ".aif", ".pcm", ".cda", ".dsf", ".dff", ".au", ".snd",
|
||||||
".mid", ".midi", ".mod", ".xm", ".it", ".s3m"
|
".mid", ".midi", ".mod", ".xm", ".it", ".s3m"
|
||||||
};
|
};
|
||||||
|
|
||||||
|
public static readonly string[] LyricExtensions =
|
||||||
|
Enum.GetValues(typeof(LyricsSearchProvider)).Cast<LyricsSearchProvider>()
|
||||||
|
.Where(x => x.IsLocal())
|
||||||
|
.Select(x => x.GetLyricsFormat())
|
||||||
|
.Where(x => x != LyricsFormat.NotSpecified)
|
||||||
|
.Select(x => x.ToFileExtension())
|
||||||
|
.ToArray();
|
||||||
|
|
||||||
|
public static readonly HashSet<string> AllSupportedExtensions = new(MusicExtensions.Union(LyricExtensions));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,89 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Collections.ObjectModel;
|
||||||
|
using BetterLyrics.WinUI3.Models;
|
||||||
|
|
||||||
|
public static class FolderTreeBuilder
|
||||||
|
{
|
||||||
|
public static ObservableCollection<FolderNode> Build(List<ExtendedTrack> tracks, List<MediaFolder> folderConfigs)
|
||||||
|
{
|
||||||
|
var rootNodes = new ObservableCollection<FolderNode>();
|
||||||
|
|
||||||
|
// 按 MediaFolderId 分组
|
||||||
|
var folderGroups = tracks.GroupBy(t => t.MediaFolderId);
|
||||||
|
|
||||||
|
foreach (var group in folderGroups)
|
||||||
|
{
|
||||||
|
var config = folderConfigs.FirstOrDefault(f => f.Id == group.Key);
|
||||||
|
if (config == null) continue;
|
||||||
|
|
||||||
|
string baseUri = config.GetStandardUri().AbsoluteUri.TrimEnd('/');
|
||||||
|
|
||||||
|
var rootNode = new FolderNode
|
||||||
|
{
|
||||||
|
SourceType = config.SourceType,
|
||||||
|
FolderName = config.Name ?? config.ConnectionSummary, // 显示用户自定义的名字
|
||||||
|
MediaFolderId = group.Key,
|
||||||
|
FolderPath = baseUri,
|
||||||
|
IsExpanded = true
|
||||||
|
};
|
||||||
|
|
||||||
|
foreach (var track in group)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!track.Uri.StartsWith(baseUri)) continue; // 防御性编程
|
||||||
|
|
||||||
|
string relativePart = track.Uri.Substring(baseUri.Length);
|
||||||
|
|
||||||
|
var segments = relativePart
|
||||||
|
.Split('/', StringSplitOptions.RemoveEmptyEntries)
|
||||||
|
.Select(s => System.Net.WebUtility.UrlDecode(s))
|
||||||
|
.ToArray();
|
||||||
|
|
||||||
|
if (segments.Length > 1) // 长度大于1说明在子文件夹里
|
||||||
|
{
|
||||||
|
var folderSegments = segments.Take(segments.Length - 1).ToArray();
|
||||||
|
CreateFolderStructure(rootNode, folderSegments, baseUri);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch { }
|
||||||
|
}
|
||||||
|
|
||||||
|
rootNodes.Add(rootNode);
|
||||||
|
}
|
||||||
|
|
||||||
|
return rootNodes;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void CreateFolderStructure(FolderNode parent, string[] segments, string rootBaseUri)
|
||||||
|
{
|
||||||
|
var current = parent;
|
||||||
|
string currentFullPath = parent.FolderPath;
|
||||||
|
|
||||||
|
foreach (var segmentName in segments)
|
||||||
|
{
|
||||||
|
var existingChild = current.SubFolders.FirstOrDefault(f => f.FolderName == segmentName);
|
||||||
|
|
||||||
|
currentFullPath += "/" + System.Net.WebUtility.UrlEncode(segmentName);
|
||||||
|
|
||||||
|
if (existingChild == null)
|
||||||
|
{
|
||||||
|
var newFolder = new FolderNode
|
||||||
|
{
|
||||||
|
FolderName = segmentName,
|
||||||
|
FolderPath = currentFullPath, // 存完整的 URI
|
||||||
|
MediaFolderId = parent.MediaFolderId
|
||||||
|
};
|
||||||
|
current.SubFolders.Add(newFolder);
|
||||||
|
current = newFolder;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
current = existingChild;
|
||||||
|
currentFullPath = existingChild.FolderPath;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,4 @@
|
|||||||
using Microsoft.Graphics.Canvas.Text;
|
using System.Collections.Generic;
|
||||||
using Microsoft.UI.Xaml;
|
|
||||||
using System;
|
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Windows.Markup;
|
using System.Windows.Markup;
|
||||||
@@ -10,8 +8,6 @@ namespace BetterLyrics.WinUI3.Helper
|
|||||||
{
|
{
|
||||||
public static class FontHelper
|
public static class FontHelper
|
||||||
{
|
{
|
||||||
public static string[] SystemFontFamilies => CanvasTextFormat.GetSystemFontFamilies().Order().ToArray();
|
|
||||||
|
|
||||||
public static string GetLocalizedFontFamilyName(string sourceName, string langCode)
|
public static string GetLocalizedFontFamilyName(string sourceName, string langCode)
|
||||||
{
|
{
|
||||||
if (langCode == "")
|
if (langCode == "")
|
||||||
@@ -35,5 +31,20 @@ namespace BetterLyrics.WinUI3.Helper
|
|||||||
|
|
||||||
return sourceName;
|
return sourceName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static List<string> GetSystemFontFamilies()
|
||||||
|
{
|
||||||
|
List<string> fontFamilies = new();
|
||||||
|
|
||||||
|
foreach (var font in Fonts.SystemFontFamilies)
|
||||||
|
{
|
||||||
|
if (font.FamilyNames.TryGetValue(XmlLanguage.GetLanguage("en-us"), out string englishFamilyName))
|
||||||
|
{
|
||||||
|
fontFamilies.Add(englishFamilyName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return fontFamilies.Order().ToList();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
using BetterLyrics.WinUI3.Enums;
|
using BetterLyrics.WinUI3.Enums;
|
||||||
using Impressionist.Abstractions;
|
using Impressionist.Abstractions;
|
||||||
using Microsoft.Graphics.Canvas;
|
|
||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
@@ -53,42 +52,13 @@ namespace BetterLyrics.WinUI3.Helper
|
|||||||
return buffer;
|
return buffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static async Task<BitmapDecoder> MakeSquareWithThemeColor(IBuffer buffer, PaletteGeneratorType generatorType)
|
public static async Task<BitmapDecoder> GetBitmapDecoder(IBuffer buffer)
|
||||||
{
|
{
|
||||||
using var stream = new InMemoryRandomAccessStream();
|
using var stream = new InMemoryRandomAccessStream();
|
||||||
await stream.WriteAsync(buffer);
|
await stream.WriteAsync(buffer);
|
||||||
var decoder = await BitmapDecoder.CreateAsync(stream);
|
var decoder = await BitmapDecoder.CreateAsync(stream);
|
||||||
|
|
||||||
if (decoder.PixelWidth == decoder.PixelHeight)
|
return decoder;
|
||||||
{
|
|
||||||
// 已经是正方形,直接返回
|
|
||||||
return decoder;
|
|
||||||
}
|
|
||||||
|
|
||||||
using var device = CanvasDevice.GetSharedDevice();
|
|
||||||
using var canvasBitmap = await CanvasBitmap.LoadAsync(device, stream);
|
|
||||||
var size = Math.Max(decoder.PixelWidth, decoder.PixelHeight);
|
|
||||||
|
|
||||||
var result = await GetAccentColorAsync(decoder, generatorType);
|
|
||||||
var color = Windows.UI.Color.FromArgb(255, (byte)result.Color.X, (byte)result.Color.Y, (byte)result.Color.Z);
|
|
||||||
using var renderTarget = new CanvasRenderTarget(device, size, size, 96);
|
|
||||||
|
|
||||||
int offsetX = (int)(size - decoder.PixelWidth) / 2;
|
|
||||||
int offsetY = (int)(size - decoder.PixelHeight) / 2;
|
|
||||||
using (var ds = renderTarget.CreateDrawingSession())
|
|
||||||
{
|
|
||||||
ds.FillRectangle(0, 0, size, size, color);
|
|
||||||
ds.DrawImage(canvasBitmap, offsetX, offsetY);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 保存为 PNG 并转为 byte[]
|
|
||||||
stream.Seek(0);
|
|
||||||
stream.Size = 0;
|
|
||||||
await renderTarget.SaveAsync(stream, CanvasBitmapFileFormat.Png);
|
|
||||||
stream.Seek(0);
|
|
||||||
var newDecoder = await BitmapDecoder.CreateAsync(stream);
|
|
||||||
return newDecoder;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static byte[] GenerateNoiseBGRA(int width, int height)
|
public static byte[] GenerateNoiseBGRA(int width, int height)
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
using BetterLyrics.WinUI3.Models;
|
using BetterLyrics.WinUI3.Models;
|
||||||
using BetterLyrics.WinUI3.Services.ResourceService;
|
using BetterLyrics.WinUI3.Services.LocalizationService;
|
||||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||||
using NTextCat;
|
using NTextCat;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel.Design;
|
||||||
|
using System.Globalization;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using Windows.Globalization;
|
using Windows.Globalization;
|
||||||
|
|
||||||
@@ -10,9 +12,9 @@ namespace BetterLyrics.WinUI3.Helper
|
|||||||
{
|
{
|
||||||
public class LanguageHelper
|
public class LanguageHelper
|
||||||
{
|
{
|
||||||
|
private static readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
|
||||||
private static readonly RankedLanguageIdentifierFactory _factory = new();
|
private static readonly RankedLanguageIdentifierFactory _factory = new();
|
||||||
private static readonly RankedLanguageIdentifier _identifier;
|
private static readonly RankedLanguageIdentifier _identifier;
|
||||||
private static readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
|
|
||||||
|
|
||||||
public const string ChineseCode = "zh";
|
public const string ChineseCode = "zh";
|
||||||
public const string JapaneseCode = "ja";
|
public const string JapaneseCode = "ja";
|
||||||
@@ -92,12 +94,23 @@ namespace BetterLyrics.WinUI3.Helper
|
|||||||
|
|
||||||
public static List<ExtendedLanguage> SupportedDisplayLanguages { get; set; } =
|
public static List<ExtendedLanguage> SupportedDisplayLanguages { get; set; } =
|
||||||
[
|
[
|
||||||
new ExtendedLanguage("", _resourceService.GetLocalizedString("SettingsPageSystemLanguage")),
|
new ExtendedLanguage(CultureInfo.CurrentUICulture.Name, _localizationService.GetLocalizedString("SettingsPageSystemLanguage")),
|
||||||
new ExtendedLanguage("en-US", "English"),
|
new ExtendedLanguage("ar"),
|
||||||
new ExtendedLanguage("ja-JP"),
|
new ExtendedLanguage("de"),
|
||||||
new ExtendedLanguage("ko-KR"),
|
new ExtendedLanguage("en"),
|
||||||
new ExtendedLanguage("zh-CN", "简体中文"),
|
new ExtendedLanguage("es"),
|
||||||
new ExtendedLanguage("zh-TW", "繁體中文"),
|
new ExtendedLanguage("fr"),
|
||||||
|
new ExtendedLanguage("hi"),
|
||||||
|
new ExtendedLanguage("id"),
|
||||||
|
new ExtendedLanguage("ja"),
|
||||||
|
new ExtendedLanguage("ko"),
|
||||||
|
new ExtendedLanguage("ms"),
|
||||||
|
new ExtendedLanguage("pt"),
|
||||||
|
new ExtendedLanguage("ru"),
|
||||||
|
new ExtendedLanguage("th"),
|
||||||
|
new ExtendedLanguage("vi"),
|
||||||
|
new ExtendedLanguage("zh-Hans"),
|
||||||
|
new ExtendedLanguage("zh-Hant"),
|
||||||
];
|
];
|
||||||
|
|
||||||
static LanguageHelper()
|
static LanguageHelper()
|
||||||
@@ -107,7 +120,7 @@ namespace BetterLyrics.WinUI3.Helper
|
|||||||
|
|
||||||
public static string? DetectLanguageCode(string? text)
|
public static string? DetectLanguageCode(string? text)
|
||||||
{
|
{
|
||||||
if (text == null) return null;
|
if (string.IsNullOrWhiteSpace(text)) return null;
|
||||||
var guessList = _identifier.Identify(text);
|
var guessList = _identifier.Identify(text);
|
||||||
string? code = guessList?.FirstOrDefault()?.Item1.Iso639_2T;
|
string? code = guessList?.FirstOrDefault()?.Item1.Iso639_2T;
|
||||||
code = code switch
|
code = code switch
|
||||||
|
|||||||
@@ -0,0 +1,124 @@
|
|||||||
|
using BetterLyrics.WinUI3.Events;
|
||||||
|
using Microsoft.UI.Xaml;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using Vanara.PInvoke;
|
||||||
|
using Windows.Foundation;
|
||||||
|
|
||||||
|
namespace BetterLyrics.WinUI3.Helper
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 用于管理覆盖层窗口的鼠标交互区域检测
|
||||||
|
/// </summary>
|
||||||
|
public class OverlayInputHelper
|
||||||
|
{
|
||||||
|
private readonly Window _window;
|
||||||
|
private readonly IntPtr _hwnd;
|
||||||
|
private readonly DispatcherTimer _timer;
|
||||||
|
private readonly List<FrameworkElement> _interactiveControls = new();
|
||||||
|
|
||||||
|
private bool _wasOverControl = false;
|
||||||
|
|
||||||
|
public Action<InteractiveAreaEventArgs> OnInteractiveAreaEntered;
|
||||||
|
public Action<InteractiveAreaEventArgs> OnInteractiveAreaMoved;
|
||||||
|
public Action OnInteractiveAreaExited;
|
||||||
|
|
||||||
|
public OverlayInputHelper(Window window)
|
||||||
|
{
|
||||||
|
_window = window;
|
||||||
|
_hwnd = WinRT.Interop.WindowNative.GetWindowHandle(_window);
|
||||||
|
|
||||||
|
_timer = new DispatcherTimer();
|
||||||
|
_timer.Interval = TimeSpan.FromMilliseconds(50);
|
||||||
|
_timer.Tick += Timer_Tick;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Register(FrameworkElement element)
|
||||||
|
{
|
||||||
|
if (!_interactiveControls.Contains(element)) _interactiveControls.Add(element);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Unregister(FrameworkElement element)
|
||||||
|
{
|
||||||
|
if (_interactiveControls.Contains(element)) _interactiveControls.Remove(element);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Start()
|
||||||
|
{
|
||||||
|
_timer.Start();
|
||||||
|
OnInteractiveAreaExited?.Invoke();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Stop()
|
||||||
|
{
|
||||||
|
_timer.Stop();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Timer_Tick(object? sender, object e)
|
||||||
|
{
|
||||||
|
User32.GetCursorPos(out var mousePoint);
|
||||||
|
|
||||||
|
bool isOverAnyControl = false;
|
||||||
|
|
||||||
|
List<FrameworkElement> overlappedElements = new();
|
||||||
|
|
||||||
|
foreach (var control in _interactiveControls)
|
||||||
|
{
|
||||||
|
if (control.XamlRoot == null || !control.XamlRoot.IsHostVisible) continue;
|
||||||
|
|
||||||
|
var bounds = GetElementScreenBounds(control);
|
||||||
|
|
||||||
|
if (mousePoint.X >= bounds.X &&
|
||||||
|
mousePoint.X <= (bounds.X + bounds.Width) &&
|
||||||
|
mousePoint.Y >= bounds.Y &&
|
||||||
|
mousePoint.Y <= (bounds.Y + bounds.Height))
|
||||||
|
{
|
||||||
|
isOverAnyControl = true;
|
||||||
|
overlappedElements.Add(control);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isOverAnyControl)
|
||||||
|
{
|
||||||
|
OnInteractiveAreaMoved?.Invoke(new InteractiveAreaEventArgs(overlappedElements));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isOverAnyControl != _wasOverControl)
|
||||||
|
{
|
||||||
|
if (isOverAnyControl)
|
||||||
|
{
|
||||||
|
OnInteractiveAreaEntered?.Invoke(new InteractiveAreaEventArgs(overlappedElements));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
OnInteractiveAreaExited?.Invoke();
|
||||||
|
}
|
||||||
|
|
||||||
|
_wasOverControl = isOverAnyControl;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private Rect GetElementScreenBounds(FrameworkElement element)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var transform = element.TransformToVisual(null);
|
||||||
|
var topLeft = transform.TransformPoint(new Point(0, 0));
|
||||||
|
double dpiScale = element.XamlRoot.RasterizationScale;
|
||||||
|
|
||||||
|
int clientX = (int)(topLeft.X * dpiScale);
|
||||||
|
int clientY = (int)(topLeft.Y * dpiScale);
|
||||||
|
|
||||||
|
var point = new POINT { X = clientX, Y = clientY };
|
||||||
|
User32.ClientToScreen(_hwnd, ref point);
|
||||||
|
|
||||||
|
return new Rect(point.X, point.Y, element.ActualWidth * dpiScale, element.ActualHeight * dpiScale);
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
return Rect.Empty;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
using ColorThiefDotNet;
|
using ColorThiefDotNet;
|
||||||
|
using CommunityToolkit.WinUI.Helpers;
|
||||||
using Impressionist.Abstractions;
|
using Impressionist.Abstractions;
|
||||||
using Impressionist.Implementations;
|
using Impressionist.Implementations;
|
||||||
using System;
|
using System;
|
||||||
@@ -50,7 +51,29 @@ namespace BetterLyrics.WinUI3.Helper
|
|||||||
return paletteResult;
|
return paletteResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static async Task<Dictionary<Vector3, int>> GetPixelColor(BitmapDecoder bitmapDecoder)
|
public static List<Windows.UI.Color> GenerateChartColors(Windows.UI.Color baseColor, int count)
|
||||||
|
{
|
||||||
|
List<Windows.UI.Color> results = [];
|
||||||
|
|
||||||
|
var baseHsl = baseColor.ToHsl();
|
||||||
|
double baseHue = baseHsl.H;
|
||||||
|
double baseSaturation = baseHsl.S;
|
||||||
|
double baseBrightness = baseHsl.L;
|
||||||
|
|
||||||
|
double step = 360.0 / count;
|
||||||
|
|
||||||
|
for (int i = 0; i < count; i++)
|
||||||
|
{
|
||||||
|
double newHue = (baseHue + (step * i)) % 360;
|
||||||
|
|
||||||
|
Windows.UI.Color newColor = CommunityToolkit.WinUI.Helpers.ColorHelper.FromHsl(newHue, baseSaturation, baseBrightness);
|
||||||
|
results.Add(newColor);
|
||||||
|
}
|
||||||
|
|
||||||
|
return results;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static async Task<Dictionary<Vector3, int>> GetPixelColor(BitmapDecoder bitmapDecoder)
|
||||||
{
|
{
|
||||||
var pixelDataProvider = await bitmapDecoder.GetPixelDataAsync();
|
var pixelDataProvider = await bitmapDecoder.GetPixelDataAsync();
|
||||||
var pixels = pixelDataProvider.DetachPixelData();
|
var pixels = pixelDataProvider.DetachPixelData();
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using Windows.Security.Credentials;
|
using System;
|
||||||
|
using Windows.Security.Credentials;
|
||||||
|
|
||||||
namespace BetterLyrics.WinUI3.Helper
|
namespace BetterLyrics.WinUI3.Helper
|
||||||
{
|
{
|
||||||
@@ -12,23 +13,13 @@ namespace BetterLyrics.WinUI3.Helper
|
|||||||
/// <param name="value">要保存的值</param>
|
/// <param name="value">要保存的值</param>
|
||||||
public static void Save(string resource, string key, string value)
|
public static void Save(string resource, string key, string value)
|
||||||
{
|
{
|
||||||
// 删除旧值(避免重复存储)
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var vault = new PasswordVault();
|
var vault = new PasswordVault();
|
||||||
|
|
||||||
var oldCredential = vault.Retrieve(resource, key);
|
|
||||||
if (oldCredential != null)
|
|
||||||
{
|
|
||||||
vault.Remove(oldCredential);
|
|
||||||
}
|
|
||||||
|
|
||||||
vault.Add(new PasswordCredential(resource, key, value));
|
vault.Add(new PasswordCredential(resource, key, value));
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception) { }
|
||||||
{
|
|
||||||
// 没有旧值就忽略
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -47,7 +38,7 @@ namespace BetterLyrics.WinUI3.Helper
|
|||||||
credential.RetrievePassword();
|
credential.RetrievePassword();
|
||||||
return credential.Password;
|
return credential.Password;
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception)
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -65,10 +56,7 @@ namespace BetterLyrics.WinUI3.Helper
|
|||||||
var credential = vault.Retrieve(resource, key);
|
var credential = vault.Retrieve(resource, key);
|
||||||
vault.Remove(credential);
|
vault.Remove(credential);
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception) { }
|
||||||
{
|
|
||||||
// 不存在就忽略
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -33,6 +33,7 @@ namespace BetterLyrics.WinUI3.Helper
|
|||||||
public static string SaltPlayerForWindowsLogoPath => Path.Combine(AssetsFolder, "SaltPlayerForWindows.png");
|
public static string SaltPlayerForWindowsLogoPath => Path.Combine(AssetsFolder, "SaltPlayerForWindows.png");
|
||||||
public static string MoeKoeMusicLogoPath => Path.Combine(AssetsFolder, "MoeKoeMusic.png");
|
public static string MoeKoeMusicLogoPath => Path.Combine(AssetsFolder, "MoeKoeMusic.png");
|
||||||
public static string Listen1LogoPath => Path.Combine(AssetsFolder, "Listen1.png");
|
public static string Listen1LogoPath => Path.Combine(AssetsFolder, "Listen1.png");
|
||||||
|
public static string OriginalSoundHQPlayerLogoPath => Path.Combine(AssetsFolder, "OriginalSoundHQPlayer.png");
|
||||||
public static string UnknownPlayerLogoPath => Path.Combine(AssetsFolder, "Question.png");
|
public static string UnknownPlayerLogoPath => Path.Combine(AssetsFolder, "Question.png");
|
||||||
|
|
||||||
public static string LogDirectory => Path.Combine(CacheFolder, "logs");
|
public static string LogDirectory => Path.Combine(CacheFolder, "logs");
|
||||||
@@ -54,8 +55,11 @@ namespace BetterLyrics.WinUI3.Helper
|
|||||||
|
|
||||||
public static string AlbumArtCacheDirectory => Path.Combine(CacheFolder, "album-art");
|
public static string AlbumArtCacheDirectory => Path.Combine(CacheFolder, "album-art");
|
||||||
public static string iTunesAlbumArtCacheDirectory => Path.Combine(AlbumArtCacheDirectory, "itunes");
|
public static string iTunesAlbumArtCacheDirectory => Path.Combine(AlbumArtCacheDirectory, "itunes");
|
||||||
|
public static string LocalAlbumArtCacheDirectory => Path.Combine(AlbumArtCacheDirectory, "local");
|
||||||
|
|
||||||
public static string PlayQueuePath => Path.Combine(CacheFolder, "play-queue.m3u");
|
public static string PlayQueuePath => Path.Combine(LocalFolder, "play-queue.m3u");
|
||||||
|
public static string PlayHistoryPath => Path.Combine(LocalFolder, "play-history.db");
|
||||||
|
public static string FilesIndexPath => Path.Combine(LocalFolder, "files-index.db");
|
||||||
|
|
||||||
public static void EnsureDirectories()
|
public static void EnsureDirectories()
|
||||||
{
|
{
|
||||||
@@ -75,6 +79,7 @@ namespace BetterLyrics.WinUI3.Helper
|
|||||||
Directory.CreateDirectory(LocalTtmlCacheDirectory);
|
Directory.CreateDirectory(LocalTtmlCacheDirectory);
|
||||||
|
|
||||||
Directory.CreateDirectory(iTunesAlbumArtCacheDirectory);
|
Directory.CreateDirectory(iTunesAlbumArtCacheDirectory);
|
||||||
|
Directory.CreateDirectory(LocalAlbumArtCacheDirectory);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
using BetterLyrics.WinUI3.Services.ResourceService;
|
using BetterLyrics.WinUI3.Services.LocalizationService;
|
||||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||||
using System;
|
using System;
|
||||||
|
|
||||||
@@ -6,7 +6,7 @@ namespace BetterLyrics.WinUI3.Helper
|
|||||||
{
|
{
|
||||||
public static class PhoneticHelper
|
public static class PhoneticHelper
|
||||||
{
|
{
|
||||||
private static readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
|
private static readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
|
||||||
|
|
||||||
public const string PinyinCode = "zh-cmn-pinyin";
|
public const string PinyinCode = "zh-cmn-pinyin";
|
||||||
public const string JyutpingCode = "zh-yue-jyutping";
|
public const string JyutpingCode = "zh-yue-jyutping";
|
||||||
@@ -22,21 +22,16 @@ namespace BetterLyrics.WinUI3.Helper
|
|||||||
switch (code)
|
switch (code)
|
||||||
{
|
{
|
||||||
case PinyinCode:
|
case PinyinCode:
|
||||||
return _resourceService.GetLocalizedString("Pinyin");
|
return _localizationService.GetLocalizedString("Pinyin");
|
||||||
case JyutpingCode:
|
case JyutpingCode:
|
||||||
return _resourceService.GetLocalizedString("Jyutping");
|
return _localizationService.GetLocalizedString("Jyutping");
|
||||||
case RomanCode:
|
case RomanCode:
|
||||||
return _resourceService.GetLocalizedString("Romaji");
|
return _localizationService.GetLocalizedString("Romaji");
|
||||||
default:
|
default:
|
||||||
throw new ArgumentOutOfRangeException(nameof(code));
|
throw new ArgumentOutOfRangeException(nameof(code));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string ToRomaji(string text)
|
|
||||||
{
|
|
||||||
return Kana.Kana.KanaToRomaji(text, Kana.Error.Ignore).ToStr();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static string ToPinyin(string text, Pinyin.ManTone.Style style = Pinyin.ManTone.Style.TONE)
|
public static string ToPinyin(string text, Pinyin.ManTone.Style style = Pinyin.ManTone.Style.TONE)
|
||||||
{
|
{
|
||||||
return Pinyin.Pinyin.Instance.HanziToPinyin(text, style).ToStr();
|
return Pinyin.Pinyin.Instance.HanziToPinyin(text, style).ToStr();
|
||||||
|
|||||||
@@ -45,6 +45,12 @@ namespace BetterLyrics.WinUI3.Helper
|
|||||||
public static async Task<StorageFile?> PickSaveFileAsync<T>(IDictionary<string, IList<string>> fileTypeChoices)
|
public static async Task<StorageFile?> PickSaveFileAsync<T>(IDictionary<string, IList<string>> fileTypeChoices)
|
||||||
{
|
{
|
||||||
var window = WindowHook.GetWindow<T>();
|
var window = WindowHook.GetWindow<T>();
|
||||||
|
|
||||||
|
return await PickSaveFileAsync(window, fileTypeChoices);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static async Task<StorageFile?> PickSaveFileAsync<T>(T? window, IDictionary<string, IList<string>> fileTypeChoices)
|
||||||
|
{
|
||||||
if (window == null) return null;
|
if (window == null) return null;
|
||||||
|
|
||||||
var picker = new Windows.Storage.Pickers.FileSavePicker();
|
var picker = new Windows.Storage.Pickers.FileSavePicker();
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ using System.Text.RegularExpressions;
|
|||||||
|
|
||||||
namespace BetterLyrics.WinUI3.Helper
|
namespace BetterLyrics.WinUI3.Helper
|
||||||
{
|
{
|
||||||
public static class PlayerIDHelper
|
public static class PlayerIdHelper
|
||||||
{
|
{
|
||||||
private static readonly List<string> neteaseFamilyRegex =
|
private static readonly List<string> neteaseFamilyRegex =
|
||||||
[
|
[
|
||||||
@@ -25,62 +25,66 @@ namespace BetterLyrics.WinUI3.Helper
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool IsLXMusic(string? id) => id is PlayerID.LXMusic or PlayerID.LXMusicPortable;
|
public static bool IsLXMusic(string? id) => id is PlayerId.LXMusic or PlayerId.LXMusicPortable;
|
||||||
|
|
||||||
public static bool IsAppleMusic(string? id) => id is PlayerID.AppleMusic or PlayerID.AppleMusicAlternative;
|
public static bool IsAppleMusic(string? id) => id is PlayerId.AppleMusic or PlayerId.AppleMusicAlternative;
|
||||||
|
|
||||||
|
public static bool IsBetterLyrics(string? id) => id is PlayerId.BetterLyrics or PlayerId.BetterLyricsDebug;
|
||||||
|
|
||||||
public static string? GetDisplayName(string? id) => id switch
|
public static string? GetDisplayName(string? id) => id switch
|
||||||
{
|
{
|
||||||
PlayerID.Spotify => PlayerName.Spotify,
|
PlayerId.Spotify => PlayerName.Spotify,
|
||||||
PlayerID.AppleMusic => PlayerName.AppleMusic,
|
PlayerId.AppleMusic => PlayerName.AppleMusic,
|
||||||
PlayerID.iTunes => PlayerName.iTunes,
|
PlayerId.iTunes => PlayerName.iTunes,
|
||||||
PlayerID.KugouMusic => PlayerName.KugouMusic,
|
PlayerId.KugouMusic => PlayerName.KugouMusic,
|
||||||
PlayerID.NetEaseCloudMusic => PlayerName.NetEaseCloudMusic,
|
PlayerId.NetEaseCloudMusic => PlayerName.NetEaseCloudMusic,
|
||||||
PlayerID.QQMusic => PlayerName.QQMusic,
|
PlayerId.QQMusic => PlayerName.QQMusic,
|
||||||
PlayerID.LXMusic => PlayerName.LXMusic,
|
PlayerId.LXMusic => PlayerName.LXMusic,
|
||||||
PlayerID.LXMusicPortable => PlayerName.LXMusicPortable,
|
PlayerId.LXMusicPortable => PlayerName.LXMusicPortable,
|
||||||
PlayerID.MediaPlayerWindows11 => PlayerName.MediaPlayerWindows11,
|
PlayerId.MediaPlayerWindows11 => PlayerName.MediaPlayerWindows11,
|
||||||
PlayerID.AIMP => PlayerName.AIMP,
|
PlayerId.AIMP => PlayerName.AIMP,
|
||||||
PlayerID.Foobar2000 => PlayerName.Foobar2000,
|
PlayerId.Foobar2000 => PlayerName.Foobar2000,
|
||||||
PlayerID.MusicBee => PlayerName.MusicBee,
|
PlayerId.MusicBee => PlayerName.MusicBee,
|
||||||
PlayerID.PotPlayer => PlayerName.PotPlayer,
|
PlayerId.PotPlayer => PlayerName.PotPlayer,
|
||||||
PlayerID.Chrome => PlayerName.Chrome,
|
PlayerId.Chrome => PlayerName.Chrome,
|
||||||
PlayerID.Edge => PlayerName.Edge,
|
PlayerId.Edge => PlayerName.Edge,
|
||||||
PlayerID.BetterLyrics => PlayerName.BetterLyrics,
|
PlayerId.BetterLyrics => PlayerName.BetterLyrics,
|
||||||
PlayerID.BetterLyricsDebug => PlayerName.BetterLyricsDebug,
|
PlayerId.BetterLyricsDebug => PlayerName.BetterLyricsDebug,
|
||||||
PlayerID.SaltPlayerForWindowsMS => PlayerName.SaltPlayerForWindowsMS,
|
PlayerId.SaltPlayerForWindowsMS => PlayerName.SaltPlayerForWindowsMS,
|
||||||
PlayerID.SaltPlayerForWindowsSteam => PlayerName.SaltPlayerForWindowsSteam,
|
PlayerId.SaltPlayerForWindowsSteam => PlayerName.SaltPlayerForWindowsSteam,
|
||||||
PlayerID.MoeKoeMusic => PlayerName.MoeKoeMusic,
|
PlayerId.MoeKoeMusic => PlayerName.MoeKoeMusic,
|
||||||
PlayerID.MoeKoeMusicAlternative => PlayerName.MoeKoeMusic,
|
PlayerId.MoeKoeMusicAlternative => PlayerName.MoeKoeMusic,
|
||||||
PlayerID.Listen1 => PlayerName.Listen1,
|
PlayerId.Listen1 => PlayerName.Listen1,
|
||||||
|
PlayerId.OriginalSoundHQPlayer => PlayerName.OriginalSoundHQPlayer,
|
||||||
_ => id,
|
_ => id,
|
||||||
};
|
};
|
||||||
|
|
||||||
public static string GetLogoPath(string? id) => id switch
|
public static string GetLogoPath(string? id) => id switch
|
||||||
{
|
{
|
||||||
PlayerID.Spotify => PathHelper.SpotifyLogoPath,
|
PlayerId.Spotify => PathHelper.SpotifyLogoPath,
|
||||||
PlayerID.AppleMusic => PathHelper.AppleMusicLogoPath,
|
PlayerId.AppleMusic => PathHelper.AppleMusicLogoPath,
|
||||||
PlayerID.AppleMusicAlternative => PathHelper.AppleMusicLogoPath,
|
PlayerId.AppleMusicAlternative => PathHelper.AppleMusicLogoPath,
|
||||||
PlayerID.iTunes => PathHelper.iTunesLogoPath,
|
PlayerId.iTunes => PathHelper.iTunesLogoPath,
|
||||||
PlayerID.KugouMusic => PathHelper.KugouMusicLogoPath,
|
PlayerId.KugouMusic => PathHelper.KugouMusicLogoPath,
|
||||||
PlayerID.NetEaseCloudMusic => PathHelper.NetEaseCloudMusicLogoPath,
|
PlayerId.NetEaseCloudMusic => PathHelper.NetEaseCloudMusicLogoPath,
|
||||||
PlayerID.QQMusic => PathHelper.QQMusicLogoPath,
|
PlayerId.QQMusic => PathHelper.QQMusicLogoPath,
|
||||||
PlayerID.LXMusic => PathHelper.LXMusicLogoPath,
|
PlayerId.LXMusic => PathHelper.LXMusicLogoPath,
|
||||||
PlayerID.LXMusicPortable => PathHelper.LXMusicLogoPath,
|
PlayerId.LXMusicPortable => PathHelper.LXMusicLogoPath,
|
||||||
PlayerID.MediaPlayerWindows11 => PathHelper.MediaPlayerWindows11LogoPath,
|
PlayerId.MediaPlayerWindows11 => PathHelper.MediaPlayerWindows11LogoPath,
|
||||||
PlayerID.AIMP => PathHelper.AIMPLogoPath,
|
PlayerId.AIMP => PathHelper.AIMPLogoPath,
|
||||||
PlayerID.Foobar2000 => PathHelper.Foobar2000LogoPath,
|
PlayerId.Foobar2000 => PathHelper.Foobar2000LogoPath,
|
||||||
PlayerID.MusicBee => PathHelper.MusicBeeLogoPath,
|
PlayerId.MusicBee => PathHelper.MusicBeeLogoPath,
|
||||||
PlayerID.PotPlayer => PathHelper.PotPlayerLogoPath,
|
PlayerId.PotPlayer => PathHelper.PotPlayerLogoPath,
|
||||||
PlayerID.Chrome => PathHelper.ChromeLogoPath,
|
PlayerId.Chrome => PathHelper.ChromeLogoPath,
|
||||||
PlayerID.Edge => PathHelper.EdgeLogoPath,
|
PlayerId.Edge => PathHelper.EdgeLogoPath,
|
||||||
PlayerID.BetterLyrics => PathHelper.LogoPath,
|
PlayerId.BetterLyrics => PathHelper.LogoPath,
|
||||||
PlayerID.BetterLyricsDebug => PathHelper.LogoPath,
|
PlayerId.BetterLyricsDebug => PathHelper.LogoPath,
|
||||||
PlayerID.SaltPlayerForWindowsMS => PathHelper.SaltPlayerForWindowsLogoPath,
|
PlayerId.SaltPlayerForWindowsMS => PathHelper.SaltPlayerForWindowsLogoPath,
|
||||||
PlayerID.SaltPlayerForWindowsSteam => PathHelper.SaltPlayerForWindowsLogoPath,
|
PlayerId.SaltPlayerForWindowsSteam => PathHelper.SaltPlayerForWindowsLogoPath,
|
||||||
PlayerID.MoeKoeMusic => PathHelper.MoeKoeMusicLogoPath,
|
PlayerId.MoeKoeMusic => PathHelper.MoeKoeMusicLogoPath,
|
||||||
PlayerID.MoeKoeMusicAlternative => PathHelper.MoeKoeMusicLogoPath,
|
PlayerId.MoeKoeMusicAlternative => PathHelper.MoeKoeMusicLogoPath,
|
||||||
PlayerID.Listen1 => PathHelper.Listen1LogoPath,
|
PlayerId.Listen1 => PathHelper.Listen1LogoPath,
|
||||||
|
PlayerId.OriginalSoundHQPlayer => PathHelper.OriginalSoundHQPlayerLogoPath,
|
||||||
_ => PathHelper.UnknownPlayerLogoPath,
|
_ => PathHelper.UnknownPlayerLogoPath,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
using System;
|
||||||
|
using System.IO;
|
||||||
|
|
||||||
|
namespace BetterLyrics.WinUI3.Helper
|
||||||
|
{
|
||||||
|
public class StreamFileAbstraction : TagLib.File.IFileAbstraction
|
||||||
|
{
|
||||||
|
private readonly string _name;
|
||||||
|
private readonly Stream _stream;
|
||||||
|
private readonly bool _closeStreamOnDispose;
|
||||||
|
|
||||||
|
public StreamFileAbstraction(string path, Stream? stream, bool closeStreamOnDispose = false)
|
||||||
|
{
|
||||||
|
_name = Path.GetFileName(path);
|
||||||
|
_stream = stream ?? throw new ArgumentNullException(nameof(stream));
|
||||||
|
_closeStreamOnDispose = closeStreamOnDispose;
|
||||||
|
}
|
||||||
|
|
||||||
|
public string Name => _name;
|
||||||
|
|
||||||
|
public Stream ReadStream => _stream;
|
||||||
|
|
||||||
|
public Stream WriteStream
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if (_stream.CanWrite)
|
||||||
|
{
|
||||||
|
return _stream;
|
||||||
|
}
|
||||||
|
throw new InvalidOperationException("The underlying stream is read-only. Tag saving is not supported for this source.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void CloseStream(Stream stream)
|
||||||
|
{
|
||||||
|
if (_closeStreamOnDispose)
|
||||||
|
{
|
||||||
|
stream?.Dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
using BetterLyrics.WinUI3.Services.ResourceService;
|
using BetterLyrics.WinUI3.Services.LocalizationService;
|
||||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
using CommunityToolkit.Mvvm.DependencyInjection;
|
||||||
using Microsoft.UI.Xaml.Controls;
|
using Microsoft.UI.Xaml.Controls;
|
||||||
using Microsoft.Windows.AppNotifications;
|
using Microsoft.Windows.AppNotifications;
|
||||||
@@ -8,12 +8,12 @@ namespace BetterLyrics.WinUI3.Helper
|
|||||||
{
|
{
|
||||||
public class ToastHelper
|
public class ToastHelper
|
||||||
{
|
{
|
||||||
private static readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
|
private static readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
|
||||||
|
|
||||||
public static void ShowToast(string localizedTitleKey, string? description, InfoBarSeverity severity)
|
public static void ShowToast(string localizedTitleKey, string? description, InfoBarSeverity severity)
|
||||||
{
|
{
|
||||||
AppNotification notification = new AppNotificationBuilder()
|
AppNotification notification = new AppNotificationBuilder()
|
||||||
.AddText(_resourceService.GetLocalizedString(localizedTitleKey))
|
.AddText(_localizationService.GetLocalizedString(localizedTitleKey))
|
||||||
.AddText(description)
|
.AddText(description)
|
||||||
.BuildNotification();
|
.BuildNotification();
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,72 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Net;
|
||||||
|
using System.Net.Http;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace BetterLyrics.WinUI3.Helper
|
||||||
|
{
|
||||||
|
public static class WebDavProbeHelper
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 自动检测目标主机是 HTTP 还是 HTTPS
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>返回 "https" 或 "http",如果都连不上返回 null</returns>
|
||||||
|
public static async Task<string?> DetectSchemeAsync(string host, int port, string? path, string? user, string? pwd)
|
||||||
|
{
|
||||||
|
if (port == 443) return "https";
|
||||||
|
if (port == 80) return "http";
|
||||||
|
|
||||||
|
// 忽略 SSL 证书错误,因为很多 NAS 是自签名的
|
||||||
|
var handler = new HttpClientHandler
|
||||||
|
{
|
||||||
|
ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true,
|
||||||
|
UseProxy = false
|
||||||
|
};
|
||||||
|
|
||||||
|
// 设置认证
|
||||||
|
if (!string.IsNullOrEmpty(user) && !string.IsNullOrEmpty(pwd))
|
||||||
|
{
|
||||||
|
handler.Credentials = new NetworkCredential(user, pwd);
|
||||||
|
handler.PreAuthenticate = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
using var client = new HttpClient(handler);
|
||||||
|
client.Timeout = TimeSpan.FromSeconds(3);
|
||||||
|
|
||||||
|
if (await ProbeUrlAsync(client, "https", host, port, path))
|
||||||
|
{
|
||||||
|
return "https";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (await ProbeUrlAsync(client, "http", host, port, path))
|
||||||
|
{
|
||||||
|
return "http";
|
||||||
|
}
|
||||||
|
|
||||||
|
// 都失败
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static async Task<bool> ProbeUrlAsync(HttpClient client, string scheme, string host, int port, string? path)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var uriBuilder = new UriBuilder(scheme, host, port, path);
|
||||||
|
|
||||||
|
// 使用 PROPFIND 方法,且 Depth 为 0,只检测根节点是否存在,不拉取列表
|
||||||
|
var request = new HttpRequestMessage(new HttpMethod("PROPFIND"), uriBuilder.Uri);
|
||||||
|
request.Headers.Add("Depth", "0");
|
||||||
|
|
||||||
|
var response = await client.SendAsync(request);
|
||||||
|
|
||||||
|
return response.StatusCode != HttpStatusCode.BadRequest;
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -66,7 +66,7 @@ namespace BetterLyrics.WinUI3.Hooks
|
|||||||
|
|
||||||
_hooks.Clear();
|
_hooks.Clear();
|
||||||
|
|
||||||
//_timer.Stop();
|
_timer.Stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Timer_Tick(object? sender, object e)
|
private void Timer_Tick(object? sender, object e)
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using BetterLyrics.WinUI3.Enums;
|
using BetterLyrics.WinUI3.Enums;
|
||||||
|
using Microsoft.UI.Xaml;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using Vanara.PInvoke;
|
using Vanara.PInvoke;
|
||||||
@@ -19,13 +20,10 @@ namespace BetterLyrics.WinUI3.Hooks
|
|||||||
/// <param name="id"></param>
|
/// <param name="id"></param>
|
||||||
/// <param name="keys"></param>
|
/// <param name="keys"></param>
|
||||||
/// <param name="action"></param>
|
/// <param name="action"></param>
|
||||||
private static void RegisterHotKey<T>(ShortcutID id, List<string> keys, Action action)
|
private static void RegisterHotKey(Window window, ShortcutID id, List<string> keys, Action action)
|
||||||
{
|
{
|
||||||
if (keys.Count == 0) return;
|
if (keys.Count == 0) return;
|
||||||
|
|
||||||
var window = WindowHook.GetWindow<T>();
|
|
||||||
if (window == null) return;
|
|
||||||
|
|
||||||
HWND hwnd = WindowNative.GetWindowHandle(window);
|
HWND hwnd = WindowNative.GetWindowHandle(window);
|
||||||
User32.HotKeyModifiers modifiers = User32.HotKeyModifiers.MOD_NONE;
|
User32.HotKeyModifiers modifiers = User32.HotKeyModifiers.MOD_NONE;
|
||||||
VirtualKey key = VirtualKey.None;
|
VirtualKey key = VirtualKey.None;
|
||||||
@@ -60,21 +58,18 @@ namespace BetterLyrics.WinUI3.Hooks
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void UnregisterHotKey<T>(ShortcutID id)
|
private static void UnregisterHotKey(Window window, ShortcutID id)
|
||||||
{
|
{
|
||||||
var window = WindowHook.GetWindow<T>();
|
|
||||||
if (window == null) return;
|
|
||||||
|
|
||||||
HWND hwnd = WindowNative.GetWindowHandle(window);
|
HWND hwnd = WindowNative.GetWindowHandle(window);
|
||||||
User32.UnregisterHotKey(hwnd, (int)id);
|
User32.UnregisterHotKey(hwnd, (int)id);
|
||||||
_actions.Remove((int)id);
|
_actions.Remove((int)id);
|
||||||
_keys.Remove((int)id);
|
_keys.Remove((int)id);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void UpdateHotKey<T>(ShortcutID id, List<string> keys, Action action)
|
public static void UpdateHotKey(Window window, ShortcutID id, List<string> keys, Action action)
|
||||||
{
|
{
|
||||||
UnregisterHotKey<T>(id);
|
UnregisterHotKey(window, id);
|
||||||
RegisterHotKey<T>(id, keys, action);
|
RegisterHotKey(window, id, keys, action);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool IsHotKeyRegistered(ShortcutID id)
|
public static bool IsHotKeyRegistered(ShortcutID id)
|
||||||
|
|||||||
@@ -17,12 +17,20 @@ namespace BetterLyrics.WinUI3.Hooks
|
|||||||
|
|
||||||
static SystemVolumeHook()
|
static SystemVolumeHook()
|
||||||
{
|
{
|
||||||
_deviceEnumerator = new MMDeviceEnumerator();
|
try
|
||||||
_defaultDevice = _deviceEnumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
|
|
||||||
|
|
||||||
if (_defaultDevice != null)
|
|
||||||
{
|
{
|
||||||
_defaultDevice.AudioEndpointVolume.OnVolumeNotification += AudioEndpointVolume_OnVolumeNotification;
|
_deviceEnumerator = new MMDeviceEnumerator();
|
||||||
|
// 找不到设备会抛出异常,在这里截获它
|
||||||
|
_defaultDevice = _deviceEnumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
|
||||||
|
|
||||||
|
if (_defaultDevice != null)
|
||||||
|
{
|
||||||
|
_defaultDevice.AudioEndpointVolume.OnVolumeNotification += AudioEndpointVolume_OnVolumeNotification;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_defaultDevice = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
213
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/TaskbarHook.cs
Normal file
213
BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/TaskbarHook.cs
Normal file
@@ -0,0 +1,213 @@
|
|||||||
|
using BetterLyrics.WinUI3.Enums;
|
||||||
|
using BetterLyrics.WinUI3.Events;
|
||||||
|
using BetterLyrics.WinUI3.Extensions;
|
||||||
|
using FlaUI.Core.AutomationElements;
|
||||||
|
using FlaUI.Core.Definitions;
|
||||||
|
using FlaUI.Core.EventHandlers;
|
||||||
|
using FlaUI.UIA3;
|
||||||
|
using Microsoft.UI.Dispatching;
|
||||||
|
using System;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using System.Drawing;
|
||||||
|
using System.Threading;
|
||||||
|
|
||||||
|
namespace BetterLyrics.WinUI3.Hooks
|
||||||
|
{
|
||||||
|
public partial class TaskbarHook : IDisposable
|
||||||
|
{
|
||||||
|
private readonly UIA3Automation _automation;
|
||||||
|
private AutomationElement? _taskbar;
|
||||||
|
|
||||||
|
private StructureChangedEventHandlerBase? _structureHandler;
|
||||||
|
private PropertyChangedEventHandlerBase? _propertyHandler;
|
||||||
|
|
||||||
|
private TaskbarPlacement _currentPlacement;
|
||||||
|
|
||||||
|
private readonly DispatcherQueue _dispatcherQueue;
|
||||||
|
private readonly Action<TaskbarFreeBoundsChangedEventArgs> _onLayoutChanged;
|
||||||
|
private Timer? _debounceTimer;
|
||||||
|
private const int DebounceDelay = 150;
|
||||||
|
private bool _isDisposed;
|
||||||
|
|
||||||
|
public TaskbarHook(TaskbarPlacement placement, Action<TaskbarFreeBoundsChangedEventArgs> onLayoutChanged)
|
||||||
|
{
|
||||||
|
_automation = new UIA3Automation();
|
||||||
|
_onLayoutChanged = onLayoutChanged;
|
||||||
|
_dispatcherQueue = DispatcherQueue.GetForCurrentThread();
|
||||||
|
|
||||||
|
_currentPlacement = placement;
|
||||||
|
|
||||||
|
StartHook();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void UpdatePlacement(TaskbarPlacement newPlacement)
|
||||||
|
{
|
||||||
|
_currentPlacement = newPlacement;
|
||||||
|
RequestUpdate(); // 立即刷新位置
|
||||||
|
}
|
||||||
|
|
||||||
|
private void StartHook()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var desktop = _automation.GetDesktop();
|
||||||
|
_taskbar = desktop.FindFirstChild(cf => cf.ByClassName("Shell_TrayWnd"));
|
||||||
|
|
||||||
|
if (_taskbar == null) return;
|
||||||
|
|
||||||
|
// 监听结构变化
|
||||||
|
// 这里的返回值就是一个可以 Dispose 的对象
|
||||||
|
_structureHandler = _taskbar.RegisterStructureChangedEvent(
|
||||||
|
TreeScope.Descendants,
|
||||||
|
(element, type, id) => RequestUpdate());
|
||||||
|
|
||||||
|
// 监听属性变化
|
||||||
|
_propertyHandler = _taskbar.RegisterPropertyChangedEvent(
|
||||||
|
TreeScope.Element,
|
||||||
|
(element, id, val) => RequestUpdate(),
|
||||||
|
_automation.PropertyLibrary.Element.BoundingRectangle);
|
||||||
|
|
||||||
|
RequestUpdate();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
System.Diagnostics.Debug.WriteLine($"Hook Init Failed: {ex.Message}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void RequestUpdate()
|
||||||
|
{
|
||||||
|
if (_isDisposed) return;
|
||||||
|
_debounceTimer?.Dispose();
|
||||||
|
_debounceTimer = new Timer(_ =>
|
||||||
|
{
|
||||||
|
Rectangle voidRect = CalculateVoidRect(_currentPlacement);
|
||||||
|
_dispatcherQueue.TryEnqueue(() =>
|
||||||
|
{
|
||||||
|
if (!_isDisposed && voidRect != Rectangle.Empty)
|
||||||
|
{
|
||||||
|
_onLayoutChanged?.Invoke(new TaskbarFreeBoundsChangedEventArgs(voidRect.ToRect()));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}, null, DebounceDelay, Timeout.Infinite);
|
||||||
|
}
|
||||||
|
|
||||||
|
private Rectangle CalculateVoidRect(TaskbarPlacement placement)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (_taskbar == null) return Rectangle.Empty;
|
||||||
|
|
||||||
|
try { var _ = _taskbar.BoundingRectangle; }
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
var desktop = _automation.GetDesktop();
|
||||||
|
_taskbar = desktop.FindFirstChild(cf => cf.ByClassName("Shell_TrayWnd"));
|
||||||
|
if (_taskbar == null) return Rectangle.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle taskbarRect = _taskbar.BoundingRectangle;
|
||||||
|
|
||||||
|
// 绝对右边界:托盘
|
||||||
|
int barrierRight = taskbarRect.Right;
|
||||||
|
var tray = _taskbar.FindFirstDescendant(cf => cf.ByAutomationId("SystemTrayIcon")); // Win11
|
||||||
|
if (tray == null) tray = _taskbar.FindFirstDescendant(cf => cf.ByClassName("TrayNotifyWnd")); // Win10
|
||||||
|
if (tray != null) barrierRight = tray.BoundingRectangle.Left;
|
||||||
|
|
||||||
|
// 绝对左边界:任务栏左边缘 或 小组件(Win11)
|
||||||
|
int barrierLeft = taskbarRect.Left;
|
||||||
|
var widgets = _taskbar.FindFirstDescendant(cf => cf.ByAutomationId("WidgetsButton"));
|
||||||
|
|
||||||
|
// 只有当小组件确实在最左侧时 (Win11默认),它才构成左边界
|
||||||
|
// 如果用户把任务栏设为靠左对齐,小组件会在开始按钮右边,这时候不把它当做左边界
|
||||||
|
if (widgets != null && widgets.BoundingRectangle.Left < taskbarRect.Left + 100)
|
||||||
|
{
|
||||||
|
barrierLeft = (int)widgets.BoundingRectangle.Right;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// 寻找 中间内容区域 (Start + Search + Apps) 的 左右极值
|
||||||
|
int contentMinLeft = barrierRight;
|
||||||
|
int contentMaxRight = barrierLeft;
|
||||||
|
|
||||||
|
// 定义所有中间元素
|
||||||
|
string[] systemButtonIds = new[] {
|
||||||
|
"StartButton", "SearchButton", "TaskViewButton", "ChatButton"
|
||||||
|
};
|
||||||
|
|
||||||
|
// 系统按钮
|
||||||
|
foreach (var id in systemButtonIds)
|
||||||
|
{
|
||||||
|
var btn = _taskbar.FindFirstDescendant(cf => cf.ByAutomationId(id));
|
||||||
|
if (btn != null)
|
||||||
|
{
|
||||||
|
var rect = btn.BoundingRectangle;
|
||||||
|
// 排除不可见的
|
||||||
|
if (rect.Width <= 0) continue;
|
||||||
|
|
||||||
|
// 更新极值
|
||||||
|
if (rect.Left < contentMinLeft) contentMinLeft = (int)rect.Left;
|
||||||
|
if (rect.Right > contentMaxRight) contentMaxRight = (int)rect.Right;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// App 图标
|
||||||
|
var appIcons = _taskbar.FindAllDescendants(cf => cf.ByClassName("Taskbar.TaskListButtonAutomationPeer"));
|
||||||
|
foreach (var icon in appIcons)
|
||||||
|
{
|
||||||
|
var rect = icon.BoundingRectangle;
|
||||||
|
if (rect.Width <= 0) continue;
|
||||||
|
|
||||||
|
if (rect.Left < contentMinLeft) contentMinLeft = (int)rect.Left;
|
||||||
|
if (rect.Right > contentMaxRight) contentMaxRight = (int)rect.Right;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 如果完全没找到内容,重置为中间
|
||||||
|
if (contentMinLeft == barrierRight) contentMinLeft = taskbarRect.Left;
|
||||||
|
if (contentMaxRight == barrierLeft) contentMaxRight = taskbarRect.Left;
|
||||||
|
|
||||||
|
int finalLeft, finalRight;
|
||||||
|
int padding = 10;
|
||||||
|
|
||||||
|
if (placement == TaskbarPlacement.Left)
|
||||||
|
{
|
||||||
|
// 【小组件】... [空隙] ...【开始按钮】
|
||||||
|
// 如果是 Win10 或 Win11左对齐,contentMinLeft 几乎等于 barrierLeft,空隙为0
|
||||||
|
finalLeft = barrierLeft + padding;
|
||||||
|
finalRight = contentMinLeft - padding;
|
||||||
|
}
|
||||||
|
else // Right
|
||||||
|
{
|
||||||
|
// 【最后一个图标】... [空隙] ...【托盘】
|
||||||
|
finalLeft = contentMaxRight + padding;
|
||||||
|
finalRight = barrierRight - padding;
|
||||||
|
}
|
||||||
|
|
||||||
|
int width = finalRight - finalLeft;
|
||||||
|
|
||||||
|
if (width < 20) return Rectangle.Empty;
|
||||||
|
|
||||||
|
var finalRect = new Rectangle(finalLeft, taskbarRect.Top, width, taskbarRect.Height);
|
||||||
|
return finalRect;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
System.Diagnostics.Debug.WriteLine($"Calc Rect Error: {ex.Message}");
|
||||||
|
return Rectangle.Empty;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
if (_isDisposed) return;
|
||||||
|
_isDisposed = true;
|
||||||
|
|
||||||
|
_debounceTimer?.Dispose();
|
||||||
|
|
||||||
|
_structureHandler?.Dispose();
|
||||||
|
_propertyHandler?.Dispose();
|
||||||
|
|
||||||
|
_automation?.Dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,11 +1,8 @@
|
|||||||
// 2025/6/23 by Zhe Fang
|
// 2025/6/23 by Zhe Fang
|
||||||
|
|
||||||
using BetterLyrics.WinUI3.Enums;
|
using BetterLyrics.WinUI3.Enums;
|
||||||
using BetterLyrics.WinUI3.Helper;
|
using BetterLyrics.WinUI3.Models;
|
||||||
using BetterLyrics.WinUI3.Services.LiveStatesService;
|
|
||||||
using BetterLyrics.WinUI3.Services.MediaSessionsService;
|
|
||||||
using BetterLyrics.WinUI3.Views;
|
using BetterLyrics.WinUI3.Views;
|
||||||
using CommunityToolkit.Mvvm.DependencyInjection;
|
|
||||||
using CommunityToolkit.WinUI;
|
using CommunityToolkit.WinUI;
|
||||||
using Microsoft.UI.Dispatching;
|
using Microsoft.UI.Dispatching;
|
||||||
using Microsoft.UI.Windowing;
|
using Microsoft.UI.Windowing;
|
||||||
@@ -26,42 +23,31 @@ namespace BetterLyrics.WinUI3.Hooks
|
|||||||
private static List<object> _activeWindows = [];
|
private static List<object> _activeWindows = [];
|
||||||
private static List<object> _workAreas = [];
|
private static List<object> _workAreas = [];
|
||||||
|
|
||||||
private static readonly Dictionary<HWND, WindowStyle> _defaultWindowStyle = [];
|
private static WindowStyle? _defaultWindowStyle;
|
||||||
private static readonly Dictionary<HWND, ExtendedWindowStyle> _defaultExtendedWindowStyle = [];
|
private static ExtendedWindowStyle? _defaultExtendedWindowStyle;
|
||||||
|
|
||||||
private static readonly ILiveStatesService _liveStatesService = Ioc.Default.GetRequiredService<ILiveStatesService>();
|
public static void HideWindow(this Window window)
|
||||||
private static readonly IMediaSessionsService _mediaSessionsService = Ioc.Default.GetRequiredService<IMediaSessionsService>();
|
|
||||||
|
|
||||||
private static DispatcherQueueTimer? _setLyricsWindowVisibilityByPlayingStatusTimer;
|
|
||||||
|
|
||||||
public static void HideWindow<T>()
|
|
||||||
{
|
{
|
||||||
var window = _activeWindows.Find(w => w is T);
|
window.Hide();
|
||||||
var castedWindow = window as Window;
|
|
||||||
castedWindow?.Hide();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void CloseWindow<T>()
|
public static void CloseWindow(this Window window)
|
||||||
{
|
{
|
||||||
if (typeof(T) == typeof(NowPlayingWindow))
|
if (window is NowPlayingWindow nowPlayingWindow)
|
||||||
{
|
{
|
||||||
EnsureDockModeReleased();
|
if (GetWindowHandle(window) is IntPtr hwnd)
|
||||||
}
|
{
|
||||||
var window = _activeWindows.Find(w => w is T);
|
UnregisterWorkArea(hwnd);
|
||||||
if (window is Window w)
|
}
|
||||||
{
|
nowPlayingWindow.LyricsWindowStatus.IsOpened = false;
|
||||||
w.Close();
|
|
||||||
_activeWindows.Remove(w);
|
|
||||||
}
|
}
|
||||||
|
window.Close();
|
||||||
|
_activeWindows.Remove(window);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void MinimizeWindow<T>()
|
public static void MinimizeWindow(this Window window)
|
||||||
{
|
{
|
||||||
var window = _activeWindows.Find(w => w is T);
|
window.Minimize();
|
||||||
if (window is Window w)
|
|
||||||
{
|
|
||||||
w.Minimize();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static T? GetWindow<T>()
|
public static T? GetWindow<T>()
|
||||||
@@ -76,15 +62,28 @@ namespace BetterLyrics.WinUI3.Hooks
|
|||||||
return default;
|
return default;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static List<T> GetWindows<T>()
|
||||||
|
{
|
||||||
|
var windows = new List<T>();
|
||||||
|
foreach (var window in _activeWindows)
|
||||||
|
{
|
||||||
|
if (window is T castedWindow)
|
||||||
|
{
|
||||||
|
windows.Add(castedWindow);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return windows;
|
||||||
|
}
|
||||||
|
|
||||||
public static IntPtr? GetWindowHandle(object? obj)
|
public static IntPtr? GetWindowHandle(object? obj)
|
||||||
{
|
{
|
||||||
if (obj is FrameworkElement frameworkElement)
|
if (obj is FrameworkElement frameworkElement)
|
||||||
{
|
{
|
||||||
return frameworkElement.XamlRoot.ContentIslandEnvironment.AppWindowId.GetWindowHandle();
|
return frameworkElement.XamlRoot.ContentIslandEnvironment.AppWindowId.GetWindowHandle();
|
||||||
}
|
}
|
||||||
else if (obj != null)
|
else if (obj is Window window)
|
||||||
{
|
{
|
||||||
return WindowNative.GetWindowHandle(obj);
|
return WindowNative.GetWindowHandle(window);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -97,16 +96,22 @@ namespace BetterLyrics.WinUI3.Hooks
|
|||||||
return GetWindowHandle(GetWindow<T>());
|
return GetWindowHandle(GetWindow<T>());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void OpenOrShowWindow<T>()
|
public static T OpenOrShowWindow<T>(LyricsWindowStatus? status = null)
|
||||||
{
|
{
|
||||||
var window = _activeWindows.Find(w => w is T);
|
var window = _activeWindows.Find(w =>
|
||||||
//window = null;
|
(typeof(T) != typeof(NowPlayingWindow) && w is T) ||
|
||||||
|
(typeof(T) == typeof(NowPlayingWindow) && w is T && ((NowPlayingWindow)w).LyricsWindowStatus == status)
|
||||||
|
);
|
||||||
|
|
||||||
if (window == null)
|
if (window == null)
|
||||||
{
|
{
|
||||||
if (typeof(T) == typeof(NowPlayingWindow))
|
if (typeof(T) == typeof(NowPlayingWindow))
|
||||||
{
|
{
|
||||||
window = new NowPlayingWindow();
|
if (status == null)
|
||||||
((NowPlayingWindow)window).SystemBackdrop = SystemBackdropHelper.CreateSystemBackdrop(BackdropType.Transparent);
|
{
|
||||||
|
throw new NullReferenceException(nameof(status));
|
||||||
|
}
|
||||||
|
window = new NowPlayingWindow(status);
|
||||||
}
|
}
|
||||||
else if (typeof(T) == typeof(SettingsWindow))
|
else if (typeof(T) == typeof(SettingsWindow))
|
||||||
{
|
{
|
||||||
@@ -135,33 +140,24 @@ namespace BetterLyrics.WinUI3.Hooks
|
|||||||
|
|
||||||
TrackWindow(window);
|
TrackWindow(window);
|
||||||
var castedWindow = (Window)window;
|
var castedWindow = (Window)window;
|
||||||
|
|
||||||
castedWindow.Restore();
|
castedWindow.Restore();
|
||||||
castedWindow.Activate();
|
castedWindow.Activate();
|
||||||
|
|
||||||
|
if (typeof(T) == typeof(SystemTrayWindow))
|
||||||
|
{
|
||||||
|
_defaultWindowStyle = castedWindow.GetWindowStyle();
|
||||||
|
_defaultExtendedWindowStyle = castedWindow.GetExtendedWindowStyle();
|
||||||
|
castedWindow.HideWindow();
|
||||||
|
}
|
||||||
|
|
||||||
if (typeof(T) == typeof(NowPlayingWindow))
|
if (typeof(T) == typeof(NowPlayingWindow))
|
||||||
{
|
{
|
||||||
_liveStatesService.InitLyricsWindowStatus();
|
|
||||||
|
|
||||||
var hwnd = WindowNative.GetWindowHandle(castedWindow);
|
var hwnd = WindowNative.GetWindowHandle(castedWindow);
|
||||||
_defaultWindowStyle.Add(hwnd, castedWindow.GetWindowStyle());
|
|
||||||
_defaultExtendedWindowStyle.Add(hwnd, castedWindow.GetExtendedWindowStyle());
|
|
||||||
|
|
||||||
var lyricsWindow = (NowPlayingWindow)window;
|
var lyricsWindow = (NowPlayingWindow)window;
|
||||||
lyricsWindow.ViewModel.InitShortcuts();
|
lyricsWindow.InitStatus();
|
||||||
lyricsWindow.ViewModel.InitFgWindowWatcher();
|
lyricsWindow.InitFgWindowWatcher();
|
||||||
|
|
||||||
_mediaSessionsService.InitPlaybackShortcuts();
|
|
||||||
|
|
||||||
//TaskbarList.ThumbBarAddButtons(hwnd,
|
|
||||||
// [
|
|
||||||
// new Shell32.THUMBBUTTON()
|
|
||||||
// {
|
|
||||||
// szTip = "Previous",
|
|
||||||
// dwFlags = Shell32.THUMBBUTTONFLAGS.THBF_ENABLED,
|
|
||||||
// dwMask = Shell32.THUMBBUTTONMASK.THB_TOOLTIP | Shell32.THUMBBUTTONMASK.THB_FLAGS,
|
|
||||||
// }
|
|
||||||
// ]
|
|
||||||
//);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -170,6 +166,13 @@ namespace BetterLyrics.WinUI3.Hooks
|
|||||||
castedWindow.Activate();
|
castedWindow.Activate();
|
||||||
castedWindow.AppWindow.MoveInZOrderAtTop();
|
castedWindow.AppWindow.MoveInZOrderAtTop();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (typeof(T) == typeof(NowPlayingWindow))
|
||||||
|
{
|
||||||
|
((NowPlayingWindow)window).LyricsWindowStatus.IsOpened = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (T)window;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void RestartApp(string args = "")
|
public static void RestartApp(string args = "")
|
||||||
@@ -194,13 +197,19 @@ namespace BetterLyrics.WinUI3.Hooks
|
|||||||
|
|
||||||
public static void ExitApp()
|
public static void ExitApp()
|
||||||
{
|
{
|
||||||
EnsureDockModeReleased();
|
EnsureAllWorkAreasReleased();
|
||||||
Environment.Exit(0);
|
Environment.Exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void EnsureDockModeReleased()
|
private static void EnsureAllWorkAreasReleased()
|
||||||
{
|
{
|
||||||
SetIsWorkArea<NowPlayingWindow>(false);
|
foreach (var item in _workAreas)
|
||||||
|
{
|
||||||
|
if (GetWindowHandle(item) is IntPtr hwnd)
|
||||||
|
{
|
||||||
|
UnregisterWorkArea(hwnd);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void TrackWindow(object window)
|
private static void TrackWindow(object window)
|
||||||
@@ -215,43 +224,18 @@ namespace BetterLyrics.WinUI3.Hooks
|
|||||||
|
|
||||||
private static void WindowHelper_Closed(object sender, WindowEventArgs args)
|
private static void WindowHelper_Closed(object sender, WindowEventArgs args)
|
||||||
{
|
{
|
||||||
if (_activeWindows.Contains(sender))
|
_activeWindows.Remove(sender);
|
||||||
{
|
|
||||||
_activeWindows.Remove(sender);
|
|
||||||
|
|
||||||
var hwnd = WindowNative.GetWindowHandle(sender);
|
|
||||||
_defaultWindowStyle.Remove(hwnd);
|
|
||||||
_defaultExtendedWindowStyle.Remove(hwnd);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void SetIsClickThrough<T>(bool enable)
|
public static void SetIsWorkArea(this NowPlayingWindow window, bool enable)
|
||||||
{
|
{
|
||||||
Window? window = GetWindow<T>() as Window;
|
|
||||||
if (window == null) return;
|
if (window == null) return;
|
||||||
|
|
||||||
IntPtr hwnd = WindowNative.GetWindowHandle(window);
|
IntPtr hwnd = WindowNative.GetWindowHandle(window);
|
||||||
|
|
||||||
if (enable)
|
if (enable)
|
||||||
{
|
{
|
||||||
window.SetExtendedWindowStyle(_defaultExtendedWindowStyle[hwnd] | ExtendedWindowStyle.Transparent | ExtendedWindowStyle.Layered);
|
RegisterWorkArea(hwnd, window.LyricsWindowStatus);
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
window.SetExtendedWindowStyle(_defaultExtendedWindowStyle[hwnd]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void SetIsWorkArea<T>(bool enable)
|
|
||||||
{
|
|
||||||
Window? window = GetWindow<T>() as Window;
|
|
||||||
if (window == null) return;
|
|
||||||
|
|
||||||
IntPtr hwnd = WindowNative.GetWindowHandle(window);
|
|
||||||
|
|
||||||
if (enable)
|
|
||||||
{
|
|
||||||
RegisterWorkArea(hwnd);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -259,35 +243,86 @@ namespace BetterLyrics.WinUI3.Hooks
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void SetIsBorderless<T>(bool enable)
|
public static void SetIsLocked(this Window window, bool enable)
|
||||||
{
|
{
|
||||||
var window = GetWindow<T>() as Window;
|
SetIsBorderless(window, enable);
|
||||||
if (window == null) return;
|
SetIsClickThrough(window, enable);
|
||||||
|
}
|
||||||
|
|
||||||
var hwnd = WindowNative.GetWindowHandle(window);
|
public static void SetIsClickThrough(this Window window, bool enable)
|
||||||
|
{
|
||||||
if (enable)
|
if (_defaultExtendedWindowStyle is ExtendedWindowStyle style)
|
||||||
{
|
{
|
||||||
window.SetWindowStyle(WindowStyle.Popup | WindowStyle.Visible);
|
if (enable)
|
||||||
}
|
{
|
||||||
else
|
window.SetExtendedWindowStyle(style | ExtendedWindowStyle.Layered | ExtendedWindowStyle.Transparent);
|
||||||
{
|
}
|
||||||
window.SetWindowStyle(_defaultWindowStyle[hwnd]);
|
else
|
||||||
|
{
|
||||||
|
window.SetExtendedWindowStyle(style);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void SetIsShowInSwitchers<T>(bool enable)
|
public static void SetIsBorderless(this Window window, bool enable)
|
||||||
{
|
{
|
||||||
var window = GetWindow<T>() as Window;
|
if (_defaultWindowStyle is WindowStyle style)
|
||||||
if (window == null) return;
|
{
|
||||||
|
if (enable)
|
||||||
|
{
|
||||||
|
window.SetWindowStyle(WindowStyle.Popup | WindowStyle.Visible);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
window.SetWindowStyle(style);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool SetIsFullscreen(this Window window, bool enable, bool defaultExtendsContentIntoTitleBar = true)
|
||||||
|
{
|
||||||
|
if (window.AppWindow == null) return false;
|
||||||
|
|
||||||
|
if (enable)
|
||||||
|
{
|
||||||
|
window.ExtendsContentIntoTitleBar = false;
|
||||||
|
window.AppWindow.SetPresenter(AppWindowPresenterKind.FullScreen);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
window.ExtendsContentIntoTitleBar = defaultExtendsContentIntoTitleBar;
|
||||||
|
window.AppWindow.SetPresenter(AppWindowPresenterKind.Overlapped);
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool SetIsMaximized(this Window window, bool enable)
|
||||||
|
{
|
||||||
|
if (window.AppWindow == null) return false;
|
||||||
|
|
||||||
|
if (enable)
|
||||||
|
{
|
||||||
|
window.Maximize();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
window.Restore();
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void SetIsShowInSwitchers(this Window window, bool enable)
|
||||||
|
{
|
||||||
|
if (window.AppWindow == null) return;
|
||||||
|
|
||||||
window.AppWindow.IsShownInSwitchers = enable;
|
window.AppWindow.IsShownInSwitchers = enable;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void SetIsAlwaysOnTop<T>(bool enable)
|
public static void SetIsAlwaysOnTop(this Window window, bool enable)
|
||||||
{
|
{
|
||||||
var window = GetWindow<T>() as Window;
|
if (window.AppWindow == null) return;
|
||||||
if (window == null) return;
|
|
||||||
|
|
||||||
if (window.AppWindow.Presenter is OverlappedPresenter presenter)
|
if (window.AppWindow.Presenter is OverlappedPresenter presenter)
|
||||||
{
|
{
|
||||||
@@ -295,36 +330,27 @@ namespace BetterLyrics.WinUI3.Hooks
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void MoveAndResize<T>(Rect rect)
|
public static void MoveAndResize(this Window window, Rect rect)
|
||||||
{
|
{
|
||||||
var window = GetWindow<T>() as Window;
|
if (window.AppWindow == null) return;
|
||||||
if (window == null) return;
|
|
||||||
|
|
||||||
window.AppWindow.Move(new Windows.Graphics.PointInt32((int)rect.X, (int)rect.Y));
|
window.AppWindow.Move(new Windows.Graphics.PointInt32((int)rect.X, (int)rect.Y));
|
||||||
window.AppWindow.Resize(new Windows.Graphics.SizeInt32((int)rect.Width, (int)rect.Height));
|
window.AppWindow.Resize(new Windows.Graphics.SizeInt32((int)rect.Width, (int)rect.Height));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void SetTitleBarArea<T>(TitleBarArea titleBarArea)
|
public static void SetTitleBarArea(this NowPlayingWindow window, TitleBarArea titleBarArea)
|
||||||
{
|
{
|
||||||
if (typeof(T) == typeof(NowPlayingWindow))
|
window.SetTitleBarArea(titleBarArea);
|
||||||
{
|
|
||||||
NowPlayingWindow? lyricsWindow = GetWindow<NowPlayingWindow>();
|
|
||||||
lyricsWindow?.SetTitleBarArea(titleBarArea);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
throw new Exception($"Unsupported window type: {typeof(T).FullName}");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void RegisterWorkArea(IntPtr hwnd)
|
private static void RegisterWorkArea(IntPtr hwnd, LyricsWindowStatus status)
|
||||||
{
|
{
|
||||||
if (_workAreas.Contains(hwnd)) return;
|
if (_workAreas.Contains(hwnd)) return;
|
||||||
|
|
||||||
var uEdge = _liveStatesService.LiveStates.LyricsWindowStatus.DockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
|
var uEdge = status.DockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
|
||||||
|
|
||||||
double top = _liveStatesService.LiveStates.LyricsWindowStatus.DockPlacement == DockPlacement.Top ? _liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Top : _liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Bottom - _liveStatesService.LiveStates.LyricsWindowStatus.DockHeight;
|
double top = status.DockPlacement == DockPlacement.Top ? status.MonitorBounds.Top : status.MonitorBounds.Bottom - status.DockHeight;
|
||||||
double bottom = top + _liveStatesService.LiveStates.LyricsWindowStatus.DockHeight;
|
double bottom = top + status.DockHeight;
|
||||||
|
|
||||||
Shell32.APPBARDATA abd = new()
|
Shell32.APPBARDATA abd = new()
|
||||||
{
|
{
|
||||||
@@ -333,9 +359,9 @@ namespace BetterLyrics.WinUI3.Hooks
|
|||||||
uEdge = uEdge,
|
uEdge = uEdge,
|
||||||
rc = new RECT
|
rc = new RECT
|
||||||
{
|
{
|
||||||
Left = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Left,
|
Left = (int)status.MonitorBounds.Left,
|
||||||
Top = (int)top,
|
Top = (int)top,
|
||||||
Right = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Right,
|
Right = (int)status.MonitorBounds.Right,
|
||||||
Bottom = (int)bottom,
|
Bottom = (int)bottom,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -363,23 +389,22 @@ namespace BetterLyrics.WinUI3.Hooks
|
|||||||
_workAreas.Remove(hwnd);
|
_workAreas.Remove(hwnd);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void UpdateWorkArea<T>()
|
public static void UpdateWorkArea(this NowPlayingWindow window)
|
||||||
{
|
{
|
||||||
var window = GetWindow<T>() as Window;
|
|
||||||
if (window == null) return;
|
|
||||||
|
|
||||||
var hwnd = WindowNative.GetWindowHandle(window);
|
var hwnd = WindowNative.GetWindowHandle(window);
|
||||||
|
|
||||||
if (!_workAreas.Contains(hwnd))
|
if (!_workAreas.Contains(hwnd))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
var uEdge = _liveStatesService.LiveStates.LyricsWindowStatus.DockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
|
var status = window.LyricsWindowStatus;
|
||||||
|
|
||||||
double top = _liveStatesService.LiveStates.LyricsWindowStatus.DockPlacement == DockPlacement.Top ?
|
var uEdge = status.DockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
|
||||||
_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Top :
|
|
||||||
_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Bottom - _liveStatesService.LiveStates.LyricsWindowStatus.DockHeight;
|
|
||||||
|
|
||||||
double bottom = top + _liveStatesService.LiveStates.LyricsWindowStatus.DockHeight;
|
double top = status.DockPlacement == DockPlacement.Top ?
|
||||||
|
status.MonitorBounds.Top :
|
||||||
|
status.MonitorBounds.Bottom - status.DockHeight;
|
||||||
|
|
||||||
|
double bottom = top + status.DockHeight;
|
||||||
|
|
||||||
Shell32.APPBARDATA abd = new()
|
Shell32.APPBARDATA abd = new()
|
||||||
{
|
{
|
||||||
@@ -388,9 +413,9 @@ namespace BetterLyrics.WinUI3.Hooks
|
|||||||
uEdge = uEdge,
|
uEdge = uEdge,
|
||||||
rc = new RECT
|
rc = new RECT
|
||||||
{
|
{
|
||||||
Left = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Left,
|
Left = (int)status.MonitorBounds.Left,
|
||||||
Top = (int)top,
|
Top = (int)top,
|
||||||
Right = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Right,
|
Right = (int)status.MonitorBounds.Right,
|
||||||
Bottom = (int)bottom,
|
Bottom = (int)bottom,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -403,37 +428,32 @@ namespace BetterLyrics.WinUI3.Hooks
|
|||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="dispatcherQueue">请确保此参数指向同一个对象,建议传值 BaseViewModel._dispatcherQueue</param>
|
/// <param name="dispatcherQueue">请确保此参数指向同一个对象,建议传值 BaseViewModel._dispatcherQueue</param>
|
||||||
public static void SetLyricsWindowVisibilityByPlayingStatus(DispatcherQueue dispatcherQueue)
|
public static void SetLyricsWindowVisibilityByPlayingStatus(this NowPlayingWindow window, bool isPlaying, DispatcherQueue dispatcherQueue)
|
||||||
{
|
{
|
||||||
_setLyricsWindowVisibilityByPlayingStatusTimer ??= dispatcherQueue.CreateTimer();
|
var status = window.LyricsWindowStatus;
|
||||||
|
|
||||||
_setLyricsWindowVisibilityByPlayingStatusTimer.Debounce(() =>
|
status.VisibilityTimer ??= dispatcherQueue.CreateTimer();
|
||||||
|
|
||||||
|
status.VisibilityTimer.Debounce(() =>
|
||||||
{
|
{
|
||||||
var window = GetWindow<NowPlayingWindow>();
|
if (status.AutoShowOrHideWindow && !isPlaying)
|
||||||
if (window == null) return;
|
|
||||||
|
|
||||||
if (_liveStatesService.LiveStates.LyricsWindowStatus.AutoShowOrHideWindow && !_mediaSessionsService.CurrentIsPlaying)
|
|
||||||
{
|
{
|
||||||
if (_liveStatesService.LiveStates.LyricsWindowStatus.IsWorkArea)
|
if (status.IsWorkArea)
|
||||||
{
|
{
|
||||||
_liveStatesService.LiveStates.IsLyricsWindowStatusRefreshing = true;
|
window.SetIsWorkArea(false);
|
||||||
SetIsWorkArea<NowPlayingWindow>(false);
|
|
||||||
_liveStatesService.LiveStates.IsLyricsWindowStatusRefreshing = false;
|
|
||||||
}
|
}
|
||||||
HideWindow<NowPlayingWindow>();
|
window.HideWindow();
|
||||||
}
|
}
|
||||||
else if (_liveStatesService.LiveStates.LyricsWindowStatus.AutoShowOrHideWindow && _mediaSessionsService.CurrentIsPlaying)
|
else if (status.AutoShowOrHideWindow && isPlaying)
|
||||||
{
|
{
|
||||||
if (_liveStatesService.LiveStates.LyricsWindowStatus.IsWorkArea)
|
if (status.IsWorkArea)
|
||||||
{
|
{
|
||||||
_liveStatesService.LiveStates.IsLyricsWindowStatusRefreshing = true;
|
window.SetIsWorkArea(true);
|
||||||
SetIsWorkArea<NowPlayingWindow>(true);
|
|
||||||
_liveStatesService.LiveStates.IsLyricsWindowStatusRefreshing = false;
|
|
||||||
}
|
}
|
||||||
OpenOrShowWindow<NowPlayingWindow>();
|
OpenOrShowWindow<NowPlayingWindow>(status);
|
||||||
if (_liveStatesService.LiveStates.LyricsWindowStatus.IsWorkArea)
|
if (status.IsWorkArea)
|
||||||
{
|
{
|
||||||
MoveAndResize<NowPlayingWindow>(_liveStatesService.LiveStates.LyricsWindowStatus.GetWindowBoundsWhenWorkArea());
|
window.MoveAndResize(status.GetWindowBoundsWhenWorkArea());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, Constants.Time.DebounceTimeout);
|
}, Constants.Time.DebounceTimeout);
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user