From a829113cfd4528125f441fa9bc4c97e8a7c7c313 Mon Sep 17 00:00:00 2001 From: nimaye <Nicolas.MAYE@etu.uca.fr> Date: Fri, 9 Dec 2022 14:24:53 +0100 Subject: [PATCH] ajustement content view Planification --- Sources/IHM/Desktop/CV_Planification.xaml | 43 ++++++++++------------- Sources/IHM/Desktop/DashBoard.xaml | 6 ++-- 2 files changed, 21 insertions(+), 28 deletions(-) diff --git a/Sources/IHM/Desktop/CV_Planification.xaml b/Sources/IHM/Desktop/CV_Planification.xaml index b572d12..a0b78f3 100644 --- a/Sources/IHM/Desktop/CV_Planification.xaml +++ b/Sources/IHM/Desktop/CV_Planification.xaml @@ -2,41 +2,34 @@ <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="IHM.Desktop.CV_Planification"> - <StackLayout BackgroundColor="{StaticResource Yellow300Accent}" > - - <Grid> - <Grid.RowDefinitions> - <RowDefinition Height="1*"/> - <RowDefinition Height="5*"/> - <RowDefinition Height="1*"/> - - </Grid.RowDefinitions> - <Grid.ColumnDefinitions> - <ColumnDefinition Width="1*"/> - <ColumnDefinition Width="1*"/> - - - - </Grid.ColumnDefinitions> - <StackLayout BackgroundColor="{StaticResource Secondary}" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="4"> + <Grid> + <Grid.RowDefinitions> + <RowDefinition Height="0.5*"/> + <RowDefinition Height="5*"/> + <RowDefinition Height="1*"/> - </StackLayout> + </Grid.RowDefinitions> + <Grid.ColumnDefinitions> + <ColumnDefinition Width="1*"/> + <ColumnDefinition Width="1*"/> + </Grid.ColumnDefinitions> - - <Button Text="Planifier une échéance" BackgroundColor="{StaticResource Primary}" TextColor="{StaticResource Secondary}" Grid.Column="0" Grid.Row="0" ></Button> - <Button Text="Supprimer une échéance" BackgroundColor="{StaticResource Tertiary}" TextColor="{StaticResource Secondary}" Grid.Column="1" Grid.Row="0"></Button> - - + <Button Text="Planifier une échéance" BackgroundColor="{StaticResource Primary}" TextColor="{StaticResource Secondary}" Grid.Column="0" Grid.Row="0" ></Button> + <Button Text="Supprimer une échéance" BackgroundColor="{StaticResource Tertiary}" TextColor="{StaticResource Secondary}" Grid.Column="1" Grid.Row="0"></Button> - </Grid> + <StackLayout Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" Grid.RowSpan="2" BackgroundColor="AliceBlue" Margin="15"> + + </StackLayout> + + - </StackLayout> + </Grid> </ContentView> diff --git a/Sources/IHM/Desktop/DashBoard.xaml b/Sources/IHM/Desktop/DashBoard.xaml index 3842a4f..cb13e3c 100644 --- a/Sources/IHM/Desktop/DashBoard.xaml +++ b/Sources/IHM/Desktop/DashBoard.xaml @@ -4,7 +4,7 @@ x:Class="IHM.Desktop.Dashboard" Title="Dashboard"> - <StackLayout BackgroundColor="{StaticResource Yellow300Accent}" > + <StackLayout BackgroundColor="{StaticResource Secondary}"> <Grid> <Grid.RowDefinitions> <RowDefinition Height="1*"/> @@ -44,9 +44,9 @@ - <ContentView BackgroundColor="AliceBlue" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Grid.RowSpan="6" x:Name="mainCV"> + <ContentView Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Grid.RowSpan="6" x:Name="mainCV"> - </ContentView> + </ContentView>