From 5a9fb58663980cbe95bd32a823cb33c4104c450b Mon Sep 17 00:00:00 2001
From: Corentin LEMAIRE <corentin.lemaire@etu.uca.fr>
Date: Mon, 12 Jun 2023 18:09:34 +0200
Subject: [PATCH] Some minor fixes

---
 Sources/Linaris/App.xaml                       |  1 +
 Sources/Linaris/App.xaml.cs                    | 17 ++++++-----------
 Sources/Linaris/Linaris.csproj                 | 18 +++++++++++++++++-
 Sources/Linaris/MainPage.xaml.cs               |  5 +++--
 .../Platforms/Windows/Package.appxmanifest     |  2 +-
 Sources/Model/InfoTitle.cs                     |  2 +-
 .../Serialization/LINQ_XML_Serialization.cs    |  4 ++--
 7 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/Sources/Linaris/App.xaml b/Sources/Linaris/App.xaml
index ae057eb..d56b28b 100644
--- a/Sources/Linaris/App.xaml
+++ b/Sources/Linaris/App.xaml
@@ -12,3 +12,4 @@
         </ResourceDictionary>
     </Application.Resources>
 </Application>
+    
\ No newline at end of file
diff --git a/Sources/Linaris/App.xaml.cs b/Sources/Linaris/App.xaml.cs
index 3d0f67d..008f26e 100644
--- a/Sources/Linaris/App.xaml.cs
+++ b/Sources/Linaris/App.xaml.cs
@@ -11,21 +11,16 @@ public partial class App : Application
 
     public FooterPage FooterPage { get; set; }
 
-    public TimeSpan MusicPosition { get; set; } = TimeSpan.FromSeconds(0);
+    public TimeSpan MusicPosition { get; set; }
 
-    public MediaElementState MediaState { get; set; } = MediaElementState.Paused;
+    public MediaElementState MediaState { get; set; }
 
     public App()
     {
-        try
-        {
-            InitializeComponent();
-        }
-        catch (Exception ex)
-        {
-            Debug.WriteLine(ex);
-        }
-        Manager = new Manager(new LinqXmlSerialization(FileSystem.AppDataDirectory));
+        InitializeComponent();
+        MusicPosition = TimeSpan.FromSeconds(0);
+        MediaState = MediaElementState.Paused;
+        Manager = new Manager(new LinqXmlSerialization(FileSystem.Current.AppDataDirectory));
         FooterPage = new FooterPage();
         MainPage = new AppShell();
     }
diff --git a/Sources/Linaris/Linaris.csproj b/Sources/Linaris/Linaris.csproj
index 459ec0d..bdee2a0 100644
--- a/Sources/Linaris/Linaris.csproj
+++ b/Sources/Linaris/Linaris.csproj
@@ -29,6 +29,16 @@
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
 		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
+		<GenerateAppInstallerFile>True</GenerateAppInstallerFile>
+		<AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
+		<PackageCertificateThumbprint>D9EF0E98B2CABE92C87A46ACC4954059B92B6346</PackageCertificateThumbprint>
+		<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
+		<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+		<AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
+		<GenerateTestArtifacts>True</GenerateTestArtifacts>
+		<AppInstallerUri>D:\Bureau</AppInstallerUri>
+		<HoursBetweenUpdateChecks>24</HoursBetweenUpdateChecks>
+		<DefaultLanguage>fr</DefaultLanguage>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -51,7 +61,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.Maui.MediaElement" Version="1.0.2" />
+		<PackageReference Include="CommunityToolkit.Maui.MediaElement" Version="2.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
 	</ItemGroup>
 
@@ -78,6 +88,9 @@
 		<MauiXaml Update="AlbumPage.xaml">
 			<Generator>MSBuild:Compile</Generator>
 		</MauiXaml>
+		<MauiXaml Update="App.xaml">
+		  <Generator>MSBuild:Compile</Generator>
+		</MauiXaml>
 		<MauiXaml Update="EditPlaylistPage.xaml">
 			<Generator>MSBuild:Compile</Generator>
 		</MauiXaml>
@@ -93,6 +106,9 @@
 		<MauiXaml Update="LocalFilesPage.xaml">
 			<Generator>MSBuild:Compile</Generator>
 		</MauiXaml>
+		<MauiXaml Update="MainPage.xaml">
+		  <Generator>MSBuild:Compile</Generator>
+		</MauiXaml>
 		<MauiXaml Update="PlaylistPage.xaml">
 			<Generator>MSBuild:Compile</Generator>
 		</MauiXaml>
diff --git a/Sources/Linaris/MainPage.xaml.cs b/Sources/Linaris/MainPage.xaml.cs
index a0da7e5..df5eb13 100644
--- a/Sources/Linaris/MainPage.xaml.cs
+++ b/Sources/Linaris/MainPage.xaml.cs
@@ -8,7 +8,7 @@ namespace Linaris;
 public partial class MainPage : ContentPage
 {
 
-	private readonly ObservableCollection<Album> albums = (Application.Current as App).Manager.GetAlbums();
+    private readonly ObservableCollection<Album> albums;
 
     public ObservableCollection<Album> Albums
 	{
@@ -18,7 +18,8 @@ public partial class MainPage : ContentPage
 	public MainPage()
 	{
         InitializeComponent();
-		BindingContext = this;
+        albums = (Application.Current as App).Manager.GetAlbums();
+        BindingContext = this;
     }
 
     async void GoToAlbum(object sender, EventArgs e)
diff --git a/Sources/Linaris/Platforms/Windows/Package.appxmanifest b/Sources/Linaris/Platforms/Windows/Package.appxmanifest
index 095b582..93c4356 100644
--- a/Sources/Linaris/Platforms/Windows/Package.appxmanifest
+++ b/Sources/Linaris/Platforms/Windows/Package.appxmanifest
@@ -6,7 +6,7 @@
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   IgnorableNamespaces="uap rescap">
 
-  <Identity Name="maui-package-name-placeholder" Publisher="CN=User Name" Version="0.0.0.0" />
+  <Identity Name="maui-package-name-placeholder" Publisher="CN=coren" Version="0.0.3.0" />
 
   <mp:PhoneIdentity PhoneProductId="FAE74902-2FAE-40B1-9171-6989A858C6A6" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
diff --git a/Sources/Model/InfoTitle.cs b/Sources/Model/InfoTitle.cs
index 247b89a..79c1020 100644
--- a/Sources/Model/InfoTitle.cs
+++ b/Sources/Model/InfoTitle.cs
@@ -24,7 +24,7 @@ namespace Model
 
         private string description = Manager.DEFAULT_DESC;
 
-        private List<Artist> feat = new List<Artist>();
+        private List<Artist> feat = new();
 
         public IEnumerable<Artist> Feat
         {
diff --git a/Sources/Model/Serialization/LINQ_XML_Serialization.cs b/Sources/Model/Serialization/LINQ_XML_Serialization.cs
index ac7b85c..92932af 100644
--- a/Sources/Model/Serialization/LINQ_XML_Serialization.cs
+++ b/Sources/Model/Serialization/LINQ_XML_Serialization.cs
@@ -349,7 +349,7 @@ namespace Model.Serialization
             if (!File.Exists(XMLFILECUSTOMS))
             {
 
-                XDocument CustomsFile2 = new XDocument();
+                XDocument CustomsFile2 = new();
 
                 var custom = customTitles.Select(c => new XElement("CustomTitle",
                                                       new XAttribute("Name", c.Name),
@@ -367,7 +367,7 @@ namespace Model.Serialization
 
                 using TextWriter tw = File.CreateText(XMLFILECUSTOMS);
                 using XmlWriter writer = XmlWriter.Create(tw, settings);
-                CustomsFile2.Save(writer);
+                        CustomsFile2.Save(writer);
             }
             XDocument CustomsFile = XDocument.Load(XMLFILECUSTOMS);