diff --git a/AMC.View/AMC.View.csproj b/AMC.View/AMC.View.csproj index e673ece..7a81671 100644 --- a/AMC.View/AMC.View.csproj +++ b/AMC.View/AMC.View.csproj @@ -49,14 +49,29 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -68,6 +83,9 @@ + + BottomBar.xaml + True True @@ -86,6 +104,12 @@ + + MSBuild:Compile + + + MSBuild:Compile + MSBuild:Compile @@ -100,8 +124,4 @@ - - - - diff --git a/AMC.View/App.xaml.cs b/AMC.View/App.xaml.cs index 4675ecb..4598800 100644 --- a/AMC.View/App.xaml.cs +++ b/AMC.View/App.xaml.cs @@ -8,14 +8,4 @@ public partial class App : Application MainPage = new AppShell(); } - - protected override void OnStart() - { - base.OnStart(); - // Uncomment to set the culture to French - - // CultureInfo.CurrentCulture = new CultureInfo("fr-FR"); - // CultureInfo.CurrentUICulture = new CultureInfo("fr-FR"); - - } } diff --git a/AMC.View/Controls/LibraryCategoryItem.xaml.cs b/AMC.View/Controls/LibraryCategoryItem.xaml.cs index 16817a7..a339d33 100644 --- a/AMC.View/Controls/LibraryCategoryItem.xaml.cs +++ b/AMC.View/Controls/LibraryCategoryItem.xaml.cs @@ -1,5 +1,4 @@ - -namespace AMC.View.Controls +namespace AMC.View.Controls { public partial class LibraryCategoryItem : ContentView { @@ -8,14 +7,16 @@ namespace AMC.View.Controls returnType: typeof(string), declaringType: typeof(LibraryCategoryItem), defaultValue: "", - propertyChanged: CategoryTextChanged); + propertyChanged: CategoryTextChanged + ); public static readonly BindableProperty IconSourceProperty = BindableProperty.Create( propertyName: nameof(IconSource), returnType: typeof(ImageSource), declaringType: typeof(LibraryCategoryItem), defaultValue: null, - propertyChanged: IconSourceChanged); + propertyChanged: IconSourceChanged + ); public LibraryCategoryItem() { diff --git a/AMC.View/Resources/Images/macroblank_1.png b/AMC.View/Resources/Images/album_macroblank_1.png similarity index 100% rename from AMC.View/Resources/Images/macroblank_1.png rename to AMC.View/Resources/Images/album_macroblank_1.png diff --git a/AMC.View/Resources/Images/macroblank_2.png b/AMC.View/Resources/Images/album_macroblank_2.png similarity index 100% rename from AMC.View/Resources/Images/macroblank_2.png rename to AMC.View/Resources/Images/album_macroblank_2.png diff --git a/AMC.View/Resources/Images/macroblank_3.png b/AMC.View/Resources/Images/album_macroblank_3.png similarity index 100% rename from AMC.View/Resources/Images/macroblank_3.png rename to AMC.View/Resources/Images/album_macroblank_3.png diff --git a/AMC.View/Resources/Images/icon_bottom_browse_gray.png b/AMC.View/Resources/Images/icon_bottom_browse_gray.png new file mode 100644 index 0000000..62e0007 Binary files /dev/null and b/AMC.View/Resources/Images/icon_bottom_browse_gray.png differ diff --git a/AMC.View/Resources/Images/icon_bottom_browse_red.png b/AMC.View/Resources/Images/icon_bottom_browse_red.png new file mode 100644 index 0000000..3dd13d8 Binary files /dev/null and b/AMC.View/Resources/Images/icon_bottom_browse_red.png differ diff --git a/AMC.View/Resources/Images/icon_bottom_library_gray.png b/AMC.View/Resources/Images/icon_bottom_library_gray.png new file mode 100644 index 0000000..b4166d3 Binary files /dev/null and b/AMC.View/Resources/Images/icon_bottom_library_gray.png differ diff --git a/AMC.View/Resources/Images/icon_bottom_library_red.png b/AMC.View/Resources/Images/icon_bottom_library_red.png new file mode 100644 index 0000000..ce060ba Binary files /dev/null and b/AMC.View/Resources/Images/icon_bottom_library_red.png differ diff --git a/AMC.View/Resources/Images/icon_bottom_play_gray.png b/AMC.View/Resources/Images/icon_bottom_play_gray.png new file mode 100644 index 0000000..908919f Binary files /dev/null and b/AMC.View/Resources/Images/icon_bottom_play_gray.png differ diff --git a/AMC.View/Resources/Images/icon_bottom_play_red.png b/AMC.View/Resources/Images/icon_bottom_play_red.png new file mode 100644 index 0000000..9884776 Binary files /dev/null and b/AMC.View/Resources/Images/icon_bottom_play_red.png differ diff --git a/AMC.View/Resources/Images/icon_bottom_radio_gray.png b/AMC.View/Resources/Images/icon_bottom_radio_gray.png new file mode 100644 index 0000000..7bb1421 Binary files /dev/null and b/AMC.View/Resources/Images/icon_bottom_radio_gray.png differ diff --git a/AMC.View/Resources/Images/icon_bottom_radio_red.png b/AMC.View/Resources/Images/icon_bottom_radio_red.png new file mode 100644 index 0000000..3fdd6be Binary files /dev/null and b/AMC.View/Resources/Images/icon_bottom_radio_red.png differ diff --git a/AMC.View/Resources/Images/icon_bottom_search_gray.png b/AMC.View/Resources/Images/icon_bottom_search_gray.png new file mode 100644 index 0000000..b8a232e Binary files /dev/null and b/AMC.View/Resources/Images/icon_bottom_search_gray.png differ diff --git a/AMC.View/Resources/Images/icon_bottom_search_red.png b/AMC.View/Resources/Images/icon_bottom_search_red.png new file mode 100644 index 0000000..1ffcba5 Binary files /dev/null and b/AMC.View/Resources/Images/icon_bottom_search_red.png differ diff --git a/AMC.View/Resources/Images/icon_albums.png b/AMC.View/Resources/Images/icon_categories_albums.png similarity index 100% rename from AMC.View/Resources/Images/icon_albums.png rename to AMC.View/Resources/Images/icon_categories_albums.png diff --git a/AMC.View/Resources/Images/icon_artists.png b/AMC.View/Resources/Images/icon_categories_artists.png similarity index 100% rename from AMC.View/Resources/Images/icon_artists.png rename to AMC.View/Resources/Images/icon_categories_artists.png diff --git a/AMC.View/Resources/Images/icon_genres.png b/AMC.View/Resources/Images/icon_categories_genres.png similarity index 100% rename from AMC.View/Resources/Images/icon_genres.png rename to AMC.View/Resources/Images/icon_categories_genres.png diff --git a/AMC.View/Resources/Images/icon_playlists.png b/AMC.View/Resources/Images/icon_categories_playlists.png similarity index 100% rename from AMC.View/Resources/Images/icon_playlists.png rename to AMC.View/Resources/Images/icon_categories_playlists.png diff --git a/AMC.View/Resources/Images/icon_songs.png b/AMC.View/Resources/Images/icon_categories_songs.png similarity index 100% rename from AMC.View/Resources/Images/icon_songs.png rename to AMC.View/Resources/Images/icon_categories_songs.png diff --git a/AMC.View/Resources/Images/icon_default_song.png b/AMC.View/Resources/Images/icon_default_song.png new file mode 100644 index 0000000..0acd79c Binary files /dev/null and b/AMC.View/Resources/Images/icon_default_song.png differ diff --git a/AMC.View/Resources/Images/icon_next.png b/AMC.View/Resources/Images/icon_next.png new file mode 100644 index 0000000..6503057 Binary files /dev/null and b/AMC.View/Resources/Images/icon_next.png differ diff --git a/AMC.View/Resources/Images/icon_next_dark.png b/AMC.View/Resources/Images/icon_next_dark.png new file mode 100644 index 0000000..5a5efee Binary files /dev/null and b/AMC.View/Resources/Images/icon_next_dark.png differ diff --git a/AMC.View/Resources/Images/icon_play.png b/AMC.View/Resources/Images/icon_play.png new file mode 100644 index 0000000..d9d08af Binary files /dev/null and b/AMC.View/Resources/Images/icon_play.png differ diff --git a/AMC.View/Resources/Images/icon_play_dark.png b/AMC.View/Resources/Images/icon_play_dark.png new file mode 100644 index 0000000..3ad0714 Binary files /dev/null and b/AMC.View/Resources/Images/icon_play_dark.png differ diff --git a/AMC.View/Views/LibraryPage.xaml b/AMC.View/Views/LibraryPage.xaml index c61c559..95fc1e0 100644 --- a/AMC.View/Views/LibraryPage.xaml +++ b/AMC.View/Views/LibraryPage.xaml @@ -22,23 +22,23 @@ + IconSource="icon_categories_playlists.png" /> + IconSource="icon_categories_artists.png" /> + IconSource="icon_categories_albums.png" /> + IconSource="icon_categories_songs.png" /> + IconSource="icon_categories_genres.png" /> diff --git a/AMC.View/Views/LibraryPage.xaml.cs b/AMC.View/Views/LibraryPage.xaml.cs index a383baf..a672c64 100644 --- a/AMC.View/Views/LibraryPage.xaml.cs +++ b/AMC.View/Views/LibraryPage.xaml.cs @@ -8,6 +8,8 @@ namespace AMC.View.Views public LibraryPage() : this(null) { } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Blocker Code Smell", "S3427:Method overloads with default parameter values should not overlap ", Justification = "The parameterless ctor is needed by MAUI")] public LibraryPage(LibraryViewModel? libraryViewModel = null) { InitializeComponent(); @@ -21,7 +23,7 @@ namespace AMC.View.Views var collectionView = (CollectionView)sender; var selectedAlbum = (AlbumViewModel)e.CurrentSelection.FirstOrDefault(); - if (selectedAlbum != null) + if (e.CurrentSelection.FirstOrDefault() is AlbumViewModel selectedAlbum) { Navigation.PushAsync(new AlbumPage(selectedAlbum)); } diff --git a/AMC.ViewModel/ViewModels/LibraryViewModel.cs b/AMC.ViewModel/ViewModels/LibraryViewModel.cs index d39e33e..ca40c90 100644 --- a/AMC.ViewModel/ViewModels/LibraryViewModel.cs +++ b/AMC.ViewModel/ViewModels/LibraryViewModel.cs @@ -24,7 +24,7 @@ namespace AMC.ViewModel.ViewModels Id = 1, Title = "Test Album 1", Artist = "Test Artist 1", - CoverImage = "macroblank_1.png", + CoverImage = "album_macroblank_1.png", Genre = "Test genre 1", Year = 1970, ReleaseDate = new DateTime(1970, 01, 01), @@ -48,7 +48,7 @@ namespace AMC.ViewModel.ViewModels Id = 2, Title = "Test Albuuuuuuuuuuuuuuuuuuum 2", Artist = "Test Artist 2", - CoverImage = "macroblank_2.png", + CoverImage = "album_macroblank_2.png", Genre = "Test genre 2", Year = 1970, ReleaseDate = new DateTime(1970, 01, 01), @@ -69,7 +69,7 @@ namespace AMC.ViewModel.ViewModels Id = 3, Title = "Test Album 3", Artist = "Test Aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaartist 3", - CoverImage = "macroblank_3.png", + CoverImage = "album_macroblank_3.png", Genre = "Test genre 3", Year = 1970, ReleaseDate = new DateTime(1970, 01, 01),