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)

@ -1,53 +1,53 @@
using Model.Stub; using Model.Stub;
using Model; using Model;
namespace Ohara; namespace Ohara;
public partial class PageInfoBestiaire : ContentPage public partial class PageInfoBestiaire : ContentPage
{ {
public PageInfoBestiaire() public PageInfoBestiaire()
{ {
InitializeComponent(); InitializeComponent();
var manager = new Manager(); var manager = new Manager();
listeBest.ItemsSource = manager.GetBestiaires(); listeBest.ItemsSource = manager.GetBestiaires();
} }
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)
{ {
await Navigation.PushAsync(new PageFDD()); await Navigation.PushAsync(new PageFDD());
} }
private async void Hyperlink_Equip(object sender, EventArgs e) private async void Hyperlink_Equip(object sender, EventArgs e)
{ {
await Navigation.PushAsync(new PageEquipage()); await Navigation.PushAsync(new PageEquipage());
} }
private async void Hyperlink_Carte(object sender, EventArgs e) private async void Hyperlink_Carte(object sender, EventArgs e)
{ {
await Navigation.PushAsync(new PageCarte()); await Navigation.PushAsync(new PageCarte());
} }
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)
{ {
await Navigation.PushAsync(new PageBestiaire()); await Navigation.PushAsync(new PageBestiaire());
} }
private async void Hyperlink_Ile(object sender, EventArgs e) private async void Hyperlink_Ile(object sender, EventArgs e)
{ {
await Navigation.PushAsync(new PageIle()); await Navigation.PushAsync(new PageIle());
} }
private async void Hyperlink_Perso(object sender, EventArgs e) private async void Hyperlink_Perso(object sender, EventArgs e)
{ {
await Navigation.PushAsync(new PagePersonnage()); await Navigation.PushAsync(new PagePersonnage());
} }
} }

@ -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)

@ -1,27 +1,27 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui" <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Ohara.PageInfoFdd" x:Class="Ohara.PageInfoFdd"
Title="PageInfoFdd" Title="PageInfoFdd"
BackgroundColor="#e2edf1"> BackgroundColor="#e2edf1">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="2*" /> <RowDefinition Height="2*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="300" /> <ColumnDefinition Width="300" />
<ColumnDefinition Width="90*" /> <ColumnDefinition Width="90*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10"> <VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10">
<Image Source="ohara2.png" HeightRequest="200" HorizontalOptions="Center"> <Image Source="ohara2.png" HeightRequest="200" HorizontalOptions="Center">
<Image.Clip> <Image.Clip>
<EllipseGeometry Center="150,90" RadiusX="80" RadiusY="80"/> <EllipseGeometry Center="150,90" RadiusX="80" RadiusY="80"/>
</Image.Clip> </Image.Clip>
</Image> </Image>
<Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Accueil"/> <Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Accueil"/>
<Button Style="{StaticResource buttonMenu}" Text="Carte" Clicked="Hyperlink_Carte"/> <Button Style="{StaticResource buttonMenu}" Text="Carte" Clicked="Hyperlink_Carte"/>
<Button Style="{StaticResource buttonMenu}" Text="Personnages" Clicked="Hyperlink_Perso"/> <Button Style="{StaticResource buttonMenu}" Text="Personnages" Clicked="Hyperlink_Perso"/>
@ -29,89 +29,89 @@
<Button Style="{StaticResource buttonMenu}" Text="Bateaux" Clicked="Hyperlink_Bateau"/> <Button Style="{StaticResource buttonMenu}" Text="Bateaux" Clicked="Hyperlink_Bateau"/>
<Button Style="{StaticResource buttonMenu}" Text="Îles" Clicked="Hyperlink_Ile"/> <Button Style="{StaticResource buttonMenu}" Text="Îles" Clicked="Hyperlink_Ile"/>
<Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/> <Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
<Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/> <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
</VerticalStackLayout> </VerticalStackLayout>
<ScrollView Grid.Row="0" Grid.Column="1" Orientation="Vertical" VerticalScrollBarVisibility="Always"> <ScrollView Grid.Row="0" Grid.Column="1" Orientation="Vertical" VerticalScrollBarVisibility="Always">
<VerticalStackLayout Spacing="40"> <VerticalStackLayout Spacing="40">
<CollectionView x:Name="listObj" > <CollectionView x:Name="listObj" >
<CollectionView.ItemTemplate> <CollectionView.ItemTemplate>
<DataTemplate> <DataTemplate>
<VerticalStackLayout Spacing="10" Padding="40" > <VerticalStackLayout Spacing="10" Padding="40" >
<Grid ColumnSpacing="20"> <Grid ColumnSpacing="20">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="45*"/> <ColumnDefinition Width="45*"/>
<ColumnDefinition Width="45*"/> <ColumnDefinition Width="45*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<VerticalStackLayout Grid.Column="0" Spacing="2" Padding="5"> <VerticalStackLayout Grid.Column="0" Spacing="2" Padding="5">
<Frame Style="{StaticResource frameInfo}"> <Frame Style="{StaticResource frameInfo}">
<Label Text="Sommaire :" Style="{StaticResource titreInfo}" /> <Label Text="Sommaire :" Style="{StaticResource titreInfo}" />
</Frame> </Frame>
<Frame Style="{StaticResource frameInfo}" > <Frame Style="{StaticResource frameInfo}" >
<Label Text="1 Description" TextColor="#72a3b3"/> <Label Text="1 Description" TextColor="#72a3b3"/>
</Frame> </Frame>
<Frame Style="{StaticResource frameInfo}" > <Frame Style="{StaticResource frameInfo}" >
<Label Text="2 Force/Faiblesses" TextColor="#72a3b3"/> <Label Text="2 Force/Faiblesses" TextColor="#72a3b3"/>
</Frame> </Frame>
<Frame Style="{StaticResource frameInfo}" > <Frame Style="{StaticResource frameInfo}" >
<Label Text="3 Utilisateurs" TextColor="#72a3b3"/> <Label Text="3 Utilisateurs" TextColor="#72a3b3"/>
</Frame> </Frame>
</VerticalStackLayout> </VerticalStackLayout>
<VerticalStackLayout Grid.Column="1" Spacing="2" Padding="5"> <VerticalStackLayout Grid.Column="1" Spacing="2" Padding="5">
<Frame Style="{StaticResource frameInfo}" > <Frame Style="{StaticResource frameInfo}" >
<Label Text="{Binding Nom}" HorizontalOptions="Center" Style="{StaticResource titreInfo}" /> <Label Text="{Binding Nom}" HorizontalOptions="Center" Style="{StaticResource titreInfo}" />
</Frame> </Frame>
<Frame Style="{StaticResource frameInfo}"> <Frame Style="{StaticResource frameInfo}">
<Image <Image
Source="{Binding Image}" Source="{Binding Image}"
HeightRequest="250" HeightRequest="250"
WidthRequest="250"/> WidthRequest="250"/>
</Frame> </Frame>
<Frame Style="{StaticResource frameInfo}"> <Frame Style="{StaticResource frameInfo}">
<HorizontalStackLayout Spacing="5" HorizontalOptions="Center"> <HorizontalStackLayout Spacing="5" HorizontalOptions="Center">
<Label Text="Nom romanisé :" TextColor="#72a3b3" FontAttributes="Bold"/> <Label Text="Nom romanisé :" TextColor="#72a3b3" FontAttributes="Bold"/>
<Label Text="{Binding NomRomanise}" TextColor="#72a3b3"/> <Label Text="{Binding NomRomanise}" TextColor="#72a3b3"/>
</HorizontalStackLayout> </HorizontalStackLayout>
</Frame> </Frame>
<Frame Style="{StaticResource frameInfo}"> <Frame Style="{StaticResource frameInfo}">
<HorizontalStackLayout Spacing="5" HorizontalOptions="Center"> <HorizontalStackLayout Spacing="5" HorizontalOptions="Center">
<Label Text="Type :" TextColor="#72a3b3" FontAttributes="Bold"/> <Label Text="Type :" TextColor="#72a3b3" FontAttributes="Bold"/>
<Label Text="{Binding Type}" TextColor="#72a3b3"/> <Label Text="{Binding Type}" TextColor="#72a3b3"/>
</HorizontalStackLayout> </HorizontalStackLayout>
</Frame> </Frame>
<Frame Style="{StaticResource frameInfo}"> <Frame Style="{StaticResource frameInfo}">
<HorizontalStackLayout Spacing="5" HorizontalOptions="Center"> <HorizontalStackLayout Spacing="5" HorizontalOptions="Center">
<Label Text="Premier apparition (chapitre) :" TextColor="#72a3b3" FontAttributes="Bold"/> <Label Text="Premier apparition (chapitre) :" TextColor="#72a3b3" FontAttributes="Bold"/>
<Label Text="{Binding PremierChap}" TextColor="#72a3b3"/> <Label Text="{Binding PremierChap}" TextColor="#72a3b3"/>
</HorizontalStackLayout> </HorizontalStackLayout>
</Frame> </Frame>
<Frame Style="{StaticResource frameInfo}"> <Frame Style="{StaticResource frameInfo}">
<HorizontalStackLayout Spacing="5" HorizontalOptions="Center"> <HorizontalStackLayout Spacing="5" HorizontalOptions="Center">
<Label Text="Premier apparition (episode) :" TextColor="#72a3b3" FontAttributes="Bold"/> <Label Text="Premier apparition (episode) :" TextColor="#72a3b3" FontAttributes="Bold"/>
<Label Text="{Binding PremierEp}" TextColor="#72a3b3"/> <Label Text="{Binding PremierEp}" TextColor="#72a3b3"/>
</HorizontalStackLayout> </HorizontalStackLayout>
</Frame> </Frame>
</VerticalStackLayout> </VerticalStackLayout>
</Grid> </Grid>
<Label Text="Description :" Style="{StaticResource titreInfo}"/> <Label Text="Description :" Style="{StaticResource titreInfo}"/>
<Line Stroke="#72a3b3" StrokeThickness="2" X1="0" X2="3000"/> <Line Stroke="#72a3b3" StrokeThickness="2" X1="0" X2="3000"/>
<Label Text="{Binding Description}" TextColor="#72a3b3"/> <Label Text="{Binding Description}" TextColor="#72a3b3"/>
<Label Text="Force / Faiblesses :" Style="{StaticResource titreInfo}"/> <Label Text="Force / Faiblesses :" Style="{StaticResource titreInfo}"/>
<Line Stroke="#72a3b3" StrokeThickness="2" X1="0" X2="3000"/> <Line Stroke="#72a3b3" StrokeThickness="2" X1="0" X2="3000"/>
<Label Text="{Binding Forces}" TextColor="#72a3b3"/> <Label Text="{Binding Forces}" TextColor="#72a3b3"/>
<Label Text="{Binding Faiblesses}" TextColor="#72a3b3"/> <Label Text="{Binding Faiblesses}" TextColor="#72a3b3"/>
<Label Text="Utilisateurs :" Style="{StaticResource titreInfo}"/> <Label Text="Utilisateurs :" Style="{StaticResource titreInfo}"/>
<Line Stroke="#72a3b3" StrokeThickness="2" X1="0" X2="3000"/> <Line Stroke="#72a3b3" StrokeThickness="2" X1="0" X2="3000"/>
</VerticalStackLayout> </VerticalStackLayout>
</DataTemplate> </DataTemplate>
</CollectionView.ItemTemplate> </CollectionView.ItemTemplate>
</CollectionView> </CollectionView>
</VerticalStackLayout> </VerticalStackLayout>
</ScrollView> </ScrollView>
</Grid> </Grid>
</ContentPage> </ContentPage>

@ -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)

@ -1,27 +1,27 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui" <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Ohara.PageInfoIle" x:Class="Ohara.PageInfoIle"
Title="PageInfoIle" Title="PageInfoIle"
BackgroundColor="#e2edf1"> BackgroundColor="#e2edf1">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="2*" /> <RowDefinition Height="2*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="300" /> <ColumnDefinition Width="300" />
<ColumnDefinition Width="90*" /> <ColumnDefinition Width="90*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10"> <VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10">
<Image Source="ohara2.png" HeightRequest="300" HorizontalOptions="Center" > <Image Source="ohara2.png" HeightRequest="300" HorizontalOptions="Center" >
<Image.Clip> <Image.Clip>
<EllipseGeometry Center="150,90" RadiusX="80" RadiusY="80"/> <EllipseGeometry Center="150,90" RadiusX="80" RadiusY="80"/>
</Image.Clip> </Image.Clip>
</Image> </Image>
<Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Accueil"/> <Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Accueil"/>
<Button Style="{StaticResource buttonMenu}" Text="Carte" Clicked="Hyperlink_Carte"/> <Button Style="{StaticResource buttonMenu}" Text="Carte" Clicked="Hyperlink_Carte"/>
<Button Style="{StaticResource buttonMenu}" Text="Personnages" Clicked="Hyperlink_Perso"/> <Button Style="{StaticResource buttonMenu}" Text="Personnages" Clicked="Hyperlink_Perso"/>
@ -29,94 +29,94 @@
<Button Style="{StaticResource buttonMenu}" Text="Bateaux" Clicked="Hyperlink_Bateau"/> <Button Style="{StaticResource buttonMenu}" Text="Bateaux" Clicked="Hyperlink_Bateau"/>
<Button Style="{StaticResource buttonMenu2}" Text="Îles" Clicked="Hyperlink_Ile"/> <Button Style="{StaticResource buttonMenu2}" Text="Îles" Clicked="Hyperlink_Ile"/>
<Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/> <Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
<Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/> <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
</VerticalStackLayout> </VerticalStackLayout>
<ScrollView Grid.Row="0" Grid.Column="1" Orientation="Vertical" VerticalScrollBarVisibility="Always"> <ScrollView Grid.Row="0" Grid.Column="1" Orientation="Vertical" VerticalScrollBarVisibility="Always">
<VerticalStackLayout Spacing="40"> <VerticalStackLayout Spacing="40">
<CollectionView x:Name="listeIle"> <CollectionView x:Name="listeIle">
<CollectionView.ItemTemplate> <CollectionView.ItemTemplate>
<DataTemplate> <DataTemplate>
<VerticalStackLayout Spacing="10" Padding="40"> <VerticalStackLayout Spacing="10" Padding="40">
<Grid ColumnSpacing="20"> <Grid ColumnSpacing="20">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="40*"/> <ColumnDefinition Width="40*"/>
<ColumnDefinition Width="40*"/> <ColumnDefinition Width="40*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<VerticalStackLayout Grid.Column="0" Spacing="4"> <VerticalStackLayout Grid.Column="0" Spacing="4">
<Frame Style="{StaticResource frameInfo}"> <Frame Style="{StaticResource frameInfo}">
<Label Text="Sommaire" Style="{StaticResource titreInfo}"/> <Label Text="Sommaire" Style="{StaticResource titreInfo}"/>
</Frame> </Frame>
<Frame Style="{StaticResource frameInfo}"> <Frame Style="{StaticResource frameInfo}">
<Label Text="1 - Description" TextColor="#72a3b3"/> <Label Text="1 - Description" TextColor="#72a3b3"/>
</Frame> </Frame>
<Frame Style="{StaticResource frameInfo}"> <Frame Style="{StaticResource frameInfo}">
<Label Text="2 - Caracteristiques" TextColor="#72a3b3"/> <Label Text="2 - Caracteristiques" TextColor="#72a3b3"/>
</Frame> </Frame>
</VerticalStackLayout> </VerticalStackLayout>
<VerticalStackLayout Grid.Column="1" Spacing="4"> <VerticalStackLayout Grid.Column="1" Spacing="4">
<Frame Style="{StaticResource frameInfo}"> <Frame Style="{StaticResource frameInfo}">
<Label Style="{StaticResource titreInfo}" Text="{Binding Nom}"/> <Label Style="{StaticResource titreInfo}" Text="{Binding Nom}"/>
</Frame> </Frame>
<Frame Style="{StaticResource frameInfo}" > <Frame Style="{StaticResource frameInfo}" >
<Image <Image
Source="{Binding Image}" Source="{Binding Image}"
HeightRequest="200" HeightRequest="200"
WidthRequest="300" WidthRequest="300"
/> />
</Frame> </Frame>
<Frame Style="{StaticResource frameInfo}"> <Frame Style="{StaticResource frameInfo}">
<StackLayout HorizontalOptions="Center" Orientation="Horizontal" Spacing="5"> <StackLayout HorizontalOptions="Center" Orientation="Horizontal" Spacing="5">
<Label Text="Nom Romanisé :" TextColor="#72a3b3" FontAttributes="Bold"/> <Label Text="Nom Romanisé :" TextColor="#72a3b3" FontAttributes="Bold"/>
<Label Text="{Binding NomRomanise}" TextColor="#72a3b3"/> <Label Text="{Binding NomRomanise}" TextColor="#72a3b3"/>
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame Style="{StaticResource frameInfo}"> <Frame Style="{StaticResource frameInfo}">
<StackLayout HorizontalOptions="Center" Orientation="Horizontal" Spacing="5"> <StackLayout HorizontalOptions="Center" Orientation="Horizontal" Spacing="5">
<Label Text="Région :" TextColor="#72a3b3" FontAttributes="Bold"/> <Label Text="Région :" TextColor="#72a3b3" FontAttributes="Bold"/>
<Label Text="{Binding Region}" TextColor="#72a3b3"/> <Label Text="{Binding Region}" TextColor="#72a3b3"/>
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame Style="{StaticResource frameInfo}"> <Frame Style="{StaticResource frameInfo}">
<StackLayout HorizontalOptions="Center" Orientation="Horizontal" Spacing="5"> <StackLayout HorizontalOptions="Center" Orientation="Horizontal" Spacing="5">
<Label Text="Première apparition manga :" TextColor="#72a3b3" FontAttributes="Bold"/> <Label Text="Première apparition manga :" TextColor="#72a3b3" FontAttributes="Bold"/>
<Label Text="{Binding PremierChap}" TextColor="#72a3b3"/> <Label Text="{Binding PremierChap}" TextColor="#72a3b3"/>
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame Style="{StaticResource frameInfo}"> <Frame Style="{StaticResource frameInfo}">
<StackLayout HorizontalOptions="Center" Orientation="Horizontal" Spacing="5"> <StackLayout HorizontalOptions="Center" Orientation="Horizontal" Spacing="5">
<Label Text="Première apparition anime :" TextColor="#72a3b3" FontAttributes="Bold"/> <Label Text="Première apparition anime :" TextColor="#72a3b3" FontAttributes="Bold"/>
<Label Text="{Binding PremierEp}" TextColor="#72a3b3"/> <Label Text="{Binding PremierEp}" TextColor="#72a3b3"/>
</StackLayout> </StackLayout>
</Frame> </Frame>
</VerticalStackLayout> </VerticalStackLayout>
</Grid> </Grid>
<Label Text="Description :" TextColor="#72a3b3" FontSize="20" FontAttributes="Bold"/> <Label Text="Description :" TextColor="#72a3b3" FontSize="20" FontAttributes="Bold"/>
<Line X1="0" Y1="0" X2="3000" Y2="0" StrokeThickness="2" Stroke="#72a3b3" /> <Line X1="0" Y1="0" X2="3000" Y2="0" StrokeThickness="2" Stroke="#72a3b3" />
<Label Text="{Binding Description}" TextColor="#72a3b3" /> <Label Text="{Binding Description}" TextColor="#72a3b3" />
<Label Text="Caracteristiques :" TextColor="#72a3b3" FontSize="20" FontAttributes="Bold"/> <Label Text="Caracteristiques :" TextColor="#72a3b3" FontSize="20" FontAttributes="Bold"/>
<Line X1="0" Y1="0" X2="3000" Y2="0" StrokeThickness="2" Stroke="#72a3b3" /> <Line X1="0" Y1="0" X2="3000" Y2="0" StrokeThickness="2" Stroke="#72a3b3" />
<Label Text="{Binding Caracteristique}" TextColor="#72a3b3" /> <Label Text="{Binding Caracteristique}" TextColor="#72a3b3" />
</VerticalStackLayout> </VerticalStackLayout>
</DataTemplate> </DataTemplate>
</CollectionView.ItemTemplate> </CollectionView.ItemTemplate>
</CollectionView> </CollectionView>
</VerticalStackLayout> </VerticalStackLayout>
</ScrollView> </ScrollView>
</Grid> </Grid>
</ContentPage> </ContentPage>

@ -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