guillaume.rey
/
Ohara_MAUI
2
1
Fork 0
Code Issues 1 Pull Requests Packages Projects 1 Releases Wiki Activity

Correction conflits

Browse Source
devGuillaume
Yoan BRUGIÈRE 2 years ago
parent 70c960e538 dcfdfb5b0a
commit 0b7bef6450
4 changed files with 186 additions and 34 deletions
Show Stats Download Patch File Download Diff File

3
Sources/Ohara/Ohara.csproj
Unescape View File

@ -81,6 +81,9 @@
<MauiXaml Update="PagePersonnage.xaml"> <MauiXaml Update="PagePersonnage.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="PageInfoEquipage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="PageFDD.xaml"> <MauiXaml Update="PageFDD.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>

7
Sources/Ohara/PageFDD.xaml
Unescape View File

@ -53,8 +53,9 @@
<Label Text="Trier" HorizontalTextAlignment="Center" /> <Label Text="Trier" HorizontalTextAlignment="Center" />
</Frame> </Frame>
</Grid> </Grid>
<Frame BackgroundColor="#e2edf1">
<CollectionView x:Name="listeFDD" ItemsUpdatingScrollMode="KeepScrollOffset" VerticalScrollBarVisibility="Always" ItemsLayout="VerticalGrid, 4"> <ScrollView Orientation="Vertical" VerticalScrollBarVisibility="Always">
<CollectionView x:Name="listeFDD" ItemsLayout="VerticalGrid, 4">
<CollectionView.ItemTemplate> <CollectionView.ItemTemplate>
<DataTemplate> <DataTemplate>
<Grid Padding="10" ColumnSpacing="10" RowSpacing="20"> <Grid Padding="10" ColumnSpacing="10" RowSpacing="20">
@ -88,6 +89,8 @@
</DataTemplate> </DataTemplate>
</CollectionView.ItemTemplate> </CollectionView.ItemTemplate>
</CollectionView> </CollectionView>
</ScrollView>
</Frame>
</VerticalStackLayout> </VerticalStackLayout>
</Grid> </Grid>

128
Sources/Ohara/PageInfoEquipage.xaml
Unescape View File

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

18
Sources/Ohara/PageInfoEquipage.xaml.cs
Unescape View File

@ -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;
}
}
Write Preview
Loading…
Cancel
Save