fix: no way to back on platform other than Skia

unoplatform · Aug 16, 2023 · eb77ea8 · eb77ea8
1 parent 28d581c
commit eb77ea8
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/UI/NativeFrameNav/NativeFrameNav.Shared/App.xaml.cs b/UI/NativeFrameNav/NativeFrameNav.Shared/App.xaml.cs
@@ -23,9 +23,11 @@ public App()
         {
             InitializeLogging();
 
-#if __IOS__ || __ANDROID__
-			Uno.UI.FeatureConfiguration.Style.ConfigureNativeFrameNavigation();
-#endif
+            // This cannot be used with IOS because of this bug: https://github.com/unoplatform/uno/issues/13284
+            //#if __IOS__ || __ANDROID__
+//#if __ANDROID__
+//            Uno.UI.FeatureConfiguration.Style.ConfigureNativeFrameNavigation();
+//#endif
             this.InitializeComponent();
 
 #if HAS_UNO || NETFX_CORE

diff --git a/UI/NativeFrameNav/NativeFrameNav.Shared/BlankPage1.xaml b/UI/NativeFrameNav/NativeFrameNav.Shared/BlankPage1.xaml
@@ -17,7 +17,7 @@
 
 		<CommandBar Grid.Row="0" Content="BlankPage1">
 			<CommandBar.PrimaryCommands>
-				<skia:AppBarButton Content="Back" Click="NavigateBack" />
+				<AppBarButton Content="Back" Click="NavigateBack" />
 			</CommandBar.PrimaryCommands>
 		</CommandBar>
 		<StackPanel Grid.Row="1">

diff --git a/UI/NativeFrameNav/NativeFrameNav.Shared/BlankPage2.xaml b/UI/NativeFrameNav/NativeFrameNav.Shared/BlankPage2.xaml
@@ -17,7 +17,7 @@
 
 		<CommandBar Grid.Row="0" Content="BlankPage2">
 			<CommandBar.PrimaryCommands>
-				<skia:AppBarButton Content="Back" Click="NavigateBack" />
+				<AppBarButton Content="Back" Click="NavigateBack" />
 			</CommandBar.PrimaryCommands>
 		</CommandBar>
 		<StackPanel Grid.Row="1">

diff --git a/UI/NativeFrameNav/NativeFrameNav.Shared/MainPage.xaml b/UI/NativeFrameNav/NativeFrameNav.Shared/MainPage.xaml
@@ -8,16 +8,16 @@
 	  mc:Ignorable="d"
 	  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
-    <Grid toolkit:VisibleBoundsPadding.PaddingMask="Top">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
+	<Grid toolkit:VisibleBoundsPadding.PaddingMask="Top">
+		<Grid.RowDefinitions>
+			<RowDefinition Height="Auto" />
+			<RowDefinition Height="*" />
+		</Grid.RowDefinitions>
 
-        <CommandBar Grid.Row="0" Content="MainPage" />
-        <StackPanel Grid.Row="1">
-            <TextBlock Text="Main Content" />
-            <Button Content="Next Page" Click="GotoNextPage" />
-        </StackPanel>
-    </Grid>
+		<CommandBar Grid.Row="0" Content="MainPage" />
+		<StackPanel Grid.Row="1">
+			<TextBlock Text="Main Content" />
+			<Button Content="Next Page" Click="GotoNextPage" />
+		</StackPanel>
+	</Grid>
 </Page>
diff --git a/UI/NativeFrameNav/NativeFrameNav.sln b/UI/NativeFrameNav/NativeFrameNav.sln
@@ -258,6 +258,7 @@ Global
 		{71F85A48-AE93-4807-9F4B-B64A786056E2}.AppStore|x86.Build.0 = Debug|Any CPU
 		{71F85A48-AE93-4807-9F4B-B64A786056E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{71F85A48-AE93-4807-9F4B-B64A786056E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{71F85A48-AE93-4807-9F4B-B64A786056E2}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{71F85A48-AE93-4807-9F4B-B64A786056E2}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{71F85A48-AE93-4807-9F4B-B64A786056E2}.Debug|ARM.Build.0 = Debug|Any CPU
 		{71F85A48-AE93-4807-9F4B-B64A786056E2}.Debug|ARM64.ActiveCfg = Debug|Any CPU