diff --git a/Harmonia.WinUI/Assets/Fonts/Lexend-Black.ttf b/Harmonia.WinUI/Assets/Fonts/Lexend-Black.ttf new file mode 100644 index 0000000..ff44480 Binary files /dev/null and b/Harmonia.WinUI/Assets/Fonts/Lexend-Black.ttf differ diff --git a/Harmonia.WinUI/Assets/Fonts/Lexend-Bold.ttf b/Harmonia.WinUI/Assets/Fonts/Lexend-Bold.ttf new file mode 100644 index 0000000..97614b9 Binary files /dev/null and b/Harmonia.WinUI/Assets/Fonts/Lexend-Bold.ttf differ diff --git a/Harmonia.WinUI/Assets/Fonts/Lexend-ExtraBold.ttf b/Harmonia.WinUI/Assets/Fonts/Lexend-ExtraBold.ttf new file mode 100644 index 0000000..641ab9b Binary files /dev/null and b/Harmonia.WinUI/Assets/Fonts/Lexend-ExtraBold.ttf differ diff --git a/Harmonia.WinUI/Assets/Fonts/Lexend-ExtraLight.ttf b/Harmonia.WinUI/Assets/Fonts/Lexend-ExtraLight.ttf new file mode 100644 index 0000000..fececa0 Binary files /dev/null and b/Harmonia.WinUI/Assets/Fonts/Lexend-ExtraLight.ttf differ diff --git a/Harmonia.WinUI/Assets/Fonts/Lexend-Light.ttf b/Harmonia.WinUI/Assets/Fonts/Lexend-Light.ttf new file mode 100644 index 0000000..1b67c78 Binary files /dev/null and b/Harmonia.WinUI/Assets/Fonts/Lexend-Light.ttf differ diff --git a/Harmonia.WinUI/Assets/Fonts/Lexend-Medium.ttf b/Harmonia.WinUI/Assets/Fonts/Lexend-Medium.ttf new file mode 100644 index 0000000..a56f1e9 Binary files /dev/null and b/Harmonia.WinUI/Assets/Fonts/Lexend-Medium.ttf differ diff --git a/Harmonia.WinUI/Assets/Fonts/Lexend-Regular.ttf b/Harmonia.WinUI/Assets/Fonts/Lexend-Regular.ttf new file mode 100644 index 0000000..b869458 Binary files /dev/null and b/Harmonia.WinUI/Assets/Fonts/Lexend-Regular.ttf differ diff --git a/Harmonia.WinUI/Assets/Fonts/Lexend-SemiBold.ttf b/Harmonia.WinUI/Assets/Fonts/Lexend-SemiBold.ttf new file mode 100644 index 0000000..436b93b Binary files /dev/null and b/Harmonia.WinUI/Assets/Fonts/Lexend-SemiBold.ttf differ diff --git a/Harmonia.WinUI/Assets/Fonts/Lexend-Thin.ttf b/Harmonia.WinUI/Assets/Fonts/Lexend-Thin.ttf new file mode 100644 index 0000000..3bd5c47 Binary files /dev/null and b/Harmonia.WinUI/Assets/Fonts/Lexend-Thin.ttf differ diff --git a/Harmonia.WinUI/Assets/Fonts/NotoSansJP-Black.ttf b/Harmonia.WinUI/Assets/Fonts/NotoSansJP-Black.ttf new file mode 100644 index 0000000..0e33dde Binary files /dev/null and b/Harmonia.WinUI/Assets/Fonts/NotoSansJP-Black.ttf differ diff --git a/Harmonia.WinUI/Assets/Fonts/NotoSansJP-Bold.ttf b/Harmonia.WinUI/Assets/Fonts/NotoSansJP-Bold.ttf new file mode 100644 index 0000000..26a47bb Binary files /dev/null and b/Harmonia.WinUI/Assets/Fonts/NotoSansJP-Bold.ttf differ diff --git a/Harmonia.WinUI/Assets/Fonts/NotoSansJP-ExtraBold.ttf b/Harmonia.WinUI/Assets/Fonts/NotoSansJP-ExtraBold.ttf new file mode 100644 index 0000000..8435967 Binary files /dev/null and b/Harmonia.WinUI/Assets/Fonts/NotoSansJP-ExtraBold.ttf differ diff --git a/Harmonia.WinUI/Assets/Fonts/NotoSansJP-ExtraLight.ttf b/Harmonia.WinUI/Assets/Fonts/NotoSansJP-ExtraLight.ttf new file mode 100644 index 0000000..df421ba Binary files /dev/null and b/Harmonia.WinUI/Assets/Fonts/NotoSansJP-ExtraLight.ttf differ diff --git a/Harmonia.WinUI/Assets/Fonts/NotoSansJP-Light.ttf b/Harmonia.WinUI/Assets/Fonts/NotoSansJP-Light.ttf new file mode 100644 index 0000000..7e8c292 Binary files /dev/null and b/Harmonia.WinUI/Assets/Fonts/NotoSansJP-Light.ttf differ diff --git a/Harmonia.WinUI/Assets/Fonts/NotoSansJP-Medium.ttf b/Harmonia.WinUI/Assets/Fonts/NotoSansJP-Medium.ttf new file mode 100644 index 0000000..f107339 Binary files /dev/null and b/Harmonia.WinUI/Assets/Fonts/NotoSansJP-Medium.ttf differ diff --git a/Harmonia.WinUI/Assets/Fonts/NotoSansJP-Regular.ttf b/Harmonia.WinUI/Assets/Fonts/NotoSansJP-Regular.ttf new file mode 100644 index 0000000..d13df30 Binary files /dev/null and b/Harmonia.WinUI/Assets/Fonts/NotoSansJP-Regular.ttf differ diff --git a/Harmonia.WinUI/Assets/Fonts/NotoSansJP-SemiBold.ttf b/Harmonia.WinUI/Assets/Fonts/NotoSansJP-SemiBold.ttf new file mode 100644 index 0000000..2a24dc7 Binary files /dev/null and b/Harmonia.WinUI/Assets/Fonts/NotoSansJP-SemiBold.ttf differ diff --git a/Harmonia.WinUI/Assets/Fonts/NotoSansJP-Thin.ttf b/Harmonia.WinUI/Assets/Fonts/NotoSansJP-Thin.ttf new file mode 100644 index 0000000..b3d4cf4 Binary files /dev/null and b/Harmonia.WinUI/Assets/Fonts/NotoSansJP-Thin.ttf differ diff --git a/Harmonia.WinUI/Harmonia.WinUI.csproj b/Harmonia.WinUI/Harmonia.WinUI.csproj index 2a21b7a..193b79e 100644 --- a/Harmonia.WinUI/Harmonia.WinUI.csproj +++ b/Harmonia.WinUI/Harmonia.WinUI.csproj @@ -1,4 +1,4 @@ - + WinExe net10.0-windows10.0.26100.0 @@ -14,6 +14,7 @@ true enable + @@ -30,6 +31,10 @@ + + + + diff --git a/Harmonia.WinUI/Resources/Styles.xaml b/Harmonia.WinUI/Resources/Styles.xaml index f1254ea..637a811 100644 --- a/Harmonia.WinUI/Resources/Styles.xaml +++ b/Harmonia.WinUI/Resources/Styles.xaml @@ -4,29 +4,34 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> + ms-appx:///Assets/Fonts/Lexend-Regular.ttf#Lexend, ms-appx:///Assets/Fonts/NotoSansJP-Regular.ttf#Noto Sans JP + ms-appx:///Assets/Fonts/Lexend-Medium.ttf#Lexend, ms-appx:///Assets/Fonts/NotoSansJP-Medium.ttf#Noto Sans JP + ms-appx:///Assets/Fonts/Lexend-SemiBold.ttf#Lexend, ms-appx:///Assets/Fonts/NotoSansJP-SemiBold.ttf#Noto Sans JP + ms-appx:///Assets/Fonts/Lexend-Bold.ttf#Lexend, ms-appx:///Assets/Fonts/NotoSansJP-Bold.ttf#Noto Sans JP + @@ -92,7 +97,7 @@ - + diff --git a/Harmonia.WinUI/Views/PlayerView.xaml b/Harmonia.WinUI/Views/PlayerView.xaml index c4c449a..57c435b 100644 --- a/Harmonia.WinUI/Views/PlayerView.xaml +++ b/Harmonia.WinUI/Views/PlayerView.xaml @@ -52,6 +52,7 @@ - + diff --git a/Harmonia.WinUI/Views/PlaylistsView.xaml b/Harmonia.WinUI/Views/PlaylistsView.xaml index 5e015d5..3441400 100644 --- a/Harmonia.WinUI/Views/PlaylistsView.xaml +++ b/Harmonia.WinUI/Views/PlaylistsView.xaml @@ -60,6 +60,7 @@