✏️ 🎨 Clean up a bit

AMC.View/AMC.View.csproj

@@ -49,14 +49,29 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <None Remove="Resources\Images\icon_albums.png" />
+	  <None Remove="Resources\Images\album_macroblank_1.png" />
-	  <None Remove="Resources\Images\icon_artists.png" />
+	  <None Remove="Resources\Images\album_macroblank_2.png" />
-	  <None Remove="Resources\Images\icon_genres.png" />
+	  <None Remove="Resources\Images\album_macroblank_3.png" />
-	  <None Remove="Resources\Images\icon_playlists.png" />
+	  <None Remove="Resources\Images\icon_bottom_browse_gray.png" />
-	  <None Remove="Resources\Images\icon_songs.png" />
+	  <None Remove="Resources\Images\icon_bottom_browse_red.png" />
-	  <None Remove="Resources\Images\macroblank_1.png" />
+	  <None Remove="Resources\Images\icon_bottom_library_gray.png" />
-	  <None Remove="Resources\Images\macroblank_2.png" />
+	  <None Remove="Resources\Images\icon_bottom_library_red.png" />
-	  <None Remove="Resources\Images\macroblank_3.png" />
+	  <None Remove="Resources\Images\icon_bottom_play_gray.png" />
+	  <None Remove="Resources\Images\icon_bottom_play_red.png" />
+	  <None Remove="Resources\Images\icon_bottom_radio_gray.png" />
+	  <None Remove="Resources\Images\icon_bottom_radio_red.png" />
+	  <None Remove="Resources\Images\icon_bottom_search_gray.png" />
+	  <None Remove="Resources\Images\icon_bottom_search_red.png" />
+	  <None Remove="Resources\Images\icon_categories_albums.png" />
+	  <None Remove="Resources\Images\icon_categories_artists.png" />
+	  <None Remove="Resources\Images\icon_categories_genres.png" />
+	  <None Remove="Resources\Images\icon_categories_playlists.png" />
+	  <None Remove="Resources\Images\icon_categories_songs.png" />
+	  <None Remove="Resources\Images\icon_default_song.png" />
+	  <None Remove="Resources\Images\icon_next.png" />
+	  <None Remove="Resources\Images\icon_next_dark.png" />
+	  <None Remove="Resources\Images\icon_play.png" />
+	  <None Remove="Resources\Images\icon_play_dark.png" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -68,6 +83,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <Compile Update="Controls\BottomBar.xaml.cs">
+	    <DependentUpon>BottomBar.xaml</DependentUpon>
+	  </Compile>
 	  <Compile Update="Resources\Strings\Strings.Designer.cs">
 	    <DesignTime>True</DesignTime>
 	    <AutoGen>True</AutoGen>
@@ -86,6 +104,12 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <MauiXaml Update="Controls\BottomBar.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Controls\IconLabelButton.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Resources\Styles\Values.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
@@ -100,8 +124,4 @@
 	  </MauiXaml>
 	</ItemGroup>
 
-	<ItemGroup>
-	  <Folder Include="Resources\Icons\" />
-	</ItemGroup>
-
 </Project>

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");
-
-    }
 }

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()
         {

AMC.View/Views/LibraryPage.xaml

@@ -22,23 +22,23 @@
 
             <StackLayout Orientation="Vertical" Spacing="0">
                 <ctl:LibraryCategoryItem CategoryText="{x:Static strings:Strings.PlaylistsCategory}"
-                                         IconSource="icon_playlists.png" />
+                                             IconSource="icon_categories_playlists.png" />
                 <BoxView Style="{StaticResource GraySeparator}"/>
 
                 <ctl:LibraryCategoryItem CategoryText="{x:Static strings:Strings.ArtistsCategory}"
-                                         IconSource="icon_artists.png" />
+                                             IconSource="icon_categories_artists.png" />
                 <BoxView Style="{StaticResource GraySeparator}"/>
 
                 <ctl:LibraryCategoryItem CategoryText="{x:Static strings:Strings.AlbumsCategory}"
-                                         IconSource="icon_albums.png" />
+                                             IconSource="icon_categories_albums.png" />
                 <BoxView Style="{StaticResource GraySeparator}"/>
 
                 <ctl:LibraryCategoryItem CategoryText="{x:Static strings:Strings.SongsCategory}"
-                                         IconSource="icon_songs.png" />
+                                             IconSource="icon_categories_songs.png" />
                 <BoxView Style="{StaticResource GraySeparator}"/>
 
                 <ctl:LibraryCategoryItem CategoryText="{x:Static strings:Strings.GenresCategory}"
-                                         IconSource="icon_genres.png" />
+                                             IconSource="icon_categories_genres.png" />
                 <BoxView Style="{StaticResource GraySeparator}"/>
 
             </StackLayout>

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));
             }

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),