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

Quelques modification de styles
continuous-integration/drone/push Build is failing Details

Browse Source
pull/15/head
Yoan BRUGIÈRE 2 years ago
parent 4c0e3621c9
commit a80e43f9f9
8 changed files with 195 additions and 173 deletions
Show Stats Download Patch File Download Diff File

2
Sources/Model/ObjetOhara.cs
Unescape View File

@ -14,7 +14,7 @@ namespace Model
public string Nom { get; set; } public string Nom { get; set; }
[DataMember (Name ="image")] [DataMember (Name ="image")]
public string? Image { get; set;} public string? Image { get; set;}
[DataMember(Name = "estfavori")]
public bool EstFavori { get; set; } public bool EstFavori { get; set; }
public ObjetOhara(string nom,string image = "baseimage.png", bool estFavori = false) public ObjetOhara(string nom,string image = "baseimage.png", bool estFavori = false)

22
Sources/Ohara/AppShell.xaml
Unescape View File

@ -6,24 +6,20 @@
xmlns:local="clr-namespace:Ohara" xmlns:local="clr-namespace:Ohara"
Shell.FlyoutBehavior="Locked" Shell.FlyoutBehavior="Locked"
Shell.NavBarIsVisible="False" Shell.NavBarIsVisible="False"
Shell.Background="#72a3b3" Shell.FlyoutWidth="300"
> >
<Shell.TitleView> <Shell.TitleView>
<Label/> <Label/>
</Shell.TitleView> </Shell.TitleView>
<Shell.FlyoutHeader >
<Grid HeightRequest="200" BackgroundColor="Black" Margin="0,0,0,20">
<Image Source="ohara2.png" Aspect="Fill" Opacity="0.8" />
<Shell.FlyoutHeader> <Label Text="Ohara" FontSize="33" TextColor="White" HorizontalOptions="Center" VerticalOptions="Center" FontAttributes="Bold/>
<StackLayout> <Line X1="0" Y1="0" X2="3000" Y2="0" StrokeThickness="5" Stroke="#72a3b3" VerticalOptions="End" />
<Label Text="Ohara" FontSize="33" HorizontalOptions="Center"/> </Grid>
<Image Source="ohara2.png" HeightRequest="300" HorizontalOptions="Center" >
<Image.Clip>
<EllipseGeometry Center="150,90" RadiusX="80" RadiusY="80"/>
</Image.Clip>
</Image>
</StackLayout>
</Shell.FlyoutHeader> </Shell.FlyoutHeader>
@ -37,6 +33,8 @@
<ShellContent Title="Equipages" ContentTemplate="{DataTemplate local:PageEquipage}" /> <ShellContent Title="Equipages" ContentTemplate="{DataTemplate local:PageEquipage}" />
<ShellContent Title="Bestiaire" ContentTemplate="{DataTemplate local:PageBestiaire}" /> <ShellContent Title="Bestiaire" ContentTemplate="{DataTemplate local:PageBestiaire}" />
<Shell.FlyoutFooter>
<Label Text="REY Guillaume et BRUGIÈRE Yoan" HorizontalOptions="Center" Margin="10"/>
</Shell.FlyoutFooter>
</Shell> </Shell>

12
Sources/Ohara/MainPage.xaml
Unescape View File

@ -3,9 +3,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Ohara.MainPage" x:Class="Ohara.MainPage"
BackgroundColor="#e2edf1"> BackgroundColor="#e2edf1">
<ScrollView>
<VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40" Margin="0,20,0,0"> <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40" Margin="0,20,0,0">
<Frame CornerRadius="20" WidthRequest="600" HeightRequest="75"> <Frame CornerRadius="20" Margin="150,0,150,0" HeightRequest="75">
<Label Text="Bienvenue dans Ohara !" FontAttributes="Bold" FontSize="30" HorizontalOptions="Center" TextColor="White"/> <Label Text="Bienvenue dans Ohara !" FontAttributes="Bold" FontSize="30" HorizontalOptions="Center" TextColor="White"/>
<Frame.Background> <Frame.Background>
<LinearGradientBrush StartPoint="0,0" EndPoint="1,1"> <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
@ -13,15 +13,15 @@
<GradientStop Color="#94b9ff" Offset="1.0" /> <GradientStop Color="#94b9ff" Offset="1.0" />
</LinearGradientBrush> </LinearGradientBrush>
</Frame.Background> </Frame.Background>
</Frame> </Frame>
<Frame CornerRadius="20" BorderColor="#72a3b3" BackgroundColor="#72a3b3" Padding="20" WidthRequest="1000" HeightRequest="500" > <Frame CornerRadius="20" BorderColor="#72a3b3" BackgroundColor="#72a3b3" Padding="20" HeightRequest="500" Margin="50,0,50,0">
<Label Text="Présentation :" FontAttributes="Bold" FontSize="30" HorizontalOptions="Center" TextColor="White"/> <Label Text="Présentation :" FontAttributes="Bold" FontSize="30" HorizontalOptions="Center" TextColor="White"/>
</Frame> </Frame>
<Frame CornerRadius="20" BorderColor="#72a3b3" BackgroundColor="#72a3b3" Padding="20" WidthRequest="1200" HeightRequest="500" > <Frame CornerRadius="20" BorderColor="#72a3b3" BackgroundColor="#72a3b3" Padding="20" HeightRequest="500" Margin="50,0,50,0" >
<Label Text="Nouveautés : ..." FontAttributes="Bold" FontSize="30" HorizontalOptions="Start" TextColor="White"/> <Label Text="Nouveautés : ..." FontAttributes="Bold" FontSize="30" HorizontalOptions="Start" TextColor="White"/>
</Frame> </Frame>
</VerticalStackLayout> </VerticalStackLayout>
</ScrollView>
</ContentPage> </ContentPage>

24
Sources/Ohara/PageBestiaire.xaml
Unescape View File

@ -6,6 +6,10 @@
BackgroundColor="#e2edf1"> BackgroundColor="#e2edf1">
<VerticalStackLayout Spacing="20"> <VerticalStackLayout Spacing="20">
<CollectionView x:Name="listeBest" ItemsLayout="VerticalGrid, 4" EmptyView="Aucun résultat trouvé." SelectionMode="Single" SelectionChanged="listeBest_SelectionChanged">
<CollectionView.Header>
<Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" > <Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="10*"/> <RowDefinition Height="10*"/>
@ -16,17 +20,27 @@
<ColumnDefinition Width="10*"/> <ColumnDefinition Width="10*"/>
<ColumnDefinition Width="10*"/> <ColumnDefinition Width="10*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<SearchBar Placeholder="Rechercher..." BackgroundColor="#bfe5ef" Grid.Column="0"/> <SearchBar Placeholder="Rechercher..." BackgroundColor="#bfe5ef" Grid.Column="0" x:Name="searchBar" />
<Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="2">
<Label Text="Filtrer" HorizontalTextAlignment="Center" /> <Frame Grid.Column="2" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" >
<Label Text="Filtrer" />
<FlyoutBase.ContextFlyout>
<MenuFlyout >
<MenuFlyoutItem x:Name="Logia" Text="Logia" />
</MenuFlyout>
</FlyoutBase.ContextFlyout>
</Frame> </Frame>
<Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="3"> <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="3">
<Label Text="Trier" HorizontalTextAlignment="Center" /> <Label Text="Trier" HorizontalTextAlignment="Center" />
</Frame> </Frame>
</Grid> </Grid>
</CollectionView.Header>
<CollectionView x:Name="listeBest" ItemsLayout="VerticalGrid, 4" EmptyView="Aucun résultat trouvé." SelectionMode="Single" SelectionChanged="listeBest_SelectionChanged">
<CollectionView.ItemTemplate> <CollectionView.ItemTemplate>
<DataTemplate> <DataTemplate>
<Grid Padding="20" ColumnSpacing="20" RowSpacing="20"> <Grid Padding="20" ColumnSpacing="20" RowSpacing="20">

31
Sources/Ohara/PageEquipage.xaml
Unescape View File

@ -5,8 +5,13 @@
Title="PageEquipage" Title="PageEquipage"
BackgroundColor="#e2edf1"> BackgroundColor="#e2edf1">
<ScrollView>
<VerticalStackLayout Spacing="10">
<CollectionView x:Name="listeEquip" EmptyView="Aucun résultat trouvé." SelectionMode="Single" SelectionChanged="listeEquip_SelectionChanged">
<CollectionView.ItemsLayout>
<GridItemsLayout Orientation="Vertical" Span="4" HorizontalItemSpacing="15" VerticalItemSpacing="15"/>
</CollectionView.ItemsLayout>
<CollectionView.Header>
<Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" > <Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="10*"/> <RowDefinition Height="10*"/>
@ -17,17 +22,27 @@
<ColumnDefinition Width="10*"/> <ColumnDefinition Width="10*"/>
<ColumnDefinition Width="10*"/> <ColumnDefinition Width="10*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<SearchBar Placeholder="Rechercher..." BackgroundColor="#bfe5ef" Grid.Column="0"/> <SearchBar Placeholder="Rechercher..." BackgroundColor="#bfe5ef" Grid.Column="0" x:Name="searchBar" />
<Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="2">
<Label Text="Filtrer" HorizontalTextAlignment="Center" /> <Frame Grid.Column="2" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" >
<Label Text="Filtrer" />
<FlyoutBase.ContextFlyout>
<MenuFlyout >
<MenuFlyoutItem x:Name="Logia" Text="Logia" />
</MenuFlyout>
</FlyoutBase.ContextFlyout>
</Frame> </Frame>
<Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="3"> <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="3">
<Label Text="Trier" HorizontalTextAlignment="Center" /> <Label Text="Trier" HorizontalTextAlignment="Center" />
</Frame> </Frame>
</Grid> </Grid>
</CollectionView.Header>
<CollectionView x:Name="listeEquip" ItemsLayout="VerticalGrid, 4" EmptyView="Aucun résultat trouvé." SelectionMode="Single" SelectionChanged="listeEquip_SelectionChanged">
<CollectionView.ItemTemplate> <CollectionView.ItemTemplate>
<DataTemplate> <DataTemplate>
<Grid Padding="20" ColumnSpacing="20" RowSpacing="20"> <Grid Padding="20" ColumnSpacing="20" RowSpacing="20">
@ -55,6 +70,4 @@
</DataTemplate> </DataTemplate>
</CollectionView.ItemTemplate> </CollectionView.ItemTemplate>
</CollectionView> </CollectionView>
</VerticalStackLayout>
</ScrollView>
</ContentPage> </ContentPage>

33
Sources/Ohara/PageFDD.xaml
Unescape View File

@ -6,8 +6,12 @@
BackgroundColor="#e2edf1"> BackgroundColor="#e2edf1">
<VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="10">
<CollectionView x:Name="listeFDD" EmptyView="Aucun résultat trouvé." SelectionMode="Single" SelectionChanged="listeFDD_SelectionChanged" >
<CollectionView.ItemsLayout>
<GridItemsLayout Orientation="Vertical" Span="4" HorizontalItemSpacing="15" VerticalItemSpacing="15"/>
</CollectionView.ItemsLayout>
<CollectionView.Header>
<Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" > <Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="10*"/> <RowDefinition Height="10*"/>
@ -38,25 +42,16 @@
<Label Text="Trier" HorizontalTextAlignment="Center" /> <Label Text="Trier" HorizontalTextAlignment="Center" />
</Frame> </Frame>
</Grid> </Grid>
</CollectionView.Header>
<CollectionView.ItemTemplate >
<DataTemplate >
<CollectionView x:Name="listeFDD" ItemsLayout="VerticalGrid, 4" EmptyView="Aucun résultat trouvé." SelectionMode="Single" SelectionChanged="listeFDD_SelectionChanged"> <Frame Style="{StaticResource frameObjet}">
<CollectionView.ItemTemplate>
<DataTemplate>
<Grid Padding="20" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="33*"/>
</Grid.ColumnDefinitions>
<Frame Style="{StaticResource frameObjet}"
>
<StackLayout Orientation="Vertical" Padding="5"> <StackLayout Orientation="Vertical" Padding="5">
<Image <Image
Source="{Binding Image}" Source="{Binding Image}"
HeightRequest="290" HeightRequest="280"
WidthRequest="290" /> WidthRequest="280" />
<Label <Label
HorizontalOptions="Center" HorizontalOptions="Center"
@ -77,13 +72,7 @@
</StackLayout> </StackLayout>
</Frame> </Frame>
</Grid>
</DataTemplate> </DataTemplate>
</CollectionView.ItemTemplate> </CollectionView.ItemTemplate>
</CollectionView> </CollectionView>
</VerticalStackLayout>
</ContentPage> </ContentPage>

28
Sources/Ohara/PageFavoris.xaml
Unescape View File

@ -5,37 +5,29 @@
Title="PageFavoris" Title="PageFavoris"
BackgroundColor="#e2edf1"> BackgroundColor="#e2edf1">
<CollectionView x:Name="listeFavs" Grid.Column="1" SelectionMode="Single" SelectionChanged="listeFavs_SelectionChanged"> <CollectionView x:Name="listeFavs" SelectionMode="Single" SelectionChanged="listeFavs_SelectionChanged">
<CollectionView.ItemsLayout Style=""> <CollectionView.ItemsLayout>
<GridItemsLayout Orientation="Vertical" Span="4" /> <GridItemsLayout Orientation="Vertical" Span="4" HorizontalItemSpacing="15" VerticalItemSpacing="15"/>
</CollectionView.ItemsLayout> </CollectionView.ItemsLayout>
<CollectionView.Header> <CollectionView.Header>
<Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" > <HorizontalStackLayout BackgroundColor="#72a3b3" Padding="10" Spacing="80">
<Grid.RowDefinitions> <SearchBar Placeholder="Rechercher..." BackgroundColor="#bfe5ef" WidthRequest="200"/>
<RowDefinition Height="10*"/> <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef">
</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" /> <Label Text="Filtrer" HorizontalTextAlignment="Center" />
</Frame> </Frame>
<Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="3"> <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" >
<Label Text="Trier" HorizontalTextAlignment="Center" /> <Label Text="Trier" HorizontalTextAlignment="Center" />
</Frame> </Frame>
</Grid>
</HorizontalStackLayout>
</CollectionView.Header> </CollectionView.Header>
<CollectionView.ItemTemplate> <CollectionView.ItemTemplate>
<DataTemplate> <DataTemplate>
<Frame Style="{StaticResource frameObjet}" Margin="10"> <Frame Style="{StaticResource frameObjet}">
<StackLayout Orientation="Vertical" Padding="5"> <StackLayout Orientation="Vertical" Padding="5">
<Image <Image
Source="{Binding Image}" Source="{Binding Image}"

16
Sources/Ohara/Resources/Styles/Styles.xaml
Unescape View File

@ -676,4 +676,20 @@
</Setter> </Setter>
</Style> </Style>
<!--<Style TargetType="Label"
Class="FlyoutItemLabelStyle">
<Setter Property="TextColor"
Value="White" />
<Setter Property="WidthRequest" Value="250"/>
<Setter Property="HorizontalOptions" Value="Center"/>
</Style>
<Style TargetType="Layout"
Class="FlyoutItemLayoutStyle"
ApplyToDerivedTypes="True">
<Setter Property="BackgroundColor"
Value="Teal" />
</Style>-->
</ResourceDictionary> </ResourceDictionary>

Write Preview
Loading…
Cancel
Save