diff --git a/Sources/Ohara/App.xaml.cs b/Sources/Ohara/App.xaml.cs
index a751b57..22d1d53 100644
--- a/Sources/Ohara/App.xaml.cs
+++ b/Sources/Ohara/App.xaml.cs
@@ -1,10 +1,12 @@
-using Plugin.Maui.Audio;
+using Model;
+using Plugin.Maui.Audio;
namespace Ohara;
public partial class App : Application
{
- public App()
+ public Manager manager { get; set; } = new Manager();
+ public App()
{
InitializeComponent();
diff --git a/Sources/Ohara/AppShell.xaml b/Sources/Ohara/AppShell.xaml
index 66dd193..04d8f36 100644
--- a/Sources/Ohara/AppShell.xaml
+++ b/Sources/Ohara/AppShell.xaml
@@ -4,17 +4,39 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:Ohara"
- Shell.FlyoutBehavior="Disabled"
- Shell.NavBarIsVisible="False">
+ Shell.FlyoutBehavior="Locked"
+ Shell.NavBarIsVisible="False"
+ Shell.Background="#72a3b3"
+ >
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Sources/Ohara/MainPage.xaml b/Sources/Ohara/MainPage.xaml
index 04d3b4f..a21a3e5 100644
--- a/Sources/Ohara/MainPage.xaml
+++ b/Sources/Ohara/MainPage.xaml
@@ -4,69 +4,24 @@
x:Class="Ohara.MainPage"
BackgroundColor="#e2edf1">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Sources/Ohara/MainPage.xaml.cs b/Sources/Ohara/MainPage.xaml.cs
index dd5298c..e2d8686 100644
--- a/Sources/Ohara/MainPage.xaml.cs
+++ b/Sources/Ohara/MainPage.xaml.cs
@@ -4,77 +4,11 @@ using Plugin.Maui.Audio;
namespace Ohara;
public partial class MainPage : ContentPage
-{
- private readonly IAudioManager audioManager = new AudioManager();
- private static string chemin = "Sons/test.wav";
-
+{
public MainPage()
- {
- InitializeComponent();
-
-
- }
-
-
- private async void Hyperlink_Accueil(object sender, EventArgs e)
{
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new MainPage());
- player.Play();
- }
+ InitializeComponent();
- private async void Hyperlink_FDD(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
}
-
- private async void Hyperlink_Equip(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
-
- }
- private async void Hyperlink_Perso(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Carte(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
-
- }
- private async void Hyperlink_Bateau(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
- private async void Hyperlink_Bestiaire(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Ile(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
- private async void Hyperlink_Favoris(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageFavoris(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-}
+}
\ No newline at end of file
diff --git a/Sources/Ohara/PageBateau.xaml b/Sources/Ohara/PageBateau.xaml
index 4966234..f50c5db 100644
--- a/Sources/Ohara/PageBateau.xaml
+++ b/Sources/Ohara/PageBateau.xaml
@@ -5,100 +5,72 @@
Title="PageBateau"
BackgroundColor="#e2edf1">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/Sources/Ohara/PageBateau.xaml.cs b/Sources/Ohara/PageBateau.xaml.cs
index 9829ba1..3e4713a 100644
--- a/Sources/Ohara/PageBateau.xaml.cs
+++ b/Sources/Ohara/PageBateau.xaml.cs
@@ -6,75 +6,13 @@ namespace Ohara;
public partial class PageBateau : ContentPage
{
- private readonly IAudioManager audioManager;
- private static string chemin = "Sons/test.wav";
+ public Manager manager => (App.Current as App).manager;
- public PageBateau(IAudioManager audioManager)
+ public PageBateau()
{
InitializeComponent();
- var manager = new Manager();
-
-
listeBateau.ItemsSource = manager.GetBateaux();
- this.audioManager = audioManager;
- }
-
- private async void Hyperlink_Accueil(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new MainPage());
- player.Play();
- }
- private async void Hyperlink_FDD(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
- private async void Hyperlink_Equip(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Perso(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Carte(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Bateau(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
- private async void Hyperlink_Bestiaire(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Ile(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
- private async void Hyperlink_Favoris(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageFavoris(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
+
}
async void listeBateau_SelectionChanged(object sender, SelectionChangedEventArgs e)
diff --git a/Sources/Ohara/PageBestiaire.xaml b/Sources/Ohara/PageBestiaire.xaml
index 5b7969a..b987382 100644
--- a/Sources/Ohara/PageBestiaire.xaml
+++ b/Sources/Ohara/PageBestiaire.xaml
@@ -4,68 +4,43 @@
x:Class="Ohara.PageBestiaire"
Title="PageBestiaire"
BackgroundColor="#e2edf1">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Sources/Ohara/PageBestiaire.xaml.cs b/Sources/Ohara/PageBestiaire.xaml.cs
index 0229b17..9819b04 100644
--- a/Sources/Ohara/PageBestiaire.xaml.cs
+++ b/Sources/Ohara/PageBestiaire.xaml.cs
@@ -7,77 +7,18 @@ namespace Ohara;
public partial class PageBestiaire : ContentPage
{
- private readonly IAudioManager audioManager;
- private static string chemin = "Sons/test.wav";
+ public Manager manager => (App.Current as App).manager;
public ICommand AjouterFavoris { get; private set; }
- public PageBestiaire(IAudioManager audioManager)
+ public PageBestiaire()
{
InitializeComponent();
-
- var manager = new Manager();
-
AjouterFavoris = new Command((obj) => manager.AddFavoris((ObjetOhara)obj));
-
-
listeBest.ItemsSource = manager.GetBestiaires();
-
-
- this.audioManager = audioManager;
- }
- private async void Hyperlink_Accueil(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new MainPage());
- player.Play();
- }
-
- private async void Hyperlink_FDD(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
- private async void Hyperlink_Equip(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Carte(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Bateau(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
- private async void Hyperlink_Perso(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
- private async void Hyperlink_Ile(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Favoris(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageFavoris(new Plugin.Maui.Audio.AudioManager()));
}
async void listeBest_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
-
+
await Navigation.PushAsync(new PageInfoBestiaire((Bestiaire)listeBest.SelectedItem));
}
}
\ No newline at end of file
diff --git a/Sources/Ohara/PageCarte.xaml b/Sources/Ohara/PageCarte.xaml
index 9cf897d..b8c2bce 100644
--- a/Sources/Ohara/PageCarte.xaml
+++ b/Sources/Ohara/PageCarte.xaml
@@ -4,34 +4,7 @@
x:Class="Ohara.PageCarte"
BackgroundColor="#e2edf1">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -46,10 +19,4 @@
-->
-
-
-
-
-
-
diff --git a/Sources/Ohara/PageCarte.xaml.cs b/Sources/Ohara/PageCarte.xaml.cs
index db2755c..565e678 100644
--- a/Sources/Ohara/PageCarte.xaml.cs
+++ b/Sources/Ohara/PageCarte.xaml.cs
@@ -4,62 +4,10 @@ namespace Ohara;
public partial class PageCarte : ContentPage
{
- private readonly IAudioManager audioManager;
- private static string chemin = "Sons/test.wav";
- public PageCarte(IAudioManager audioManager)
+ public PageCarte()
{
InitializeComponent();
- this.audioManager = audioManager;
- }
- private async void Hyperlink_Accueil(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new MainPage());
- player.Play();
- }
-
- private async void Hyperlink_FDD(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
- private async void Hyperlink_Equip(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
- private async void Hyperlink_Perso(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Bateau(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Bestiaire(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Ile(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Favoris(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageFavoris(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
+
}
+
}
\ No newline at end of file
diff --git a/Sources/Ohara/PageEquipage.xaml b/Sources/Ohara/PageEquipage.xaml
index 89acbe1..03c8d63 100644
--- a/Sources/Ohara/PageEquipage.xaml
+++ b/Sources/Ohara/PageEquipage.xaml
@@ -4,68 +4,42 @@
x:Class="Ohara.PageEquipage"
Title="PageEquipage"
BackgroundColor="#e2edf1">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Sources/Ohara/PageEquipage.xaml.cs b/Sources/Ohara/PageEquipage.xaml.cs
index b0ead5a..1228313 100644
--- a/Sources/Ohara/PageEquipage.xaml.cs
+++ b/Sources/Ohara/PageEquipage.xaml.cs
@@ -5,77 +5,17 @@ using Plugin.Maui.Audio;
public partial class PageEquipage : ContentPage
{
- private readonly IAudioManager audioManager;
- private static string chemin = "Sons/test.wav";
- public PageEquipage(IAudioManager audioManager)
+ public Manager manager => (App.Current as App).manager;
+ public PageEquipage()
{
InitializeComponent();
- var manager = new Manager();
listeEquip.ItemsSource = manager.GetEquipages();
- this.audioManager = audioManager;
+
}
- private async void Hyperlink_Accueil(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new MainPage());
- player.Play();
- }
-
- private async void Hyperlink_FDD(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
- private async void Hyperlink_Equip(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
- private async void Hyperlink_Perso(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Bateau(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
- private async void Hyperlink_Bestiaire(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Carte(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Ile(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
async void listeEquip_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
await Navigation.PushAsync(new PageInfoEquipage((Equipage)listeEquip.SelectedItem));
}
- private async void Hyperlink_Favoris(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageFavoris(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
+
}
\ No newline at end of file
diff --git a/Sources/Ohara/PageFDD.xaml b/Sources/Ohara/PageFDD.xaml
index c4d99a4..6ed942d 100644
--- a/Sources/Ohara/PageFDD.xaml
+++ b/Sources/Ohara/PageFDD.xaml
@@ -5,114 +5,85 @@
Title="PageFDD"
BackgroundColor="#e2edf1">
-
-
+
+
+
-
+
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
+
-
-
-
-
+
+
+
+
-
-
-
+
+
\ No newline at end of file
diff --git a/Sources/Ohara/PageFDD.xaml.cs b/Sources/Ohara/PageFDD.xaml.cs
index 009a4f5..7928266 100644
--- a/Sources/Ohara/PageFDD.xaml.cs
+++ b/Sources/Ohara/PageFDD.xaml.cs
@@ -8,17 +8,12 @@ using System.Windows.Input;
public partial class PageFDD : ContentPage
{
- private readonly IAudioManager audioManager;
- private static string chemin = "Sons/test.wav";
public ICommand FiltrerType { get; private set; }
- public PageFDD(IAudioManager audioManager)
+ public Manager manager => (App.Current as App).manager;
+ public PageFDD()
{
InitializeComponent();
- this.audioManager = audioManager;
- var manager = new Manager();
-
-
listeFDD.ItemsSource = manager.GetFruits();
void OnTextChanged(object sender, EventArgs e)
{
@@ -30,8 +25,6 @@ public partial class PageFDD : ContentPage
Logia.Command = FiltrerType;
Logia.CommandParameter = "Logia";
-
-
}
private void listeFDD_ScrollToRequested(object sender, ScrollToRequestEventArgs e)
@@ -39,56 +32,6 @@ public partial class PageFDD : ContentPage
}
- private async void Hyperlink_Accueil(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new MainPage());
- player.Play();
- }
-
- private async void Hyperlink_Equip(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
- private async void Hyperlink_Perso(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Carte(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Bateau(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Bestiaire(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Ile(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Favoris(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageFavoris(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
private void MenuFlyoutItem_Clicked(object sender, EventArgs e)
{
diff --git a/Sources/Ohara/PageFavoris.xaml b/Sources/Ohara/PageFavoris.xaml
index c59225e..2511ba0 100644
--- a/Sources/Ohara/PageFavoris.xaml
+++ b/Sources/Ohara/PageFavoris.xaml
@@ -4,91 +4,63 @@
x:Class="Ohara.PageFavoris"
Title="PageFavoris"
BackgroundColor="#e2edf1">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/Sources/Ohara/PageFavoris.xaml.cs b/Sources/Ohara/PageFavoris.xaml.cs
index ff7923f..dc8a486 100644
--- a/Sources/Ohara/PageFavoris.xaml.cs
+++ b/Sources/Ohara/PageFavoris.xaml.cs
@@ -5,73 +5,14 @@ namespace Ohara;
public partial class PageFavoris : ContentPage
{
- private readonly IAudioManager audioManager;
- private static string chemin = "Sons/test.wav";
- public Manager Mgr { get; private set; } = new Manager();
+ public Manager manager => (App.Current as App).manager;
- public PageFavoris(IAudioManager audioManager)
+ public PageFavoris()
{
InitializeComponent();
+ listeFavs.ItemsSource = manager.GetFavoris();
-
- var manager = new Manager();
- listeFavs.ItemsSource = manager.GetFavoris();
- this.audioManager = audioManager;
-
- }
- private async void Hyperlink_Accueil(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new MainPage());
- player.Play();
- }
-
- private async void Hyperlink_FDD(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
- private async void Hyperlink_Equip(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
}
-
- private async void Hyperlink_Perso(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Bateau(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
- private async void Hyperlink_Bestiaire(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Carte(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Ile(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
async void listeFavs_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
diff --git a/Sources/Ohara/PageIle.xaml b/Sources/Ohara/PageIle.xaml
index 669142c..1de3d73 100644
--- a/Sources/Ohara/PageIle.xaml
+++ b/Sources/Ohara/PageIle.xaml
@@ -5,98 +5,71 @@
Title="PageIle"
BackgroundColor="#e2edf1">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/Sources/Ohara/PageIle.xaml.cs b/Sources/Ohara/PageIle.xaml.cs
index f7379e2..6e46b38 100644
--- a/Sources/Ohara/PageIle.xaml.cs
+++ b/Sources/Ohara/PageIle.xaml.cs
@@ -6,72 +6,13 @@ namespace Ohara;
public partial class PageIle : ContentPage
{
- private readonly IAudioManager audioManager;
- private static string chemin = "Sons/test.wav";
- public PageIle(IAudioManager audioManager)
+ public Manager manager => (App.Current as App).manager;
+ public PageIle()
{
InitializeComponent();
- var manager = new Manager();
-
-
listeIle.ItemsSource = manager.GetIles();
- this.audioManager = audioManager;
- }
-
-
-
- private async void Hyperlink_Accueil(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new MainPage());
- player.Play();
+
}
-
- private async void Hyperlink_Equip(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_FDD(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Perso(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Carte(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Bateau(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
- private async void Hyperlink_Bestiaire(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
- private async void Hyperlink_Favoris(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageFavoris(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
async void listeIle_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
await Navigation.PushAsync(new PageInfoIle((Ile)listeIle.SelectedItem));
diff --git a/Sources/Ohara/PageInfoBateau.xaml b/Sources/Ohara/PageInfoBateau.xaml
index 9050e1c..5322ca0 100644
--- a/Sources/Ohara/PageInfoBateau.xaml
+++ b/Sources/Ohara/PageInfoBateau.xaml
@@ -4,106 +4,78 @@
x:Class="Ohara.PageInfoBateau"
Title="PageInfoBateau"
BackgroundColor="#e2edf1">
-
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
-
-
-
-
+
\ No newline at end of file
diff --git a/Sources/Ohara/PageInfoBateau.xaml.cs b/Sources/Ohara/PageInfoBateau.xaml.cs
index 42fe639..2c40814 100644
--- a/Sources/Ohara/PageInfoBateau.xaml.cs
+++ b/Sources/Ohara/PageInfoBateau.xaml.cs
@@ -8,48 +8,6 @@ public partial class PageInfoBateau : ContentPage
public PageInfoBateau(Bateau bateau)
{
InitializeComponent();
- BindingContext=bateau;
- }
-
-
- private async void Hyperlink_Accueil(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new MainPage());
- }
-
- private async void Hyperlink_FDD(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
- }
-
- private async void Hyperlink_Equip(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
- }
- private async void Hyperlink_Carte(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
- }
- private async void Hyperlink_Bateau(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
- }
-
- private async void Hyperlink_Bestiaire(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
- }
- private async void Hyperlink_Ile(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
- }
-
- private async void Hyperlink_Perso(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
- }
- private async void Hyperlink_Favoris(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageFavoris(new Plugin.Maui.Audio.AudioManager()));
+ BindingContext = bateau;
}
}
\ No newline at end of file
diff --git a/Sources/Ohara/PageInfoBestiaire.xaml b/Sources/Ohara/PageInfoBestiaire.xaml
index c5476d7..4dcad1e 100644
--- a/Sources/Ohara/PageInfoBestiaire.xaml
+++ b/Sources/Ohara/PageInfoBestiaire.xaml
@@ -4,87 +4,59 @@
x:Class="Ohara.PageInfoBestiaire"
Title="PageInfoBestiaire"
BackgroundColor="#e2edf1">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
\ No newline at end of file
diff --git a/Sources/Ohara/PageInfoBestiaire.xaml.cs b/Sources/Ohara/PageInfoBestiaire.xaml.cs
index beb6af1..551ae23 100644
--- a/Sources/Ohara/PageInfoBestiaire.xaml.cs
+++ b/Sources/Ohara/PageInfoBestiaire.xaml.cs
@@ -10,47 +10,4 @@ public partial class PageInfoBestiaire : ContentPage
InitializeComponent();
BindingContext=bestiaire;
}
-
- private async void Hyperlink_Accueil(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new MainPage());
- }
-
- private async void Hyperlink_FDD(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
- }
-
- private async void Hyperlink_Equip(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
- }
- private async void Hyperlink_Carte(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
- }
- private async void Hyperlink_Bateau(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
- }
-
- private async void Hyperlink_Bestiaire(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
- }
- private async void Hyperlink_Ile(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
- }
-
- private async void Hyperlink_Perso(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
- }
- private async void Hyperlink_Favoris(object sender, EventArgs e)
- {
-
- await Navigation.PushAsync(new PageFavoris(new Plugin.Maui.Audio.AudioManager()));
-
- }
}
\ No newline at end of file
diff --git a/Sources/Ohara/PageInfoEquipage.xaml b/Sources/Ohara/PageInfoEquipage.xaml
index 8402816..afccda3 100644
--- a/Sources/Ohara/PageInfoEquipage.xaml
+++ b/Sources/Ohara/PageInfoEquipage.xaml
@@ -4,104 +4,76 @@
x:Class="Ohara.PageInfoEquipage"
Title="PageInfoEquipage"
BackgroundColor="#e2edf1">
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Sources/Ohara/PageInfoEquipage.xaml.cs b/Sources/Ohara/PageInfoEquipage.xaml.cs
index 457e04b..caa8683 100644
--- a/Sources/Ohara/PageInfoEquipage.xaml.cs
+++ b/Sources/Ohara/PageInfoEquipage.xaml.cs
@@ -10,46 +10,4 @@ public partial class PageInfoEquipage : ContentPage
InitializeComponent();
BindingContext = equipage;
}
- private async void Hyperlink_Accueil(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new MainPage());
- }
-
- private async void Hyperlink_FDD(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
- }
-
- private async void Hyperlink_Equip(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
- }
- private async void Hyperlink_Carte(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
- }
- private async void Hyperlink_Bateau(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
- }
-
- private async void Hyperlink_Bestiaire(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
- }
- private async void Hyperlink_Ile(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
- }
-
- private async void Hyperlink_Perso(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
- }
- private async void Hyperlink_Favoris(object sender, EventArgs e)
- {
-
- await Navigation.PushAsync(new PageFavoris(new Plugin.Maui.Audio.AudioManager()));
-
- }
}
\ No newline at end of file
diff --git a/Sources/Ohara/PageInfoFdd.xaml b/Sources/Ohara/PageInfoFdd.xaml
index d1c1c16..f960926 100644
--- a/Sources/Ohara/PageInfoFdd.xaml
+++ b/Sources/Ohara/PageInfoFdd.xaml
@@ -4,119 +4,91 @@
x:Class="Ohara.PageInfoFdd"
Title="PageInfoFdd"
BackgroundColor="#e2edf1">
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Sources/Ohara/PageInfoFdd.xaml.cs b/Sources/Ohara/PageInfoFdd.xaml.cs
index 7ced5a4..a5d7f93 100644
--- a/Sources/Ohara/PageInfoFdd.xaml.cs
+++ b/Sources/Ohara/PageInfoFdd.xaml.cs
@@ -10,48 +10,4 @@ public partial class PageInfoFdd : ContentPage
InitializeComponent();
BindingContext = fdd;
}
-
- private async void Hyperlink_Accueil(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new MainPage());
- }
-
- private async void Hyperlink_FDD(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
- }
-
- private async void Hyperlink_Equip(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
- }
- private async void Hyperlink_Carte(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
- }
- private async void Hyperlink_Bateau(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
- }
-
- private async void Hyperlink_Bestiaire(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
- }
- private async void Hyperlink_Ile(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
- }
-
- private async void Hyperlink_Perso(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
- }
-
- private async void Hyperlink_Favoris(object sender, EventArgs e)
- {
-
- await Navigation.PushAsync(new PageFavoris(new Plugin.Maui.Audio.AudioManager()));
-
- }
}
\ No newline at end of file
diff --git a/Sources/Ohara/PageInfoIle.xaml b/Sources/Ohara/PageInfoIle.xaml
index 021a361..0c21e8c 100644
--- a/Sources/Ohara/PageInfoIle.xaml
+++ b/Sources/Ohara/PageInfoIle.xaml
@@ -2,105 +2,76 @@
-
+ Title="PageInfoIle">
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Sources/Ohara/PageInfoIle.xaml.cs b/Sources/Ohara/PageInfoIle.xaml.cs
index e8e3811..296530e 100644
--- a/Sources/Ohara/PageInfoIle.xaml.cs
+++ b/Sources/Ohara/PageInfoIle.xaml.cs
@@ -10,48 +10,4 @@ public partial class PageInfoIle : ContentPage
InitializeComponent();
BindingContext = ile;
}
-
- private async void Hyperlink_Accueil(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new MainPage());
- }
-
- private async void Hyperlink_FDD(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
- }
-
- private async void Hyperlink_Equip(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
- }
- private async void Hyperlink_Carte(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
- }
- private async void Hyperlink_Bateau(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
- }
-
- private async void Hyperlink_Bestiaire(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
- }
- private async void Hyperlink_Ile(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
- }
-
- private async void Hyperlink_Perso(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
- }
-
- private async void Hyperlink_Favoris(object sender, EventArgs e)
- {
-
- await Navigation.PushAsync(new PageFavoris(new Plugin.Maui.Audio.AudioManager()));
-
- }
}
\ No newline at end of file
diff --git a/Sources/Ohara/PageInfoPersonnage.xaml b/Sources/Ohara/PageInfoPersonnage.xaml
index 53ac422..9ee6831 100644
--- a/Sources/Ohara/PageInfoPersonnage.xaml
+++ b/Sources/Ohara/PageInfoPersonnage.xaml
@@ -4,126 +4,98 @@
x:Class="Ohara.PageInfoPersonnage"
Title="PageInfoPersonnage"
BackgroundColor="#e2edf1">
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
\ No newline at end of file
diff --git a/Sources/Ohara/PageInfoPersonnage.xaml.cs b/Sources/Ohara/PageInfoPersonnage.xaml.cs
index 0d49050..a882c0e 100644
--- a/Sources/Ohara/PageInfoPersonnage.xaml.cs
+++ b/Sources/Ohara/PageInfoPersonnage.xaml.cs
@@ -12,46 +12,4 @@ public partial class PageInfoPersonnage : ContentPage
InitializeComponent();
BindingContext = perso;
}
- private async void Hyperlink_Accueil(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new MainPage());
- }
-
- private async void Hyperlink_FDD(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
- }
-
- private async void Hyperlink_Equip(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
- }
- private async void Hyperlink_Carte(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
- }
- private async void Hyperlink_Bateau(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
- }
-
- private async void Hyperlink_Bestiaire(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
- }
- private async void Hyperlink_Ile(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
- }
-
- private async void Hyperlink_Perso(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
- }
- private async void Hyperlink_Favoris(object sender, EventArgs e)
- {
-
- await Navigation.PushAsync(new PageFavoris(new Plugin.Maui.Audio.AudioManager()));
-
- }
}
\ No newline at end of file
diff --git a/Sources/Ohara/PagePersonnage.xaml b/Sources/Ohara/PagePersonnage.xaml
index 353b39c..e2c3999 100644
--- a/Sources/Ohara/PagePersonnage.xaml
+++ b/Sources/Ohara/PagePersonnage.xaml
@@ -5,40 +5,8 @@
Title="PagePersonnage"
BackgroundColor="#e2edf1">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -123,10 +91,4 @@
-->
-
-
-
-
-
-
diff --git a/Sources/Ohara/PagePersonnage.xaml.cs b/Sources/Ohara/PagePersonnage.xaml.cs
index 7c923a5..123cdd3 100644
--- a/Sources/Ohara/PagePersonnage.xaml.cs
+++ b/Sources/Ohara/PagePersonnage.xaml.cs
@@ -7,76 +7,18 @@ using Model.Stub;
using Plugin.Maui.Audio;
public partial class PagePersonnage : ContentPage
{
- private readonly IAudioManager audioManager;
- private static string chemin = "Sons/test.wav";
-
- public PagePersonnage(IAudioManager audioManager)
+ public Manager manager => (App.Current as App).manager;
+ public PagePersonnage()
{
InitializeComponent();
- var manager = new Manager();
-
-
listePerso.ItemsSource = manager.GetPersonnages();
- this.audioManager = audioManager;
- }
-
- private async void Hyperlink_Accueil(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new MainPage());
- player.Play();
- }
-
- private async void Hyperlink_FDD(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
- private async void Hyperlink_Equip(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Carte(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
+
}
- private async void Hyperlink_Bateau(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
- private async void Hyperlink_Bestiaire(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
- private async void Hyperlink_Ile(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
- private async void Hyperlink_Favoris(object sender, EventArgs e)
- {
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
- await Navigation.PushAsync(new PageFavoris(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
- }
-
async void listePerso_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
+
await Navigation.PushAsync(new PageInfoPersonnage((Personnage)listePerso.SelectedItem));
}
-
+
}
\ No newline at end of file
diff --git a/Sources/Ohara/Resources/Styles/Styles.xaml b/Sources/Ohara/Resources/Styles/Styles.xaml
index 05e8a50..6663531 100644
--- a/Sources/Ohara/Resources/Styles/Styles.xaml
+++ b/Sources/Ohara/Resources/Styles/Styles.xaml
@@ -440,6 +440,8 @@
+
+