From 83fbe2c23bcf5c2c505bf3af93e76e0ecc3b33f1 Mon Sep 17 00:00:00 2001
From: Anthony RICHARD <Anthony.RICHARD@etu.uca.fr>
Date: Thu, 8 Jun 2023 05:14:06 +0200
Subject: [PATCH] =?UTF-8?q?fix=20bug=20navigation=20(fleche=20back=20en=20?=
 =?UTF-8?q?haut=20de=20la=20mainpage)=20+=20ajout=20d'une=20scrollview=20p?=
 =?UTF-8?q?our=20les=20petits=20=C3=A9crans?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/Stim/LoginPage.xaml    | 68 ++++++++++++++++++----------------
 Sources/Stim/LoginPage.xaml.cs |  2 +-
 2 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/Sources/Stim/LoginPage.xaml b/Sources/Stim/LoginPage.xaml
index d27f8a2..7bfe6bb 100644
--- a/Sources/Stim/LoginPage.xaml
+++ b/Sources/Stim/LoginPage.xaml
@@ -3,41 +3,45 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Stim.LoginPage"
              Title="LoginPage">
-    <Grid BackgroundColor="{StaticResource Tertiary}" ColumnDefinitions="*, 5*, *" RowDefinitions="auto, *">
-        <VerticalStackLayout BackgroundColor="Black" Grid.Column="0"/>
-        <VerticalStackLayout BackgroundColor="Black" Grid.Column="2"/>
-        <VerticalStackLayout BackgroundColor="Black" Grid.Column="0" Grid.Row="1"/>
-        <VerticalStackLayout BackgroundColor="Black" Grid.Column="2" Grid.Row="1"/>
-        <Grid Grid.Column="1" RowDefinitions="500, auto, auto">
-            <Image Source="no_cover.png" HeightRequest="490" Margin="0,10,0,0"/>
-            <Grid Grid.Row="1" RowDefinitions="auto, auto, auto">
-                <Entry Placeholder="Username" PlaceholderColor="{StaticResource Primary}"
-                        IsPassword="False"
-                        x:Name="Username"
-                        HeightRequest="50"
-                        ClearButtonVisibility="WhileEditing"/>
-                <Entry Placeholder="Mot de passe"
-                        PlaceholderColor="{StaticResource Primary}"
-                        IsPassword="True" x:Name="Pswd"
-                        HeightRequest="50"
-                        Grid.Row="1"
-                        ClearButtonVisibility="WhileEditing"/>
-
-                <Grid Grid.Row="2"
-                        Margin="10,0,0,10" ColumnDefinitions="3*, *">
-                    <Button Text="Se connecter"
-                            Clicked="Se_connecter"
+    <ScrollView>
+        <Grid BackgroundColor="{StaticResource Tertiary}" ColumnDefinitions="*, 5*, *" RowDefinitions="auto, *">
+            <VerticalStackLayout BackgroundColor="Black" Grid.Column="0"/>
+            <VerticalStackLayout BackgroundColor="Black" Grid.Column="2"/>
+            <VerticalStackLayout BackgroundColor="Black" Grid.Column="0" Grid.Row="1"/>
+            <VerticalStackLayout BackgroundColor="Black" Grid.Column="2" Grid.Row="1"/>
+            <Grid Grid.Column="1" RowDefinitions="500, auto, auto">
+                <Image Source="no_cover.png" HeightRequest="490" Margin="0,10,0,0"/>
+                <Grid Grid.Row="1" RowDefinitions="auto, auto, auto">
+                    <Entry Placeholder="Username" PlaceholderColor="{StaticResource Primary}"
+                            IsPassword="False"
+                            x:Name="Username"
                             HeightRequest="50"
-                            BackgroundColor="{StaticResource Gray500}"/>
-                    <Button Text="Créer un compte"
-                            Clicked="Creer_un_compte"
+                            ClearButtonVisibility="WhileEditing"
+                           Text="anthony"/>
+                    <Entry Placeholder="Mot de passe"
+                            PlaceholderColor="{StaticResource Primary}"
+                            IsPassword="True" x:Name="Pswd"
                             HeightRequest="50"
-                            BackgroundColor="{StaticResource Gray500}"
-                            Grid.Column="1"/>
+                            Grid.Row="1"
+                            ClearButtonVisibility="WhileEditing"
+                           Text="anthony5"/>
+
+                    <Grid Grid.Row="2"
+                            Margin="10,0,0,10" ColumnDefinitions="3*, *">
+                        <Button Text="Se connecter"
+                                Clicked="Se_connecter"
+                                HeightRequest="50"
+                                BackgroundColor="{StaticResource Gray500}"/>
+                        <Button Text="Créer un compte"
+                                Clicked="Creer_un_compte"
+                                HeightRequest="50"
+                                BackgroundColor="{StaticResource Gray500}"
+                                Grid.Column="1"/>
+                    </Grid>
                 </Grid>
+                <HorizontalStackLayout x:Name="Error" Grid.Row="2" HorizontalOptions="Center">
+                </HorizontalStackLayout>
             </Grid>
-            <HorizontalStackLayout x:Name="Error" Grid.Row="2" HorizontalOptions="Center">
-            </HorizontalStackLayout>
         </Grid>
-    </Grid>
+    </ScrollView>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/Stim/LoginPage.xaml.cs b/Sources/Stim/LoginPage.xaml.cs
index 9a67433..a7a8c1e 100644
--- a/Sources/Stim/LoginPage.xaml.cs
+++ b/Sources/Stim/LoginPage.xaml.cs
@@ -22,7 +22,7 @@ public partial class LoginPage : ContentPage
                 {
                     ((App)App.Current).Manager.CurrentUser = user;
                     Application.Current.MainPage = new AppShell();
-                    await Shell.Current.GoToAsync("//MainPage");
+                    await Navigation.PushModalAsync(new MainPage());//Shell.Current.GoToAsync("//MainPage");
                 }
                 else Error.Children.Add(new Label { Text = "Mot de passe incorrect",
                     TextColor = Colors.Red,