Modification CI 2 + correction bugs des boutons de transition

.drone.yml

@@ -12,8 +12,7 @@ steps:
     commands:
       - cd Sources/
       - dotnet restore Ohara.sln
-      - dotnet build Ohara.sln -c Release --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0
-      - dotnet publish Ohara/Ohara.csproj -c Release --no-restore -o $CI_PROJECT_DIR/build/release -f:net7.0-android /p:AndroidSdkDirectory=/usr/lib/android-sdk
+      - dotnet build Ohara.sln -c Release --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT 
 
   - name: tests
     image: hub.codefirst.iut.uca.fr/marc.chevaldonne/codefirst-dotnet7-maui:latest

Sources/Ohara/PageBateau.xaml.cs

@@ -17,7 +17,10 @@ public partial class PageBateau : ContentPage
 
         listeBateau.ItemsSource = manager.GetBateaux();
     }
-
+    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)
     {
         var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));

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());
+        await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
     }
 
     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());
+        await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
     }
 
     private async void Hyperlink_Bestiaire(object sender, EventArgs e)

Sources/Ohara/PageFDD.xaml.cs

@@ -1,16 +1,16 @@
 namespace Ohara;
 
-
-using Model;
-using Model.Stub;
+
+using Model;
+using Model.Stub;
 using System.Windows.Input;
 
-public partial class PageFDD : ContentPage
-{
-    public ICommand FiltrerType { get; private set; }
-	public PageFDD()
-	{
-       
+public partial class PageFDD : ContentPage
+{
+    public ICommand FiltrerType { get; private set; }
+	public PageFDD()
+	{
+       
         InitializeComponent();
 
         var manager = new Manager();
@@ -20,41 +20,41 @@ public partial class PageFDD : ContentPage
         FiltrerType = new Command(() => listeFDD.ItemsSource = manager.FiltrerFDD("Logia"));
         Logia.Command = FiltrerType;
            
-    }
-
-    private void listeFDD_ScrollToRequested(object sender, ScrollToRequestEventArgs e)
-    {
-
-    }
-
-    private async void Hyperlink_Accueil(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_Equip(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageEquipage());
-    }
-
-    private async void Hyperlink_Perso(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PagePersonnage());
-    }
-    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 void listeFDD_ScrollToRequested(object sender, ScrollToRequestEventArgs e)
+    {
+
+    }
+
+    private async void Hyperlink_Accueil(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
+    }
+
+    private async void Hyperlink_Equip(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new PageEquipage());
+    }
+
+    private async void Hyperlink_Perso(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new PagePersonnage());
+    }
+    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());
+    }
 }

Sources/Ohara/PageInfoBateau.xaml.cs

@@ -8,9 +8,9 @@ public partial class PageInfoBateau : ContentPage
     public PageInfoBateau()
     {
         InitializeComponent();
-        List<Bateau> bateau = StubBateau.RecupererBateau().ToList();
+        Manager manager = new Manager();
 
-        listeBateau.ItemsSource = bateau;
+        listeBateau.ItemsSource = manager.GetBateaux();
     }
 
 

Sources/Ohara/PageInfoIle.xaml.cs

@@ -8,10 +8,10 @@ public partial class PageInfoIle : ContentPage
 	public PageInfoIle()
 	{
         InitializeComponent();
-        List<Ile> ile = StubIle.RecupererIle().ToList();
+        Manager manager = new Manager();
 
 
-        listeIle.ItemsSource = ile;
+        listeIle.ItemsSource = manager.GetIles();
     }
 
     private async void Hyperlink_Accueil(object sender, EventArgs e)

Sources/Ohara/PageInfoPersonnage.xaml.cs

@@ -9,10 +9,10 @@ public partial class PageInfoPersonnage : ContentPage
 	public PageInfoPersonnage()
 	{
         InitializeComponent();
-        List<Personnage> perso = StubPersonnage.RecupererPersonnage().ToList();
+        Manager manager = new Manager();
 
 
-        listePerso.ItemsSource = perso;
+        listePerso.ItemsSource = manager.GetPersonnages();
     }
     private async void Hyperlink_Accueil(object sender, EventArgs e)
     {