lou.broda
/
LivreLand
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ADD : Corner Radius for Popup & init colors unless icons

Browse Source
homepage-05-09
Lou BRODA 1 year ago
parent 17bc7d5746
commit ca267e7af5
11 changed files with 130 additions and 118 deletions
Show Stats Download Patch File Download Diff File

18
LivreLand/Resources/Styles/Styles.xaml
Unescape View File

@ -177,51 +177,51 @@
</Style> </Style>
<Style TargetType="Label" x:Key="HeaderTitle"> <Style TargetType="Label" x:Key="HeaderTitle">
<Setter Property="TextColor" Value="{AppThemeBinding Light={DynamicResource Black}, Dark={StaticResource White}}"/> <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"/>
<Setter Property="FontSize" Value="Medium"/> <Setter Property="FontSize" Value="Medium"/>
<Setter Property="FontAttributes" Value="Bold"/> <Setter Property="FontAttributes" Value="Bold"/>
</Style> </Style>
<Style TargetType="Label" x:Key="HomeTitle"> <Style TargetType="Label" x:Key="HomeTitle">
<Setter Property="TextColor" Value="{AppThemeBinding Light={DynamicResource Black}, Dark={StaticResource White}}"/> <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"/>
<Setter Property="FontSize" Value="40"/> <Setter Property="FontSize" Value="40"/>
<Setter Property="FontAttributes" Value="Bold"/> <Setter Property="FontAttributes" Value="Bold"/>
</Style> </Style>
<Style TargetType="Label" x:Key="DetailsLivreTitle"> <Style TargetType="Label" x:Key="DetailsLivreTitle">
<Setter Property="TextColor" Value="{AppThemeBinding Light={DynamicResource Black}, Dark={StaticResource White}}"/> <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"/>
<Setter Property="FontSize" Value="Small"/> <Setter Property="FontSize" Value="Small"/>
<Setter Property="FontAttributes" Value="Bold"/> <Setter Property="FontAttributes" Value="Bold"/>
</Style> </Style>
<Style TargetType="Label" x:Key="DetailsLivreBody"> <Style TargetType="Label" x:Key="DetailsLivreBody">
<Setter Property="TextColor" Value="{AppThemeBinding Light={DynamicResource TextGray}, Dark={StaticResource White}}"/> <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource TextGray}, Dark={StaticResource White}}"/>
<Setter Property="FontSize" Value="Body"/> <Setter Property="FontSize" Value="Body"/>
</Style> </Style>
<Style TargetType="Label" x:Key="DetailsButtonBody"> <Style TargetType="Label" x:Key="DetailsButtonBody">
<Setter Property="TextColor" Value="{AppThemeBinding Light={DynamicResource TextGray}, Dark={StaticResource White}}"/> <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource TextGray}, Dark={StaticResource White}}"/>
<Setter Property="FontSize" Value="Medium"/> <Setter Property="FontSize" Value="Medium"/>
</Style> </Style>
<Style TargetType="Label" x:Key="MasterTitleBookText"> <Style TargetType="Label" x:Key="MasterTitleBookText">
<Setter Property="TextColor" Value="{AppThemeBinding Light={DynamicResource Black}, Dark={StaticResource White}}"/> <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"/>
<Setter Property="FontSize" Value="Medium"/> <Setter Property="FontSize" Value="Medium"/>
<Setter Property="FontAttributes" Value="Bold"/> <Setter Property="FontAttributes" Value="Bold"/>
</Style> </Style>
<Style TargetType="Label" x:Key="MasterAuthorBookText"> <Style TargetType="Label" x:Key="MasterAuthorBookText">
<Setter Property="TextColor" Value="{AppThemeBinding Light={DynamicResource Black}, Dark={StaticResource White}}"/> <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"/>
<Setter Property="FontSize" Value="Small"/> <Setter Property="FontSize" Value="Small"/>
</Style> </Style>
<Style TargetType="Label" x:Key="MasterStateBookText"> <Style TargetType="Label" x:Key="MasterStateBookText">
<Setter Property="TextColor" Value="{AppThemeBinding Light={DynamicResource TextGray}, Dark={StaticResource White}}"/> <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource TextGray}, Dark={StaticResource White}}"/>
<Setter Property="FontSize" Value="Micro"/> <Setter Property="FontSize" Value="Micro"/>
</Style> </Style>
<Style TargetType="Label" x:Key="HomeButtonText"> <Style TargetType="Label" x:Key="HomeButtonText">
<Setter Property="TextColor" Value="{AppThemeBinding Light={DynamicResource Black}, Dark={StaticResource White}}"/> <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"/>
<Setter Property="FontSize" Value="Medium"/> <Setter Property="FontSize" Value="Medium"/>
</Style> </Style>

4
LivreLand/View/BibliothequeView.xaml
Unescape View File

@ -35,7 +35,7 @@
<VerticalStackLayout Grid.Row="2"> <VerticalStackLayout Grid.Row="2">
<VerticalStackLayout.BackgroundColor> <VerticalStackLayout.BackgroundColor>
<AppThemeBinding Light="{DynamicResource LightGray}" Dark="{StaticResource Black}" /> <AppThemeBinding Light="{StaticResource LightGray}" Dark="{StaticResource Black}" />
</VerticalStackLayout.BackgroundColor> </VerticalStackLayout.BackgroundColor>
<contentView:SeparatorEntireView/> <contentView:SeparatorEntireView/>
@ -81,7 +81,7 @@
<VerticalStackLayout Grid.Row="6"> <VerticalStackLayout Grid.Row="6">
<VerticalStackLayout.BackgroundColor> <VerticalStackLayout.BackgroundColor>
<AppThemeBinding Light="{DynamicResource LightGray}" Dark="{StaticResource Black}" /> <AppThemeBinding Light="{StaticResource LightGray}" Dark="{StaticResource Black}" />
</VerticalStackLayout.BackgroundColor> </VerticalStackLayout.BackgroundColor>
<contentView:SeparatorEntireView/> <contentView:SeparatorEntireView/>

2
LivreLand/View/ContentViews/HomeButtonView.xaml.cs
Unescape View File

@ -25,7 +25,7 @@ public partial class HomeButtonView : ContentView
set => SetValue(HomeButtonView.ButtonNumberProperty, value); set => SetValue(HomeButtonView.ButtonNumberProperty, value);
} }
public static readonly BindableProperty ButtonIconColorProperty = BindableProperty.Create(nameof(ButtonIconColor), typeof(Color), typeof(HomeButtonView)); public static readonly BindableProperty ButtonIconColorProperty = BindableProperty.Create(nameof(ButtonIconColor), typeof(Color), typeof(HomeButtonView), Colors.Black);
public Color ButtonIconColor public Color ButtonIconColor
{ {
get => (Color)GetValue(HomeButtonView.ButtonIconColorProperty); get => (Color)GetValue(HomeButtonView.ButtonIconColorProperty);

204
LivreLand/View/ContentViews/PopupHomePlusButtonView.xaml
Unescape View File

@ -5,119 +5,125 @@
xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit" xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
x:Class="LivreLand.View.ContentViews.PopupHomePlusButtonView" x:Class="LivreLand.View.ContentViews.PopupHomePlusButtonView"
HorizontalOptions="End" HorizontalOptions="End"
VerticalOptions="Start"> VerticalOptions="Start"
Color="Transparent">
<Grid BackgroundColor="{DynamicResource PopupBackground}"> <Border>
<Grid.RowDefinitions> <Grid BackgroundColor="{DynamicResource PopupBackground}">
<RowDefinition Height="auto"/> <Grid.RowDefinitions>
<RowDefinition Height="auto"/> <RowDefinition Height="auto"/>
<RowDefinition Height="auto"/> <RowDefinition Height="auto"/>
<RowDefinition Height="auto"/> <RowDefinition Height="auto"/>
<RowDefinition Height="auto"/> <RowDefinition Height="auto"/>
<RowDefinition Height="10"/> <RowDefinition Height="auto"/>
<RowDefinition Height="auto"/> <RowDefinition Height="10"/>
<RowDefinition Height="auto"/> <RowDefinition Height="auto"/>
<RowDefinition Height="auto"/> <RowDefinition Height="auto"/>
</Grid.RowDefinitions> <RowDefinition Height="auto"/>
</Grid.RowDefinitions>
<Grid Grid.Row="0" <Grid Grid.Row="0"
Margin="10,5,10,5"> Margin="10,5,10,5">
<Label Text="Ajouter un livre" <Label Text="Ajouter un livre"
Style="{StaticResource MasterStateBookText}"/> Style="{StaticResource MasterStateBookText}"/>
</Grid> </Grid>
<contentView:SeparatorEntireView Grid.Row="1"/> <contentView:SeparatorEntireView Grid.Row="1"/>
<Grid Grid.Row="2" <Grid Grid.Row="2"
Margin="10,5,10,5"> Margin="10,5,10,5">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label Text="Scanner un code-barres" <Label Text="Scanner un code-barres"
Style="{StaticResource HomeButtonText}" Style="{StaticResource HomeButtonText}"
Grid.Column="0"/> Grid.Column="0"/>
<Image Source="qr_bar_code_fill.png" <Image Source="qr_bar_code_fill.png"
HeightRequest="20" HeightRequest="20"
WidthRequest="20" WidthRequest="20"
Grid.Column="2"> Grid.Column="2">
<Image.Behaviors> <Image.Behaviors>
<toolkit:IconTintColorBehavior TintColor="Black"/> <toolkit:IconTintColorBehavior TintColor="Black"/>
</Image.Behaviors> </Image.Behaviors>
</Image> </Image>
</Grid> </Grid>
<contentView:SeparatorEntireView Grid.Row="3"/> <contentView:SeparatorEntireView Grid.Row="3"/>
<Grid Grid.Row="4" <Grid Grid.Row="4"
Margin="10,5,10,5"> Margin="10,5,10,5">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label Text="Scanner des codes-barres" <Label Text="Scanner des codes-barres"
Style="{StaticResource HomeButtonText}" Style="{StaticResource HomeButtonText}"
Grid.Column="0"/> Grid.Column="0"/>
<Image Source="bar_code_fill.png" <Image Source="bar_code_fill.png"
HeightRequest="20" HeightRequest="20"
WidthRequest="20" WidthRequest="20"
Grid.Column="2"> Grid.Column="2">
<Image.Behaviors> <Image.Behaviors>
<toolkit:IconTintColorBehavior TintColor="Black"/> <toolkit:IconTintColorBehavior TintColor="Black"/>
</Image.Behaviors> </Image.Behaviors>
</Image> </Image>
</Grid> </Grid>
<Grid BackgroundColor="{DynamicResource Gray}" <Grid BackgroundColor="{DynamicResource Gray}"
Grid.Row="5"/> Grid.Row="5"/>
<Grid Grid.Row="6" <Grid Grid.Row="6"
Margin="10,5,10,5"> Margin="10,5,10,5">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label Text="Rechercher en ligne" <Label Text="Rechercher en ligne"
Style="{StaticResource HomeButtonText}" Style="{StaticResource HomeButtonText}"
Grid.Column="0"/> Grid.Column="0"/>
<Image Source="magnifying_glass.png" <Image Source="magnifying_glass.png"
HeightRequest="20" HeightRequest="20"
WidthRequest="20" WidthRequest="20"
Grid.Column="2"> Grid.Column="2">
<Image.Behaviors> <Image.Behaviors>
<toolkit:IconTintColorBehavior TintColor="Black"/> <toolkit:IconTintColorBehavior TintColor="Black"/>
</Image.Behaviors> </Image.Behaviors>
</Image> </Image>
</Grid> </Grid>
<contentView:SeparatorEntireView Grid.Row="7"/> <contentView:SeparatorEntireView Grid.Row="7"/>
<Grid Grid.Row="8" <Grid Grid.Row="8"
Margin="10,5,10,5"> Margin="10,5,10,5">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label Text="Saisir l'ISBN" <Label Text="Saisir l'ISBN"
Style="{StaticResource HomeButtonText}" Style="{StaticResource HomeButtonText}"
Grid.Column="0"/> Grid.Column="0"/>
<Image Source="keyboard_fill.png" <Image Source="keyboard_fill.png"
HeightRequest="20" HeightRequest="20"
WidthRequest="20" WidthRequest="20"
Grid.Column="2"> Grid.Column="2">
<Image.Behaviors> <Image.Behaviors>
<toolkit:IconTintColorBehavior TintColor="Black"/> <toolkit:IconTintColorBehavior TintColor="Black"/>
</Image.Behaviors> </Image.Behaviors>
</Image> </Image>
</Grid>
</Grid> </Grid>
</Grid> <Border.StrokeShape>
<RoundRectangle CornerRadius="10" />
</Border.StrokeShape>
</Border>
</toolkit:Popup> </toolkit:Popup>

8
LivreLand/View/ContentViews/SearchBarView.xaml
Unescape View File

@ -7,6 +7,7 @@
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="10"/> <ColumnDefinition Width="10"/>
<ColumnDefinition Width="300"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="10"/>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Frame CornerRadius="10" <Frame CornerRadius="10"
@ -18,7 +19,12 @@
HeightRequest="50" HeightRequest="50"
HorizontalOptions="Start"/> HorizontalOptions="Start"/>
</Frame> </Frame>
<Grid Grid.Column="3"
VerticalOptions="Center">
<Label Text="Annuler"
Style="{StaticResource DetailsLivreBody}"/>
</Grid>
</Grid> </Grid>
</ContentView> </ContentView>

2
LivreLand/View/ContentViews/SeparatorBigCutStartView.xaml
Unescape View File

@ -7,7 +7,7 @@
HeightRequest="1" HeightRequest="1"
HorizontalOptions="Fill"> HorizontalOptions="Fill">
<BoxView.Color> <BoxView.Color>
<AppThemeBinding Light="{DynamicResource HeaderSeparatorGray}" Dark="{StaticResource White}" /> <AppThemeBinding Light="{StaticResource HeaderSeparatorGray}" Dark="{StaticResource White}" />
</BoxView.Color> </BoxView.Color>
</BoxView> </BoxView>
</Grid> </Grid>

2
LivreLand/View/ContentViews/SeparatorCutStartView.xaml
Unescape View File

@ -7,7 +7,7 @@
HeightRequest="1" HeightRequest="1"
HorizontalOptions="Fill"> HorizontalOptions="Fill">
<BoxView.Color> <BoxView.Color>
<AppThemeBinding Light="{DynamicResource HeaderSeparatorGray}" Dark="{StaticResource White}" /> <AppThemeBinding Light="{StaticResource HeaderSeparatorGray}" Dark="{StaticResource White}" />
</BoxView.Color> </BoxView.Color>
</BoxView> </BoxView>
</Grid> </Grid>

2
LivreLand/View/ContentViews/SeparatorEntireView.xaml
Unescape View File

@ -6,7 +6,7 @@
<BoxView HeightRequest="1" <BoxView HeightRequest="1"
HorizontalOptions="Fill"> HorizontalOptions="Fill">
<BoxView.Color> <BoxView.Color>
<AppThemeBinding Light="{DynamicResource HeaderSeparatorGray}" Dark="{StaticResource White}" /> <AppThemeBinding Light="{StaticResource HeaderSeparatorGray}" Dark="{StaticResource White}" />
</BoxView.Color> </BoxView.Color>
</BoxView> </BoxView>
</Grid> </Grid>

2
LivreLand/View/DetailsLivreView.xaml
Unescape View File

@ -17,7 +17,7 @@
HeaderBackButtonText="Tous" HeaderBackButtonText="Tous"
HeaderPlusButtonVisible="False" HeaderPlusButtonVisible="False"
HeaderSwitchButtonVisible="False" HeaderSwitchButtonVisible="False"
HeaderColor="{DynamicResource HeaderGray}"/> HeaderColor="{StaticResource HeaderGray}"/>
<contentView:SeparatorEntireView/> <contentView:SeparatorEntireView/>
</VerticalStackLayout> </VerticalStackLayout>

2
LivreLand/View/FiltrageAuteurView.xaml
Unescape View File

@ -38,7 +38,7 @@
<contentView:HomeButtonView ButtonTitle="Alain Damasio" <contentView:HomeButtonView ButtonTitle="Alain Damasio"
ButtonIcon="book_fill.png" ButtonIcon="book_fill.png"
ButtonNumber="2" ButtonNumber="2"
ButtonIconColor="{DynamicResource PinkOrange}"/> ButtonIconColor="{StaticResource PinkOrange}"/>
<contentView:SeparatorBigCutStartView/> <contentView:SeparatorBigCutStartView/>
</VerticalStackLayout> </VerticalStackLayout>

2
LivreLand/View/TousView.xaml
Unescape View File

@ -24,7 +24,7 @@
SelectionChanged="OnSelectionChanged"> SelectionChanged="OnSelectionChanged">
<CollectionView.GroupHeaderTemplate> <CollectionView.GroupHeaderTemplate>
<DataTemplate> <DataTemplate>
<Grid BackgroundColor="{DynamicResource HeaderGray}"> <Grid BackgroundColor="{StaticResource HeaderGray}">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="10"/> <ColumnDefinition Width="10"/>
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>

Write Preview
Loading…
Cancel
Save