leo.tuaillon
/
ShopNCook
2
2
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'xaml/bug-fixes' (#51) from xaml/bug-fixes into master
continuous-integration/drone/push Build is passing Details

Browse Source 
Reviewed-on: ShopNCook/ShopNCook#51
pull/52/head
Leo TUAILLON 2 years ago
parent e2df22c858 ef1fdefef8
commit 3eef25162b
13 changed files with 61 additions and 21 deletions
Show Stats Download Patch File Download Diff File

1
Endpoint/IAccountManager.cs
Unescape View File

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

11
Views/ChangePassword.xaml
Unescape View File

@ -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>

4
Views/ChangePassword.xaml.cs
Unescape View File

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

12
Views/Components/OwnedRecipeView.xaml
Unescape View File

@ -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"

12
Views/Components/RecipeView.xaml
Unescape View File

@ -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"

4
Views/Components/StoredRecipeView.xaml
Unescape View File

@ -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"

6
Views/ForgotPassword.xaml
Unescape View File

@ -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>

3
Views/LoginPage.xaml
Unescape View File

@ -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"

7
Views/MyListPage.xaml
Unescape View File

@ -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"

14
Views/ProfilePage.xaml
Unescape View File

@ -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>

4
Views/ProfilePage.xaml.cs
Unescape View File

@ -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()) ;
}
}

1
Views/RecipePage.xaml
Unescape View File

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

3
Views/RegisterPage.xaml
Unescape View File

@ -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"

Write Preview
Loading…
Cancel
Save