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

split AppShell in MainAppShell and ConnectAppShell
continuous-integration/drone/push Build is passing Details

Browse Source
pull/40/head
maxime.BATISTA@etu.uca.fr 2 years ago
parent 6ec1e1cdc2
commit 6ac6c731d0
24 changed files with 355 additions and 302 deletions
Show Stats Download Patch File Download Diff File

20
App.xaml.cs
Unescape View File

@ -1,23 +1,17 @@
namespace ShoopNCook; namespace ShoopNCook;
using ShoopNCook.Pages; using ShoopNCook.Pages;
using ShoopNCook.Models; using Models;
using ShoopNCook.Models.API;
public partial class App : Application public partial class App : Application
{ {
public App() public App()
{ {
InitializeComponent(); InitializeComponent();
Account account = getUserAccount(); Shell main = new ConnectAppShell();
main.GoToAsync("//Splash");
var appShell = new AppShell(); MainPage = main;
MainPage = appShell;
appShell.GoToAsync("//Splash");
} }
private Account getUserAccount()
{
return new Account(new User(new Uri("https://www.pngkey.com/png/full/115-1150152_default-profile-picture-avatar-png-green.png"), "Stub Account"), "test@example.com");
}
} }

31
ConnectAppShell.xaml
Unescape View File

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8" ?>
<Shell
x:Class="ShoopNCook.ConnectAppShell"
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:pages="clr-namespace:ShoopNCook.Pages"
Shell.FlyoutBehavior="Disabled"
Shell.NavBarIsVisible="False"
Shell.TabBarBackgroundColor="White"
Shell.TabBarTitleColor="{StaticResource Selected}"
Shell.TabBarUnselectedColor="{StaticResource TextColorSecondary}">
<ShellContent
x:Name="Splash"
Title="More"
ContentTemplate="{DataTemplate pages:Splash}"
Route="Splash"/>
<ShellContent
x:Name="LoginPage"
Title="Login"
ContentTemplate="{DataTemplate pages:LoginPage}"
Route="LoginPage"/>
<ShellContent
x:Name="RegisterPage"
Title="Register"
ContentTemplate="{DataTemplate pages:RegisterPage}"
Route="RegisterPage"/>
</Shell>

8
AppShell.xaml.cs → ConnectAppShell.xaml.cs
Unescape View File

@ -1,13 +1,11 @@
namespace ShoopNCook; namespace ShoopNCook;
using ShoopNCook.Pages;
using Microsoft.Maui.Controls; using Microsoft.Maui.Controls;
using Models;
public partial class ConnectAppShell : Shell
public partial class AppShell : Shell
{ {
public AppShell() public ConnectAppShell()
{ {
InitializeComponent(); InitializeComponent();
} }
} }

7
LocalEndpoint/Class1.cs
Unescape View File

@ -0,0 +1,7 @@
namespace LocalEndpoint
{
public class Class1
{
}
}

13
LocalEndpoint/LocalEndpoint.csproj
Unescape View File

@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Models\Models.csproj" />
</ItemGroup>
</Project>

49
AppShell.xaml → MainAppShell.xaml
Unescape View File

@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<Shell <Shell
x:Class="ShoopNCook.AppShell" x:Class="ShoopNCook.MainAppShell"
xmlns="http://schemas.microsoft.com/dotnet/2021/maui" xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:ShoopNCook"
xmlns:pages="clr-namespace:ShoopNCook.Pages" xmlns:pages="clr-namespace:ShoopNCook.Pages"
Shell.FlyoutBehavior="Disabled" Shell.FlyoutBehavior="Disabled"
Shell.NavBarIsVisible="False" Shell.NavBarIsVisible="False"
@ -16,21 +15,20 @@
Title="More" Title="More"
ContentTemplate="{DataTemplate pages:Splash}" ContentTemplate="{DataTemplate pages:Splash}"
Route="Splash"/> Route="Splash"/>
<ShellContent <ShellContent
x:Name="LoginPage" x:Name="LoginPage"
Title="Login" Title="Login"
ContentTemplate="{DataTemplate pages:LoginPage}" ContentTemplate="{DataTemplate pages:LoginPage}"
Route="LoginPage"/> Route="LoginPage"/>
<ShellContent <ShellContent
x:Name="RegisterPage" x:Name="RegisterPage"
Title="Register" Title="Register"
ContentTemplate="{DataTemplate pages:RegisterPage}" ContentTemplate="{DataTemplate pages:RegisterPage}"
Route="RegisterPage"/> Route="RegisterPage"/>
<TabBar> <TabBar>
<ShellContent <ShellContent
x:Name="HomeTab" x:Name="HomeTab"
Title="Home" Title="Home"
@ -59,43 +57,4 @@
Route="More" Route="More"
Icon="more.svg"/> Icon="more.svg"/>
</TabBar> </TabBar>
<FlyoutItem Title="Search">
<ShellContent
Title="Search Page"
ContentTemplate="{DataTemplate pages:SearchPage}"
Route="Search"/>
</FlyoutItem>
<FlyoutItem Title="RecipePage">
<ShellContent
Title="RecipePage"
ContentTemplate="{DataTemplate pages:RecipePage}"
Route="RecipePage"/>
</FlyoutItem>
<FlyoutItem Title="MyRecipePage">
<ShellContent
Title="MyRecipesPage"
ContentTemplate="{DataTemplate pages:MyRecipesPage}"
Route="MyRecipe"/>
</FlyoutItem>
<FlyoutItem Title="ProfilePage">
<ShellContent
Title="ProfilePage"
ContentTemplate="{DataTemplate pages:ProfilePage}"
Route="EditProfile"/>
</FlyoutItem>
<FlyoutItem>
<ShellContent
x:Name="ForgotPassword"
Title="Login"
ContentTemplate="{DataTemplate pages:ForgotPassword}"
Route="ForgotPassword"/>
</FlyoutItem>
<FlyoutItem>
<ShellContent
x:Name="CreateRecipe"
Title="CreateRecipe"
ContentTemplate="{DataTemplate pages:CreateRecipePage}"
Route="CreateRecipe"/>
</FlyoutItem>
</Shell> </Shell>

11
MainAppShell.xaml.cs
Unescape View File

@ -0,0 +1,11 @@
namespace ShoopNCook;
using Microsoft.Maui.Controls;
using Models;
public partial class MainAppShell : Shell
{
public MainAppShell()
{
InitializeComponent();
}
}

1
MauiProgram.cs
Unescape View File

@ -16,7 +16,6 @@ public static class MauiProgram
fonts.AddFont("Poppins-Bold.ttf", "PoppinsBold"); fonts.AddFont("Poppins-Bold.ttf", "PoppinsBold");
fonts.AddFont("Poppins-Regular.ttf", "Poppins"); fonts.AddFont("Poppins-Regular.ttf", "Poppins");
fonts.AddFont("Poppins-Medium.ttf", "PoppinsMedium"); fonts.AddFont("Poppins-Medium.ttf", "PoppinsMedium");
fonts.AddFont("Poppins-Regular.ttf", "Poppins");
}); });
#if DEBUG #if DEBUG
builder.Logging.AddDebug(); builder.Logging.AddDebug();

2
Models/Account.cs
Unescape View File

@ -1,4 +1,4 @@
namespace ShoopNCook.Models namespace Models
{ {
public class Account public class Account
{ {

30
Models/API/IAccountManager.cs → Models/Endpoint/IAccountManager.cs
Unescape View File

@ -1,15 +1,15 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace ShoopNCook.Models.API namespace Models.Endpoint
{ {
public interface IAccountManager public interface IAccountManager
{ {
public Account login(string email, string password); public Account login(string email, string password);
} }
} }

32
Models/API/IEndpoint.cs → Models/Endpoint/IEndpoint.cs
Unescape View File

@ -1,16 +1,16 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace ShoopNCook.Models.API namespace Models.Endpoint
{ {
public interface IEndpoint public interface IEndpoint
{ {
public IAccountManager AccountManager { get; } public IAccountManager AccountManager { get; }
public ISearchEngine SearchEngine { get; } public ISearchEngine SearchEngine { get; }
} }
} }

26
Models/API/ISearchEngine.cs → Models/Endpoint/ISearchEngine.cs
Unescape View File

@ -1,13 +1,13 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace ShoopNCook.Models.API namespace Models.Endpoint
{ {
public interface ISearchEngine public interface ISearchEngine
{ {
//TODO define methods to search recipes //TODO define methods to search recipes
} }
} }

6
Models/Ingredient.cs
Unescape View File

@ -1,10 +1,10 @@
 namespace Models
namespace ShoopNCook.Models
{ {
public class Ingredient public class Ingredient
{ {
public Ingredient(string name, float amount, Quantity quantity) { public Ingredient(string name, float amount, Quantity quantity)
{
Name = name; Name = name;
Amount = amount; Amount = amount;
Quantity = quantity; Quantity = quantity;

9
Models/Models.csproj
Unescape View File

@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
</Project>

7
Models/PreparationStep.cs
Unescape View File

@ -1,13 +1,12 @@
 namespace Models
namespace ShoopNCook.Models
{ {
public class PreparationStep public class PreparationStep
{ {
public PreparationStep(string name, string description) public PreparationStep(string name, string description)
{ {
this.Name = name; Name = name;
this.Description = description; Description = description;
} }
public string Name { get; init; } public string Name { get; init; }

3
Models/Quantity.cs
Unescape View File

@ -1,5 +1,4 @@
 namespace Models
namespace ShoopNCook.Models
{ {
public class Quantity public class Quantity
{ {

3
Models/Recipe.cs
Unescape View File

@ -1,5 +1,4 @@
 namespace Models
namespace ShoopNCook.Models
{ {
public class Recipe public class Recipe
{ {

3
Models/RecipeInfo.cs
Unescape View File

@ -1,5 +1,4 @@
 namespace Models
namespace ShoopNCook.Models
{ {
public class RecipeInfo public class RecipeInfo
{ {

7
Models/User.cs
Unescape View File

@ -1,5 +1,4 @@
 namespace Models
namespace ShoopNCook.Models
{ {
public class User public class User
{ {
@ -10,7 +9,7 @@ namespace ShoopNCook.Models
Name = name; Name = name;
} }
public Uri ProfilePicture { get; init; } public Uri ProfilePicture { get; init; }
public string Name { get; init; } public string Name { get; init; }
} }
} }

369
ShoopNCook.csproj
Unescape View File

@ -1,174 +1,203 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net7.0;net7.0-android</TargetFrameworks> <TargetFrameworks>net7.0;net7.0-android</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks> <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET --> <!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> --> <!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<RootNamespace>ShoopNCook</RootNamespace> <RootNamespace>ShoopNCook</RootNamespace>
<UseMaui>true</UseMaui> <UseMaui>true</UseMaui>
<SingleProject>true</SingleProject> <SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<!-- Display name --> <!-- Display name -->
<ApplicationTitle>ShoopNCook</ApplicationTitle> <ApplicationTitle>ShoopNCook</ApplicationTitle>
<!-- App Identifier --> <!-- App Identifier -->
<ApplicationId>com.companyname.shoopncook</ApplicationId> <ApplicationId>com.companyname.shoopncook</ApplicationId>
<ApplicationIdGuid>bf17e1fe-a722-42f6-a24d-3327d351c924</ApplicationIdGuid> <ApplicationIdGuid>bf17e1fe-a722-42f6-a24d-3327d351c924</ApplicationIdGuid>
<!-- Versions --> <!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion> <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
<ApplicationVersion>1</ApplicationVersion> <ApplicationVersion>1</ApplicationVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion> <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion> <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion> <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion> <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion> <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion> <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<!-- App Icon --> <!-- App Icon -->
<!-- Splash Screen --> <!-- Splash Screen -->
<!-- Images --> <!-- Images -->
<MauiImage Include="Resources\Images\*" /> <MauiImage Include="Resources\Images\*" />
<!-- Custom Fonts --> <!-- Custom Fonts -->
<MauiFont Include="Resources\Fonts\*" /> <MauiFont Include="Resources\Fonts\*" />
<!-- Raw Assets (also remove the "Resources\Raw" prefix) --> <!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" /> <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<AndroidResource Remove="ShopNCookTests\**" /> <AndroidResource Remove="ShopNCookTests\**" />
<AndroidResource Remove="Tests\**" /> <AndroidResource Remove="Tests\**" />
<Compile Remove="ShopNCookTests\**" /> <Compile Remove="Endpoint\**" />
<Compile Remove="Tests\**" /> <Compile Remove="LocalEndpoint\**" />
<EmbeddedResource Remove="ShopNCookTests\**" /> <Compile Remove="Models\**" />
<EmbeddedResource Remove="Tests\**" /> <Compile Remove="ShopNCookTests\**" />
<MauiCss Remove="ShopNCookTests\**" /> <Compile Remove="Tests\**" />
<MauiCss Remove="Tests\**" /> <EmbeddedResource Remove="Endpoint\**" />
<MauiXaml Remove="ShopNCookTests\**" /> <EmbeddedResource Remove="LocalEndpoint\**" />
<MauiXaml Remove="Tests\**" /> <EmbeddedResource Remove="Models\**" />
<None Remove="ShopNCookTests\**" /> <EmbeddedResource Remove="ShopNCookTests\**" />
<None Remove="Tests\**" /> <EmbeddedResource Remove="Tests\**" />
</ItemGroup> <MauiCss Remove="Endpoint\**" />
<MauiCss Remove="LocalEndpoint\**" />
<ItemGroup> <MauiCss Remove="Models\**" />
<None Remove="Resources\Fonts\Poppins-Bold.ttf" /> <MauiCss Remove="ShopNCookTests\**" />
<None Remove="Resources\Fonts\Poppins-Medium.ttf" /> <MauiCss Remove="Tests\**" />
<None Remove="Resources\Fonts\Poppins-Regular.ttf" /> <MauiXaml Remove="Endpoint\**" />
<None Remove="Resources\Images\cookie.svg" /> <MauiXaml Remove="LocalEndpoint\**" />
<None Remove="Resources\Images\email_icon.svg" /> <MauiXaml Remove="Models\**" />
<None Remove="Resources\Images\facebook_logo.svg" /> <MauiXaml Remove="ShopNCookTests\**" />
<None Remove="Resources\Images\hearth_off.svg" /> <MauiXaml Remove="Tests\**" />
<None Remove="Resources\Images\hearth_on.svg" /> <None Remove="Endpoint\**" />
<None Remove="Resources\Images\Home.svg" /> <None Remove="LocalEndpoint\**" />
<None Remove="Resources\Images\list.svg" /> <None Remove="Models\**" />
<None Remove="Resources\Images\logout_arrow.svg" /> <None Remove="ShopNCookTests\**" />
<None Remove="Resources\Images\minus.svg" /> <None Remove="Tests\**" />
<None Remove="Resources\Images\moon_white.svg" /> </ItemGroup>
<None Remove="Resources\Images\email_icon.svg" />
<None Remove="Resources\Images\facebook_logo.svg" /> <ItemGroup>
<None Remove="Resources\Images\more.svg" /> <None Remove="Resources\Fonts\Poppins-Bold.ttf" />
<None Remove="Resources\Images\password_icon.svg" /> <None Remove="Resources\Fonts\Poppins-Medium.ttf" />
<None Remove="Resources\Images\search_options.svg" /> <None Remove="Resources\Fonts\Poppins-Regular.ttf" />
<None Remove="Resources\Images\share.svg" /> <None Remove="Resources\Images\cookie.svg" />
<None Remove="Resources\Images\star_empty.svg" /> <None Remove="Resources\Images\email_icon.svg" />
<None Remove="Resources\Images\star_full.svg" /> <None Remove="Resources\Images\facebook_logo.svg" />
<None Remove="Resources\Images\user.svg" /> <None Remove="Resources\Images\hearth_off.svg" />
<None Remove="Resources\Images\user_fill.svg" /> <None Remove="Resources\Images\hearth_on.svg" />
<None Remove="Resources\Images\visibility_off.svg" /> <None Remove="Resources\Images\Home.svg" />
<None Remove="Resources\Images\visibility_on.svg" /> <None Remove="Resources\Images\list.svg" />
</ItemGroup> <None Remove="Resources\Images\logout_arrow.svg" />
<None Remove="Resources\Images\minus.svg" />
<ItemGroup> <None Remove="Resources\Images\moon_white.svg" />
<None Remove="Resources\Fonts\arrow_back_ios_FILL0_wght400_GRAD200_opsz48.svg" /> <None Remove="Resources\Images\email_icon.svg" />
<None Remove="Resources\Images\default_profile_picture.png" /> <None Remove="Resources\Images\facebook_logo.svg" />
</ItemGroup> <None Remove="Resources\Images\more.svg" />
<None Remove="Resources\Images\password_icon.svg" />
<ItemGroup> <None Remove="Resources\Images\search_options.svg" />
<MauiFont Include="Resources\Images\arrow_back.svg" /> <None Remove="Resources\Images\share.svg" />
</ItemGroup> <None Remove="Resources\Images\star_empty.svg" />
<None Remove="Resources\Images\star_full.svg" />
<ItemGroup> <None Remove="Resources\Images\user.svg" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" /> <None Remove="Resources\Images\user_fill.svg" />
<PackageReference Include="xunit" Version="2.4.2" /> <None Remove="Resources\Images\visibility_off.svg" />
</ItemGroup> <None Remove="Resources\Images\visibility_on.svg" />
</ItemGroup>
<ItemGroup>
<Compile Update="Views\MyListPage.xaml.cs"> <ItemGroup>
<DependentUpon>MyListPage.xaml</DependentUpon> <None Remove="Resources\Fonts\arrow_back_ios_FILL0_wght400_GRAD200_opsz48.svg" />
</Compile> <None Remove="Resources\Images\default_profile_picture.png" />
</ItemGroup>
<ItemGroup>
<MauiFont Include="Resources\Images\arrow_back.svg" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
<PackageReference Include="xunit" Version="2.4.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="Endpoint\Models.csproj" />
<ProjectReference Include="Models\Models.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Update="ConnectAppShell.xaml.cs">
<DependentUpon>ConnectAppShell.xaml</DependentUpon>
</Compile>
<Compile Update="MainAppShell.xaml.cs">
<DependentUpon>MainAppShell.xaml</DependentUpon>
</Compile>
<Compile Update="Views\MyListPage.xaml.cs">
<DependentUpon>MyListPage.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Components\IngredientEntry.xaml.cs"> <Compile Update="Views\Components\IngredientEntry.xaml.cs">
<DependentUpon>IngredientEntry.xaml</DependentUpon> <DependentUpon>IngredientEntry.xaml</DependentUpon>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<MauiXaml Update="Views\CreateRecipePage.xaml"> <MauiXaml Update="ConnectAppShell.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\Splash.xaml"> <MauiXaml Update="Views\CreateRecipePage.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\Components\CounterView.xaml"> <MauiXaml Update="Views\Splash.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\Components\HeadedButton.xaml"> <MauiXaml Update="Views\Components\CounterView.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\Components\IngredientEntry.xaml"> <MauiXaml Update="Views\Components\HeadedButton.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\Components\IngredientView.xaml"> <MauiXaml Update="Views\Components\IngredientEntry.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\FavoritesPage.xaml"> <MauiXaml Update="Views\Components\IngredientView.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\MorePage.xaml"> <MauiXaml Update="Views\FavoritesPage.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\ProfilePage.xaml"> <MauiXaml Update="Views\MorePage.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\RecipePage.xaml"> <MauiXaml Update="Views\ProfilePage.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\Components\RecipeView.xaml"> <MauiXaml Update="Views\RecipePage.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\RegisterPage.xaml"> <MauiXaml Update="Views\Components\RecipeView.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\SearchPage.xaml"> <MauiXaml Update="Views\RegisterPage.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\Components\RecipeView.xaml"> <MauiXaml Update="Views\SearchPage.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\SearchPage.xaml"> <MauiXaml Update="Views\Components\RecipeView.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\SearchPage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Views\Components\StepEntry.xaml"> <MauiXaml Update="Views\Components\StepEntry.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\Components\StoredRecipeView.xaml"> <MauiXaml Update="Views\Components\StoredRecipeView.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
</ItemGroup> </ItemGroup>
<ProjectExtensions> <ProjectExtensions>
<VisualStudio> <VisualStudio>
<UserProperties XamarinHotReloadDebuggerTimeoutExceptionShoopNCookHideInfoBar="True" XamarinHotReloadUnhandledDeviceExceptionShoopNCookHideInfoBar="True" /> <UserProperties XamarinHotReloadDebuggerTimeoutExceptionShoopNCookHideInfoBar="True" XamarinHotReloadUnhandledDeviceExceptionShoopNCookHideInfoBar="True" />
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
</Project> </Project>

14
ShoopNCook.sln
Unescape View File

@ -4,7 +4,11 @@ VisualStudioVersion = 17.0.31611.283
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShoopNCook", "ShoopNCook.csproj", "{8ED2FB1D-C04D-478D-9271-CC91FE110396}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShoopNCook", "ShoopNCook.csproj", "{8ED2FB1D-C04D-478D-9271-CC91FE110396}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{E50D92DC-0BB1-4998-B085-EF47C55675AC}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{E50D92DC-0BB1-4998-B085-EF47C55675AC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Models", "Models\Models.csproj", "{A9D43E07-345D-4DD4-B4F9-CE69ED569B5F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocalEndpoint", "LocalEndpoint\LocalEndpoint.csproj", "{57732316-93B9-4DA0-A212-F8892D3D968B}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -22,6 +26,14 @@ Global
{E50D92DC-0BB1-4998-B085-EF47C55675AC}.Debug|Any CPU.Build.0 = Debug|Any CPU {E50D92DC-0BB1-4998-B085-EF47C55675AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E50D92DC-0BB1-4998-B085-EF47C55675AC}.Release|Any CPU.ActiveCfg = Release|Any CPU {E50D92DC-0BB1-4998-B085-EF47C55675AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E50D92DC-0BB1-4998-B085-EF47C55675AC}.Release|Any CPU.Build.0 = Release|Any CPU {E50D92DC-0BB1-4998-B085-EF47C55675AC}.Release|Any CPU.Build.0 = Release|Any CPU
{A9D43E07-345D-4DD4-B4F9-CE69ED569B5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A9D43E07-345D-4DD4-B4F9-CE69ED569B5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A9D43E07-345D-4DD4-B4F9-CE69ED569B5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A9D43E07-345D-4DD4-B4F9-CE69ED569B5F}.Release|Any CPU.Build.0 = Release|Any CPU
{57732316-93B9-4DA0-A212-F8892D3D968B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{57732316-93B9-4DA0-A212-F8892D3D968B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{57732316-93B9-4DA0-A212-F8892D3D968B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{57732316-93B9-4DA0-A212-F8892D3D968B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

2
Views/LoginPage.xaml.cs
Unescape View File

@ -22,6 +22,6 @@ public partial class LoginPage : ContentPage
} }
private async void RegisterLabbelTapped(object sender, EventArgs e) private async void RegisterLabbelTapped(object sender, EventArgs e)
{ {
await Shell.Current.GoToAsync("//RegisterPage"); await Shell.Current.Navigation.PushAsync(new RegisterPage());
} }
} }

2
Views/RegisterPage.xaml
Unescape View File

@ -84,8 +84,6 @@
</Grid> </Grid>
</Border> </Border>
<Border <Border
Margin="0, 30, 0, 0" Margin="0, 30, 0, 0"
Stroke="{StaticResource BackgroundPrimary}" Stroke="{StaticResource BackgroundPrimary}"

2
Views/Splash.xaml.cs
Unescape View File

@ -5,8 +5,6 @@ public partial class Splash : ContentPage
public Splash() public Splash()
{ {
InitializeComponent(); InitializeComponent();
NavigationPage.SetHasNavigationBar(this, false);
} }
private async void OnGetStartedButtonClicked(object sender, EventArgs e) private async void OnGetStartedButtonClicked(object sender, EventArgs e)
{ {

Write Preview
Loading…
Cancel
Save