Merge remote-tracking branch 'origin/devGuillaume'
continuous-integration/drone/push Build is passing
Details
@ -1,42 +1,42 @@
|
||||
<?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.PageEquipage"
|
||||
Title="PageEquipage"
|
||||
Appearing="ContentPage_Appearing"
|
||||
BackgroundColor="#e2edf1">
|
||||
<ScrollView>
|
||||
<VerticalStackLayout>
|
||||
<Grid ColumnDefinitions="200,*,150" BackgroundColor="#72a3b3" Padding="10">
|
||||
<SearchBar x:Name="searchBar" Placeholder="Rechercher..." Style="{StaticResource searchBarOhara}" Grid.Column="0"/>
|
||||
<Button Text="Ajouter" Clicked="ButtonAjouter_Clicked" Style="{StaticResource buttonBarre}" Grid.Column="2"/>
|
||||
</Grid>
|
||||
<FlexLayout x:Name="listEquip" AlignItems="Center" Wrap="Wrap"
|
||||
HorizontalOptions="Center" JustifyContent="SpaceEvenly">
|
||||
<BindableLayout.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<Frame Style="{StaticResource frameEquip}" Margin="0,10,0,0" >
|
||||
<Frame.GestureRecognizers>
|
||||
<TapGestureRecognizer CommandParameter="{Binding Nom}" Tapped="TapGestureRecognizer_Tapped"/>
|
||||
</Frame.GestureRecognizers>
|
||||
<StackLayout Orientation="Vertical" Padding="5">
|
||||
<Image
|
||||
Source="{Binding Image}"
|
||||
HeightRequest="280"
|
||||
WidthRequest="280" />
|
||||
<Label
|
||||
HorizontalOptions="Center"
|
||||
VerticalOptions="Start"
|
||||
HorizontalTextAlignment="Center"
|
||||
Text="{Binding Nom}"
|
||||
FontSize="19"
|
||||
TextColor="White"
|
||||
FontAttributes="Bold" />
|
||||
</StackLayout>
|
||||
</Frame>
|
||||
</DataTemplate>
|
||||
</BindableLayout.ItemTemplate>
|
||||
</FlexLayout>
|
||||
</VerticalStackLayout>
|
||||
</ScrollView>
|
||||
<?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.PageEquipage"
|
||||
Title="PageEquipage"
|
||||
Appearing="ContentPage_Appearing"
|
||||
BackgroundColor="#e2edf1">
|
||||
<ScrollView>
|
||||
<VerticalStackLayout>
|
||||
<Grid ColumnDefinitions="200,*,150" BackgroundColor="#72a3b3" Padding="10">
|
||||
<SearchBar x:Name="searchBar" Placeholder="Rechercher..." Style="{StaticResource searchBarOhara}" Grid.Column="0"/>
|
||||
<Button Text="Ajouter" Clicked="ButtonAjouter_Clicked" Style="{StaticResource buttonBarre}" Grid.Column="2"/>
|
||||
</Grid>
|
||||
<FlexLayout x:Name="listEquip" AlignItems="Center" Wrap="Wrap"
|
||||
HorizontalOptions="Center" JustifyContent="SpaceEvenly">
|
||||
<BindableLayout.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<Frame Style="{StaticResource frameEquip}" Margin="0,10,0,0" >
|
||||
<Frame.GestureRecognizers>
|
||||
<TapGestureRecognizer CommandParameter="{Binding Nom}" Tapped="TapGestureRecognizer_Tapped"/>
|
||||
</Frame.GestureRecognizers>
|
||||
<StackLayout Orientation="Vertical" Padding="5">
|
||||
<Image
|
||||
Source="{Binding Image}"
|
||||
HeightRequest="280"
|
||||
WidthRequest="280" />
|
||||
<Label
|
||||
HorizontalOptions="Center"
|
||||
VerticalOptions="Start"
|
||||
HorizontalTextAlignment="Center"
|
||||
Text="{Binding Nom}"
|
||||
FontSize="19"
|
||||
TextColor="White"
|
||||
FontAttributes="Bold" />
|
||||
</StackLayout>
|
||||
</Frame>
|
||||
</DataTemplate>
|
||||
</BindableLayout.ItemTemplate>
|
||||
</FlexLayout>
|
||||
</VerticalStackLayout>
|
||||
</ScrollView>
|
||||
</ContentPage>
|
@ -1,62 +1,63 @@
|
||||
<?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.PageFDD"
|
||||
Title="PageFDD"
|
||||
Appearing="ContentPage_Appearing"
|
||||
BackgroundColor="#e2edf1">
|
||||
<ScrollView>
|
||||
<VerticalStackLayout>
|
||||
<Grid ColumnDefinitions="200,*,100,10,150" BackgroundColor="#72a3b3" Padding="10">
|
||||
<SearchBar x:Name="searchBar" Placeholder="Rechercher..." Style="{StaticResource searchBarOhara}" Grid.Column="0"/>
|
||||
|
||||
<Picker Title="Filtrer" Grid.Column="2" SelectedIndexChanged="PickerFiltre_SelectedIndexChanged" Style="{StaticResource pickerOhara}" >
|
||||
<Picker.ItemsSource>
|
||||
<x:Array Type="{x:Type x:String}">
|
||||
<x:String>Aucun</x:String>
|
||||
<x:String>Logia</x:String>
|
||||
<x:String>Paramecia</x:String>
|
||||
<x:String>Zoan Carnivore</x:String>
|
||||
<x:String>Zoan Mythique</x:String>
|
||||
</x:Array>
|
||||
</Picker.ItemsSource>
|
||||
</Picker>
|
||||
<Button Text="Ajouter" Clicked="Button_Clicked" Style="{StaticResource buttonBarre}" Grid.Column="4"/>
|
||||
</Grid>
|
||||
<FlexLayout x:Name="listeFDD" AlignItems="Center" Wrap="Wrap"
|
||||
HorizontalOptions="Center"
|
||||
BindableLayout.ItemsSource="{Binding Fruits}" JustifyContent="SpaceEvenly">
|
||||
<BindableLayout.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<Frame Style="{StaticResource frameObjet}" Margin="0,10,0,0" >
|
||||
<Frame.GestureRecognizers>
|
||||
<TapGestureRecognizer CommandParameter="{Binding Nom}" Tapped="TapGestureRecognizer_Tapped"/>
|
||||
</Frame.GestureRecognizers>
|
||||
<StackLayout Orientation="Vertical" Padding="5">
|
||||
<Image
|
||||
Source="{Binding Image}"
|
||||
HeightRequest="280"
|
||||
WidthRequest="280" />
|
||||
<Label
|
||||
HorizontalOptions="Center"
|
||||
VerticalOptions="Start"
|
||||
HorizontalTextAlignment="Center"
|
||||
Text="{Binding Nom}"
|
||||
FontSize="19"
|
||||
TextColor="#72a3b3"
|
||||
FontAttributes="Bold" />
|
||||
<Label
|
||||
VerticalOptions="Center"
|
||||
HorizontalOptions="Center"
|
||||
Text="{Binding Type}"
|
||||
FontAttributes="Italic"
|
||||
TextColor="#72a3b3"/>
|
||||
</StackLayout>
|
||||
</Frame>
|
||||
</DataTemplate>
|
||||
</BindableLayout.ItemTemplate>
|
||||
</FlexLayout>
|
||||
</VerticalStackLayout>
|
||||
|
||||
</ScrollView>
|
||||
<?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.PageFDD"
|
||||
Title="PageFDD"
|
||||
Appearing="ContentPage_Appearing"
|
||||
BackgroundColor="#e2edf1">
|
||||
<ScrollView>
|
||||
<VerticalStackLayout>
|
||||
<Grid ColumnDefinitions="200,*,100,10,150" BackgroundColor="#72a3b3" Padding="10">
|
||||
<SearchBar x:Name="searchBar" Placeholder="Rechercher..." Style="{StaticResource searchBarOhara}" Grid.Column="0"/>
|
||||
|
||||
<Picker Title="Filtrer" Grid.Column="2" SelectedIndexChanged="PickerFiltre_SelectedIndexChanged" Style="{StaticResource pickerOhara}" >
|
||||
<Picker.ItemsSource>
|
||||
<x:Array Type="{x:Type x:String}">
|
||||
<x:String>Aucun</x:String>
|
||||
<x:String>Logia</x:String>
|
||||
<x:String>Paramecia</x:String>
|
||||
<x:String>Zoan Carnivore</x:String>
|
||||
<x:String>Zoan Mythique</x:String>
|
||||
<x:String>Zoan</x:String>
|
||||
</x:Array>
|
||||
</Picker.ItemsSource>
|
||||
</Picker>
|
||||
<Button Text="Ajouter" Clicked="Button_Clicked" Style="{StaticResource buttonBarre}" Grid.Column="4"/>
|
||||
</Grid>
|
||||
<FlexLayout x:Name="listeFDD" AlignItems="Center" Wrap="Wrap"
|
||||
HorizontalOptions="Center"
|
||||
BindableLayout.ItemsSource="{Binding Fruits}" JustifyContent="SpaceEvenly">
|
||||
<BindableLayout.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<Frame Style="{StaticResource frameObjet}" Margin="0,10,0,0" >
|
||||
<Frame.GestureRecognizers>
|
||||
<TapGestureRecognizer CommandParameter="{Binding Nom}" Tapped="TapGestureRecognizer_Tapped"/>
|
||||
</Frame.GestureRecognizers>
|
||||
<StackLayout Orientation="Vertical" Padding="5">
|
||||
<Image
|
||||
Source="{Binding Image}"
|
||||
HeightRequest="280"
|
||||
WidthRequest="280" />
|
||||
<Label
|
||||
HorizontalOptions="Center"
|
||||
VerticalOptions="Start"
|
||||
HorizontalTextAlignment="Center"
|
||||
Text="{Binding Nom}"
|
||||
FontSize="19"
|
||||
TextColor="#72a3b3"
|
||||
FontAttributes="Bold" />
|
||||
<Label
|
||||
VerticalOptions="Center"
|
||||
HorizontalOptions="Center"
|
||||
Text="{Binding Type}"
|
||||
FontAttributes="Italic"
|
||||
TextColor="#72a3b3"/>
|
||||
</StackLayout>
|
||||
</Frame>
|
||||
</DataTemplate>
|
||||
</BindableLayout.ItemTemplate>
|
||||
</FlexLayout>
|
||||
</VerticalStackLayout>
|
||||
|
||||
</ScrollView>
|
||||
</ContentPage>
|
After Width: | Height: | Size: 2.5 MiB |
After Width: | Height: | Size: 287 KiB |
After Width: | Height: | Size: 1.3 MiB |
After Width: | Height: | Size: 1.0 MiB |
After Width: | Height: | Size: 732 KiB |
After Width: | Height: | Size: 975 KiB |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 1.7 KiB |
After Width: | Height: | Size: 595 KiB |
After Width: | Height: | Size: 112 KiB |
After Width: | Height: | Size: 3.8 MiB |
After Width: | Height: | Size: 615 KiB |
Before Width: | Height: | Size: 1.3 MiB |
After Width: | Height: | Size: 1.9 MiB |
After Width: | Height: | Size: 1.4 MiB |
Before Width: | Height: | Size: 8.4 KiB |
After Width: | Height: | Size: 343 KiB |
Before Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 76 KiB |
After Width: | Height: | Size: 2.8 MiB |
After Width: | Height: | Size: 443 KiB |
After Width: | Height: | Size: 540 KiB |
After Width: | Height: | Size: 176 KiB |
After Width: | Height: | Size: 250 KiB |
After Width: | Height: | Size: 467 KiB |
After Width: | Height: | Size: 226 KiB |
After Width: | Height: | Size: 196 KiB |
After Width: | Height: | Size: 12 KiB |
After Width: | Height: | Size: 605 KiB |
After Width: | Height: | Size: 522 KiB |
After Width: | Height: | Size: 1.3 MiB |
After Width: | Height: | Size: 216 KiB |
After Width: | Height: | Size: 9.9 MiB |
After Width: | Height: | Size: 208 KiB |
After Width: | Height: | Size: 1.1 MiB |
After Width: | Height: | Size: 525 KiB |
After Width: | Height: | Size: 677 KiB |
After Width: | Height: | Size: 102 KiB |
After Width: | Height: | Size: 881 KiB |
After Width: | Height: | Size: 398 KiB |
After Width: | Height: | Size: 1.1 MiB |