Fixes

aritchie · aritchie · commit c7a8ee4749d1 · 2026-03-13T21:02:55.000-04:00
diff --git a/src/ShinyWonderland/App.xaml.cs b/src/ShinyWonderland/App.xaml.cs
@@ -11,5 +11,5 @@ public App(StringsLocalized localize)
     }
 
     protected override Window CreateWindow(IActivationState? activationState)
-        => new(new StartAppShell());
+        => new(new AppShell(localize));
 }
diff --git a/src/ShinyWonderland/Shells/AppShell.xaml b/src/ShinyWonderland/Shells/AppShell.xaml
@@ -6,7 +6,11 @@
        x:Class="ShinyWonderland.AppShell"
        x:DataType="local:AppShell">
 
-    <TabBar>
+    <ShellItem Route="startup" FlyoutItemIsVisible="False">
+        <ShellContent ContentTemplate="{DataTemplate local:StartupPage}" />
+    </ShellItem>
+
+    <TabBar Route="main">
         <Tab Icon="ride_time">
             <ShellContent Title="{Binding Localize.RideTimes}" 
                           ContentTemplate="{DataTemplate local:RideTimesPage}"/>
diff --git a/src/ShinyWonderland/Shells/StartAppShell.xaml b/src/ShinyWonderland/Shells/StartAppShell.xaml
diff --git a/src/ShinyWonderland/Shells/StartAppShell.xaml.cs b/src/ShinyWonderland/Shells/StartAppShell.xaml.cs
diff --git a/src/ShinyWonderland/ShinyWonderland.csproj b/src/ShinyWonderland/ShinyWonderland.csproj
@@ -115,25 +115,4 @@
         <ProjectReference Include="..\ShinyWonderland.ApiClient\ShinyWonderland.ApiClient.csproj"/>
         <ProjectReference Include="..\ShinyWonderland.Localization\ShinyWonderland.Localization.csproj"/>
     </ItemGroup>
-
-    <ItemGroup>
-      <MauiXaml Update="Shells\StartAppShell.xaml">
-        <SubType>Designer</SubType>
-      </MauiXaml>
-      <MauiXaml Update="Shells\AppShell.xaml">
-        <SubType>Designer</SubType>
-      </MauiXaml>
-    </ItemGroup>
-
-    <ItemGroup>
-      <Compile Update="Shells\StartAppShell.xaml.cs">
-        <DependentUpon>StartAppShell.xaml</DependentUpon>
-        <SubType>Code</SubType>
-      </Compile>
-      <Compile Update="Shells\AppShell.xaml.cs">
-        <DependentUpon>AppShell.xaml</DependentUpon>
-        <SubType>Code</SubType>
-      </Compile>
-    </ItemGroup>
-
 </Project>
diff --git a/src/ShinyWonderland/StartupViewModel.cs b/src/ShinyWonderland/StartupViewModel.cs
@@ -13,7 +13,7 @@ public async void OnAppearing()
         await this.TryGps();
         await this.TryGeofencing();
 
-        await services.Navigator.SwitchShell(new AppShell(services.Localized));
+        await services.Navigator.NavigateTo("//main");
     }
 
     public void OnDisappearing()

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@ public App(StringsLocalized localize)`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`protected override Window CreateWindow(IActivationState? activationState)`
`14`		`- => new(new StartAppShell());`
	`14`	`+ => new(new AppShell(localize));`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public async void OnAppearing()`
`13`	`13`	`await this.TryGps();`
`14`	`14`	`await this.TryGeofencing();`
`15`	`15`
`16`		`- await services.Navigator.SwitchShell(new AppShell(services.Localized));`
	`16`	`+ await services.Navigator.NavigateTo("//main");`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public void OnDisappearing()`