split AppShell in MainAppShell and ConnectAppShell

App.xaml.cs

@@ -1,23 +1,17 @@
 namespace ShoopNCook;
 using ShoopNCook.Pages;
-using ShoopNCook.Models;
+using Models;
-using ShoopNCook.Models.API;
 
 public partial class App : Application
 {
+
     public App()
     {
         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");
-    }
 }

ConnectAppShell.xaml

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

ConnectAppShell.xaml.cs

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

LocalEndpoint/Class1.cs

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

LocalEndpoint/LocalEndpoint.csproj

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

MainAppShell.xaml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <Shell
-    x:Class="ShoopNCook.AppShell"
+    x:Class="ShoopNCook.MainAppShell"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:local="clr-namespace:ShoopNCook"
     xmlns:pages="clr-namespace:ShoopNCook.Pages"
     Shell.FlyoutBehavior="Disabled"
     Shell.NavBarIsVisible="False"
@@ -16,21 +15,20 @@
         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"/>
 
-    
     <TabBar>
-        
-        
         <ShellContent
             x:Name="HomeTab"
             Title="Home"
@@ -59,43 +57,4 @@
             Route="More"
             Icon="more.svg"/>
     </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>

MainAppShell.xaml.cs

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

MauiProgram.cs

@@ -16,7 +16,6 @@ public static class MauiProgram
 				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();

Models/Account.cs

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

Models/Endpoint/IAccountManager.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ShoopNCook.Models.API
+namespace Models.Endpoint
 {
     public interface IAccountManager
     {

Models/Endpoint/IEndpoint.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ShoopNCook.Models.API
+namespace Models.Endpoint
 {
     public interface IEndpoint
     {

Models/Endpoint/ISearchEngine.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ShoopNCook.Models.API
+namespace Models.Endpoint
 {
     public interface ISearchEngine
     {

Models/Ingredient.cs

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

Models/Models.csproj

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

Models/PreparationStep.cs

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

Models/Quantity.cs

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

Models/Recipe.cs

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

Models/RecipeInfo.cs

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

Models/User.cs

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

ShoopNCook.csproj

@@ -48,14 +48,29 @@
 	<ItemGroup>
 	  <AndroidResource Remove="ShopNCookTests\**" />
 	  <AndroidResource Remove="Tests\**" />
+	  <Compile Remove="Endpoint\**" />
+	  <Compile Remove="LocalEndpoint\**" />
+	  <Compile Remove="Models\**" />
 	  <Compile Remove="ShopNCookTests\**" />
 	  <Compile Remove="Tests\**" />
+	  <EmbeddedResource Remove="Endpoint\**" />
+	  <EmbeddedResource Remove="LocalEndpoint\**" />
+	  <EmbeddedResource Remove="Models\**" />
 	  <EmbeddedResource Remove="ShopNCookTests\**" />
 	  <EmbeddedResource Remove="Tests\**" />
+	  <MauiCss Remove="Endpoint\**" />
+	  <MauiCss Remove="LocalEndpoint\**" />
+	  <MauiCss Remove="Models\**" />
 	  <MauiCss Remove="ShopNCookTests\**" />
 	  <MauiCss Remove="Tests\**" />
+	  <MauiXaml Remove="Endpoint\**" />
+	  <MauiXaml Remove="LocalEndpoint\**" />
+	  <MauiXaml Remove="Models\**" />
 	  <MauiXaml Remove="ShopNCookTests\**" />
 	  <MauiXaml Remove="Tests\**" />
+	  <None Remove="Endpoint\**" />
+	  <None Remove="LocalEndpoint\**" />
+	  <None Remove="Models\**" />
 	  <None Remove="ShopNCookTests\**" />
 	  <None Remove="Tests\**" />
 	</ItemGroup>
@@ -103,6 +118,17 @@
 	</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>
@@ -112,6 +138,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <MauiXaml Update="ConnectAppShell.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Views\CreateRecipePage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>

ShoopNCook.sln

@@ -4,7 +4,11 @@ VisualStudioVersion = 17.0.31611.283
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShoopNCook", "ShoopNCook.csproj", "{8ED2FB1D-C04D-478D-9271-CC91FE110396}"
 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
 Global
 	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}.Release|Any CPU.ActiveCfg = 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
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Views/LoginPage.xaml.cs

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

Views/RegisterPage.xaml

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

Views/Splash.xaml.cs

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