Skip to content

Commit 3d247ae

Browse files
committed
Navigation animations
1 parent 05eb4da commit 3d247ae

File tree

11 files changed

+19
-4
lines changed

11 files changed

+19
-4
lines changed

src/Directory.Build.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
<Authors>Martí Climent and the contributors</Authors>
88
<PublisherName>Martí Climent</PublisherName>
99
<Nullable>enable</Nullable>
10+
</PropertyGroup>
11+
12+
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
1013
<Optimize>true</Optimize>
1114
</PropertyGroup>
1215

src/UniGetUI/Pages/SettingsPages/GeneralPages/Administrator.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:widgets="using:UniGetUI.Interface.Widgets"
99
mc:Ignorable="d"
10+
NavigationCacheMode="Required"
1011
Background="Transparent">
1112

1213
<StackPanel Spacing="8">

src/UniGetUI/Pages/SettingsPages/GeneralPages/Backup.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
mc:Ignorable="d"
10+
NavigationCacheMode="Required"
1011
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
1112

1213
<Grid>

src/UniGetUI/Pages/SettingsPages/GeneralPages/Experimental.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:widgets="using:UniGetUI.Interface.Widgets"
99
mc:Ignorable="d"
10+
NavigationCacheMode="Required"
1011
Background="Transparent">
1112

1213
<StackPanel Orientation="Vertical" Spacing="4">

src/UniGetUI/Pages/SettingsPages/GeneralPages/General.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
mc:Ignorable="d"
10+
NavigationCacheMode="Required"
1011
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
1112

1213
<Grid>

src/UniGetUI/Pages/SettingsPages/GeneralPages/Interface_P.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
mc:Ignorable="d"
10+
NavigationCacheMode="Required"
1011
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
1112

1213
<Grid>

src/UniGetUI/Pages/SettingsPages/GeneralPages/Notifications.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
mc:Ignorable="d"
10+
NavigationCacheMode="Required"
1011
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
1112

1213
<Grid>

src/UniGetUI/Pages/SettingsPages/GeneralPages/Operations.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
mc:Ignorable="d"
10+
NavigationCacheMode="Required"
1011
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
1112

1213
<Grid>

src/UniGetUI/Pages/SettingsPages/GeneralPages/Startup.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
mc:Ignorable="d"
10+
NavigationCacheMode="Required"
1011
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
1112

1213
<Grid>

src/UniGetUI/Pages/SettingsPages/SettingsBasePage.xaml.cs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
using Microsoft.UI.Xaml.Media;
1414
using Microsoft.UI.Xaml.Navigation;
1515
using UniGetUI.Core.Tools;
16+
using Microsoft.UI.Xaml.Media.Animation;
1617

1718
// To learn more about WinUI, the WinUI project structure,
1819
// and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -27,10 +28,14 @@ public sealed partial class SettingsBasePage : Page
2728
public SettingsBasePage()
2829
{
2930
this.InitializeComponent();
30-
BackButton.Click += (_, _) => MainNavigationFrame.NavigateToType(typeof(SettingsHomepage), null, new());
31+
BackButton.Click += (_, _) =>
32+
{
33+
if (MainNavigationFrame.CanGoBack) MainNavigationFrame.GoBack();
34+
else MainNavigationFrame.Navigate(typeof(SettingsHomepage), null, new DrillInNavigationTransitionInfo());
35+
};
3136
MainNavigationFrame.Navigated += MainNavigationFrame_Navigated;
3237
MainNavigationFrame.Navigating += MainNavigationFrame_Navigating;
33-
MainNavigationFrame.NavigateToType(typeof(SettingsHomepage), null, new());
38+
MainNavigationFrame.Navigate(typeof(SettingsHomepage), null, new DrillInNavigationTransitionInfo());
3439

3540
RestartRequired.Message = CoreTools.Translate("Restart WingetUI to fully apply changes");
3641
var RestartButton = new Button
@@ -71,7 +76,7 @@ private void Page_RestartRequired(object? sender, EventArgs e)
7176

7277
private void Page_NavigationRequested(object? sender, Type e)
7378
{
74-
MainNavigationFrame.NavigateToType(e, null, new());
79+
MainNavigationFrame.Navigate(e, null, new DrillInNavigationTransitionInfo());
7580
}
7681
}
7782
}

0 commit comments

Comments
 (0)