Correction merge

devGuillaume
Yoan 2 years ago
parent d7be22331e
commit 3a5d898a87

@ -57,6 +57,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Update="PageBestiaire.xaml.cs">
<DependentUpon>PageBestiaire.xaml</DependentUpon>
</Compile>
<Compile Update="PageCarte.xaml.cs"> <Compile Update="PageCarte.xaml.cs">
<DependentUpon>PageCarte.xaml</DependentUpon> <DependentUpon>PageCarte.xaml</DependentUpon>
</Compile> </Compile>

@ -2,7 +2,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.PageBateau" x:Class="Ohara.PageBateau"
Title="PageBateau"> Title="PageBateau"
BackgroundColor="#e2edf1">
<Grid> <Grid>

@ -21,14 +21,14 @@
</Image> </Image>
<Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Acceuil"/> <Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Accueil"/>
<Button Style="{StaticResource buttonMenu}" Text="Carte"/> <Button Style="{StaticResource buttonMenu2}" Text="Carte"/>
<Button Style="{StaticResource buttonMenu}" Text="Personnages"/> <Button Style="{StaticResource buttonMenu}" Text="Personnages" Clicked="Hyperlink_Perso"/>
<Button Style="{StaticResource buttonMenu}" Text="Fruits du démon" Clicked="Hyperlink_FDD"/> <Button Style="{StaticResource buttonMenu}" Text="Fruits du démon" Clicked="Hyperlink_FDD"/>
<Button Style="{StaticResource buttonMenu}" Text="Bateaux"/> <Button Style="{StaticResource buttonMenu}" Text="Bateaux" Clicked="Hyperlink_Bateau"/>
<Button Style="{StaticResource buttonMenu}" Text="Îles"/> <Button Style="{StaticResource buttonMenu}" Text="Îles"/>
<Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/> <Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
<Button Style="{StaticResource buttonMenu2}" Text="Équipages"/> <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
</VerticalStackLayout> </VerticalStackLayout>
<VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40"> <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40">
<Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" > <Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >

@ -13,24 +13,25 @@ public partial class PageEquipage : ContentPage
listeEquip.ItemsSource = Lequipage; listeEquip.ItemsSource = Lequipage;
} }
private async void Hyperlink_Accueil(object sender, EventArgs e)
{
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_Accueil(object sender, EventArgs e) private async void Hyperlink_Equip(object sender, EventArgs e)
{ {
await Navigation.PushAsync(new MainPage()); await Navigation.PushAsync(new PageEquipage());
} }
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());
} }
private async void Hyperlink_Carte(object sender, EventArgs e)
{
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()); await Navigation.PushAsync(new PageBateau());

@ -55,36 +55,46 @@
</Frame> </Frame>
</Grid> </Grid>
<CollectionView x:Name="listeFDD" ItemsUpdatingScrollMode="KeepScrollOffset" VerticalScrollBarVisibility="Always" ItemsLayout="VerticalGrid, 4"> <CollectionView x:Name="listeFDD" ItemsLayout="VerticalGrid, 4">
<CollectionView.ItemTemplate> <CollectionView.ItemTemplate>
<DataTemplate> <DataTemplate>
<Grid Padding="10" ColumnSpacing="10" RowSpacing="20"> <Grid Padding="20" ColumnSpacing="20" RowSpacing="20">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="25*"/> <ColumnDefinition Width="25*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Frame CornerRadius="25"
BackgroundColor="#e2edf1"
BorderColor="#72a3b3"
>
<StackLayout Orientation="Vertical" Padding="5">
<Image <Image
Source="{Binding Image}" Source="{Binding Image}"
HeightRequest="300" HeightRequest="290"
WidthRequest="300" /> WidthRequest="290" />
<Label <Label
VerticalOptions="End"
Padding="7"
HorizontalTextAlignment="Center"
HorizontalOptions="Center"
Text="{Binding Type}"
FontAttributes="Italic"
BackgroundColor="#72a3b3"/>
<Label
VerticalOptions="End"
Margin="25"
HorizontalOptions="Center" HorizontalOptions="Center"
VerticalOptions="Start"
HorizontalTextAlignment="Center" HorizontalTextAlignment="Center"
Padding="5"
Text="{Binding Nom}" Text="{Binding Nom}"
BackgroundColor="#72a3b3"
FontSize="19"
TextColor="#72a3b3"
FontAttributes="Bold" /> FontAttributes="Bold" />
<Label
VerticalOptions="Center"
HorizontalOptions="Center"
Text="{Binding Type}"
FontAttributes="Italic"
TextColor="#72a3b3"/>
</StackLayout>
</Frame>
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</CollectionView.ItemTemplate> </CollectionView.ItemTemplate>

Loading…
Cancel
Save