Merge pull request 'xaml/bug-fixes' (#51) from xaml/bug-fixes into master

Reviewed-on: ShopNCook/ShopNCook#51

Endpoint/IAccountManager.cs

@@ -8,3 +8,4 @@ namespace Endpoint
         public Account? Register(string email, string username, string password);
     }
 }
+

Views/ChangePassword.xaml

@@ -19,7 +19,7 @@
                 <HorizontalStackLayout>
                     <ImageButton 
                         Grid.Column="0" 
-           
+                        Clicked="OnBackButtonClicked"
                         HeightRequest="50"
                         WidthRequest="50"
                         Source="arrow_back.svg"/>
@@ -60,7 +60,8 @@
                             <Entry 
                                 Style="{StaticResource UserInput}"
                                 Grid.Column="2"
-                                Placeholder="Old Password"/>
+                                Placeholder="Old Password"
+                                IsPassword="True"/>
                         </Grid>
                     </Border>
 
@@ -85,7 +86,8 @@
                             <Entry 
                                 Style="{StaticResource UserInput}"
                                 Grid.Column="2"
-                                Placeholder="New Password"/>
+                                Placeholder="New Password"
+                                IsPassword="True"/>
                         </Grid>
                     </Border>
 
@@ -111,7 +113,8 @@
                             <Entry 
                                 Style="{StaticResource UserInput}"
                                 Grid.Column="2"
-                                Placeholder="New Password"/>
+                                Placeholder="New Password"
+                                IsPassword="True"/>
                         </Grid>
                     </Border>
                 </VerticalStackLayout>

Views/ChangePassword.xaml.cs

@@ -6,4 +6,8 @@ public partial class ChangePassword : ContentPage
 	{
 		InitializeComponent();
 	}
+    private async void OnBackButtonClicked(object sender, EventArgs e)
+    {
+        await Navigation.PopAsync();
+    }
 }

Views/Components/OwnedRecipeView.xaml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="ShoopNCook.Views.OwnedRecipeView">
+             x:Class="ShoopNCook.Views.OwnedRecipeView"
+             Margin="6,2">
     <Border
         Style="{StaticResource SecondaryBorderShadow}"
         StrokeShape="RoundRectangle 30">
@@ -11,6 +12,8 @@
             Padding="10"
             MinimumHeightRequest="175"
             MinimumWidthRequest="150"
+            MaximumHeightRequest="175"
+            MaximumWidthRequest="150"
             RowDefinitions="*, Auto">
 
             <Grid.GestureRecognizers>
@@ -25,7 +28,12 @@
                 StrokeShape="RoundRectangle 20"
                 BackgroundColor="{StaticResource ImageBackground}">
                 <Grid>
-                    <Image x:Name="RecipeImage" />
+                    <Image x:Name="RecipeImage" 
+                           MinimumHeightRequest="175"
+                           MinimumWidthRequest="150"
+                           MaximumHeightRequest="175"
+                           MaximumWidthRequest="150"
+                           Aspect="AspectFill"/>
                     <HorizontalStackLayout
                         x:Name="Stars"
                         VerticalOptions="End"

Views/Components/RecipeView.xaml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="ShoopNCook.Views.RecipeView">
+             x:Class="ShoopNCook.Views.RecipeView"
+             Margin="4,2">
 
 
     <Border
@@ -12,7 +13,9 @@
             BackgroundColor="{StaticResource BackgroundSecondary}"
             Padding="10"
             MinimumHeightRequest="175"
+            MaximumHeightRequest="175"
             MinimumWidthRequest="150"
+            MaximumWidthRequest="150"
             RowDefinitions="*, Auto">
             <Grid.GestureRecognizers>
                 <TapGestureRecognizer Tapped="OnRecipeTapped"/>
@@ -23,7 +26,12 @@
                 StrokeShape="RoundRectangle 20"
                 BackgroundColor="{StaticResource ImageBackground}">
                 <Grid>
-                    <Image x:Name="RecipeImage" />
+                    <Image x:Name="RecipeImage"
+                           Aspect="AspectFill"
+                           MinimumHeightRequest="155"
+                           MinimumWidthRequest="130"
+                           MaximumHeightRequest="155"
+                           MaximumWidthRequest="130"/>
                     <HorizontalStackLayout
                         x:Name="Stars"
                         VerticalOptions="End"

Views/Components/StoredRecipeView.xaml

@@ -23,9 +23,11 @@
                 Grid.Row="0"
                 Stroke="Transparent"
                 StrokeShape="RoundRectangle 20"
+                MaximumHeightRequest="300"
                 BackgroundColor="{StaticResource ImageBackground}">
                 <Grid>
-                    <Image x:Name="RecipeImage"/>
+                    <Image x:Name="RecipeImage"
+                           Aspect="AspectFill"/>
                     <HorizontalStackLayout
                         x:Name="Stars"
                         VerticalOptions="End"

Views/ForgotPassword.xaml

@@ -131,7 +131,8 @@
                     Style="{StaticResource SecondaryBorderShadow}">
                     <Entry
                         Style="{StaticResource UserInput}" 
-                        Placeholder="New password"/>
+                        Placeholder="New password"
+                        IsPassword="True"/>
                 </Border>
                 <Label 
                     Grid.Row="5"
@@ -143,7 +144,8 @@
                     Style="{StaticResource SecondaryBorderShadow}">
                     <Entry
                         Style="{StaticResource UserInput}" 
-                        Placeholder="New password"/>
+                        Placeholder="New password"
+                        IsPassword="True"/>
                 </Border>
             </Grid>
 

Views/LoginPage.xaml

@@ -59,7 +59,8 @@
                     Style="{StaticResource UserInput}"
                     Grid.Column="2"
                     Placeholder="Password"
-                    x:Name="PasswordEntry"/>
+                    x:Name="PasswordEntry"
+                    IsPassword="True"/>
                 <ImageButton
                     Grid.Column="3"
                     Source="visibility_off.svg"

Views/MyListPage.xaml

@@ -15,13 +15,6 @@
             ColumnDefinitions="*"
             MaximumHeightRequest="60">
 
-            <ImageButton 
-                Grid.Column="0" 
-                HeightRequest="50"
-                WidthRequest="50"
-                Source="arrow_back.svg"
-                HorizontalOptions="Start"/>
-
             <Label 
                 Grid.Column="0"
                 FontSize="24"

Views/ProfilePage.xaml

@@ -76,7 +76,7 @@
             <Grid
                 Grid.Row="2"
                 Padding="0, 20, 0, 0"
-                RowDefinitions="Auto, *, Auto, *">
+                RowDefinitions="Auto, *, Auto, Auto,Auto">
                 <Label 
                     Grid.Row="0"
                     Text="Name"
@@ -106,6 +106,18 @@
                         Text="%Profile_Mail%"
                         Placeholder="Place your email address here"/>
                 </Border>
+                <Border
+                    Grid.Row="4"
+                    Margin="0, 30, 0, 0"
+                    Stroke="{StaticResource BackgroundPrimary}"
+                    StrokeShape="RoundRectangle 12">
+                    <Button
+                        BackgroundColor="{StaticResource ActionButton}"
+                        FontFamily="PoppinsMedium"
+                        TextColor="White"
+                        Text="Change My Password"
+                        Clicked="ChangeMyPasswordClicked"/>
+                </Border>
 
 
 

Views/ProfilePage.xaml.cs

@@ -12,4 +12,8 @@ public partial class ProfilePage : ContentPage
     {
         await Navigation.PopAsync();
     }
+    private async void ChangeMyPasswordClicked(object sender, EventArgs e)
+    {
+        await Shell.Current.Navigation.PushAsync(new ChangePassword()) ;
+    }
 }

Views/RecipePage.xaml

@@ -50,6 +50,7 @@
                     StrokeShape="RoundRectangle 20"
                     BackgroundColor="{StaticResource ImageBackground}">
                     <Image 
+                        Aspect="AspectFill"
                         HeightRequest="250"
                         x:Name="RecipeImage"/>
                 </Border>

Views/RegisterPage.xaml

@@ -79,7 +79,8 @@
                         Style="{StaticResource UserInput}"
                         Grid.Column="2"
                         Placeholder="Password"
-                        x:Name="PasswordEntry"/>
+                        x:Name="PasswordEntry"
+                        IsPassword="True"/>
                     <ImageButton
                         Grid.Column="3"
                         Source="visibility_off.svg"