Merge pull request 'xaml/homePage' (#29) from xaml/homePage into master

Reviewed-on: ShopNCook/ShopNCook#29
pull/30/head^2
Leo TUAILLON 2 years ago
commit be803872c8

@ -19,6 +19,11 @@
ContentTemplate="{DataTemplate pages:ProfilePage}"
Route="Profile" />
<ShellContent
Title="Home Page"
ContentTemplate="{DataTemplate pages:HomePage}"
Route="HomePage" />
<ShellContent
Title="Search Page"
ContentTemplate="{DataTemplate pages:SearchPage}"
@ -44,7 +49,6 @@
ContentTemplate="{DataTemplate pages:FavoritesPage}"
Route="Favorites" />
<ShellContent
Title="My Recipes Page"
ContentTemplate="{DataTemplate pages:MyRecipesPage}"

@ -14,10 +14,10 @@ public static class MauiProgram
fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
fonts.AddFont("Poppins-Bold.ttf", "PoppinsBold");
fonts.AddFont("Poppins-Regular.ttf", "Poppins");
fonts.AddFont("Poppins-Medium.ttf", "PoppinsMedium");
fonts.AddFont("Poppins-Regular.ttf", "Poppins");
});
#if DEBUG
builder.Logging.AddDebug();
#endif

@ -0,0 +1,125 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="ShoopNCook.Pages.HomePage"
xmlns:views="clr-namespace:ShoopNCook.Views"
Title="HomePage"
BackgroundColor="{StaticResource BackgroundPrimary}">
<ScrollView>
<Grid RowDefinitions="Auto,Auto,Auto,*">
<FlexLayout
Grid.Row="0"
JustifyContent="SpaceBetween"
AlignItems="Center"
AlignContent="Center"
Margin="20,35,20,20"
>
<Border
Style="{StaticResource SecondaryBorder}"
BackgroundColor="{StaticResource BackgroundSecondary}"
StrokeShape="RoundRectangle 1500"
>
<ImageButton
Source="default_profile_picture.png"
WidthRequest="65"
HeightRequest="65"/>
</Border>
</FlexLayout>
<Grid
ColumnDefinitions="*,Auto"
Grid.Row="1"
Margin="20">
<Border
Margin="0,10,10,7"
Style="{StaticResource SecondaryBorder}">
<Entry
Style="{StaticResource UserInput}"
Grid.Column="0"
Placeholder="Search here..."/>
</Border>
<ImageButton
Grid.Column="1"
Source="syncalt.svg"
Padding="5"
BackgroundColor="{StaticResource ActionButton}"
WidthRequest="65"
HeightRequest="65"
CornerRadius="15"
Margin="0,5,5,0">
</ImageButton>
</Grid>
<VerticalStackLayout
Grid.Row="2">
<FlexLayout
JustifyContent="SpaceBetween"
AlignItems="Center"
Margin="20"
HeightRequest="30">
<Label
Text="Popular recipe"
Style="{StaticResource h2}"/>
<Label
Text="Show All"
TextColor="{StaticResource TextColorSecondary}"/>
</FlexLayout>
<ScrollView
Orientation="Horizontal">
<HorizontalStackLayout
Spacing="10"
Padding="0,0,0,40">
<views:RecipeView/>
<views:RecipeView/>
<views:RecipeView/>
<views:RecipeView/>
<views:RecipeView/>
</HorizontalStackLayout>
</ScrollView>
</VerticalStackLayout>
<VerticalStackLayout
Grid.Row="3">
<FlexLayout
JustifyContent="SpaceBetween"
AlignItems="Center"
Margin="20,0,20,20"
HeightRequest="30"
>
<Label
Text="Recommended for you"
Style="{StaticResource h2}"/>
<Label
Text="Show All"
TextColor="{StaticResource TextColorSecondary}"/>
</FlexLayout>
<ScrollView>
<FlexLayout
JustifyContent="Center"
AlignItems="Start"
AlignContent="Start"
Direction="Row"
Wrap="Wrap">
<views:RecipeView Margin="2.5"/>
<views:RecipeView Margin="2.5"/>
<views:RecipeView Margin="2.5"/>
<views:RecipeView Margin="2.5"/>
<views:RecipeView Margin="2.5"/>
<views:RecipeView Margin="2.5"/>
<views:RecipeView Margin="2.5"/>
</FlexLayout>
</ScrollView>
</VerticalStackLayout>
</Grid>
</ScrollView>
</ContentPage>

@ -0,0 +1,9 @@
namespace ShoopNCook.Pages;
public partial class HomePage : ContentPage
{
public HomePage()
{
InitializeComponent();
}
}

@ -105,7 +105,6 @@
AlignContent="Start"
Direction="Row"
Wrap="Wrap">
<views:RecipeView Margin="5"/>
<views:RecipeView Margin="5"/>
<views:RecipeView Margin="5"/>

@ -1 +1,2 @@
# ShopNCook
Leo TUAILLON

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 96 960 960" fill="#FFFFFF" width="48"><path d="M120 816v-60h240v60H120Zm0-210v-60h480v60H120Zm0-210v-60h720v60H120Z"/></svg>

After

Width:  |  Height:  |  Size: 187 B

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="48" fill="#FFFFFF" viewBox="0 96 960 960" width="48"><path d="M271 936 80 745l192-192 42 42-120 120h649v60H194l119 119-42 42Zm418-337-42-42 119-119H117v-60h649L646 258l42-42 192 192-191 191Z"/></svg>

After

Width:  |  Height:  |  Size: 247 B

@ -34,7 +34,7 @@
x:Key="UserInput">
<Setter Property="TextColor" Value="{StaticResource TextColorPrimary}"/>
<Setter Property="PlaceholderColor" Value="{StaticResource TextColorSecondary}"/>
<Setter Property="FontFamily" Value="PoppinsMedium"/>
<Setter Property="FontFamily" Value="Poppins"/>
<Setter Property="FontSize" Value="20"/>
<Setter Property="Margin" Value="7, 0, 0, 0"/>
</Style>
@ -44,7 +44,7 @@
x:Key="UserButton">
<Setter Property="FontFamily" Value="PoppinsMedium"/>
<Setter Property="FontSize" Value="20"/>
<Setter Property="TextColor" Value="{StaticResource ButtonText}"></Setter>
<Setter Property="TextColor" Value="{StaticResource ButtonText}"/>
</Style>
<Style

@ -49,25 +49,11 @@
<ItemGroup>
<None Remove="Resources\Fonts\Poppins-Bold.ttf" />
<None Remove="Resources\Fonts\Poppins-Medium.ttf" />
<None Remove="Resources\Fonts\Poppins-Regular.ttf" />
<None Remove="Resources\Images\cookie.svg" />
<None Remove="Resources\Images\email_icon.svg" />
<None Remove="Resources\Images\facebook_logo.svg" />
<None Remove="Resources\Images\hearth_off.svg" />
<None Remove="Resources\Images\hearth_on.svg" />
<None Remove="Resources\Images\logout_arrow.svg" />
<None Remove="Resources\Images\minus.svg" />
<None Remove="Resources\Images\moon_white.svg" />
<None Remove="Resources\Images\email_icon.svg" />
<None Remove="Resources\Images\facebook_logo.svg" />
<None Remove="Resources\Images\password_icon.svg" />
<None Remove="Resources\Images\search_options.svg" />
<None Remove="Resources\Images\share.svg" />
<None Remove="Resources\Images\star_empty.svg" />
<None Remove="Resources\Images\star_full.svg" />
<None Remove="Resources\Images\user.svg" />
<None Remove="Resources\Images\user_fill.svg" />
<None Remove="Resources\Images\visibility_off.svg" />
<None Remove="Resources\Images\visibility_on.svg" />
</ItemGroup>
@ -86,36 +72,18 @@
</ItemGroup>
<ItemGroup>
<MauiXaml Update="Pages\MyList.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Views\HeadedButton.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Views\IngredientView.xaml">
<MauiXaml Update="Views\FavoritesPage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Pages\FavoritesPage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Pages\MorePage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Pages\ProfilePage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Pages\RecipePage.xaml">
<MauiXaml Update="Pages\MyList.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Views\RecipeView.xaml">
<MauiXaml Update="Views\HeadedButton.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Pages\RegisterPage.xaml">
<MauiXaml Update="Views\ProfilePage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Pages\SearchPage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Views\RecipeView.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>

Loading…
Cancel
Save