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

some fixes and add add recipe button

Browse Source
pull/31/head
maxime.BATISTA@etu.uca.fr 2 years ago
parent f1dcd519e2
commit c8c58f29b7
4 changed files with 60 additions and 16 deletions
Show Stats Download Patch File Download Diff File

15
Pages/MyRecipesPage.xaml
Unescape View File

@ -6,12 +6,11 @@
xmlns:views="clr-namespace:ShoopNCook.Views"
BackgroundColor="{StaticResource BackgroundPrimary}">
<Grid
RowDefinitions="Auto, *">
RowDefinitions="Auto, *, Auto">
<!-- Header label and return button -->
<Grid
Grid.Row="0"
Padding="10, 20, 0, 30"
ColumnDefinitions="*">
Padding="10, 20, 0, 30">
<ImageButton
Grid.Column="0"
@ -52,5 +51,15 @@
<views:OwnedRecipeView Margin="5" Note="2" Title="Margherita Pizza"/>
</FlexLayout>
</ScrollView>
<Border
Margin="20, 0, 20, 5"
Grid.Row="2"
Style="{StaticResource SecondaryBorder}">
<Button
Style="{StaticResource UserButton}"
BackgroundColor="{StaticResource Selected}"
Text="Add a new recipe"/>
</Border>
</Grid>
</ContentPage>

7
Resources/Styles/Styles.xaml
Unescape View File

@ -7,7 +7,8 @@
<Style TargetType="Border"
x:Key="SecondaryBorder">
<Setter Property="StrokeShape" Value="RoundRectangle 25"/>
<Setter Property="Stroke" Value="{StaticResource BackgroundSecondary}"/>
<Setter Property="Stroke" Value="Transparent"/>
<Setter Property="StrokeThickness" Value="0"/>
<Setter Property="BackgroundColor" Value="{StaticResource BackgroundSecondary}"/>
</Style>
@ -15,7 +16,8 @@
x:Key="SecondaryBorderShadow">
<Setter Property="StrokeShape" Value="RoundRectangle 25"/>
<Setter Property="Stroke" Value="{StaticResource BackgroundSecondary}"/>
<Setter Property="Stroke" Value="Transparent"/>
<Setter Property="StrokeThickness" Value="0"/>
<Setter Property="BackgroundColor" Value="{StaticResource BackgroundSecondary}"/>
<Setter Property="Shadow">
<Setter.Value>
@ -42,6 +44,7 @@
x:Key="UserButton">
<Setter Property="FontFamily" Value="PoppinsMedium"/>
<Setter Property="FontSize" Value="20"/>
<Setter Property="TextColor" Value="{StaticResource ButtonText}"></Setter>
</Style>
<Style

42
ShoopNCook.csproj
Unescape View File

@ -49,11 +49,25 @@
<ItemGroup>
<None Remove="Resources\Fonts\Poppins-Bold.ttf" />
<None Remove="Resources\Images\bin.svg" />
<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>
@ -72,21 +86,39 @@
</ItemGroup>
<ItemGroup>
<MauiXaml Update="Views\FavoritesPage.xaml">
<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">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Pages\FavoritesPage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Views\MyRecipesPage.xaml">
<MauiXaml Update="Pages\MorePage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Views\OwnedRecipeView.xaml">
<MauiXaml Update="Pages\ProfilePage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Views\ProfilePage.xaml">
<MauiXaml Update="Pages\RecipePage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Views\RecipeView.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Pages\RegisterPage.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>
<MauiXaml Update="Views\SearchPage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>

12
Views/OwnedRecipeView.xaml
Unescape View File

@ -51,11 +51,13 @@
BackgroundColor="{StaticResource Selected}"
Stroke="Transparent"
StrokeShape="RoundRectangle 250"
Margin="15, 0, 15, 0">
Margin="8, 0, 8, 0">
<Grid
ColumnDefinitions="Auto, *"
Padding="15, 3, 15, 3"
ColumnSpacing="4">
Padding="10, 3, 10, 3"
ColumnSpacing="4"
HorizontalOptions="Center"
>
<Grid.GestureRecognizers>
<TapGestureRecognizer
Tapped="TapGestureRecognizer_Tapped"
@ -66,11 +68,9 @@
Source="bin.svg"
MaximumHeightRequest="15"/>
<Label
Grid.Column="1"
Text="Delete"
/>
Text="Delete"/>
</Grid>
</Border>
</VerticalStackLayout>

Write Preview
Loading…
Cancel
Save