From 8dd44358aec5b063e7880b6092eba8939efdca38 Mon Sep 17 00:00:00 2001
From: "maxime.BATISTA@etu.uca.fr" <maximebatista18@gmail.com>
Date: Sun, 2 Apr 2023 16:27:51 +0200
Subject: [PATCH] last fixes before PR

---
 AppShell.xaml          |   1 -
 ShoopNCook.csproj      | 144 +++++++++++++--------------
 Views/ProfilePage.xaml | 219 ++++++++++++++++++++++-------------------
 3 files changed, 187 insertions(+), 177 deletions(-)

diff --git a/AppShell.xaml b/AppShell.xaml
index d428e29..f63ee1e 100644
--- a/AppShell.xaml
+++ b/AppShell.xaml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" encoding="UTF-8" ?>
 <Shell
     x:Class="ShoopNCook.AppShell"
diff --git a/ShoopNCook.csproj b/ShoopNCook.csproj
index b6d7873..0256a63 100644
--- a/ShoopNCook.csproj
+++ b/ShoopNCook.csproj
@@ -1,53 +1,53 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
-		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
-		<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
-		<OutputType>Exe</OutputType>
-		<RootNamespace>ShoopNCook</RootNamespace>
-		<UseMaui>true</UseMaui>
-		<SingleProject>true</SingleProject>
-		<ImplicitUsings>enable</ImplicitUsings>
-
-		<!-- Display name -->
-		<ApplicationTitle>ShoopNCook</ApplicationTitle>
-
-		<!-- App Identifier -->
-		<ApplicationId>com.companyname.shoopncook</ApplicationId>
-		<ApplicationIdGuid>bf17e1fe-a722-42f6-a24d-3327d351c924</ApplicationIdGuid>
-
-		<!-- Versions -->
-		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
-		<ApplicationVersion>1</ApplicationVersion>
-
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
-		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<!-- App Icon -->
-		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
-
-		<!-- Splash Screen -->
-		<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
-
-		<!-- Images -->
-		<MauiImage Include="Resources\Images\*" />
-		<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />
-
-		<!-- Custom Fonts -->
-		<MauiFont Include="Resources\Fonts\*" />
-
-		<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
-		<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
-	</ItemGroup>
-
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
+		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
+		<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
+		<OutputType>Exe</OutputType>
+		<RootNamespace>ShoopNCook</RootNamespace>
+		<UseMaui>true</UseMaui>
+		<SingleProject>true</SingleProject>
+		<ImplicitUsings>enable</ImplicitUsings>
+
+		<!-- Display name -->
+		<ApplicationTitle>ShoopNCook</ApplicationTitle>
+
+		<!-- App Identifier -->
+		<ApplicationId>com.companyname.shoopncook</ApplicationId>
+		<ApplicationIdGuid>bf17e1fe-a722-42f6-a24d-3327d351c924</ApplicationIdGuid>
+
+		<!-- Versions -->
+		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
+		<ApplicationVersion>1</ApplicationVersion>
+
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
+		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<!-- App Icon -->
+		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
+
+		<!-- Splash Screen -->
+		<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
+
+		<!-- Images -->
+		<MauiImage Include="Resources\Images\*" />
+		<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />
+
+		<!-- Custom Fonts -->
+		<MauiFont Include="Resources\Fonts\*" />
+
+		<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
+		<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
+	</ItemGroup>
+
 	<ItemGroup>
 	  <None Remove="Resources\Fonts\Poppins-Bold.ttf" />
 	  <None Remove="Resources\Images\email_icon.svg" />
@@ -55,25 +55,25 @@
 	  <None Remove="Resources\Images\password_icon.svg" />
 	  <None Remove="Resources\Images\visibility_off.svg" />
 	  <None Remove="Resources\Images\visibility_on.svg" />
-	</ItemGroup>
-
-	<ItemGroup>
-	  <None Remove="Resources\Fonts\arrow_back_ios_FILL0_wght400_GRAD200_opsz48.svg" />
-	  <None Remove="Resources\Images\default_profile_picture.png" />
-	</ItemGroup>
-
-	<ItemGroup>
-	  <MauiFont Include="Resources\Images\arrow_back.svg" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
-	</ItemGroup>
-
-	<ItemGroup>
-	  <MauiXaml Update="Views\ProfilePage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	</ItemGroup>
-
-</Project>
+	</ItemGroup>
+
+	<ItemGroup>
+	  <None Remove="Resources\Fonts\arrow_back_ios_FILL0_wght400_GRAD200_opsz48.svg" />
+	  <None Remove="Resources\Images\default_profile_picture.png" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <MauiFont Include="Resources\Images\arrow_back.svg" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <MauiXaml Update="Views\ProfilePage.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	</ItemGroup>
+
+</Project>
diff --git a/Views/ProfilePage.xaml b/Views/ProfilePage.xaml
index 4e3c3d8..0c97a3b 100644
--- a/Views/ProfilePage.xaml
+++ b/Views/ProfilePage.xaml
@@ -5,126 +5,137 @@
              Title="ProfilePage"
              BackgroundColor="{StaticResource BackgroundPrimary}">
 
-    <Grid
-        Margin="20"
-        RowDefinitions="Auto, *, Auto, Auto">
-        
-        <!-- Profile and return button -->
+    <ScrollView>
         <Grid
-            Grid.Row="0"
-            RowDefinitions="Auto, *"
-            ColumnDefinitions="*, 1.5*"
-            Margin="0, 0, 0, 40">
-            <HorizontalStackLayout>
-                <ImageButton 
-                    Grid.Column="0" 
+            Margin="20"
+            RowDefinitions="Auto, Auto, Auto, *">
+        
+            <!-- Profile label and return button -->
+            <Grid
+                Grid.Row="0"
+                RowDefinitions="Auto, *"
+                ColumnDefinitions="*, 1.5*"
+                Margin="0, 0, 0, 40">
+                <HorizontalStackLayout>
+                    <ImageButton 
+                        Grid.Column="0" 
            
-                    HeightRequest="50"
-                    WidthRequest="50"
-                    Source="arrow_back.svg"/>
-            </HorizontalStackLayout>
-            <Label 
-                Grid.Column="1"
-                FontSize="24"
-                TextColor="{StaticResource TextColorPrimary}"
-                Text="Profile"
-                FontFamily="PoppinsBold"
-                VerticalOptions="Center"/>
-        </Grid>
+                        HeightRequest="50"
+                        WidthRequest="50"
+                        Source="arrow_back.svg"/>
+                </HorizontalStackLayout>
+                <Label 
+                    Grid.Column="1"
+                    FontSize="24"
+                    TextColor="{StaticResource TextColorPrimary}"
+                    Text="Profile"
+                    FontFamily="PoppinsBold"
+                    VerticalOptions="Center"/>
+            </Grid>
 
-        <!-- Profile picture and name -->
-        <Grid
-            Grid.Row="1"
-            RowDefinitions="*, Auto, Auto">
+            <!-- Profile picture and name -->
+            <Grid
+                Grid.Row="1"
+                RowDefinitions="*, Auto, Auto">
 
 
-            <Border
-                Grid.Row="0"
-                StrokeShape="RoundRectangle 10000"
-                MaximumHeightRequest="150"
-                HorizontalOptions="Center"
-                Stroke="{StaticResource BackgroundPrimary}"
-                BackgroundColor="{StaticResource BackgroundSecondary}">
-                <ImageButton
+                <Border
                     Grid.Row="0"
-                    Source="default_profile_picture.png"/>
-            </Border>
+                    StrokeShape="RoundRectangle 10000"
+                    MaximumHeightRequest="150"
+                    MaximumWidthRequest="150"
+                    HorizontalOptions="Center"
+                    Stroke="{StaticResource BackgroundPrimary}"
+                    BackgroundColor="{StaticResource BackgroundSecondary}">
+                    <ImageButton
+                        Grid.Row="0"
+                        Source="default_profile_picture.png"/>
+                </Border>
 
-            <Label 
-                Grid.Row="1"
-                FontSize="30"
-                HorizontalOptions="Center"
-                TextColor="{StaticResource TextColorPrimary}"
-                Text="%Profile_Name%"
-                FontFamily="PoppinsBold"/>
-            <Label 
+                <Label 
+                    Grid.Row="1"
+                    FontSize="30"
+                    HorizontalOptions="Center"
+                    TextColor="{StaticResource TextColorPrimary}"
+                    Text="%Profile_Name%"
+                    FontFamily="PoppinsBold"/>
+                <Label 
+                    Grid.Row="2"
+                    FontSize="16"
+                    HorizontalOptions="Center"
+                    TextColor="{StaticResource TextColorSecondary}"
+                    Text="Profile settings"
+                    FontFamily="PoppinsBold"/>
+
+            </Grid>
+
+            <!-- User inputs -->
+            <Grid
                 Grid.Row="2"
-                FontSize="16"
-                HorizontalOptions="Center"
-                TextColor="{StaticResource TextColorSecondary}"
-                Text="Profile settings"
-                FontFamily="PoppinsBold"/>
+                Margin="0, 20, 0, 0"
+                RowDefinitions="Auto, *, Auto, *">
+                <Label 
+                    Grid.Row="0"
+                    Text="Name"
+                    FontFamily="PoppinsBold"
+                    TextColor="{StaticResource TextColorSecondary}"/>
 
-        </Grid>
+                <Border
+                    Grid.Row="1"
+                    StrokeShape="RoundRectangle 12"
+                    Stroke="{StaticResource BackgroundSecondary}">
+                    <Entry
+                        TextColor="{StaticResource TextColorPrimary}"
+                        PlaceholderColor="{StaticResource TextColorSecondary}"
+                        BackgroundColor="{StaticResource BackgroundSecondary}"
+                        Text="%Profile_Name%"
+                        Placeholder="Place your name here"/>
+                </Border>
 
-        <Grid
-            Grid.Row="2"
-            Margin="0, 20, 0, 0"
-            RowDefinitions="Auto, *, Auto, *">
-            <Label 
-                Grid.Row="0"
-                Text="Name"
-                FontFamily="PoppinsBold"
-                TextColor="{StaticResource TextColorSecondary}"/>
+                <Label 
+                    Grid.Row="2"
+                    Text="Your Email"
+                    FontFamily="PoppinsBold"
+                    TextColor="{StaticResource TextColorSecondary}"/>
+                <Border
+                    Grid.Row="3"
+                    StrokeShape="RoundRectangle 12"
+                    Stroke="{StaticResource BackgroundSecondary}">
+                    <Entry
+                        TextColor="{StaticResource TextColorPrimary}"
+                        PlaceholderColor="{StaticResource TextColorSecondary}"
+                        BackgroundColor="{StaticResource BackgroundSecondary}"
+                        Text="%Profile_Mail%"
+                        FontFamily="PoppinsBold"
+                        Placeholder="Place your mail address here"/>
+                </Border>
 
-            <Border
-                Grid.Row="1"
-                StrokeShape="RoundRectangle 12"
-                Stroke="{StaticResource BackgroundSecondary}">
-                <Entry
-                    TextColor="{StaticResource TextColorPrimary}"
-                    PlaceholderColor="{StaticResource TextColorSecondary}"
-                    BackgroundColor="{StaticResource BackgroundSecondary}"
-                    Text="%Profile_Name%"
-                    Placeholder="Place your name here"/>
-            </Border>
+            </Grid>
 
-            <Label 
-                Grid.Row="2"
-                Text="Your Email"
-                FontFamily="PoppinsBold"
-                TextColor="{StaticResource TextColorSecondary}"/>
-            <Border
+
+            <!-- Save button -->
+
+            <VerticalStackLayout
                 Grid.Row="3"
-                StrokeShape="RoundRectangle 12"
-                Stroke="{StaticResource BackgroundSecondary}">
-                <Entry
-                    TextColor="{StaticResource TextColorPrimary}"
-                    PlaceholderColor="{StaticResource TextColorSecondary}"
-                    BackgroundColor="{StaticResource BackgroundSecondary}"
-                    Text="%Profile_Mail%"
-                    FontFamily="PoppinsBold"
-                    Placeholder="Place your mail address here"/>
-            </Border>
+                VerticalOptions="End">
+                <Border
+                    Margin="0, 30, 0, 0"
+                    Stroke="{StaticResource BackgroundPrimary}"
+                    StrokeShape="RoundRectangle 12">
+                    <Label
+                        HeightRequest="50"
+                        BackgroundColor="{StaticResource ActionButton}"
+                        HorizontalTextAlignment="Center"
+                        VerticalTextAlignment="Center"
+                        FontFamily="PoppinsBold"
+                        Text="SAVE"/>
+                </Border>
+            </VerticalStackLayout>
 
-        </Grid>
 
+        </Grid>
 
-        <Border
-            Grid.Row="4"
-            Margin="0, 30, 0, 0"
-            Stroke="{StaticResource BackgroundPrimary}"
-            StrokeShape="RoundRectangle 12">
-            <Label
-                HeightRequest="50"
-                BackgroundColor="{StaticResource ActionButton}"
-                HorizontalTextAlignment="Center"
-                VerticalTextAlignment="Center"
-                FontFamily="PoppinsBold"
-                Text="LOG IN"/>
-        </Border>
-
-    </Grid>
+    </ScrollView>
 
 
 </ContentPage>
\ No newline at end of file