From 4e0a2d51685cedc789247a38b693968d9cffd842 Mon Sep 17 00:00:00 2001 From: Alexis DRAI Date: Tue, 16 May 2023 19:55:32 +0200 Subject: [PATCH] :construction: Add dark/light themes, finish album top --- AD_MAUI/AD_MAUI.csproj | 5 +- AD_MAUI/Model/Album.cs | 2 + AD_MAUI/Resources/Icons/play.svg | 1 + AD_MAUI/Resources/Icons/shuffle.svg | 4 + AD_MAUI/Resources/Images/dotnet_bot.svg | 93 -- AD_MAUI/Resources/Images/macroblank.svg | 1788 +++++++++++++++++++++++ AD_MAUI/Resources/Styles/Colors.xaml | 37 +- AD_MAUI/Resources/Styles/Styles.xaml | 8 +- AD_MAUI/ViewModel/AlbumViewModel.cs | 40 +- AD_MAUI/ViewModel/SongViewModel.cs | 22 - AD_MAUI/Views/AlbumPage.xaml | 89 +- 11 files changed, 1906 insertions(+), 183 deletions(-) create mode 100644 AD_MAUI/Resources/Icons/play.svg create mode 100644 AD_MAUI/Resources/Icons/shuffle.svg delete mode 100644 AD_MAUI/Resources/Images/dotnet_bot.svg create mode 100644 AD_MAUI/Resources/Images/macroblank.svg diff --git a/AD_MAUI/AD_MAUI.csproj b/AD_MAUI/AD_MAUI.csproj index 62bffea..a3b0c37 100644 --- a/AD_MAUI/AD_MAUI.csproj +++ b/AD_MAUI/AD_MAUI.csproj @@ -40,7 +40,6 @@ - @@ -49,6 +48,10 @@ + + + + diff --git a/AD_MAUI/Model/Album.cs b/AD_MAUI/Model/Album.cs index e161c00..1444ecf 100644 --- a/AD_MAUI/Model/Album.cs +++ b/AD_MAUI/Model/Album.cs @@ -6,6 +6,8 @@ public string Title { get; set; } public string Artist { get; set; } public string CoverImage { get; set; } + public string Genre { get; set; } + public int Year { get; set; } public List Songs { get; set; } } diff --git a/AD_MAUI/Resources/Icons/play.svg b/AD_MAUI/Resources/Icons/play.svg new file mode 100644 index 0000000..eb75877 --- /dev/null +++ b/AD_MAUI/Resources/Icons/play.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/AD_MAUI/Resources/Icons/shuffle.svg b/AD_MAUI/Resources/Icons/shuffle.svg new file mode 100644 index 0000000..83bf20c --- /dev/null +++ b/AD_MAUI/Resources/Icons/shuffle.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/AD_MAUI/Resources/Images/dotnet_bot.svg b/AD_MAUI/Resources/Images/dotnet_bot.svg deleted file mode 100644 index abfaff2..0000000 --- a/AD_MAUI/Resources/Images/dotnet_bot.svg +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/AD_MAUI/Resources/Images/macroblank.svg b/AD_MAUI/Resources/Images/macroblank.svg new file mode 100644 index 0000000..2a83810 --- /dev/null +++ b/AD_MAUI/Resources/Images/macroblank.svg @@ -0,0 +1,1788 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AD_MAUI/Resources/Styles/Colors.xaml b/AD_MAUI/Resources/Styles/Colors.xaml index 245758b..8b5fb5b 100644 --- a/AD_MAUI/Resources/Styles/Colors.xaml +++ b/AD_MAUI/Resources/Styles/Colors.xaml @@ -4,11 +4,25 @@ xmlns="http://schemas.microsoft.com/dotnet/2021/maui" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"> - #512BD4 - #DFD8F7 - #2B0B98 + #141414 + #FF2D55 + #EDEDED + + + + + + #EDEDED + #FF2D55 + #141414 + + + + + White Black + #8E8E93 #E1E1E1 #C8C8C8 #ACACAC @@ -17,11 +31,8 @@ #404040 #212121 #141414 - - - - - + + @@ -31,14 +42,4 @@ - #F7B548 - #FFD590 - #FFE5B9 - #28C2D1 - #7BDDEF - #C3F2F4 - #3E8EED - #72ACF1 - #A7CBF6 - \ No newline at end of file diff --git a/AD_MAUI/Resources/Styles/Styles.xaml b/AD_MAUI/Resources/Styles/Styles.xaml index dc4a034..9e974be 100644 --- a/AD_MAUI/Resources/Styles/Styles.xaml +++ b/AD_MAUI/Resources/Styles/Styles.xaml @@ -24,8 +24,8 @@