merge with master

pull/39/head
maxime.BATISTA@etu.uca.fr 2 years ago
commit 16737be9f5

@ -70,5 +70,5 @@
ContentTemplate="{DataTemplate pages:LoginPage}"
Route="LoginPage"/>
</FlyoutItem>
</Shell>

@ -0,0 +1,37 @@
<?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.Splash"
Title="Splash">
<Grid
RowDefinitions="Auto,Auto,*,Auto">
<Image Grid.Row="0"
Source="logo.png"
Margin="0,80,0,0">
</Image>
<Label
Grid.Row="1"
Text="ShopNCook"
Style="{StaticResource h1}"
TextColor="{StaticResource TextColorPrimary}"
HorizontalTextAlignment="Center"
Margin="0,25,0,25"
/>
<Label
Grid.Row="2"
Text="Don't waste time planning your meals ! Eat better, faster, better !"
Style="{StaticResource h2}"
TextColor="{StaticResource TextColorSecondary}"
HorizontalTextAlignment="Center"
FontSize="Small"
Margin="15"
/>
<Button
Grid.Row="3"
BackgroundColor="{StaticResource Selected}"
FontFamily="PoppinsMedium"
TextColor="{StaticResource ButtonText}"
Text="Let's Get Started ➝"
Margin="25"/>
</Grid>
</ContentPage>

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

@ -0,0 +1,12 @@
<?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.SplashScreen"
Title="SplashScreen">
<VerticalStackLayout>
<Label
Text="Welcome to .NET MAUI!"
VerticalOptions="Center"
HorizontalOptions="Center" />
</VerticalStackLayout>
</ContentPage>

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

@ -1,2 +1,4 @@
# ShopNCook
Leo TUAILLON
Par TUAILLON Leo et BATISTA Maxime
ShopNCook est une application de cuisine.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 228 B

After

Width:  |  Height:  |  Size: 118 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 118 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 118 KiB

@ -32,10 +32,8 @@
<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\*" />
@ -95,6 +93,9 @@
</ItemGroup>
<ItemGroup>
<MauiXaml Update="Pages\Splash.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Views\CounterView.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>

Loading…
Cancel
Save