v0.3.0

.github/workflows/build.yml

@@ -0,0 +1,69 @@
+name: Build Musium Packaged
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches: 
+      - main
+
+jobs:
+
+  build:
+
+    strategy:
+      matrix:
+        configuration: [Release]
+        platform: [x64, ARM64]
+
+    runs-on: windows-latest
+
+    env:
+      Solution_Name: Musium
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Install .NET Core
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 8.0.x
+
+    - name: Setup MSBuild.exe
+      uses: microsoft/setup-msbuild@v1.0.2
+
+    - name: Restore the application
+      run: msbuild "$env:Solution_Name.slnx" /t:Restore /p:Configuration=$env:Configuration
+      env:
+        Configuration: ${{ matrix.configuration }}
+
+    - name: Decode the pfx
+      run: |
+        $pfx_cert_byte = [System.Convert]::FromBase64String("${{ secrets.BASE64_ENCODED_PFX }}")
+        $certificatePath = "GitHubActionsWorkflow.pfx"
+        [IO.File]::WriteAllBytes("$certificatePath", $pfx_cert_byte)
+
+    - name: Create the app package
+      run: msbuild "$env:Solution_Name.slnx" /p:Configuration=$env:Configuration /p:Platform=$env:Platform /p:UapAppxPackageBuildMode=$env:Appx_Package_Build_Mode /p:AppxBundle=$env:Appx_Bundle /p:PackageCertificateKeyFile=GitHubActionsWorkflow.pfx /p:AppxPackageDir="$env:Appx_Package_Dir" /p:GenerateAppxPackageOnBuild=true
+      env:
+        Appx_Bundle: Never
+        Appx_Package_Build_Mode: SideloadOnly
+        Appx_Package_Dir: Packages\
+        Configuration: ${{ matrix.configuration }}
+        Platform: ${{ matrix.platform }}
+
+    - name: Remove the pfx
+      run: Remove-Item -path GitHubActionsWorkflow.pfx
+
+    - name: Upload app packages and certificate
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ matrix.platform }}-App-Package
+        path: |
+          ${{ github.workspace }}/Packages/**/*.msix
+          ${{ github.workspace }}/Packages/**/*.cer
+          !${{ github.workspace }}/Packages/**/Dependencies/**
+
+

App.xaml.cs

@@ -20,6 +20,7 @@
 using Windows.Media.Core;
 using Windows.Media.Playback;
 using Windows.Storage;
+using System.Threading.Tasks;
 
 namespace Musium
 {
@@ -37,7 +38,10 @@ protected override async void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventA
             MainWindow.Activate();
 
             var Audio = AudioService.Instance;
-            await Audio.ScanDirectoryIntoLibrary(SettingsService.Instance.LibraryPath);
+            await Task.Run(async () =>
+            {
+                await Audio.ScanDirectoryIntoLibrary(SettingsService.Instance.LibraryPath);
+            });
         }
     }
 }

Controls/QueueListItemControl.xaml

@@ -8,7 +8,17 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <Grid Padding="6" Height="60" HorizontalAlignment="Stretch">
+
+    <Grid Padding="6" Height="60" HorizontalAlignment="Stretch" Background="Transparent">
+        <Grid.ContextFlyout>
+            <MenuFlyout>
+                <MenuFlyoutItem Text="Remove from queue" Click="RemoveQueue_Click">
+                    <MenuFlyoutItem.Icon>
+                        <SymbolIcon Symbol="Delete"/>
+                    </MenuFlyoutItem.Icon>
+                </MenuFlyoutItem>
+            </MenuFlyout>
+        </Grid.ContextFlyout>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="*"/>

Controls/QueueListItemControl.xaml.cs

@@ -7,9 +7,11 @@
 using Microsoft.UI.Xaml.Media.Imaging;
 using Microsoft.UI.Xaml.Navigation;
 using Musium.Models;
+using Musium.Services;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
@@ -24,6 +26,7 @@ namespace Musium.Controls;
 
 public sealed partial class QueueListItemControl : UserControl, INotifyPropertyChanged
 {
+    public readonly AudioService Audio = AudioService.Instance;
     public event PropertyChangedEventHandler? PropertyChanged;
     void OnPropertyChanged([CallerMemberName] string? name = null)
     {
@@ -92,4 +95,9 @@ private async Task UpdateCoverArtAsync()
             DisplayedCoverArt = null;
         }
     }
+
+    private void RemoveQueue_Click(object sender, RoutedEventArgs e)
+    {
+        Audio.RemoveFromQueue(Song);
+    }
 }

Controls/TrackItemControl.xaml

@@ -15,6 +15,9 @@
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
         <converters:InverseBooleanToVisibilityConverter x:Key="InverseBooleanToVisibilityConverter" />
         <converters:BoolGridLengthConverter x:Key="BoolGridLengthConverter" />
+        <converters:BoolToFavoriteStringConverter x:Key="BoolToFavoriteStringConverter" />
+        <converters:BoolToAccentBrushConverter x:Key="BoolToAccentBrushConverter" />
+
     </UserControl.Resources>
 
     <Button Background="Transparent"
@@ -23,14 +26,32 @@
         HorizontalAlignment="Stretch"
         HorizontalContentAlignment="Stretch"
         Click="Button_Click">
-
+        <Button.ContextFlyout>
+            <MenuFlyout>
+                <MenuFlyoutItem Text="Play next" Click="NextQueue_Click">
+                    <MenuFlyoutItem.Icon>
+                        <SymbolIcon Symbol="Import"/>
+                    </MenuFlyoutItem.Icon>
+                </MenuFlyoutItem>
+                <MenuFlyoutItem Text="Add to Queue" Click="LastQueue_Click">
+                    <MenuFlyoutItem.Icon>
+                        <FontIcon Glyph="&#xEA52;"/>
+                    </MenuFlyoutItem.Icon>
+                </MenuFlyoutItem>
+                <MenuFlyoutItem Text="{x:Bind Song.Favorited, Mode=OneWay, Converter={StaticResource BoolToFavoriteStringConverter}}" Click="MenuFlyoutItemFav_Click">
+                    <MenuFlyoutItem.Icon>
+                        <FontIcon Glyph="{x:Bind Song.Favorited, Mode=OneWay, Converter={StaticResource GetFavoritedGlyph}}"/>
+                    </MenuFlyoutItem.Icon>
+                </MenuFlyoutItem>
+            </MenuFlyout>
+        </Button.ContextFlyout>
         <Grid VerticalAlignment="Center" HorizontalAlignment="Stretch" ColumnSpacing="32">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="{x:Bind TrackView, Converter={StaticResource BoolGridLengthConverter}, Mode=OneWay}"/>
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="30"/>
                 <ColumnDefinition Width="45"/>
                 <ColumnDefinition Width="40"/>
             </Grid.ColumnDefinitions>
@@ -50,7 +71,11 @@
 
             <FontIcon Grid.Column="4" Glyph="{x:Bind Song.Lossless, Mode=OneWay, Converter={StaticResource GetLosslessGlyph}}" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5"/>
             <Button Grid.Column="5" Background="Transparent" CornerRadius="50" VerticalAlignment="Center" HorizontalAlignment="Right" Width="45" Height="45" Click="Favorite_Click">
-                <FontIcon Glyph="{x:Bind Song.Favorited, Mode=OneWay, Converter={StaticResource GetFavoritedGlyph}}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                <FontIcon 
+                    Glyph="{x:Bind Song.Favorited, Mode=OneWay, Converter={StaticResource GetFavoritedGlyph}}" 
+                    Foreground="{x:Bind Song.Favorited, Mode=OneWay, Converter={StaticResource BoolToAccentBrushConverter}}"
+                    VerticalAlignment="Center" 
+                    HorizontalAlignment="Center"/>
             </Button>
             <TextBlock Grid.Column="6" Text="{x:Bind Song.Duration, Mode=OneWay, Converter={StaticResource DurationConverter}}" VerticalAlignment="Center" HorizontalAlignment="Right" TextTrimming="WordEllipsis"/>
         </Grid>

Controls/TrackItemControl.xaml.cs

@@ -1,4 +1,3 @@
-using Musium.Models;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
@@ -7,6 +6,8 @@
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Media.Imaging;
 using Microsoft.UI.Xaml.Navigation;
+using Musium.Models;
+using Musium.Services;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -31,6 +32,8 @@ void OnPropertyChanged([CallerMemberName] string? name = null)
         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
     }
 
+    public readonly AudioService Audio = AudioService.Instance;
+
     private BitmapImage? _displayedCoverArt;
     public BitmapImage? DisplayedCoverArt
     {
@@ -97,4 +100,18 @@ private void Favorite_Click(object sender, RoutedEventArgs e)
     {
         Song.Favorited = !Song.Favorited;
     }
+
+    private void NextQueue_Click(object sender, RoutedEventArgs e)
+    {
+        Audio.InsertStartOfQueue(Song);
+    }
+    private void LastQueue_Click(object sender, RoutedEventArgs e)
+    {
+        Audio.InsertEndOfQueue(Song);
+    }
+
+    private void MenuFlyoutItemFav_Click(object sender, RoutedEventArgs e)
+    {
+        Song.Favorited = !Song.Favorited;
+    }
 }

Converters/BoolToAccentBrushConverter.cs

@@ -0,0 +1,33 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Media;
+using Musium.Services;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.UI;
+
+namespace Musium.Converters
+{
+    public class BoolToAccentBrushConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is bool state && state == true)
+            {
+                return Application.Current.Resources["AccentFillColorDefaultBrush"] as SolidColorBrush;
+            }
+            else
+            {
+                return Application.Current.Resources["TextFillColorPrimaryBrush"] as SolidColorBrush;
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

Converters/BoolToFavoriteStringConverter.cs

@@ -0,0 +1,22 @@
+using System;
+using Microsoft.UI.Xaml.Data;
+
+namespace Musium.Converters
+{
+    public class BoolToFavoriteStringConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is bool favorited)
+            {
+                return (favorited ? "Unfavorite" : "Favorite"); 
+            }
+            return "Favorite";
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

Converters/RepeatStateToBrushConverter.cs

@@ -17,8 +17,7 @@ public object Convert(object value, Type targetType, object parameter, string la
         {
             if (value is RepeatState state && state != RepeatState.Off)
             {
-                var accentColor = (Color)Application.Current.Resources["SystemAccentColor"];
-                return new SolidColorBrush(accentColor);
+                return Application.Current.Resources["AccentFillColorDefaultBrush"] as SolidColorBrush;
             }
             else
             {

Converters/ShuffleStateToBrushConverter.cs

@@ -17,8 +17,7 @@ public object Convert(object value, Type targetType, object parameter, string la
         {
             if (value is ShuffleState state && state == ShuffleState.Shuffle)
             {
-                var accentColor = (Color)Application.Current.Resources["SystemAccentColor"];
-                return new SolidColorBrush(accentColor);
+                return Application.Current.Resources["AccentFillColorDefaultBrush"] as SolidColorBrush;
             }
             else
             {

MainWindow.xaml

@@ -49,24 +49,24 @@
                     </NavigationViewItem.Icon>
                 </NavigationViewItem>
                 <NavigationViewItem 
-                    Content="Favorited"
-                    Tag="Musium.Pages.Favorited">
+                    Content="Favorites"
+                    Tag="Musium.Pages.Favorites">
                     <NavigationViewItem.Icon>
-                        <FontIcon Glyph="&#xEB51;"/>
+                        <FontIcon Glyph="&#xE728;"/>
                     </NavigationViewItem.Icon>
                 </NavigationViewItem>
                 <NavigationViewItem 
                     Content="Albums"
                     Tag="Musium.Pages.Albums">
                     <NavigationViewItem.Icon>
-                        <SymbolIcon Symbol="Pictures" />
+                        <FontIcon Glyph="&#xE93C;" />
                     </NavigationViewItem.Icon>
                 </NavigationViewItem>
                 <NavigationViewItem 
                     Content="Tracks"
                     Tag="Musium.Pages.Tracks">
                     <NavigationViewItem.Icon>
-                        <SymbolIcon Symbol="Audio" />
+                        <SymbolIcon Symbol="MusicInfo" />
                     </NavigationViewItem.Icon>
                 </NavigationViewItem>
             </NavigationView.MenuItems>

MainWindow.xaml.cs

@@ -43,7 +43,7 @@ public MainWindow()
             ExtendsContentIntoTitleBar = true;
             SetTitleBar(Titlebar);
 
-            UpdateNavigationViewSelection(typeof(Musium.Pages.Albums));
+            UpdateNavigationViewSelection(typeof(Musium.Pages.NowPlaying));
 
             Audio.SetDispatcherQueue(DispatcherQueue);
             Audio.SetMediaPlayer(AudioPlayerElement);

Models/Album.cs

@@ -1,14 +1,15 @@
 using Microsoft.UI.Xaml.Media.Imaging;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 
 namespace Musium.Models
 {
     public class Album : ObservableObject
     {
-        private List<Song> _songs;
-        public List<Song> Songs
+        private ObservableCollection<Song> _songs;
+        public ObservableCollection<Song> Songs
         {
             get => _songs;
             set