Annulation de la fonctionnalité son + modification CI
continuous-integration/drone/push Build is passing Details

devGuillaume
Yoan BRUGIÈRE 2 years ago
parent 7f30455de5
commit ecdf48ca75

@ -5,66 +5,60 @@ namespace Ohara;
public partial class MainPage : ContentPage public partial class MainPage : ContentPage
{ {
private readonly IAudioManager audioManager;
private static string chemin = "Sons/test.wav";
public MainPage(IAudioManager audioManager) public MainPage()
{ {
InitializeComponent(); InitializeComponent();
this.audioManager = audioManager;
} }
private async void Hyperlink_Accueil(object sender, EventArgs e) 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())); await Navigation.PushAsync(new MainPage());
player.Play();
} }
private async void Hyperlink_FDD(object sender, EventArgs e) private async void Hyperlink_FDD(object sender, EventArgs e)
{ {
var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
await Navigation.PushAsync(new PageFDD()); await Navigation.PushAsync(new PageFDD());
player.Play();
} }
private async void Hyperlink_Equip(object sender, EventArgs e) private async void Hyperlink_Equip(object sender, EventArgs e)
{ {
var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
await Navigation.PushAsync(new PageEquipage()); await Navigation.PushAsync(new PageEquipage());
player.Play();
} }
private async void Hyperlink_Perso(object sender, EventArgs e) private async void Hyperlink_Perso(object sender, EventArgs e)
{ {
var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
await Navigation.PushAsync(new PagePersonnage()); await Navigation.PushAsync(new PagePersonnage());
player.Play();
} }
private async void Hyperlink_Carte(object sender, EventArgs e) private async void Hyperlink_Carte(object sender, EventArgs e)
{ {
var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
await Navigation.PushAsync(new PageCarte()); await Navigation.PushAsync(new PageCarte());
player.Play();
} }
private async void Hyperlink_Bateau(object sender, EventArgs e) private async void Hyperlink_Bateau(object sender, EventArgs e)
{ {
var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin)); await Navigation.PushAsync(new PageBateau());
await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
player.Play();
} }
private async void Hyperlink_Bestiaire(object sender, EventArgs e) private async void Hyperlink_Bestiaire(object sender, EventArgs e)
{ {
var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
await Navigation.PushAsync(new PageBestiaire()); await Navigation.PushAsync(new PageBestiaire());
player.Play();
} }
private async void Hyperlink_Ile(object sender, EventArgs e) private async void Hyperlink_Ile(object sender, EventArgs e)
{ {
var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
await Navigation.PushAsync(new PageIle()); await Navigation.PushAsync(new PageIle());
player.Play();
} }
} }

@ -6,10 +6,9 @@ namespace Ohara;
public partial class PageBateau : ContentPage public partial class PageBateau : ContentPage
{ {
private readonly IAudioManager audioManager;
private static string chemin = "Sons/test.wav";
public PageBateau(IAudioManager audioManager)
public PageBateau()
{ {
InitializeComponent(); InitializeComponent();
var manager = new Manager(); var manager = new Manager();
@ -19,50 +18,44 @@ public partial class PageBateau : ContentPage
} }
private async void Hyperlink_Accueil(object sender, EventArgs e) 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) private async void Hyperlink_FDD(object sender, EventArgs e)
{ {
var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
await Navigation.PushAsync(new PageFDD()); await Navigation.PushAsync(new PageFDD());
player.Play();
} }
private async void Hyperlink_Equip(object sender, EventArgs e) private async void Hyperlink_Equip(object sender, EventArgs e)
{ {
var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
await Navigation.PushAsync(new PageEquipage()); await Navigation.PushAsync(new PageEquipage());
player.Play();
} }
private async void Hyperlink_Perso(object sender, EventArgs e) private async void Hyperlink_Perso(object sender, EventArgs e)
{ {
var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
await Navigation.PushAsync(new PagePersonnage()); await Navigation.PushAsync(new PagePersonnage());
player.Play();
} }
private async void Hyperlink_Carte(object sender, EventArgs e) private async void Hyperlink_Carte(object sender, EventArgs e)
{ {
var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
await Navigation.PushAsync(new PageCarte()); await Navigation.PushAsync(new PageCarte());
player.Play();
} }
private async void Hyperlink_Bateau(object sender, EventArgs e) private async void Hyperlink_Bateau(object sender, EventArgs e)
{ {
var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin)); await Navigation.PushAsync(new PageBateau());
await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
player.Play();
} }
private async void Hyperlink_Bestiaire(object sender, EventArgs e) private async void Hyperlink_Bestiaire(object sender, EventArgs e)
{ {
var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
await Navigation.PushAsync(new PageBestiaire()); await Navigation.PushAsync(new PageBestiaire());
player.Play();
} }
private async void Hyperlink_Ile(object sender, EventArgs e) private async void Hyperlink_Ile(object sender, EventArgs e)
{ {
var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
await Navigation.PushAsync(new PageIle()); await Navigation.PushAsync(new PageIle());
player.Play();
} }
} }

@ -17,7 +17,7 @@ public partial class PageBestiaire : ContentPage
} }
private async void Hyperlink_Accueil(object sender, EventArgs e) 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) 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) 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) private async void Hyperlink_Perso(object sender, EventArgs e)

@ -8,7 +8,7 @@ public partial class PageCarte : ContentPage
} }
private async void Hyperlink_Accueil(object sender, EventArgs e) 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) 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) 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) private async void Hyperlink_Bestiaire(object sender, EventArgs e)

@ -12,7 +12,7 @@ public partial class PageEquipage : ContentPage
} }
private async void Hyperlink_Accueil(object sender, EventArgs e) 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) 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) 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) private async void Hyperlink_Bestiaire(object sender, EventArgs e)

@ -29,7 +29,7 @@ public partial class PageFDD : ContentPage
private async void Hyperlink_Accueil(object sender, EventArgs e) 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) 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) 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) private async void Hyperlink_Bestiaire(object sender, EventArgs e)
{ {

@ -21,7 +21,7 @@ public partial class PageIle : ContentPage
private async void Hyperlink_Accueil(object sender, EventArgs e) 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) 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) 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) private async void Hyperlink_Bestiaire(object sender, EventArgs e)
{ {

@ -16,7 +16,7 @@ public partial class PageInfoBateau : ContentPage
private async void Hyperlink_Accueil(object sender, EventArgs e) 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) 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) 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) private async void Hyperlink_Bestiaire(object sender, EventArgs e)

@ -16,7 +16,7 @@ public partial class PageInfoBestiaire : ContentPage
private async void Hyperlink_Accueil(object sender, EventArgs e) 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) private async void Hyperlink_FDD(object sender, EventArgs e)
@ -34,7 +34,7 @@ public partial class PageInfoBestiaire : ContentPage
} }
private async void Hyperlink_Bateau(object sender, EventArgs e) 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) private async void Hyperlink_Bestiaire(object sender, EventArgs e)

@ -17,7 +17,7 @@ public partial class PageInfoEquipage : ContentPage
} }
private async void Hyperlink_Accueil(object sender, EventArgs e) 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) 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) 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) private async void Hyperlink_Bestiaire(object sender, EventArgs e)

@ -14,7 +14,7 @@ public partial class PageInfoFdd : ContentPage
private async void Hyperlink_Accueil(object sender, EventArgs e) 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) 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) 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) private async void Hyperlink_Bestiaire(object sender, EventArgs e)

@ -16,7 +16,7 @@ public partial class PageInfoIle : ContentPage
private async void Hyperlink_Accueil(object sender, EventArgs e) 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) 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) 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) private async void Hyperlink_Bestiaire(object sender, EventArgs e)

@ -16,7 +16,7 @@ public partial class PageInfoPersonnage : ContentPage
} }
private async void Hyperlink_Accueil(object sender, EventArgs e) 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) 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) 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) private async void Hyperlink_Bestiaire(object sender, EventArgs e)

@ -2,6 +2,8 @@ namespace Ohara;
using Model; using Model;
using Model.Stub; using Model.Stub;
using Plugin.Maui.Audio;
public partial class PagePersonnage : ContentPage public partial class PagePersonnage : ContentPage
{ {
@ -17,7 +19,7 @@ public partial class PagePersonnage : ContentPage
private async void Hyperlink_Accueil(object sender, EventArgs e) 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) 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) 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) private async void Hyperlink_Bestiaire(object sender, EventArgs e)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB

Loading…
Cancel
Save