better view, connection done
continuous-integration/drone/push Build is passing Details

pull/60/head
Alexandre AGOSTINHO 2 years ago
parent dd93267af8
commit 603149c7a1

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui" <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
x:Class="Views.Login" x:Class="Views.Login"
xmlns:local="clr-namespace:Views" xmlns:local="clr-namespace:Views"
Title="Login" Title="Login"
@ -22,46 +23,66 @@
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!-- Login --> <!-- Login -->
<Label Grid.Column="1" <Label Grid.Column="1" Grid.Row="0"
Grid.Row="0"
Text="Login :" Text="Login :"
FontAttributes="Bold" FontAttributes="Bold"
FontSize="Medium" FontSize="Medium"
Padding="0,50,0,10" Padding="0,50,0,10"
MinimumWidthRequest="200"/> MinimumWidthRequest="200"/>
<Entry x:Name="login_entry"
Grid.Column="1" <Entry Grid.Column="1" Grid.Row="1"
Grid.Row="1"
x:Name="login_entry"
Placeholder="exemple@mctg.fr" PlaceholderColor="DimGrey"
IsSpellCheckEnabled="False"
toolkit:SetFocusOnEntryCompletedBehavior.NextElement="{x:Reference passwd_entry}"
BackgroundColor="#D1E8E2" BackgroundColor="#D1E8E2"
Margin="0,0,0,20"/> Margin="0,0,0,20"/>
<!-- Password --> <!-- Password -->
<Label Grid.Column="1" <Label Grid.Column="1" Grid.Row="2"
Grid.Row="2"
Text="Mot de passe :" Text="Mot de passe :"
FontAttributes="Bold" FontAttributes="Bold"
FontSize="Medium" FontSize="Medium"
Padding="0,50,0,10" Padding="0,50,0,10"
MinimumWidthRequest="200"/> MinimumWidthRequest="200"/>
<Entry x:Name="passwd_entry"
Grid.Column="1" <Entry Grid.Column="1" Grid.Row="3"
Grid.Row="3"
x:Name="passwd_entry"
IsPassword="True"
Completed="LoginButton_Clicked"
BackgroundColor="#D1E8E2" BackgroundColor="#D1E8E2"
Margin="0,0,0,50"/> Margin="0,0,0,50"/>
<!-- Checkbox first login --> <!-- Checkbox first login -->
<CheckBox x:Name="firstLogin_checkbox" <HorizontalStackLayout
Grid.Column="1" Grid.Column="1" Grid.Row="4"
Grid.Row="4"/> HorizontalOptions="Center">
<Label Grid.Column="1"
Grid.Row="4" <CheckBox
Text="première connection" x:Name="firstLogin_checkbox"/>
Margin="50,0,0,0" <Label
FontAttributes="Italic"/> Text="première connection"
FontAttributes="Italic"
Margin="10, 20"/>
</HorizontalStackLayout>
<!-- Return button --> <!-- Return button -->
<Button BackgroundColor="#D1E8E2" <Button Text="Connection"
BackgroundColor="{StaticResource Primary}"
Grid.Column="1" Grid.Column="1"
Grid.Row="5" Grid.Row="5"
Clicked="LoginButton_Clicked"/> Clicked="LoginButton_Clicked"/>

@ -2,13 +2,14 @@
<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui" <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:Views" xmlns:local="clr-namespace:Views"
xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
x:Class="Views.MiniHeader" x:Class="Views.MiniHeader"
x:Name="miniheader"> x:Name="miniheader">
<Grid BackgroundColor="#116466" ColumnDefinitions="*,*,*">
<Grid BackgroundColor="{StaticResource Primary}" ColumnDefinitions="*,*,*">
<local:ReturnButton NeedReturn="{Binding NeedReturn, Source={x:Reference miniheader}}" <local:ReturnButton NeedReturn="{Binding NeedReturn, Source={x:Reference miniheader}}"
HorizontalOptions="Start" Padding="10, 10, 0, 0" HorizontalOptions="Start" Padding="10, 10, 0, 0"
WidthRequest="60" WidthRequest="60"/>
/>
<Label Grid.Column="1" <Label Grid.Column="1"
Text="{Binding TitleMini, Source={x:Reference miniheader}}" Text="{Binding TitleMini, Source={x:Reference miniheader}}"
FontSize="Medium" FontSize="Medium"
@ -19,8 +20,9 @@
HorizontalOptions="Center" /> HorizontalOptions="Center" />
<ImageButton Grid.Column="2" <ImageButton Grid.Column="2"
Source="person_default.svg" Source="person_default.svg"
WidthRequest="80" HeightRequest="80" WidthRequest="80" HeightRequest="80"
CornerRadius="50" CornerRadius="50"
BorderWidth="4" BorderColor="Black"/> BorderWidth="4" BorderColor="Black"
IsVisible="{Binding ., Converter={toolkit:IsNotNullConverter}}"/>
</Grid> </Grid>
</ContentView> </ContentView>

@ -1,10 +1,15 @@
using Model;
namespace Views; namespace Views;
public partial class MiniHeader : ContentView public partial class MiniHeader : ContentView
{ {
MasterManager Master = (Application.Current as App).Master;
public MiniHeader() public MiniHeader()
{ {
InitializeComponent(); InitializeComponent();
BindingContext = Master.User.CurrentConnected;
} }
public static readonly BindableProperty TitleMiniProperty = public static readonly BindableProperty TitleMiniProperty =

Loading…
Cancel
Save