Change Pages to ui:Page (modernWPF)

onesounds · onesounds · commit 85fbdd180847 · 2021-12-03T05:05:11.000+09:00
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml
@@ -1,10 +1,11 @@
-﻿<Page
+﻿<ui:Page
     x:Class="Flow.Launcher.Resources.Pages.WelcomePage1"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="http://schemas.modernwpf.com/2019"
     Title="WelcomePage1"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
     mc:Ignorable="d">
@@ -148,4 +149,4 @@
             </StackPanel>
         </Grid>
     </ScrollViewer>
-</Page>
+</ui:Page>
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs
@@ -25,7 +25,7 @@ namespace Flow.Launcher.Resources.Pages
     /// <summary>
     /// WelcomePage1.xaml에 대한 상호 작용 논리
     /// </summary>
-    public partial class WelcomePage1 : Page
+    public partial class WelcomePage1
     {
 
         public WelcomePage1(Settings settings)
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml
@@ -1,4 +1,4 @@
-﻿<Page
+﻿<ui:Page
     x:Class="Flow.Launcher.Resources.Pages.WelcomePage2"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -119,4 +119,4 @@
             </StackPanel>
         </Grid>
     </ScrollViewer>
-</Page>
+</ui:Page>
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs
@@ -20,7 +20,7 @@ namespace Flow.Launcher.Resources.Pages
     /// <summary>
     /// WelcomePage2.xaml에 대한 상호 작용 논리
     /// </summary>
-    public partial class WelcomePage2 : Page
+    public partial class WelcomePage2
     {
         private readonly Settings settings;
 
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml
@@ -1,10 +1,11 @@
-﻿<Page
+﻿<ui:Page
     x:Class="Flow.Launcher.Resources.Pages.WelcomePage3"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="http://schemas.modernwpf.com/2019"
     Title="WelcomePage3"
     mc:Ignorable="d">
     <Page.Resources>
@@ -303,4 +304,4 @@
 
         </Grid>
     </ScrollViewer>
-</Page>
+</ui:Page>
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs
@@ -17,7 +17,7 @@
 namespace Flow.Launcher.Resources.Pages
 {
 
-    public partial class WelcomePage3 : Page
+    public partial class WelcomePage3
     {
         public WelcomePage3()
         {
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml
@@ -1,10 +1,11 @@
-﻿<Page
+﻿<ui:Page
     x:Class="Flow.Launcher.Resources.Pages.WelcomePage4"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="http://schemas.modernwpf.com/2019"
     Title="WelcomePage4"
     d:DesignHeight="450"
     d:DesignWidth="800"
@@ -132,4 +133,4 @@
             </StackPanel>
         </Grid>
     </ScrollViewer>
-</Page>
+</ui:Page>
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs
@@ -18,7 +18,7 @@ namespace Flow.Launcher.Resources.Pages
     /// <summary>
     /// WelcomePage4.xaml에 대한 상호 작용 논리
     /// </summary>
-    public partial class WelcomePage4 : Page
+    public partial class WelcomePage4
     {
         public WelcomePage4()
         {
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml
@@ -1,10 +1,11 @@
-﻿<Page
+﻿<ui:Page
     x:Class="Flow.Launcher.Resources.Pages.WelcomePage5"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"
     Title="WelcomePage5"
     d:DesignHeight="450"
@@ -118,4 +119,4 @@
             </StackPanel>
         </Grid>
     </ScrollViewer>
-</Page>
+</ui:Page>
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs
@@ -21,7 +21,7 @@
 
 namespace Flow.Launcher.Resources.Pages
 {
-    public partial class WelcomePage5 : Page
+    public partial class WelcomePage5
     {
         private const string StartupPath = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run";
         private readonly Settings settings;
diff --git a/Flow.Launcher/WelcomeWindow.xaml.cs b/Flow.Launcher/WelcomeWindow.xaml.cs
@@ -83,7 +83,8 @@ private void BackwardButton_Click(object sender, RoutedEventArgs e)
             {
                 page--;
                 UpdateView();
-                ContentFrame.GoBack();
+                var pageToNavigateTo = pages[page];
+                ContentFrame.Navigate(pageToNavigateTo, _transitionInfo);
             }
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ namespace Flow.Launcher.Resources.Pages`
`25`	`25`	`/// <summary>`
`26`	`26`	`/// WelcomePage1.xaml에 대한 상호 작용 논리`
`27`	`27`	`/// </summary>`
`28`		`- public partial class WelcomePage1 : Page`
	`28`	`+ public partial class WelcomePage1`
`29`	`29`	`{`
`30`	`30`
`31`	`31`	`public WelcomePage1(Settings settings)`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ namespace Flow.Launcher.Resources.Pages`
`20`	`20`	`/// <summary>`
`21`	`21`	`/// WelcomePage2.xaml에 대한 상호 작용 논리`
`22`	`22`	`/// </summary>`
`23`		`- public partial class WelcomePage2 : Page`
	`23`	`+ public partial class WelcomePage2`
`24`	`24`	`{`
`25`	`25`	`private readonly Settings settings;`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`namespace Flow.Launcher.Resources.Pages`
`18`	`18`	`{`
`19`	`19`
`20`		`- public partial class WelcomePage3 : Page`
	`20`	`+ public partial class WelcomePage3`
`21`	`21`	`{`
`22`	`22`	`public WelcomePage3()`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ namespace Flow.Launcher.Resources.Pages`
`18`	`18`	`/// <summary>`
`19`	`19`	`/// WelcomePage4.xaml에 대한 상호 작용 논리`
`20`	`20`	`/// </summary>`
`21`		`- public partial class WelcomePage4 : Page`
	`21`	`+ public partial class WelcomePage4`
`22`	`22`	`{`
`23`	`23`	`public WelcomePage4()`
`24`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`namespace Flow.Launcher.Resources.Pages`
`23`	`23`	`{`
`24`		`- public partial class WelcomePage5 : Page`
	`24`	`+ public partial class WelcomePage5`
`25`	`25`	`{`
`26`	`26`	`private const string StartupPath = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run";`
`27`	`27`	`private readonly Settings settings;`