rebuild connections and swipe account views and update appicon

pull/46/head
Antoine PEREDERII 2 years ago
parent e6e4cd4a4f
commit 0ab728ab8f

@ -9,8 +9,8 @@
Shell.FlyoutBehavior="Disabled"> Shell.FlyoutBehavior="Disabled">
<ShellContent ContentTemplate="{DataTemplate views:ConnectionPage}" <ShellContent ContentTemplate="{DataTemplate views:ConnectionPage}"
Route="connection"/> Route="connection"/>
<TabBar> <TabBar>

@ -40,7 +40,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<!-- App Icon --> <!-- App Icon -->
<MauiIcon Include="Resources\AppIcon\appicon.png" Color="#512BD4" /> <MauiIcon Include="Resources\AppIcon\appicon.png" Color="#FFFFFF" />
<!-- Splash Screen --> <!-- Splash Screen -->
<MauiSplashScreen Include="Resources\Splash\splash.png" Color="#a8daab" BaseSize="128,128" /> <MauiSplashScreen Include="Resources\Splash\splash.png" Color="#a8daab" BaseSize="128,128" />

@ -0,0 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 25.0.1705.4
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Banquale", "Banquale.csproj", "{654F2E92-6589-4E5D-85AC-B89F54C381DD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{654F2E92-6589-4E5D-85AC-B89F54C381DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{654F2E92-6589-4E5D-85AC-B89F54C381DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{654F2E92-6589-4E5D-85AC-B89F54C381DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{654F2E92-6589-4E5D-85AC-B89F54C381DD}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E1BCACFC-BABE-4F61-8D1F-A56C274B6C67}
EndGlobalSection
EndGlobal

@ -16,7 +16,7 @@ namespace Banquale.Model
[DataMember] [DataMember]
public string FirstName { get; private set; } public string FirstName { get; private set; }
[DataMember] [DataMember]
public int Id { get; private set; } public uint Id { get; private set; }
[DataMember] [DataMember]
public string Password { get; private set; } public string Password { get; private set; }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 191 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

@ -5,103 +5,44 @@
Title="ConnectionPage" Title="ConnectionPage"
Shell.NavBarIsVisible="False"> Shell.NavBarIsVisible="False">
<StackLayout> <VerticalStackLayout VerticalOptions="Center">
<Frame CornerRadius="20" Margin="20, 250, 20, 0">
<Entry Placeholder="Identifiant" <Frame CornerRadius="20" Margin="20, 150, 20, 0">
MaxLength="20"
MinimumWidthRequest="275" <Entry
HorizontalOptions="CenterAndExpand" Placeholder="Identifiant"
HorizontalTextAlignment="Center" MaxLength="20"
FontSize="Large"/> MinimumWidthRequest="275"
HorizontalOptions="CenterAndExpand"
HorizontalTextAlignment="Center"
FontSize="Large"
x:Name="ident"/>
</Frame> </Frame>
<Frame CornerRadius="10" Margin="20, 75, 20, 0"> <Frame CornerRadius="20" Margin="20, 50, 20, 0">
<Entry Placeholder="Mot de passe"
IsPassword="True" <Entry
MinimumWidthRequest="275" Placeholder="Mot de passe"
MaxLength="20" MaxLength="20"
HorizontalOptions="Center" MinimumWidthRequest="275"
HorizontalTextAlignment="Center" HorizontalOptions="Center"
FontSize="Large"/> HorizontalTextAlignment="Center"
FontSize="Large"
IsPassword="True"
x:Name="pass"/>
</Frame> </Frame>
<Button Text="Se connecter" <Button
Text="Se connecter"
BorderWidth="2" BorderWidth="2"
HorizontalOptions="Fill" HorizontalOptions="Fill"
MinimumHeightRequest="75" MinimumHeightRequest="100"
Margin="10,75,10,0" Margin="10, 100, 10, 0"
FontSize="Large" FontSize="Large"
Clicked="Connection_Clicked"/> Clicked="Connection_Clicked"/>
</StackLayout> </VerticalStackLayout>
<!-- Version avec Grid (moins efficace quand on écrit dans les Entry-->
<!--<Grid RowDefinitions="5*, 2*, *, 2*, 2*, 2*, 2*">
--><!--<Grid.RowDefinitions>
<RowDefinition Height="5*"/>
<RowDefinition Height="2*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="2*"/>
<RowDefinition Height="2*"/>
<RowDefinition Height="2*"/>
<RowDefinition Height="2*"/>
</Grid.RowDefinitions>--><!--
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="9*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Frame Grid.Column="1" BackgroundColor="#C8C8C8" CornerRadius="20">
<Entry Placeholder="Identifiant"
PlaceholderColor="#6E6E6E"
TextColor="#212121"
MaxLength="20"
VerticalTextAlignment="Center"
HorizontalTextAlignment="Center"
FontSize="Large"/>
</Frame>
</Grid>
<Grid Grid.Row="3">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="9*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Frame Grid.Column="1" BackgroundColor="#C8C8C8" CornerRadius="20">
<Entry Placeholder="Mot de passe"
PlaceholderColor="#6E6E6E"
TextColor="#212121"
IsPassword="True"
MinimumWidthRequest="275"
MaxLength="20"
VerticalTextAlignment="Center"
HorizontalTextAlignment="Center"
FontSize="Large"/>
</Frame>
</Grid>
<Grid Grid.Row="5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="20*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Button Grid.Column="1" Text="Se connecter"
BorderWidth="2"
BorderColor="Black"
HorizontalOptions="Fill"
BackgroundColor="Gray"
TextColor="Black"
FontSize="Large"/>
</Grid>
</Grid>-->
</ContentPage> </ContentPage>

@ -9,6 +9,15 @@ public partial class ConnectionPage : ContentPage
public async void Connection_Clicked(Object sender, EventArgs e) public async void Connection_Clicked(Object sender, EventArgs e)
{ {
string id = ident.Text;
string password = pass.Text;
if (string.IsNullOrWhiteSpace(id) || string.IsNullOrWhiteSpace(password))
{
await DisplayAlert("Erreur", "Tout les champs doivent être complétés", "OK");
return;
}
await Navigation.PushModalAsync(new SwitchAccountPage()); await Navigation.PushModalAsync(new SwitchAccountPage());
} }

@ -7,9 +7,9 @@
Shell.NavBarIsVisible="False"> Shell.NavBarIsVisible="False">
<!-- Version StackLayout, moins efficace pour la responsivity --> <StackLayout
VerticalOptions="Center"
<!--<StackLayout VerticalOptions="Center" HorizontalOptions="Center"> HorizontalOptions="Center">
<local:SwitchAccountView/> <local:SwitchAccountView/>
@ -18,30 +18,13 @@
<Button Text="Déconnexion" <Button Text="Déconnexion"
BorderWidth="2" BorderWidth="2"
BorderColor="Black"
HorizontalOptions="Fill" HorizontalOptions="Fill"
BackgroundColor="Gray" MinimumHeightRequest="100"
TextColor="Black"
MinimumHeightRequest="75"
MinimumWidthRequest="375" MinimumWidthRequest="375"
Margin="10,65,0,0" Margin="10,65,0,0"
FontSize="Large"/> FontSize="Large"
</StackLayout>-->
<Grid RowDefinitions="2*, 2*, *">
<local:SwitchAccountView Grid.Row="0"/>
<local:SwitchAccountView Grid.Row="1"/>
<Button
Text="Déconnexion"
Grid.Row="2"
HorizontalOptions="Fill"
MinimumHeightRequest="75"
MinimumWidthRequest="375"
Clicked="DisconnectionClicked"/> Clicked="DisconnectionClicked"/>
</Grid> </StackLayout>
</ContentPage> </ContentPage>

@ -6,7 +6,11 @@
<VerticalStackLayout> <VerticalStackLayout>
<Button Text=" Compte Personnel &#x0a; Mme Tatouille " <Button Text=" Compte Personnel &#x0a; Mme Tatouille "
Clicked="Transfer_Clicked"/> Clicked="Transfer_Clicked"
MinimumHeightRequest="65"
FontSize="Large"
Margin="0, 10, 0, 10"/>
<!-- &#x0a; sert à faire un retour à la ligne--> <!-- &#x0a; sert à faire un retour à la ligne-->
</VerticalStackLayout> </VerticalStackLayout>

Loading…
Cancel
Save