diff --git a/Models_Classe/Metronome.cs b/Models_Classe/Metronome.cs deleted file mode 100644 index 24346b5..0000000 --- a/Models_Classe/Metronome.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace App.Models -{ - class Metronome - { - - - public void lancer() - { - //lancer la partition - var son = AudioManager.Current.CreatePlayer(await FileSystem.OpenAppPackageFileAsync("")); - son.Play(); - } - - public void arreter() - { - //mettre en pause la partition - } - - public void reinitialiser() - { - //remettre la partition à 0 - } - - public void regler() - { - //régler la partition (volume, tempo ...) - } - - } -} diff --git a/Models_Classe/Partition.cs b/Models_Classe/Partition.cs deleted file mode 100644 index 1df4904..0000000 --- a/Models_Classe/Partition.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MauiApp1.Model -{ - public class Partition - { - public string Nom { get; private set; } - public int IdPartition { get; private set; } - public string Auteur { get; private set; } - public int Complexite { get; private set; } - public string Description { get; private set; } - public string Instrument { get; private set; } - public string Son { get; private set; } - - public Partition(string nom, int idPartition, string auteur, int complexite, string description, string instrument, string son) - { - Nom = nom; - IdPartition = idPartition; - Auteur = auteur; - Complexite = complexite; - Description = description; - Instrument = instrument; - Son = son; - } - - } -} diff --git a/Models_Classe/ReglageTempo.cs b/Models_Classe/ReglageTempo.cs deleted file mode 100644 index 91ec943..0000000 --- a/Models_Classe/ReglageTempo.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace App.Models -{ - class ReglageTempo - { - public int Valeur { get; private set; } - - - public void augmenter(int valeur) - { - Valeur = valeur; - } - - public void reduire(int valeur) - { - Valeur = valeur; - } - - } -} diff --git a/Models_Classe/Trier.cs b/Models_Classe/Trier.cs deleted file mode 100644 index 32fd50e..0000000 --- a/Models_Classe/Trier.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace App.Models -{ - class Trier - { - - public List partitions = new List(); - - public List parNom(List liste) - { - Comparer comparer = Comparer.Create((p1, p2) => p1.Nom.CompareTo(p2.Nom)); - liste.Sort(comparer); - return liste; - } - - public List parComplexite(List liste) - { - Comparer comparer = Comparer.Create((p1, p2) => p1.Complexite.CompareTo(p2.Complexite)); - liste.Sort(comparer); - return liste; - } - - public List parInstrument(List liste) - { - Comparer comparer = Comparer.Create((p1, p2) => p1.Instrument.CompareTo(p2.Instrument)); - liste.Sort(comparer); - return liste; - } - - } -} diff --git a/Models_Classe/Utilisateur.cs b/Models_Classe/Utilisateur.cs deleted file mode 100644 index 6678385..0000000 --- a/Models_Classe/Utilisateur.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MauiApp1.Model -{ - - public class Utilisateur - { - public int IdUtilisateur { get; private set; } - public List Favoris { get; private set; } - - - public Utilisateur(int id) - { - IdUtilisateur = id; - Favoris = new List; - } - - - public void ajouter(Partition partition) - { - favoris.Add(partition); - } - - public void retirer(Partition partition) - { - favoris.Remove(partition); - } - - public void retirerTout() - { - Favoris.Clear(); - } - - } - -} diff --git a/ViewsApp/ViewsApp.sln b/MusiLib/MusiLib.sln similarity index 59% rename from ViewsApp/ViewsApp.sln rename to MusiLib/MusiLib.sln index 7fe3c67..7d1b22b 100644 --- a/ViewsApp/ViewsApp.sln +++ b/MusiLib/MusiLib.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.31611.283 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ViewsApp", "ViewsApp\ViewsApp.csproj", "{ED56AAF4-0B15-453C-9AED-775E967658A1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusiLib", "MusiLib\MusiLib.csproj", "{8A10FC03-4412-41B1-96AB-A0AA658B2237}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,12 +11,12 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {ED56AAF4-0B15-453C-9AED-775E967658A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED56AAF4-0B15-453C-9AED-775E967658A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED56AAF4-0B15-453C-9AED-775E967658A1}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {ED56AAF4-0B15-453C-9AED-775E967658A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED56AAF4-0B15-453C-9AED-775E967658A1}.Release|Any CPU.Build.0 = Release|Any CPU - {ED56AAF4-0B15-453C-9AED-775E967658A1}.Release|Any CPU.Deploy.0 = Release|Any CPU + {8A10FC03-4412-41B1-96AB-A0AA658B2237}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8A10FC03-4412-41B1-96AB-A0AA658B2237}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8A10FC03-4412-41B1-96AB-A0AA658B2237}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {8A10FC03-4412-41B1-96AB-A0AA658B2237}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8A10FC03-4412-41B1-96AB-A0AA658B2237}.Release|Any CPU.Build.0 = Release|Any CPU + {8A10FC03-4412-41B1-96AB-A0AA658B2237}.Release|Any CPU.Deploy.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ViewsApp/ViewsApp/App.xaml b/MusiLib/MusiLib/App.xaml similarity index 86% rename from ViewsApp/ViewsApp/App.xaml rename to MusiLib/MusiLib/App.xaml index ae2071d..20b83a2 100644 --- a/ViewsApp/ViewsApp/App.xaml +++ b/MusiLib/MusiLib/App.xaml @@ -1,8 +1,8 @@  + xmlns:local="clr-namespace:MusiLib" + x:Class="MusiLib.App"> diff --git a/MusiLib/MusiLib/App.xaml.cs b/MusiLib/MusiLib/App.xaml.cs new file mode 100644 index 0000000..c1ac093 --- /dev/null +++ b/MusiLib/MusiLib/App.xaml.cs @@ -0,0 +1,17 @@ +using MusiLib.Model; + +namespace MusiLib; + +public partial class App : Application +{ + + public Manager MyManager { get; private set; } = new Manager(); + public App() + { + MyManager.chargerDonnees(); + + InitializeComponent(); + + MainPage = new AppShell(); + } +} diff --git a/ViewsApp/ViewsApp/AppShell.xaml b/MusiLib/MusiLib/AppShell.xaml similarity index 76% rename from ViewsApp/ViewsApp/AppShell.xaml rename to MusiLib/MusiLib/AppShell.xaml index 2ef3ea7..f271e48 100644 --- a/ViewsApp/ViewsApp/AppShell.xaml +++ b/MusiLib/MusiLib/AppShell.xaml @@ -1,10 +1,10 @@ diff --git a/ViewsApp/ViewsApp/AppShell.xaml.cs b/MusiLib/MusiLib/AppShell.xaml.cs similarity index 80% rename from ViewsApp/ViewsApp/AppShell.xaml.cs rename to MusiLib/MusiLib/AppShell.xaml.cs index ccd5d18..02ecd04 100644 --- a/ViewsApp/ViewsApp/AppShell.xaml.cs +++ b/MusiLib/MusiLib/AppShell.xaml.cs @@ -1,4 +1,4 @@ -namespace ViewsApp; +namespace MusiLib; public partial class AppShell : Shell { diff --git a/ViewsApp/ViewsApp/MauiProgram.cs b/MusiLib/MusiLib/MauiProgram.cs similarity index 93% rename from ViewsApp/ViewsApp/MauiProgram.cs rename to MusiLib/MusiLib/MauiProgram.cs index e0903da..dfec5d2 100644 --- a/ViewsApp/ViewsApp/MauiProgram.cs +++ b/MusiLib/MusiLib/MauiProgram.cs @@ -1,4 +1,4 @@ -namespace ViewsApp; +namespace MusiLib; public static class MauiProgram { diff --git a/ViewsApp/ViewsApp/Model/Manager.cs b/MusiLib/MusiLib/Model/Manager.cs similarity index 97% rename from ViewsApp/ViewsApp/Model/Manager.cs rename to MusiLib/MusiLib/Model/Manager.cs index 30d8907..597f364 100644 --- a/ViewsApp/ViewsApp/Model/Manager.cs +++ b/MusiLib/MusiLib/Model/Manager.cs @@ -1,11 +1,11 @@ -using MauiApp1.Model; +using MusiLib.Model; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ViewsApp.Model +namespace MusiLib.Model { public class Manager { diff --git a/ViewsApp/ViewsApp/Model/Metronome.cs b/MusiLib/MusiLib/Model/Metronome.cs similarity index 100% rename from ViewsApp/ViewsApp/Model/Metronome.cs rename to MusiLib/MusiLib/Model/Metronome.cs diff --git a/ViewsApp/ViewsApp/Model/Partition.cs b/MusiLib/MusiLib/Model/Partition.cs similarity index 97% rename from ViewsApp/ViewsApp/Model/Partition.cs rename to MusiLib/MusiLib/Model/Partition.cs index 0994075..568a43e 100644 --- a/ViewsApp/ViewsApp/Model/Partition.cs +++ b/MusiLib/MusiLib/Model/Partition.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace MauiApp1.Model +namespace MusiLib.Model { public class Partition { diff --git a/ViewsApp/ViewsApp/Model/ReglageTempo.cs b/MusiLib/MusiLib/Model/ReglageTempo.cs similarity index 100% rename from ViewsApp/ViewsApp/Model/ReglageTempo.cs rename to MusiLib/MusiLib/Model/ReglageTempo.cs diff --git a/ViewsApp/ViewsApp/Model/Trier.cs b/MusiLib/MusiLib/Model/Trier.cs similarity index 97% rename from ViewsApp/ViewsApp/Model/Trier.cs rename to MusiLib/MusiLib/Model/Trier.cs index 9238075..7a7907b 100644 --- a/ViewsApp/ViewsApp/Model/Trier.cs +++ b/MusiLib/MusiLib/Model/Trier.cs @@ -1,4 +1,4 @@ -using MauiApp1.Model; +using MusiLib.Model; using System; using System.Collections.Generic; using System.Linq; diff --git a/ViewsApp/ViewsApp/Model/Utilisateur.cs b/MusiLib/MusiLib/Model/Utilisateur.cs similarity index 97% rename from ViewsApp/ViewsApp/Model/Utilisateur.cs rename to MusiLib/MusiLib/Model/Utilisateur.cs index 485451d..f4551e2 100644 --- a/ViewsApp/ViewsApp/Model/Utilisateur.cs +++ b/MusiLib/MusiLib/Model/Utilisateur.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace MauiApp1.Model +namespace MusiLib.Model { public class Utilisateur diff --git a/ViewsApp/ViewsApp/ViewsApp.csproj b/MusiLib/MusiLib/MusiLib.csproj similarity index 75% rename from ViewsApp/ViewsApp/ViewsApp.csproj rename to MusiLib/MusiLib/MusiLib.csproj index 85873d9..47b672f 100644 --- a/ViewsApp/ViewsApp/ViewsApp.csproj +++ b/MusiLib/MusiLib/MusiLib.csproj @@ -6,17 +6,17 @@ Exe - ViewsApp + MusiLib true true enable - ViewsApp + MusiLib - com.companyname.viewsapp - 295ba9c5-f6fe-4439-8d4e-4847cfe92086 + com.companyname.musilib + c2deb312-b3f3-425c-8e4b-18b5328ffd7c 1.0 @@ -32,10 +32,10 @@ - + - + @@ -48,16 +48,4 @@ - - - MSBuild:Compile - - - MSBuild:Compile - - - MSBuild:Compile - - - diff --git a/ViewsApp/ViewsApp/Platforms/Android/AndroidManifest.xml b/MusiLib/MusiLib/Platforms/Android/AndroidManifest.xml similarity index 100% rename from ViewsApp/ViewsApp/Platforms/Android/AndroidManifest.xml rename to MusiLib/MusiLib/Platforms/Android/AndroidManifest.xml diff --git a/ViewsApp/ViewsApp/Platforms/Android/MainActivity.cs b/MusiLib/MusiLib/Platforms/Android/MainActivity.cs similarity index 94% rename from ViewsApp/ViewsApp/Platforms/Android/MainActivity.cs rename to MusiLib/MusiLib/Platforms/Android/MainActivity.cs index 2c92631..0c91508 100644 --- a/ViewsApp/ViewsApp/Platforms/Android/MainActivity.cs +++ b/MusiLib/MusiLib/Platforms/Android/MainActivity.cs @@ -2,7 +2,7 @@ using Android.Content.PM; using Android.OS; -namespace ViewsApp; +namespace MusiLib; [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)] public class MainActivity : MauiAppCompatActivity diff --git a/ViewsApp/ViewsApp/Platforms/Android/MainApplication.cs b/MusiLib/MusiLib/Platforms/Android/MainApplication.cs similarity index 93% rename from ViewsApp/ViewsApp/Platforms/Android/MainApplication.cs rename to MusiLib/MusiLib/Platforms/Android/MainApplication.cs index 53dd4cc..869ce7e 100644 --- a/ViewsApp/ViewsApp/Platforms/Android/MainApplication.cs +++ b/MusiLib/MusiLib/Platforms/Android/MainApplication.cs @@ -1,7 +1,7 @@ using Android.App; using Android.Runtime; -namespace ViewsApp; +namespace MusiLib; [Application] public class MainApplication : MauiApplication diff --git a/ViewsApp/ViewsApp/Platforms/Android/Resources/values/colors.xml b/MusiLib/MusiLib/Platforms/Android/Resources/values/colors.xml similarity index 100% rename from ViewsApp/ViewsApp/Platforms/Android/Resources/values/colors.xml rename to MusiLib/MusiLib/Platforms/Android/Resources/values/colors.xml diff --git a/ViewsApp/ViewsApp/Platforms/MacCatalyst/AppDelegate.cs b/MusiLib/MusiLib/Platforms/MacCatalyst/AppDelegate.cs similarity index 90% rename from ViewsApp/ViewsApp/Platforms/MacCatalyst/AppDelegate.cs rename to MusiLib/MusiLib/Platforms/MacCatalyst/AppDelegate.cs index d111857..2e894b0 100644 --- a/ViewsApp/ViewsApp/Platforms/MacCatalyst/AppDelegate.cs +++ b/MusiLib/MusiLib/Platforms/MacCatalyst/AppDelegate.cs @@ -1,6 +1,6 @@ using Foundation; -namespace ViewsApp; +namespace MusiLib; [Register("AppDelegate")] public class AppDelegate : MauiUIApplicationDelegate diff --git a/ViewsApp/ViewsApp/Platforms/MacCatalyst/Info.plist b/MusiLib/MusiLib/Platforms/MacCatalyst/Info.plist similarity index 100% rename from ViewsApp/ViewsApp/Platforms/MacCatalyst/Info.plist rename to MusiLib/MusiLib/Platforms/MacCatalyst/Info.plist diff --git a/ViewsApp/ViewsApp/Platforms/iOS/Program.cs b/MusiLib/MusiLib/Platforms/MacCatalyst/Program.cs similarity index 94% rename from ViewsApp/ViewsApp/Platforms/iOS/Program.cs rename to MusiLib/MusiLib/Platforms/MacCatalyst/Program.cs index 1b3b980..9dcf8b7 100644 --- a/ViewsApp/ViewsApp/Platforms/iOS/Program.cs +++ b/MusiLib/MusiLib/Platforms/MacCatalyst/Program.cs @@ -1,7 +1,7 @@ using ObjCRuntime; using UIKit; -namespace ViewsApp; +namespace MusiLib; public class Program { diff --git a/ViewsApp/ViewsApp/Platforms/Tizen/Main.cs b/MusiLib/MusiLib/Platforms/Tizen/Main.cs similarity index 92% rename from ViewsApp/ViewsApp/Platforms/Tizen/Main.cs rename to MusiLib/MusiLib/Platforms/Tizen/Main.cs index c327b35..0f2afa1 100644 --- a/ViewsApp/ViewsApp/Platforms/Tizen/Main.cs +++ b/MusiLib/MusiLib/Platforms/Tizen/Main.cs @@ -2,7 +2,7 @@ using System; using Microsoft.Maui; using Microsoft.Maui.Hosting; -namespace ViewsApp; +namespace MusiLib; class Program : MauiApplication { diff --git a/ViewsApp/ViewsApp/Platforms/Tizen/tizen-manifest.xml b/MusiLib/MusiLib/Platforms/Tizen/tizen-manifest.xml similarity index 84% rename from ViewsApp/ViewsApp/Platforms/Tizen/tizen-manifest.xml rename to MusiLib/MusiLib/Platforms/Tizen/tizen-manifest.xml index 59f30aa..988df34 100644 --- a/ViewsApp/ViewsApp/Platforms/Tizen/tizen-manifest.xml +++ b/MusiLib/MusiLib/Platforms/Tizen/tizen-manifest.xml @@ -1,7 +1,7 @@  - + maui-appicon-placeholder diff --git a/ViewsApp/ViewsApp/Platforms/Windows/App.xaml b/MusiLib/MusiLib/Platforms/Windows/App.xaml similarity index 75% rename from ViewsApp/ViewsApp/Platforms/Windows/App.xaml rename to MusiLib/MusiLib/Platforms/Windows/App.xaml index 4cf9baa..107462c 100644 --- a/ViewsApp/ViewsApp/Platforms/Windows/App.xaml +++ b/MusiLib/MusiLib/Platforms/Windows/App.xaml @@ -1,8 +1,8 @@  + xmlns:local="using:MusiLib.WinUI"> diff --git a/ViewsApp/ViewsApp/Platforms/Windows/App.xaml.cs b/MusiLib/MusiLib/Platforms/Windows/App.xaml.cs similarity index 96% rename from ViewsApp/ViewsApp/Platforms/Windows/App.xaml.cs rename to MusiLib/MusiLib/Platforms/Windows/App.xaml.cs index 30a1a72..8ceeb23 100644 --- a/ViewsApp/ViewsApp/Platforms/Windows/App.xaml.cs +++ b/MusiLib/MusiLib/Platforms/Windows/App.xaml.cs @@ -3,7 +3,7 @@ // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. -namespace ViewsApp.WinUI; +namespace MusiLib.WinUI; /// /// Provides application-specific behavior to supplement the default Application class. diff --git a/ViewsApp/ViewsApp/Platforms/Windows/Package.appxmanifest b/MusiLib/MusiLib/Platforms/Windows/Package.appxmanifest similarity index 92% rename from ViewsApp/ViewsApp/Platforms/Windows/Package.appxmanifest rename to MusiLib/MusiLib/Platforms/Windows/Package.appxmanifest index 4a284dd..57eb002 100644 --- a/ViewsApp/ViewsApp/Platforms/Windows/Package.appxmanifest +++ b/MusiLib/MusiLib/Platforms/Windows/Package.appxmanifest @@ -8,7 +8,7 @@ - + $placeholder$ diff --git a/ViewsApp/ViewsApp/Platforms/Windows/app.manifest b/MusiLib/MusiLib/Platforms/Windows/app.manifest similarity index 90% rename from ViewsApp/ViewsApp/Platforms/Windows/app.manifest rename to MusiLib/MusiLib/Platforms/Windows/app.manifest index 6552174..83d965a 100644 --- a/ViewsApp/ViewsApp/Platforms/Windows/app.manifest +++ b/MusiLib/MusiLib/Platforms/Windows/app.manifest @@ -1,6 +1,6 @@ - + diff --git a/ViewsApp/ViewsApp/Platforms/iOS/AppDelegate.cs b/MusiLib/MusiLib/Platforms/iOS/AppDelegate.cs similarity index 90% rename from ViewsApp/ViewsApp/Platforms/iOS/AppDelegate.cs rename to MusiLib/MusiLib/Platforms/iOS/AppDelegate.cs index d111857..2e894b0 100644 --- a/ViewsApp/ViewsApp/Platforms/iOS/AppDelegate.cs +++ b/MusiLib/MusiLib/Platforms/iOS/AppDelegate.cs @@ -1,6 +1,6 @@ using Foundation; -namespace ViewsApp; +namespace MusiLib; [Register("AppDelegate")] public class AppDelegate : MauiUIApplicationDelegate diff --git a/ViewsApp/ViewsApp/Platforms/iOS/Info.plist b/MusiLib/MusiLib/Platforms/iOS/Info.plist similarity index 100% rename from ViewsApp/ViewsApp/Platforms/iOS/Info.plist rename to MusiLib/MusiLib/Platforms/iOS/Info.plist diff --git a/ViewsApp/ViewsApp/Platforms/MacCatalyst/Program.cs b/MusiLib/MusiLib/Platforms/iOS/Program.cs similarity index 94% rename from ViewsApp/ViewsApp/Platforms/MacCatalyst/Program.cs rename to MusiLib/MusiLib/Platforms/iOS/Program.cs index 1b3b980..9dcf8b7 100644 --- a/ViewsApp/ViewsApp/Platforms/MacCatalyst/Program.cs +++ b/MusiLib/MusiLib/Platforms/iOS/Program.cs @@ -1,7 +1,7 @@ using ObjCRuntime; using UIKit; -namespace ViewsApp; +namespace MusiLib; public class Program { diff --git a/ViewsApp/ViewsApp/Properties/launchSettings.json b/MusiLib/MusiLib/Properties/launchSettings.json similarity index 100% rename from ViewsApp/ViewsApp/Properties/launchSettings.json rename to MusiLib/MusiLib/Properties/launchSettings.json diff --git a/ViewsApp/ViewsApp/Resources/Images/logo.png b/MusiLib/MusiLib/Resources/AppIcon/appicon.png similarity index 100% rename from ViewsApp/ViewsApp/Resources/Images/logo.png rename to MusiLib/MusiLib/Resources/AppIcon/appicon.png diff --git a/ViewsApp/ViewsApp/Resources/AppIcon/appicon.svg b/MusiLib/MusiLib/Resources/AppIcon/appicon.svg similarity index 100% rename from ViewsApp/ViewsApp/Resources/AppIcon/appicon.svg rename to MusiLib/MusiLib/Resources/AppIcon/appicon.svg diff --git a/ViewsApp/ViewsApp/Resources/AppIcon/appiconfg.svg b/MusiLib/MusiLib/Resources/AppIcon/appiconfg.svg similarity index 100% rename from ViewsApp/ViewsApp/Resources/AppIcon/appiconfg.svg rename to MusiLib/MusiLib/Resources/AppIcon/appiconfg.svg diff --git a/ViewsApp/ViewsApp/Resources/Fonts/OpenSans-Regular.ttf b/MusiLib/MusiLib/Resources/Fonts/OpenSans-Regular.ttf similarity index 100% rename from ViewsApp/ViewsApp/Resources/Fonts/OpenSans-Regular.ttf rename to MusiLib/MusiLib/Resources/Fonts/OpenSans-Regular.ttf diff --git a/ViewsApp/ViewsApp/Resources/Fonts/OpenSans-Semibold.ttf b/MusiLib/MusiLib/Resources/Fonts/OpenSans-Semibold.ttf similarity index 100% rename from ViewsApp/ViewsApp/Resources/Fonts/OpenSans-Semibold.ttf rename to MusiLib/MusiLib/Resources/Fonts/OpenSans-Semibold.ttf diff --git a/ViewsApp/ViewsApp/Resources/Images/amazing_grace.pdf b/MusiLib/MusiLib/Resources/Images/amazing_grace.pdf similarity index 100% rename from ViewsApp/ViewsApp/Resources/Images/amazing_grace.pdf rename to MusiLib/MusiLib/Resources/Images/amazing_grace.pdf diff --git a/ViewsApp/ViewsApp/Resources/Images/au_clair_de_la_lune.pdf b/MusiLib/MusiLib/Resources/Images/au_clair_de_la_lune.pdf similarity index 100% rename from ViewsApp/ViewsApp/Resources/Images/au_clair_de_la_lune.pdf rename to MusiLib/MusiLib/Resources/Images/au_clair_de_la_lune.pdf diff --git a/ViewsApp/ViewsApp/Resources/Images/aura_lee_love_me_tender.pdf b/MusiLib/MusiLib/Resources/Images/aura_lee_love_me_tender.pdf similarity index 100% rename from ViewsApp/ViewsApp/Resources/Images/aura_lee_love_me_tender.pdf rename to MusiLib/MusiLib/Resources/Images/aura_lee_love_me_tender.pdf diff --git a/ViewsApp/ViewsApp/Resources/Images/dotnet_bot.svg b/MusiLib/MusiLib/Resources/Images/dotnet_bot.svg similarity index 100% rename from ViewsApp/ViewsApp/Resources/Images/dotnet_bot.svg rename to MusiLib/MusiLib/Resources/Images/dotnet_bot.svg diff --git a/ViewsApp/ViewsApp/Resources/Images/etoile.png b/MusiLib/MusiLib/Resources/Images/etoile.png similarity index 100% rename from ViewsApp/ViewsApp/Resources/Images/etoile.png rename to MusiLib/MusiLib/Resources/Images/etoile.png diff --git a/ViewsApp/ViewsApp/Resources/Images/fais_dodo_colas_mon_petit_frere.pdf b/MusiLib/MusiLib/Resources/Images/fais_dodo_colas_mon_petit_frere.pdf similarity index 100% rename from ViewsApp/ViewsApp/Resources/Images/fais_dodo_colas_mon_petit_frere.pdf rename to MusiLib/MusiLib/Resources/Images/fais_dodo_colas_mon_petit_frere.pdf diff --git a/MusiLib/MusiLib/Resources/Images/logo.png b/MusiLib/MusiLib/Resources/Images/logo.png new file mode 100644 index 0000000..4ecbc4a Binary files /dev/null and b/MusiLib/MusiLib/Resources/Images/logo.png differ diff --git a/ViewsApp/ViewsApp/Resources/Images/ode_a_la_joie.pdf b/MusiLib/MusiLib/Resources/Images/ode_a_la_joie.pdf similarity index 100% rename from ViewsApp/ViewsApp/Resources/Images/ode_a_la_joie.pdf rename to MusiLib/MusiLib/Resources/Images/ode_a_la_joie.pdf diff --git a/ViewsApp/ViewsApp/Resources/Images/tri.png b/MusiLib/MusiLib/Resources/Images/tri.png similarity index 100% rename from ViewsApp/ViewsApp/Resources/Images/tri.png rename to MusiLib/MusiLib/Resources/Images/tri.png diff --git a/ViewsApp/ViewsApp/Resources/Raw/AboutAssets.txt b/MusiLib/MusiLib/Resources/Raw/AboutAssets.txt similarity index 100% rename from ViewsApp/ViewsApp/Resources/Raw/AboutAssets.txt rename to MusiLib/MusiLib/Resources/Raw/AboutAssets.txt diff --git a/ViewsApp/ViewsApp/Resources/Raw/Sounds/au_clair_de_la_lune.mp3 b/MusiLib/MusiLib/Resources/Raw/au_clair_de_la_lune.mp3 similarity index 100% rename from ViewsApp/ViewsApp/Resources/Raw/Sounds/au_clair_de_la_lune.mp3 rename to MusiLib/MusiLib/Resources/Raw/au_clair_de_la_lune.mp3 diff --git a/MusiLib/MusiLib/Resources/Splash/splash.png b/MusiLib/MusiLib/Resources/Splash/splash.png new file mode 100644 index 0000000..4ecbc4a Binary files /dev/null and b/MusiLib/MusiLib/Resources/Splash/splash.png differ diff --git a/ViewsApp/ViewsApp/Resources/Splash/splash.svg b/MusiLib/MusiLib/Resources/Splash/splash.svg similarity index 100% rename from ViewsApp/ViewsApp/Resources/Splash/splash.svg rename to MusiLib/MusiLib/Resources/Splash/splash.svg diff --git a/ViewsApp/ViewsApp/Resources/Styles/Colors.xaml b/MusiLib/MusiLib/Resources/Styles/Colors.xaml similarity index 100% rename from ViewsApp/ViewsApp/Resources/Styles/Colors.xaml rename to MusiLib/MusiLib/Resources/Styles/Colors.xaml diff --git a/ViewsApp/ViewsApp/Resources/Styles/Styles.xaml b/MusiLib/MusiLib/Resources/Styles/Styles.xaml similarity index 100% rename from ViewsApp/ViewsApp/Resources/Styles/Styles.xaml rename to MusiLib/MusiLib/Resources/Styles/Styles.xaml diff --git a/ViewsApp/ViewsApp/Views/Accueil.xaml b/MusiLib/MusiLib/Views/Accueil.xaml similarity index 98% rename from ViewsApp/ViewsApp/Views/Accueil.xaml rename to MusiLib/MusiLib/Views/Accueil.xaml index 921db48..4572d53 100644 --- a/ViewsApp/ViewsApp/Views/Accueil.xaml +++ b/MusiLib/MusiLib/Views/Accueil.xaml @@ -1,7 +1,7 @@ diff --git a/ViewsApp/ViewsApp/Views/Accueil.xaml.cs b/MusiLib/MusiLib/Views/Accueil.xaml.cs similarity index 95% rename from ViewsApp/ViewsApp/Views/Accueil.xaml.cs rename to MusiLib/MusiLib/Views/Accueil.xaml.cs index 41f948d..9391e40 100644 --- a/ViewsApp/ViewsApp/Views/Accueil.xaml.cs +++ b/MusiLib/MusiLib/Views/Accueil.xaml.cs @@ -1,4 +1,4 @@ -namespace ViewsApp.Views; +namespace MusiLib.Views; public partial class Accueil : ContentPage, IAllowClick { diff --git a/ViewsApp/ViewsApp/Views/Favoris.xaml b/MusiLib/MusiLib/Views/Favoris.xaml similarity index 98% rename from ViewsApp/ViewsApp/Views/Favoris.xaml rename to MusiLib/MusiLib/Views/Favoris.xaml index 1482cf4..77b8e2c 100644 --- a/ViewsApp/ViewsApp/Views/Favoris.xaml +++ b/MusiLib/MusiLib/Views/Favoris.xaml @@ -1,7 +1,7 @@ diff --git a/ViewsApp/ViewsApp/Views/Favoris.xaml.cs b/MusiLib/MusiLib/Views/Favoris.xaml.cs similarity index 95% rename from ViewsApp/ViewsApp/Views/Favoris.xaml.cs rename to MusiLib/MusiLib/Views/Favoris.xaml.cs index 582a165..5ec8feb 100644 --- a/ViewsApp/ViewsApp/Views/Favoris.xaml.cs +++ b/MusiLib/MusiLib/Views/Favoris.xaml.cs @@ -1,4 +1,4 @@ -namespace ViewsApp.Views; +namespace MusiLib.Views; public partial class Favoris : ContentPage, IAllowClick { diff --git a/ViewsApp/ViewsApp/Views/IAllowClick.cs b/MusiLib/MusiLib/Views/IAllowClick.cs similarity index 93% rename from ViewsApp/ViewsApp/Views/IAllowClick.cs rename to MusiLib/MusiLib/Views/IAllowClick.cs index a6ab1ce..cba0184 100644 --- a/ViewsApp/ViewsApp/Views/IAllowClick.cs +++ b/MusiLib/MusiLib/Views/IAllowClick.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ViewsApp.Views +namespace MusiLib.Views { public interface IAllowClick { diff --git a/ViewsApp/ViewsApp/Views/Partition.xaml b/MusiLib/MusiLib/Views/Partition.xaml similarity index 86% rename from ViewsApp/ViewsApp/Views/Partition.xaml rename to MusiLib/MusiLib/Views/Partition.xaml index 3e05b23..52aaca2 100644 --- a/ViewsApp/ViewsApp/Views/Partition.xaml +++ b/MusiLib/MusiLib/Views/Partition.xaml @@ -1,8 +1,8 @@ diff --git a/ViewsApp/ViewsApp/Views/Partition.xaml.cs b/MusiLib/MusiLib/Views/Partition.xaml.cs similarity index 74% rename from ViewsApp/ViewsApp/Views/Partition.xaml.cs rename to MusiLib/MusiLib/Views/Partition.xaml.cs index 8e20cae..d445ac2 100644 --- a/ViewsApp/ViewsApp/Views/Partition.xaml.cs +++ b/MusiLib/MusiLib/Views/Partition.xaml.cs @@ -1,8 +1,7 @@ -using System.Diagnostics; -using ViewsApp.Model; +using MusiLib.Model; +namespace MusiLib.Views; -namespace ViewsApp.Views; public partial class Partition : ContentPage { @@ -19,10 +18,12 @@ public partial class Partition : ContentPage private void Button_Clicked(object sender, EventArgs e) { - var player = new Windows.Media.Playback.MediaPlayer(); + /*var player = new Windows.Media.Playback.MediaPlayer(); var uri = new Uri($"C:/Users/Utilisateur/Documents/Cours/SAE/SAE_201/ViewsApp/ViewsApp/Resources/Raw/au_clair_de_la_lune.mp3"); player.SetUriSource(uri); player.Volume = 0.5; - player.Play(); + player.Play();*/ + + } } \ No newline at end of file diff --git a/ViewsApp/ViewsApp/App.xaml.cs b/ViewsApp/ViewsApp/App.xaml.cs deleted file mode 100644 index 424df9b..0000000 --- a/ViewsApp/ViewsApp/App.xaml.cs +++ /dev/null @@ -1,17 +0,0 @@ -using ViewsApp.Model; - -namespace ViewsApp; - -public partial class App : Application -{ - - public Manager MyManager { get; private set; } = new Manager(); - public App() - { - MyManager.chargerDonnees(); - - InitializeComponent(); - - MainPage = new AppShell(); - } -}