diff --git a/Sources/Ohara/MainPage.xaml.cs b/Sources/Ohara/MainPage.xaml.cs
index a600c8e..953a5b0 100644
--- a/Sources/Ohara/MainPage.xaml.cs
+++ b/Sources/Ohara/MainPage.xaml.cs
@@ -5,66 +5,60 @@ namespace Ohara;
public partial class MainPage : ContentPage
{
- private readonly IAudioManager audioManager;
- private static string chemin = "Sons/test.wav";
- public MainPage(IAudioManager audioManager)
+ public MainPage()
{
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(new Plugin.Maui.Audio.AudioManager()));
- player.Play();
+
+ await Navigation.PushAsync(new MainPage());
+
}
private async void Hyperlink_FDD(object sender, EventArgs e)
{
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
+
await Navigation.PushAsync(new PageFDD());
- player.Play();
+
}
private async void Hyperlink_Equip(object sender, EventArgs e)
{
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
+
await Navigation.PushAsync(new PageEquipage());
- player.Play();
+
}
private async void Hyperlink_Perso(object sender, EventArgs e)
{
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
await Navigation.PushAsync(new PagePersonnage());
- player.Play();
}
private async void Hyperlink_Carte(object sender, EventArgs e)
{
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
+
await Navigation.PushAsync(new PageCarte());
- 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();
+ await Navigation.PushAsync(new PageBateau());
}
private async void Hyperlink_Bestiaire(object sender, EventArgs e)
{
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
+
await Navigation.PushAsync(new PageBestiaire());
- player.Play();
+
}
private async void Hyperlink_Ile(object sender, EventArgs e)
{
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
+
await Navigation.PushAsync(new PageIle());
- player.Play();
+
}
}
diff --git a/Sources/Ohara/PageBateau.xaml.cs b/Sources/Ohara/PageBateau.xaml.cs
index 54533fd..6cbef9c 100644
--- a/Sources/Ohara/PageBateau.xaml.cs
+++ b/Sources/Ohara/PageBateau.xaml.cs
@@ -6,10 +6,9 @@ namespace Ohara;
public partial class PageBateau : ContentPage
{
- private readonly IAudioManager audioManager;
- private static string chemin = "Sons/test.wav";
+
- public PageBateau(IAudioManager audioManager)
+ public PageBateau()
{
InitializeComponent();
var manager = new Manager();
@@ -19,50 +18,44 @@ public partial class PageBateau : ContentPage
}
private async void Hyperlink_Accueil(object sender, EventArgs e)
{
- await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
+ await Navigation.PushAsync(new MainPage());
}
private async void Hyperlink_FDD(object sender, EventArgs e)
{
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
+
await Navigation.PushAsync(new PageFDD());
- player.Play();
+
}
private async void Hyperlink_Equip(object sender, EventArgs e)
{
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
+
await Navigation.PushAsync(new PageEquipage());
- player.Play();
+
}
private async void Hyperlink_Perso(object sender, EventArgs e)
{
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
+
await Navigation.PushAsync(new PagePersonnage());
- player.Play();
+
}
private async void Hyperlink_Carte(object sender, EventArgs e)
{
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
+
await Navigation.PushAsync(new PageCarte());
- 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();
+ await Navigation.PushAsync(new PageBateau());
}
private async void Hyperlink_Bestiaire(object sender, EventArgs e)
{
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
await Navigation.PushAsync(new PageBestiaire());
- player.Play();
}
private async void Hyperlink_Ile(object sender, EventArgs e)
{
- var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
await Navigation.PushAsync(new PageIle());
- player.Play();
}
}
\ No newline at end of file
diff --git a/Sources/Ohara/PageBestiaire.xaml.cs b/Sources/Ohara/PageBestiaire.xaml.cs
index ceef83b..fd0b54b 100644
--- a/Sources/Ohara/PageBestiaire.xaml.cs
+++ b/Sources/Ohara/PageBestiaire.xaml.cs
@@ -17,7 +17,7 @@ public partial class PageBestiaire : ContentPage
}
private async void Hyperlink_Accueil(object sender, EventArgs e)
{
- await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
+ await Navigation.PushAsync(new MainPage());
}
private async void Hyperlink_FDD(object sender, EventArgs e)
@@ -35,7 +35,7 @@ public partial class PageBestiaire : ContentPage
}
private async void Hyperlink_Bateau(object sender, EventArgs e)
{
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
+ await Navigation.PushAsync(new PageBateau());
}
private async void Hyperlink_Perso(object sender, EventArgs e)
diff --git a/Sources/Ohara/PageCarte.xaml.cs b/Sources/Ohara/PageCarte.xaml.cs
index 35a15b7..e3e866a 100644
--- a/Sources/Ohara/PageCarte.xaml.cs
+++ b/Sources/Ohara/PageCarte.xaml.cs
@@ -8,7 +8,7 @@ public partial class PageCarte : ContentPage
}
private async void Hyperlink_Accueil(object sender, EventArgs e)
{
- await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
+ await Navigation.PushAsync(new MainPage());
}
private async void Hyperlink_FDD(object sender, EventArgs e)
@@ -27,7 +27,7 @@ public partial class PageCarte : ContentPage
}
private async void Hyperlink_Bateau(object sender, EventArgs e)
{
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
+ await Navigation.PushAsync(new PageBateau());
}
private async void Hyperlink_Bestiaire(object sender, EventArgs e)
diff --git a/Sources/Ohara/PageEquipage.xaml.cs b/Sources/Ohara/PageEquipage.xaml.cs
index 96d87d1..831ed93 100644
--- a/Sources/Ohara/PageEquipage.xaml.cs
+++ b/Sources/Ohara/PageEquipage.xaml.cs
@@ -12,7 +12,7 @@ public partial class PageEquipage : ContentPage
}
private async void Hyperlink_Accueil(object sender, EventArgs e)
{
- await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
+ await Navigation.PushAsync(new MainPage());
}
private async void Hyperlink_FDD(object sender, EventArgs e)
@@ -31,7 +31,7 @@ public partial class PageEquipage : ContentPage
}
private async void Hyperlink_Bateau(object sender, EventArgs e)
{
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
+ await Navigation.PushAsync(new PageBateau());
}
private async void Hyperlink_Bestiaire(object sender, EventArgs e)
diff --git a/Sources/Ohara/PageFDD.xaml.cs b/Sources/Ohara/PageFDD.xaml.cs
index c1514c3..7e76662 100644
--- a/Sources/Ohara/PageFDD.xaml.cs
+++ b/Sources/Ohara/PageFDD.xaml.cs
@@ -29,7 +29,7 @@ public partial class PageFDD : ContentPage
private async void Hyperlink_Accueil(object sender, EventArgs e)
{
- await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
+ await Navigation.PushAsync(new MainPage());
}
private async void Hyperlink_Equip(object sender, EventArgs e)
@@ -47,7 +47,7 @@ public partial class PageFDD : ContentPage
}
private async void Hyperlink_Bateau(object sender, EventArgs e)
{
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
+ await Navigation.PushAsync(new PageBateau());
}
private async void Hyperlink_Bestiaire(object sender, EventArgs e)
{
diff --git a/Sources/Ohara/PageIle.xaml.cs b/Sources/Ohara/PageIle.xaml.cs
index b99383b..97b3a1c 100644
--- a/Sources/Ohara/PageIle.xaml.cs
+++ b/Sources/Ohara/PageIle.xaml.cs
@@ -21,7 +21,7 @@ public partial class PageIle : ContentPage
private async void Hyperlink_Accueil(object sender, EventArgs e)
{
- await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
+ await Navigation.PushAsync(new MainPage());
}
private async void Hyperlink_Equip(object sender, EventArgs e)
@@ -42,7 +42,7 @@ public partial class PageIle : ContentPage
}
private async void Hyperlink_Bateau(object sender, EventArgs e)
{
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
+ await Navigation.PushAsync(new PageBateau());
}
private async void Hyperlink_Bestiaire(object sender, EventArgs e)
{
diff --git a/Sources/Ohara/PageInfoBateau.xaml.cs b/Sources/Ohara/PageInfoBateau.xaml.cs
index f1da1c1..a2e1349 100644
--- a/Sources/Ohara/PageInfoBateau.xaml.cs
+++ b/Sources/Ohara/PageInfoBateau.xaml.cs
@@ -16,7 +16,7 @@ public partial class PageInfoBateau : ContentPage
private async void Hyperlink_Accueil(object sender, EventArgs e)
{
- await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
+ await Navigation.PushAsync(new MainPage());
}
private async void Hyperlink_FDD(object sender, EventArgs e)
@@ -34,7 +34,7 @@ public partial class PageInfoBateau : ContentPage
}
private async void Hyperlink_Bateau(object sender, EventArgs e)
{
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
+ await Navigation.PushAsync(new PageBateau());
}
private async void Hyperlink_Bestiaire(object sender, EventArgs e)
diff --git a/Sources/Ohara/PageInfoBestiaire.xaml.cs b/Sources/Ohara/PageInfoBestiaire.xaml.cs
index 75f3fed..f7508b0 100644
--- a/Sources/Ohara/PageInfoBestiaire.xaml.cs
+++ b/Sources/Ohara/PageInfoBestiaire.xaml.cs
@@ -1,53 +1,53 @@
-using Model.Stub;
-using Model;
-
-namespace Ohara;
-
-public partial class PageInfoBestiaire : ContentPage
-{
- public PageInfoBestiaire()
- {
- InitializeComponent();
+using Model.Stub;
+using Model;
+
+namespace Ohara;
+
+public partial class PageInfoBestiaire : ContentPage
+{
+ public PageInfoBestiaire()
+ {
+ InitializeComponent();
var manager = new Manager();
listeBest.ItemsSource = manager.GetBestiaires();
- }
-
- private async void Hyperlink_Accueil(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
- }
-
- private async void Hyperlink_FDD(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageFDD());
- }
-
- private async void Hyperlink_Equip(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageEquipage());
- }
- private async void Hyperlink_Carte(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageCarte());
- }
- 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());
- }
- private async void Hyperlink_Ile(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PageIle());
- }
-
- private async void Hyperlink_Perso(object sender, EventArgs e)
- {
- await Navigation.PushAsync(new PagePersonnage());
- }
+ }
+
+ 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());
+ }
+
+ private async void Hyperlink_Equip(object sender, EventArgs e)
+ {
+ await Navigation.PushAsync(new PageEquipage());
+ }
+ private async void Hyperlink_Carte(object sender, EventArgs e)
+ {
+ await Navigation.PushAsync(new PageCarte());
+ }
+ private async void Hyperlink_Bateau(object sender, EventArgs e)
+ {
+ await Navigation.PushAsync(new PageBateau());
+ }
+
+ private async void Hyperlink_Bestiaire(object sender, EventArgs e)
+ {
+ await Navigation.PushAsync(new PageBestiaire());
+ }
+ private async void Hyperlink_Ile(object sender, EventArgs e)
+ {
+ await Navigation.PushAsync(new PageIle());
+ }
+
+ private async void Hyperlink_Perso(object sender, EventArgs e)
+ {
+ await Navigation.PushAsync(new PagePersonnage());
+ }
}
\ No newline at end of file
diff --git a/Sources/Ohara/PageInfoEquipage.xaml.cs b/Sources/Ohara/PageInfoEquipage.xaml.cs
index 9876842..96c7a91 100644
--- a/Sources/Ohara/PageInfoEquipage.xaml.cs
+++ b/Sources/Ohara/PageInfoEquipage.xaml.cs
@@ -17,7 +17,7 @@ public partial class PageInfoEquipage : ContentPage
}
private async void Hyperlink_Accueil(object sender, EventArgs e)
{
- await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
+ await Navigation.PushAsync(new MainPage());
}
private async void Hyperlink_FDD(object sender, EventArgs e)
@@ -35,7 +35,7 @@ public partial class PageInfoEquipage : ContentPage
}
private async void Hyperlink_Bateau(object sender, EventArgs e)
{
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
+ await Navigation.PushAsync(new PageBateau());
}
private async void Hyperlink_Bestiaire(object sender, EventArgs e)
diff --git a/Sources/Ohara/PageInfoFdd.xaml b/Sources/Ohara/PageInfoFdd.xaml
index bf4c23c..f5eb7ee 100644
--- a/Sources/Ohara/PageInfoFdd.xaml
+++ b/Sources/Ohara/PageInfoFdd.xaml
@@ -1,27 +1,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -29,89 +29,89 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Sources/Ohara/PageInfoFdd.xaml.cs b/Sources/Ohara/PageInfoFdd.xaml.cs
index 9d7293b..6a45580 100644
--- a/Sources/Ohara/PageInfoFdd.xaml.cs
+++ b/Sources/Ohara/PageInfoFdd.xaml.cs
@@ -14,7 +14,7 @@ public partial class PageInfoFdd : ContentPage
private async void Hyperlink_Accueil(object sender, EventArgs e)
{
- await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
+ await Navigation.PushAsync(new MainPage());
}
private async void Hyperlink_FDD(object sender, EventArgs e)
@@ -32,7 +32,7 @@ public partial class PageInfoFdd : ContentPage
}
private async void Hyperlink_Bateau(object sender, EventArgs e)
{
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
+ await Navigation.PushAsync(new PageBateau());
}
private async void Hyperlink_Bestiaire(object sender, EventArgs e)
diff --git a/Sources/Ohara/PageInfoIle.xaml b/Sources/Ohara/PageInfoIle.xaml
index 28a8207..37d38d2 100644
--- a/Sources/Ohara/PageInfoIle.xaml
+++ b/Sources/Ohara/PageInfoIle.xaml
@@ -1,27 +1,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -29,94 +29,94 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Sources/Ohara/PageInfoIle.xaml.cs b/Sources/Ohara/PageInfoIle.xaml.cs
index 0e667bc..f6f10e1 100644
--- a/Sources/Ohara/PageInfoIle.xaml.cs
+++ b/Sources/Ohara/PageInfoIle.xaml.cs
@@ -16,7 +16,7 @@ public partial class PageInfoIle : ContentPage
private async void Hyperlink_Accueil(object sender, EventArgs e)
{
- await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
+ await Navigation.PushAsync(new MainPage());
}
private async void Hyperlink_FDD(object sender, EventArgs e)
@@ -34,7 +34,7 @@ public partial class PageInfoIle : ContentPage
}
private async void Hyperlink_Bateau(object sender, EventArgs e)
{
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
+ await Navigation.PushAsync(new PageBateau());
}
private async void Hyperlink_Bestiaire(object sender, EventArgs e)
diff --git a/Sources/Ohara/PageInfoPersonnage.xaml.cs b/Sources/Ohara/PageInfoPersonnage.xaml.cs
index e10c442..1a6f9cd 100644
--- a/Sources/Ohara/PageInfoPersonnage.xaml.cs
+++ b/Sources/Ohara/PageInfoPersonnage.xaml.cs
@@ -16,7 +16,7 @@ public partial class PageInfoPersonnage : ContentPage
}
private async void Hyperlink_Accueil(object sender, EventArgs e)
{
- await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
+ await Navigation.PushAsync(new MainPage());
}
private async void Hyperlink_FDD(object sender, EventArgs e)
@@ -34,7 +34,7 @@ public partial class PageInfoPersonnage : ContentPage
}
private async void Hyperlink_Bateau(object sender, EventArgs e)
{
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
+ await Navigation.PushAsync(new PageBateau());
}
private async void Hyperlink_Bestiaire(object sender, EventArgs e)
diff --git a/Sources/Ohara/PagePersonnage.xaml.cs b/Sources/Ohara/PagePersonnage.xaml.cs
index 89d081e..f23df4b 100644
--- a/Sources/Ohara/PagePersonnage.xaml.cs
+++ b/Sources/Ohara/PagePersonnage.xaml.cs
@@ -2,6 +2,8 @@ namespace Ohara;
using Model;
using Model.Stub;
+
+using Plugin.Maui.Audio;
public partial class PagePersonnage : ContentPage
{
@@ -17,7 +19,7 @@ public partial class PagePersonnage : ContentPage
private async void Hyperlink_Accueil(object sender, EventArgs e)
{
- await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
+ await Navigation.PushAsync(new MainPage());
}
private async void Hyperlink_FDD(object sender, EventArgs e)
@@ -35,7 +37,7 @@ public partial class PagePersonnage : ContentPage
}
private async void Hyperlink_Bateau(object sender, EventArgs e)
{
- await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
+ await Navigation.PushAsync(new PageBateau());
}
private async void Hyperlink_Bestiaire(object sender, EventArgs e)
diff --git a/Sources/Ohara/Resources/Images/clown.png b/Sources/Ohara/Resources/Images/clown.png
index 85059d8..90af569 100644
Binary files a/Sources/Ohara/Resources/Images/clown.png and b/Sources/Ohara/Resources/Images/clown.png differ
diff --git a/Sources/Ohara/Resources/Images/noire.png b/Sources/Ohara/Resources/Images/noire.png
index a0368e6..4a69a83 100644
Binary files a/Sources/Ohara/Resources/Images/noire.png and b/Sources/Ohara/Resources/Images/noire.png differ
diff --git a/Sources/Ohara/Resources/Images/roux.png b/Sources/Ohara/Resources/Images/roux.png
index d0784e2..4703514 100644
Binary files a/Sources/Ohara/Resources/Images/roux.png and b/Sources/Ohara/Resources/Images/roux.png differ