From bf9d9205c54ab68ff6a3eb11ea028c437f776f91 Mon Sep 17 00:00:00 2001
From: V J <Vianney.JOURDY@etu.uca.fr>
Date: Wed, 31 May 2023 11:12:09 +0200
Subject: [PATCH] =?UTF-8?q?connection=20+=20deconnection=20am=C3=A9liar?=
 =?UTF-8?q?=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MangaMap/CustomHeader.xaml                   |   9 ++++++++-
 MangaMap/CustomHeader.xaml.cs                |   5 +++++
 MangaMap/MangaMap.csproj                     |   1 +
 MangaMap/Resources/Images/account_circle.png | Bin 0 -> 1428 bytes
 MangaMap/Views/settingsPage.xaml.cs          |   4 ++++
 5 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 MangaMap/Resources/Images/account_circle.png

diff --git a/MangaMap/CustomHeader.xaml b/MangaMap/CustomHeader.xaml
index d736f8f..51fb1da 100644
--- a/MangaMap/CustomHeader.xaml
+++ b/MangaMap/CustomHeader.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="MangaMap.NewContent1"
              Background="{StaticResource Primary}">
-    <Grid ColumnDefinitions="50, *, 40">
+    <Grid ColumnDefinitions="50, *,40, 40">
         <ImageButton Source="logo.png"
                      MaximumHeightRequest="30"
                      MaximumWidthRequest="30"
@@ -11,6 +11,13 @@
                      Clicked="ImageButton_Clicked"/>
 
         <ImageButton Grid.Column="2"
+                     Source="account_circle.png"
+                     MaximumHeightRequest="30"
+                     MaximumWidthRequest="30"
+                     VerticalOptions="Center"
+                     Clicked="AccountButton_Clicked"/>
+
+        <ImageButton Grid.Column="3"
                      Source="settings.png"
                      MaximumHeightRequest="30"
                      MaximumWidthRequest="30"
diff --git a/MangaMap/CustomHeader.xaml.cs b/MangaMap/CustomHeader.xaml.cs
index fb50889..11be92d 100644
--- a/MangaMap/CustomHeader.xaml.cs
+++ b/MangaMap/CustomHeader.xaml.cs
@@ -18,4 +18,9 @@ public partial class NewContent1 : ContentView
 	{
 		await Shell.Current.GoToAsync("//page/secondaire/settingsPage");
 	}
+
+	async void AccountButton_Clicked(object sender, System.EventArgs e)
+	{
+		await Shell.Current.GoToAsync("//page/secondaire/connexionPage");
+	}
 }
\ No newline at end of file
diff --git a/MangaMap/MangaMap.csproj b/MangaMap/MangaMap.csproj
index 29b9919..c3948aa 100644
--- a/MangaMap/MangaMap.csproj
+++ b/MangaMap/MangaMap.csproj
@@ -58,6 +58,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<None Remove="Resources\Images\account_circle.png" />
 		<None Remove="Resources\Images\Evangelion.jpg" />
 		<None Remove="Resources\Images\logo.png" />
 		<None Remove="Resources\Images\settings.png" />
diff --git a/MangaMap/Resources/Images/account_circle.png b/MangaMap/Resources/Images/account_circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..98f1e1429dc7fe2794c45d350a89ae77203a237c
GIT binary patch
literal 1428
zcmV;F1#9|=P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px)PDw;TRA@u(nOBG{MG%I+`y!YV3Zh~_5fyXx!HkMo!JNS?M$8H-m=$wYFpDT+
zKt(b8V9sI|71S5SoWK|5lb)rvcV@ch?7eqcxCO(UGgDpN)m2^fSIrEjIn9{n>t~Jv
zQ*FVSX@RAHO@VcRWy7V8Ux({W;6>ounW6k-6<7s01lSnZVBmsY16~Gh1wI-$c8q;g
z1r`8K1Wo|_JsJ89xB|Ew@b@4ZMS*>QGk{gInZ5w-0lrD@(cERzy_OF5eSsCS@gD*g
z19uJ4V5kCT0_SBDyae2x7XMe}<nsV3u^+HWHs&(m<Vrb%!st1`*+KA+z~R7ywUc%5
z?FL*8EE(QE3hZ1Xx7GrO0XGGK9{_tz=I~{UTLQQj*epE16F9J>M2!Nw1NR3(4*+|V
z1gG~arTeFq{JE8n1a9mbTT&oj{I$R_g~d4LIAC>P{>1w`@IG)A;0E;3p1^&9Vejn!
zxUqc-7#@w&O|*F$*t#(JslY`Ap6h|53p{RA!(((Z&$NcvJ_VvV4T&28-}Owq4q%pT
z=x^Zj^k+q2?(pvTWQ{IyMyXel73Db>a6J>KO93;i0-7Xcq<E-j@lN<$$j0uP=cLK7
z%JUpG*8B?C5cs}FrcvnO^xoZf11DtcE(Oet?viAj7vuEN{(w<KdI8wHgZcRoX%47J
zT4JUqPh6QY|2WZI3cLfXnK%uhw-gk(BqSf<g_E_Bo8sn3mjb60<Q@v#oOs>^*2?+Y
z6c9;jVo7+g22jedj|1DKG1~)AbSz9Bc_n$|?IT_Dy#PCwOQ?2iOq&7+0k<WN&cl<<
zdL3|7de-L}(ba0Aks@O-IT*M-&fTU!^nam3W5T|jil!FOiE-LU%p?YqYFxA7Yf!+1
zbI_)M(Po!4$qvEfeG06dqSjoAX<Oi_Y``|alj+$%DXP3(a3NpoW{)L4qtdP=3&aC#
zHWl~O(1pNhf$<sO%k+PFV5{)XWOsUvP++x`#buvxklQTqGq6w+?)}%wiDY{O*r~u@
zjWm;-1%Y4EZ|@72ED#k~9Qa{?0<v0Sc7<KfiY4R_S}Y{IDg~konUG9OL&-_ax@KU>
z3~F{Bx*3iYVw(V~T__%60hQryD#`F{n3k#zaSWriv3gc27;{Wj7&T5Cucba*Gb<Mz
zWk>vEelgFCQCk$UgCKmC^jQz`RFa6*GbP#C7}pT%0&}khXlz~DAkA7u76H5#O#^HI
z{FJU*8S)8B?nnb{gbBgNQI`TXnM9S6IDgB+tO7uzg<#E+vX3k&1#-HlEyq537T6*&
zcs6aORVk1cG(roLR8AHhb|<_>A!}c+F4-d&G%hBhKwU~K)6}Id*xgvKu<DP~`;`lP
zZ=}{@Q_NclilrKt8C+62UtZKJ#ItaI$BqlkUQhVl4usbqY2ovw`c`aZeX%|u0L)1R
z?EdNdO%rY8qF&(<zyAsUck(PUB3b-g6DqA*SMrS6qOnMcWbyPbFmHM|p$3S|rM{57
zmVPI-tV+yepGV6~hIG|qbC8w<TD+)0C)Ft6;2dSvR%$~O%e!($sN6ae<kc$RK;yB#
z*^t=$f{IRCNeRQQ?fRyPApcwGOHXO+pzgH7jsR}Rq#7+e+%{*2kky`L<&N1P3!PGT
zZ*0gA3p9fap=Y&x;IJ$AN$O}=iP_NoEFDNYbAHgUGFv8Hu|iX}(MF37+K5pUaI$Ir
zi78s#jBS-AjEFv5<4T?(;e^%OZ2!pDw!j7tnW*|cv)ZVt!9g{fF!&Hx37wrxqn?4;
ixyIhP<|r`LruYvaiVQ$md~GQJ0000<MNUMnLSTX-I-dRj

literal 0
HcmV?d00001

diff --git a/MangaMap/Views/settingsPage.xaml.cs b/MangaMap/Views/settingsPage.xaml.cs
index 7a59b6a..b76e70e 100644
--- a/MangaMap/Views/settingsPage.xaml.cs
+++ b/MangaMap/Views/settingsPage.xaml.cs
@@ -1,7 +1,10 @@
 namespace MangaMap.Views;
+using Model;
 
 public partial class settingsPage : ContentPage
 {
+    public Manager my_manager => (App.Current as App).MyManager;
+
 	public settingsPage()
 	{
 		InitializeComponent();
@@ -9,6 +12,7 @@ public partial class settingsPage : ContentPage
 
     private async void OnDisconnectClicked(object sender, EventArgs e)
     {
+        my_manager.UtilisateurActuel = new Utilisateur();
         await Shell.Current.Navigation.PushAsync(new loginPage());
     }