Correction conflits

devGuillaume
Yoan 2 years ago
commit d7be22331e

@ -10,21 +10,28 @@ namespace Model
{
public string Nom { get; set; }
public string NomRomanise { get; set; }
public Equipage Affiliation { get; set; }
public Equipage? Affiliation { get; set; }
public int PremierChap { get; set; }
public int PremierEp { get; set; }
public string Description { get; set; }
public string Caracteristique { get; set; }
public Bateau(string nom, string nomRomanise, Equipage affiliation, int premierChap, int premierEp, string description, string caracteristique)
public string? Image { get; set; }
public Bateau(string nom, string nomRomanise, int premierChap, int premierEp, string description, string caracteristique, string image)
{
Nom = nom;
NomRomanise = nomRomanise;
Affiliation = affiliation;
PremierChap = premierChap;
PremierEp = premierEp;
Description = description;
Caracteristique = caracteristique;
Image= image;
}
public Bateau(string nom, string nomRomanise, Equipage affiliation, int premierChap, int premierEp, string description, string caracteristique, string image) : this(nom,nomRomanise,premierChap,premierEp,description,caracteristique,image)
{
Affiliation = affiliation;
}
}
}

@ -3,6 +3,7 @@
public class Personnage
{
public string Nom { get; set; }
public double Prime { get; set; }
public string Epithete { get; set; }
public int Age { get; set; }
public double Taille { get; set; }
@ -11,21 +12,24 @@
public string Citation { get; set; }
public Equipage? Equipage { get; set; }
public List<FruitDuDemon> Fruit { get; set; } = new List<FruitDuDemon>();
public string? Image { get; set; }
public Personnage(string nom, string epithete, int age, double taille, string origine, string biographie, string citation)
public Personnage(string nom, double prime, string epithete, int age, double taille, string origine, string biographie, string citation, string image)
{
Nom = nom;
Prime = prime;
Epithete = epithete;
Age = age;
Taille = taille;
Origine = origine;
Biographie = biographie;
Citation = citation;
Citation = citation;
Image = image;
}
public Personnage(string nom, string epithete, int age, double taille, string origine, string biographie, string citation,Equipage equipage,List<FruitDuDemon> fruit) : this(nom,epithete,age,taille,origine,biographie,citation)
public Personnage(string nom, double prime, string epithete, int age, double taille, string origine, string biographie, string citation,string image ,Equipage equipage,List<FruitDuDemon> fruit) : this(nom,prime,epithete,age,taille,origine,biographie,citation,image)
{
Equipage = equipage;
Fruit = fruit;

@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using static System.Net.Mime.MediaTypeNames;
namespace Model.Stub
{
public static class StubBateau
{
public static IEnumerable<Bateau> RecupererBateau()
{
List<Bateau> bateau = new List<Bateau>()
{
new Bateau("Sunny", "Sauzando Sani-go", 435, 321, "Le Thousand Sunny est...", "Ce bateau a pour particularités ...", "sunny.png"),
new Bateau("Vogue Merry", "Goingu Merri-go", 41, 17, "Le Vogue Merry est...", "Ce bateau a pour particularités ...", "sunny.png"),
new Bateau("Moby Dick", "Mobi Dikku-go", 234, 151, "Le Moby Dick est...", "Ce bateau a pour particularités ...", "sunny.png"),
};
return bateau;
}
}
}

@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Model.Stub
{
public static class StubPersonnage
{
public static IEnumerable<Personnage> RecupererPersonnage()
{
List<Personnage> perso = new List<Personnage>()
{
new Personnage("Luffy", 3000000000,"Luffy au Chapeau de Paille", 19, 1.74, "East Blue", "Monkey D. Luffy est...", "Le Roi des Pirates, ce sera moi !", "luffy.png"),
new Personnage("Nami", 366000000, "Le Chatte Voleuse", 20, 1.70, "East Blue", "Nami est...", "Je n'aime que deux choses, l'argent et les mandarines !!", "nami.png"),
new Personnage("Usopp", 500000000,"Dieu Usopp", 19, 1.76, "East Blue", "Usopp est...", "Je suis le grand capitaine Usopp ! J'ai 8 000 hommes sous mon commandement ! C'est moi qui fait la loi sur cette île ! Je vous préviens, quittez ce village pendant qu'il est encore temps sinon vous aurez à faire à moi et à mes hommes!", "usopp.png"),
new Personnage("Zoro", 1111000000,"Le Chasseur de Pirates", 21, 1.81, "East Blue", "Zoro est...", "Un coup dans le dos est le déshonneur pour un sabreur !", "zoro.png"),
};
return perso;
}
}
}

@ -13,8 +13,8 @@
<ShellContent
ContentTemplate="{DataTemplate local:PageInfoFdd}"
Route="PageInfoFdd" />
ContentTemplate="{DataTemplate local:PageEquipage}"
Route="PageFDD" />
</Shell>

@ -25,10 +25,10 @@
<Button Style="{StaticResource buttonMenu2}" Text="Accueil"/>
<Button Style="{StaticResource buttonMenu}" Text="Carte"/>
<Button Style="{StaticResource buttonMenu}" Text="Personnages"/>
<Button Style="{StaticResource buttonMenu}" Text="Carte" Clicked="Hyperlink_Carte"/>
<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="Bateaux"/>
<Button Style="{StaticResource buttonMenu}" Text="Bateaux" Clicked="Hyperlink_Bateau"/>
<Button Style="{StaticResource buttonMenu}" Text="Îles"/>
<Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
<Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>

@ -18,5 +18,17 @@ public partial class MainPage : ContentPage
{
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());
}
}

@ -1,9 +0,0 @@
namespace Ohara;
public partial class NewPage1 : ContentPage
{
public NewPage1()
{
InitializeComponent();
}
}

@ -1,151 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Ohara.NewPage2"
BackgroundColor="#e2edf1">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="2*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="300" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10">
<Image Source="ohara2.png" HeightRequest="200" HorizontalOptions="Center">
<Image.Clip>
<EllipseGeometry Center="150,90" RadiusX="80" RadiusY="80"/>
</Image.Clip>
</Image>
<Button Style="{StaticResource buttonMenu}" Text="Accueil"/>
<Button Style="{StaticResource buttonMenu}" Text="Carte"/>
<Button Style="{StaticResource buttonMenu2}" Text="Personnages"/>
<Button Style="{StaticResource buttonMenu}" Text="Fruits du démon"/>
<Button Style="{StaticResource buttonMenu}" Text="Bateaux"/>
<Button Style="{StaticResource buttonMenu}" Text="Îles"/>
<Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
<Button Style="{StaticResource buttonMenu}" Text="Équipages"/>
</VerticalStackLayout>
<VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40">
<Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >
<Grid.RowDefinitions>
<RowDefinition Height="10*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions >
<ColumnDefinition Width="20*"/>
<ColumnDefinition Width="25*"/>
<ColumnDefinition Width="10*"/>
<ColumnDefinition Width="10*"/>
</Grid.ColumnDefinitions>
<SearchBar Placeholder="Rechercher..." BackgroundColor="#bfe5ef" Grid.Column="0"/>
<Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="2">
<Label Text="Filtrer" HorizontalTextAlignment="Center" />
</Frame>
<Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="3">
<Label Text="Trier" HorizontalTextAlignment="Center" />
</Frame>
</Grid>
<ScrollView Orientation="Horizontal" HorizontalScrollBarVisibility="Always">
<HorizontalStackLayout Spacing="40" Padding="40">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Image Source="luffy.png" HeightRequest="800" HorizontalOptions="Start" Grid.Row="0"/>
<Frame CornerRadius="20" BorderColor="#72a3b3" BackgroundColor="#72a3b3" Margin="20, 50" Padding="20" WidthRequest="350" HeightRequest="200" Grid.Row="0" VerticalOptions="End">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="*" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Label Text="Monkey D. Luffy" FontAttributes="Bold" FontSize="22" TextColor="White" Grid.Row="0" HorizontalOptions="Center" Margin="10"/>
<Label Text="________________________" FontAttributes="Bold" FontSize="20" TextColor="White" Grid.Row="1" HorizontalOptions="Center" Margin="-15"/>
<Label Text="Cliquez ici pour voir en détail" FontAttributes="Bold,Italic" FontSize="15" TextColor="White" Grid.Row="2" TextDecorations="Underline" HorizontalOptions="Center"/>
</Grid>
</Frame>
</Grid>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Image Source="nami.png" HeightRequest="800" HorizontalOptions="Start"/>
<Frame CornerRadius="20" BorderColor="#72a3b3" BackgroundColor="#72a3b3" Margin="20, 50" Padding="20" WidthRequest="350" HeightRequest="200" Grid.Row="0" VerticalOptions="End">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="*" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Label Text="Nami" FontAttributes="Bold" FontSize="22" TextColor="White" Grid.Row="0" HorizontalOptions="Center" Margin="10"/>
<Label Text="________________________" FontAttributes="Bold" FontSize="20" TextColor="White" Grid.Row="1" HorizontalOptions="Center" Margin="-15"/>
<Label Text="Cliquez ici pour voir en détail" FontAttributes="Bold,Italic" FontSize="15" TextColor="White" Grid.Row="2" TextDecorations="Underline" HorizontalOptions="Center"/>
</Grid>
</Frame>
</Grid>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Image Source="usopp.png" HeightRequest="800" HorizontalOptions="Start"/>
<Frame CornerRadius="20" BorderColor="#72a3b3" BackgroundColor="#72a3b3" Margin="20, 50" Padding="20" WidthRequest="350" HeightRequest="200" Grid.Row="0" VerticalOptions="End">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="*" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Label Text="Usopp" FontAttributes="Bold" FontSize="22" TextColor="White" Grid.Row="0" HorizontalOptions="Center" Margin="10"/>
<Label Text="________________________" FontAttributes="Bold" FontSize="20" TextColor="White" Grid.Row="1" HorizontalOptions="Center" Margin="-15"/>
<Label Text="Cliquez ici pour voir en détail" FontAttributes="Bold,Italic" FontSize="15" TextColor="White" Grid.Row="2" TextDecorations="Underline" HorizontalOptions="Center"/>
</Grid>
</Frame>
</Grid>
</HorizontalStackLayout>
</ScrollView>
</VerticalStackLayout>
<!--<Rectangle WidthRequest="200" HeightRequest="300" HorizontalOptions="Start" BackgroundColor="#72a3b3">
<Rectangle.Fill>
<LinearGradientBrush StartPoint="0,0.5" EndPoint="1,0.5">
<GradientStop Color="#cdffd8" Offset="0.0" />-->
<!--<GradientStop Color="#94b9ff" Offset="1.0" /></LinearGradientBrush></Rectangle.Fill></Rectangle>-->
</Grid>
</ContentPage>

@ -1,9 +0,0 @@
namespace Ohara;
public partial class NewPage2 : ContentPage
{
public NewPage2()
{
InitializeComponent();
}
}

@ -57,11 +57,14 @@
</ItemGroup>
<ItemGroup>
<Compile Update="PageInfoFdd.xaml.cs">
<DependentUpon>PageInfoFdd.xaml</DependentUpon>
<Compile Update="PageCarte.xaml.cs">
<DependentUpon>PageCarte.xaml</DependentUpon>
</Compile>
<Compile Update="PageBestiaire.xaml.cs">
<DependentUpon>PageBestiaire.xaml</DependentUpon>
<Compile Update="PageBateau.xaml.cs">
<DependentUpon>PageBateau.xaml</DependentUpon>
</Compile>
<Compile Update="PagePersonnage.xaml.cs">
<DependentUpon>PagePersonnage.xaml</DependentUpon>
</Compile>
<Compile Update="PageEquipage.xaml.cs">
<DependentUpon>PageEquipage.xaml</DependentUpon>
@ -72,10 +75,13 @@
</ItemGroup>
<ItemGroup>
<MauiXaml Update="NewPage1.xaml">
<MauiXaml Update="PageCarte.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="PagePersonnage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="NewPage2.xaml">
<MauiXaml Update="PageInfoEquipage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="PageInfoFdd.xaml">
@ -90,6 +96,9 @@
<MauiXaml Update="PageEquipage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="PageBateau.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
</ItemGroup>
</Project>

@ -0,0 +1,142 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Ohara.PageBateau"
Title="PageBateau">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="2*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="300" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10">
<Image Source="ohara2.png" HeightRequest="300" HorizontalOptions="Center" >
<Image.Clip>
<EllipseGeometry Center="150,90" RadiusX="80" RadiusY="80"/>
</Image.Clip>
</Image>
<Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Accueil"/>
<Button Style="{StaticResource buttonMenu}" Text="Carte" Clicked="Hyperlink_Carte"/>
<Button Style="{StaticResource buttonMenu}" Text="Personnages" Clicked="Hyperlink_Perso"/>
<Button Style="{StaticResource buttonMenu}" Text="Fruits du démon" Clicked="Hyperlink_FDD"/>
<Button Style="{StaticResource buttonMenu2}" Text="Bateaux"/>
<Button Style="{StaticResource buttonMenu}" Text="Îles"/>
<Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
<Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
</VerticalStackLayout>
<VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40">
<Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >
<Grid.RowDefinitions>
<RowDefinition Height="10*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions >
<ColumnDefinition Width="20*"/>
<ColumnDefinition Width="25*"/>
<ColumnDefinition Width="10*"/>
<ColumnDefinition Width="10*"/>
</Grid.ColumnDefinitions>
<SearchBar Placeholder="Rechercher..." BackgroundColor="#bfe5ef" Grid.Column="0"/>
<Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="2">
<Label Text="Filtrer" HorizontalTextAlignment="Center" />
</Frame>
<Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="3">
<Label Text="Trier" HorizontalTextAlignment="Center" />
</Frame>
</Grid>
<ScrollView Orientation="Horizontal" HorizontalScrollBarVisibility="Always">
<CollectionView x:Name="listeBateau" ItemsLayout="HorizontalList">
<CollectionView.ItemTemplate>
<DataTemplate>
<Grid Padding="50" ColumnSpacing="10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="400"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="750"/>
</Grid.RowDefinitions>
<Frame
CornerRadius="25"
BorderColor="#e2edf1"
IsClippedToBounds="True"
Padding="0"
HeightRequest="800"
WidthRequest="450">
<Image
Source="{Binding Image}"
Aspect="Fill"
/>
</Frame>
<Frame CornerRadius="20"
BorderColor="#72a3b3"
BackgroundColor="#72a3b3"
Margin="20, 50" Padding="15"
WidthRequest="275"
HeightRequest="150"
Grid.Row="0"
VerticalOptions="End">
<StackLayout Orientation="Vertical" Spacing="10" VerticalOptions="Center">
<Label
Text="{Binding Nom}"
FontAttributes="Bold"
FontSize="22"
TextColor="White"
HorizontalOptions="Center"
/>
<Label
Text="-----------------------------"
FontAttributes="Bold"
FontSize="20"
TextColor="White"
HorizontalOptions="Center"
/>
<Label
Text="Cliquez ici pour voir en détail"
FontAttributes="Bold,Italic"
FontSize="15"
TextColor="White"
TextDecorations="Underline"
HorizontalOptions="Center"/>
</StackLayout>
</Frame>
</Grid>
</DataTemplate>
</CollectionView.ItemTemplate>
</CollectionView>
</ScrollView>
</VerticalStackLayout>
<!--<Rectangle WidthRequest="200" HeightRequest="300" HorizontalOptions="Start" BackgroundColor="#72a3b3">
<Rectangle.Fill>
<LinearGradientBrush StartPoint="0,0.5" EndPoint="1,0.5">
<GradientStop Color="#cdffd8" Offset="0.0" />-->
<!--<GradientStop Color="#94b9ff" Offset="1.0" /></LinearGradientBrush></Rectangle.Fill></Rectangle>-->
</Grid>
</ContentPage>

@ -0,0 +1,37 @@
using Model.Stub;
using Model;
namespace Ohara;
public partial class PageBateau : ContentPage
{
public PageBateau()
{
InitializeComponent();
List<Bateau> bateau = StubBateau.RecupererBateau().ToList();
listeBateau.ItemsSource = bateau;
}
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_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_Accueil(object sender, EventArgs e)
{
await Navigation.PushAsync(new MainPage());
}
}

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Ohara.NewPage1"
x:Class="Ohara.PageCarte"
BackgroundColor="#e2edf1">
<Grid>
@ -22,14 +22,14 @@
</Image>
<Button Style="{StaticResource buttonMenu}" Text="Accueil"/>
<Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Accueil"/>
<Button Style="{StaticResource buttonMenu2}" Text="Carte"/>
<Button Style="{StaticResource buttonMenu}" Text="Personnages"/>
<Button Style="{StaticResource buttonMenu}" Text="Fruits du démon"/>
<Button Style="{StaticResource buttonMenu}" Text="Bateaux"/>
<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="Bateaux" Clicked="Hyperlink_Bateau"/>
<Button Style="{StaticResource buttonMenu}" Text="Îles"/>
<Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
<Button Style="{StaticResource buttonMenu}" Text="Équipages"/>
<Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
</VerticalStackLayout>
<VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40">

@ -0,0 +1,32 @@
namespace Ohara;
public partial class PageCarte : ContentPage
{
public PageCarte()
{
InitializeComponent();
}
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_Perso(object sender, EventArgs e)
{
await Navigation.PushAsync(new PagePersonnage());
}
private async void Hyperlink_Bateau(object sender, EventArgs e)
{
await Navigation.PushAsync(new PageBateau());
}
}

@ -12,26 +12,23 @@
<ColumnDefinition Width="300" />
<ColumnDefinition Width="90*" />
</Grid.ColumnDefinitions>
<VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" >
<Label Text="Ohara" HorizontalTextAlignment="Center" Margin="19.5" FontSize="30" FontAttributes="Bold"/>
<VerticalStackLayout Spacing="10">
<Image Source="ohara2.png" HeightRequest="200" HorizontalOptions="Center">
<Image.Clip>
<EllipseGeometry Center="150,90" RadiusX="80" RadiusY="80"/>
</Image.Clip>
</Image>
<Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Acceuil"/>
<Button Style="{StaticResource buttonMenu}" Text="Carte"/>
<Button Style="{StaticResource buttonMenu}" Text="Personnages"/>
<Button Style="{StaticResource buttonMenu}" Text="Fruits du démon" Clicked="Hyperlink_FDD"/>
<Button Style="{StaticResource buttonMenu}" Text="Bateaux"/>
<Button Style="{StaticResource buttonMenu}" Text="Îles"/>
<Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
<Button Style="{StaticResource buttonMenu2}" Text="Équipages"/>
</VerticalStackLayout>
<VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10">
<Image Source="ohara2.png" HeightRequest="300" HorizontalOptions="Center" >
<Image.Clip>
<EllipseGeometry Center="150,90" RadiusX="80" RadiusY="80"/>
</Image.Clip>
</Image>
<Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Acceuil"/>
<Button Style="{StaticResource buttonMenu}" Text="Carte"/>
<Button Style="{StaticResource buttonMenu}" Text="Personnages"/>
<Button Style="{StaticResource buttonMenu}" Text="Fruits du démon" Clicked="Hyperlink_FDD"/>
<Button Style="{StaticResource buttonMenu}" Text="Bateaux"/>
<Button Style="{StaticResource buttonMenu}" Text="Îles"/>
<Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
<Button Style="{StaticResource buttonMenu2}" Text="Équipages"/>
</VerticalStackLayout>
<VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40">
<Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >

@ -18,8 +18,21 @@ public partial class PageEquipage : ContentPage
await Navigation.PushAsync(new PageFDD());
}
private async void Hyperlink_Acceuil(object sender, EventArgs e)
private async void Hyperlink_Accueil(object sender, EventArgs e)
{
await Navigation.PushAsync(new MainPage());
}
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());
}
}

@ -24,16 +24,16 @@
</Image>
<Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Acceuil"/>
<Button Style="{StaticResource buttonMenu}" Text="Carte"/>
<Button Style="{StaticResource buttonMenu}" Text="Personnages"/>
<Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Accueil"/>
<Button Style="{StaticResource buttonMenu}" Text="Carte" Clicked="Hyperlink_Carte"/>
<Button Style="{StaticResource buttonMenu}" Text="Personnages" Clicked="Hyperlink_Perso"/>
<Button Style="{StaticResource buttonMenu2}" Text="Fruits du démon"/>
<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="Bestiaire"/>
<Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
</VerticalStackLayout>
<VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40">
<VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="10">
<Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >
<Grid.RowDefinitions>
<RowDefinition Height="10*"/>
@ -58,7 +58,7 @@
<CollectionView x:Name="listeFDD" ItemsUpdatingScrollMode="KeepScrollOffset" VerticalScrollBarVisibility="Always" ItemsLayout="VerticalGrid, 4">
<CollectionView.ItemTemplate>
<DataTemplate>
<Grid Padding="10" ColumnSpacing="10" RowSpacing="80">
<Grid Padding="10" ColumnSpacing="10" RowSpacing="20">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="25*"/>
</Grid.ColumnDefinitions>

@ -20,7 +20,7 @@ public partial class PageFDD : ContentPage
}
private async void Hyperlink_Acceuil(object sender, EventArgs e)
private async void Hyperlink_Accueil(object sender, EventArgs e)
{
await Navigation.PushAsync(new MainPage());
}
@ -29,4 +29,17 @@ public partial class PageFDD : ContentPage
{
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());
}
}

@ -0,0 +1,128 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Ohara.PageInfoEquipage"
Title="PageInfoEquipage"
BackgroundColor="#e2edf1">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="2*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="300" />
<ColumnDefinition Width="90*" />
</Grid.ColumnDefinitions>
<VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10">
<Image Source="ohara2.png" HeightRequest="300" HorizontalOptions="Center" >
<Image.Clip>
<EllipseGeometry Center="150,90" RadiusX="80" RadiusY="80"/>
</Image.Clip>
</Image>
<Button Style="{StaticResource buttonMenu}" Text="Accueil"/>
<Button Style="{StaticResource buttonMenu}" Text="Carte"/>
<Button Style="{StaticResource buttonMenu}" Text="Personnages"/>
<Button Style="{StaticResource buttonMenu2}" Text="Fruits du démon"/>
<Button Style="{StaticResource buttonMenu}" Text="Bateaux"/>
<Button Style="{StaticResource buttonMenu}" Text="Îles"/>
<Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
<Button Style="{StaticResource buttonMenu}" Text="Équipages"/>
</VerticalStackLayout>
<ScrollView Grid.Row="0" Grid.Column="1" Orientation="Vertical" VerticalScrollBarVisibility="Always">
<VerticalStackLayout Spacing="40">
<CollectionView x:Name="listeEquip">
<CollectionView.ItemTemplate>
<DataTemplate>
<VerticalStackLayout Spacing="10" Padding="20">
<Grid Padding="10" ColumnSpacing="20">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="45*"/>
<ColumnDefinition Width="45*"/>
</Grid.ColumnDefinitions>
<VerticalStackLayout Grid.Column="0" Spacing="4">
<Frame BorderColor="#72a3b3">
<Label Text="Sommaire" TextColor="#72a3b3"/>
</Frame>
<Frame BorderColor="#72a3b3">
<Label Text="1 - Description" TextColor="#72a3b3"/>
</Frame>
<Frame BorderColor="#72a3b3">
<Label Text="2 - Membre(s)" TextColor="#72a3b3"/>
</Frame>
<Frame BorderColor="#72a3b3">
<Label Text="3 - Allié(s)" TextColor="#72a3b3"/>
</Frame>
</VerticalStackLayout>
<VerticalStackLayout Grid.Column="1" Spacing="4">
<Frame BorderColor="#72a3b3">
<Label
VerticalOptions="End"
HorizontalOptions="Center"
HorizontalTextAlignment="Center"
FontSize="20"
Text="{Binding Nom}"
TextColor="#72a3b3"
FontAttributes="Bold" />
</Frame>
<Frame BorderColor="#72a3b3">
<Image
Source="{Binding Image}"
HeightRequest="270"
WidthRequest="270"
Aspect="AspectFit"
/>
</Frame>
<Frame BorderColor="#72a3b3">
<StackLayout HorizontalOptions="Center" Orientation="Horizontal" Spacing="5">
<Label Text="Nom Romanisé :" TextColor="#72a3b3"/>
<Label Text="{Binding NomRomanise}" TextColor="#72a3b3"/>
</StackLayout>
</Frame>
<Frame BorderColor="#72a3b3">
<StackLayout HorizontalOptions="Center" Orientation="Horizontal" Spacing="5">
<Label Text="Region :" TextColor="#72a3b3"/>
<Label Text="{Binding Region}" TextColor="#72a3b3"/>
</StackLayout>
</Frame>
<Frame BorderColor="#72a3b3">
<StackLayout HorizontalOptions="Center" Orientation="Horizontal" Spacing="5">
<Label Text="Statut :" TextColor="#72a3b3"/>
<Label Text="{Binding Statut}" TextColor="#72a3b3"/>
</StackLayout>
</Frame>
</VerticalStackLayout>
</Grid>
<Label Text="Description :" TextColor="#72a3b3" FontSize="20" FontAttributes="Bold"/>
<Line X1="0" Y1="0" X2="3000" Y2="0" Stroke="#72a3b3" />
<Label Text="{Binding Description}" TextColor="#72a3b3" />
<Label Text="Membre(s) :" TextColor="#72a3b3" FontSize="20" FontAttributes="Bold"/>
<Line X1="0" Y1="0" X2="3000" Y2="0" Stroke="#72a3b3" />
<Label Text="{Binding Membre}" TextColor="#72a3b3" />
<Label Text="Allié(s) :" TextColor="#72a3b3" FontSize="20" FontAttributes="Bold"/>
<Line X1="0" Y1="0" X2="3000" Y2="0" Stroke="#72a3b3" />
<Label Text="{Binding Allie}" TextColor="#72a3b3" />
</VerticalStackLayout>
</DataTemplate>
</CollectionView.ItemTemplate>
</CollectionView>
</VerticalStackLayout>
</ScrollView>
</Grid>
</ContentPage>

@ -0,0 +1,18 @@
using Model.Stub;
using Model;
namespace Ohara;
public partial class PageInfoEquipage : ContentPage
{
public PageInfoEquipage()
{
InitializeComponent();
List<Equipage> Lequipage = StubEquipage.RecupererEquipage().ToList();
listeEquip.ItemsSource = Lequipage;
}
}

@ -0,0 +1,142 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Ohara.PagePersonnage"
BackgroundColor="#e2edf1">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="2*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="300" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10">
<Image Source="ohara2.png" HeightRequest="300" HorizontalOptions="Center" >
<Image.Clip>
<EllipseGeometry Center="150,90" RadiusX="80" RadiusY="80"/>
</Image.Clip>
</Image>
<Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Accueil"/>
<Button Style="{StaticResource buttonMenu}" Text="Carte" Clicked="Hyperlink_Carte"/>
<Button Style="{StaticResource buttonMenu2}" Text="Personnages"/>
<Button Style="{StaticResource buttonMenu}" Text="Fruits du démon" Clicked="Hyperlink_FDD"/>
<Button Style="{StaticResource buttonMenu}" Text="Bateaux" Clicked="Hyperlink_Bateau"/>
<Button Style="{StaticResource buttonMenu}" Text="Îles"/>
<Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
<Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
</VerticalStackLayout>
<VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40">
<Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >
<Grid.RowDefinitions>
<RowDefinition Height="10*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions >
<ColumnDefinition Width="20*"/>
<ColumnDefinition Width="25*"/>
<ColumnDefinition Width="10*"/>
<ColumnDefinition Width="10*"/>
</Grid.ColumnDefinitions>
<SearchBar Placeholder="Rechercher..." BackgroundColor="#bfe5ef" Grid.Column="0"/>
<Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="2">
<Label Text="Filtrer" HorizontalTextAlignment="Center" />
</Frame>
<Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="3">
<Label Text="Trier" HorizontalTextAlignment="Center" />
</Frame>
</Grid>
<ScrollView Orientation="Horizontal" HorizontalScrollBarVisibility="Always">
<CollectionView x:Name="listePerso" ItemsLayout="HorizontalList">
<CollectionView.ItemTemplate>
<DataTemplate>
<Grid Padding="50" ColumnSpacing="10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="400"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="750"/>
</Grid.RowDefinitions>
<Frame
CornerRadius="25"
BorderColor="#e2edf1"
IsClippedToBounds="True"
Padding="0"
HeightRequest="800"
WidthRequest="450">
<Image
Source="{Binding Image}"
Aspect="Fill"
/>
</Frame>
<Frame CornerRadius="20"
BorderColor="#72a3b3"
BackgroundColor="#72a3b3"
Margin="20, 50" Padding="15"
WidthRequest="275"
HeightRequest="150"
Grid.Row="0"
VerticalOptions="End">
<StackLayout Orientation="Vertical" Spacing="10" VerticalOptions="Center">
<Label
Text="{Binding Nom}"
FontAttributes="Bold"
FontSize="22"
TextColor="White"
HorizontalOptions="Center"
/>
<Label
Text="-----------------------------"
FontAttributes="Bold"
FontSize="20"
TextColor="White"
HorizontalOptions="Center"
/>
<Label
Text="Cliquez ici pour voir en détail"
FontAttributes="Bold,Italic"
FontSize="15"
TextColor="White"
TextDecorations="Underline"
HorizontalOptions="Center"/>
</StackLayout>
</Frame>
</Grid>
</DataTemplate>
</CollectionView.ItemTemplate>
</CollectionView>
</ScrollView>
</VerticalStackLayout>
<!--<Rectangle WidthRequest="200" HeightRequest="300" HorizontalOptions="Start" BackgroundColor="#72a3b3">
<Rectangle.Fill>
<LinearGradientBrush StartPoint="0,0.5" EndPoint="1,0.5">
<GradientStop Color="#cdffd8" Offset="0.0" />-->
<!--<GradientStop Color="#94b9ff" Offset="1.0" /></LinearGradientBrush></Rectangle.Fill></Rectangle>-->
</Grid>
</ContentPage>

@ -0,0 +1,40 @@
namespace Ohara;
using Model;
using Model.Stub;
public partial class PagePersonnage : ContentPage
{
public PagePersonnage()
{
InitializeComponent();
List<Personnage> perso = StubPersonnage.RecupererPersonnage().ToList();
listePerso.ItemsSource = perso;
}
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());
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 MiB

@ -1,12 +1,3 @@
// See https://aka.ms/new-console-template for more information
using Model;
FruitDuDemon nika = new FruitDuDemon("Fruit de l'humain modèle Nika", "Nika Nika No Mi", "Zoan Mythologique", 1, 1, "Le fruit ...", "Forces :", "Faiblesses :");
FruitDuDemon fumer = new FruitDuDemon("Fruit de la fumée", "Moku Moky No Mi", "Logia", 50, 50, "Le fruit est ..", "Forces :", "Faiblesses :", "fumer.png");
Personnage luffy = new Personnage("Monkey D. Luffy", "Chapeau de paille", 19,1.74,"East Blue","Monkey D. Luffy est...","Le Roi des Pirates ce sera moi !" );
Personnage zoro = new Personnage("Roronoa Zoro", "Chasseur de pirates", 21, 1.81, "East Blue", "Roronoa Zoro est ...", "Le plus grand des racistes ce sera moi !");
Personnage sanji = new Personnage("Sanji", "La jambe noire", 21, 1.80, "East Blue", "Sanji né Vinsmoke Sanji ..", "As-tu déjà entendu parler de All Blue ?");
nika.Utilisateur = new List<Personnage> { luffy };
luffy.Fruit = new List<FruitDuDemon> { nika };

Loading…
Cancel
Save