Revise the parameter assigning process & change navigation transition

taooceros · taooceros · commit 0d6a9c763fbe · 2021-12-02T14:07:56.000-06: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
@@ -19,6 +19,8 @@
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.ViewModel;
 using Flow.Launcher.Core.Resource;
+using ModernWpf.Navigation;
+using Page = ModernWpf.Controls.Page;
 
 namespace Flow.Launcher.Resources.Pages
 {
@@ -27,16 +29,21 @@ namespace Flow.Launcher.Resources.Pages
     /// </summary>
     public partial class WelcomePage1 : Page
     {
-
-        public WelcomePage1(Settings settings)
+        private bool initialize = false;
+        
+        protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            Settings = settings;
+
+            if (e.ExtraData is Settings settings)
+                Settings = settings;
+            else
+                throw new ArgumentException("Unexpected Navigation Parameter for Settings");
             InitializeComponent();
         }
         private Internationalization _translater => InternationalizationManager.Instance;
         public List<Language> Languages => _translater.LoadAvailableLanguages();
 
-        public Settings Settings { get; }
+        public Settings Settings { get; set; }
 
         public string CustomLanguage
         {
@@ -54,4 +61,4 @@ public string CustomLanguage
         }
 
     }
-}
+}
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
@@ -1,41 +1,33 @@
 ﻿using Flow.Launcher.Helper;
 using Flow.Launcher.Infrastructure.UserSettings;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace Flow.Launcher.Resources.Pages
 {
     /// <summary>
     /// WelcomePage2.xaml에 대한 상호 작용 논리
     /// </summary>
-    public partial class WelcomePage2 : Page
+    public partial class WelcomePage2
     {
-        private readonly Settings settings;
+        private Settings Settings { get; set; }
 
-        public WelcomePage2(Settings settings)
+        protected override void OnNavigatedTo(NavigationEventArgs e)
         {
+            if (e.ExtraData is Settings settings)
+                Settings = settings;
+            else
+                throw new ArgumentException("Unexpected Parameter setting.");
             InitializeComponent();
-            this.settings = settings;
-            HotkeyControl.SetHotkey(new Infrastructure.Hotkey.HotkeyModel(settings.Hotkey));
+
+            HotkeyControl.SetHotkey(new Infrastructure.Hotkey.HotkeyModel(Settings.Hotkey));
             HotkeyControl.HotkeyChanged += (_, _) =>
             {
                 if (HotkeyControl.CurrentHotkeyAvailable)
                 {
                     HotKeyMapper.SetHotkey(HotkeyControl.CurrentHotkey, HotKeyMapper.OnToggleHotkey);
-                    HotKeyMapper.RemoveHotkey(settings.Hotkey);
-                    settings.Hotkey = HotkeyControl.CurrentHotkey.ToString();
+                    HotKeyMapper.RemoveHotkey(Settings.Hotkey);
+                    Settings.Hotkey = HotkeyControl.CurrentHotkey.ToString();
                 }
             };
         }
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml
@@ -1,9 +1,10 @@
-﻿<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:ui="http://schemas.modernwpf.com/2019"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="WelcomePage3"
     mc:Ignorable="d">
@@ -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
@@ -13,18 +13,22 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher.Resources.Pages
 {
 
-    public partial class WelcomePage3 : Page
+    public partial class WelcomePage3
     {
-        public WelcomePage3()
+        protected override void OnNavigatedTo(NavigationEventArgs e)
         {
+            if (e.ExtraData is Settings settings)
+                Settings = settings;
+            else if(Settings is null)
+                throw new ArgumentException("Unexpected Navigation Parameter for Settings");
             InitializeComponent();
-            
         }
 
-        
+        public Settings Settings { get; set; }
     }
 }
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml
@@ -1,9 +1,10 @@
-﻿<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:ui="http://schemas.modernwpf.com/2019"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="WelcomePage4"
     d:DesignHeight="450"
@@ -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
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using Flow.Launcher.Infrastructure.UserSettings;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -18,11 +19,17 @@ namespace Flow.Launcher.Resources.Pages
     /// <summary>
     /// WelcomePage4.xaml에 대한 상호 작용 논리
     /// </summary>
-    public partial class WelcomePage4 : Page
+    public partial class WelcomePage4
     {
-        public WelcomePage4()
+        protected override void OnNavigatedTo(NavigationEventArgs e)
         {
+            if (e.ExtraData is Settings settings)
+                Settings = settings;
+            else
+                throw new ArgumentException("Unexpected Navigation Parameter for Settings");
             InitializeComponent();
         }
+
+        public Settings Settings { get; set; }
     }
 }
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml
@@ -1,9 +1,10 @@
-﻿<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:ui="http://schemas.modernwpf.com/2019"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"
     Title="WelcomePage5"
@@ -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,15 +21,19 @@
 
 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;
+        public Settings Settings { get; set; }
         public bool HideOnStartup { get; set; }
-        public WelcomePage5(Settings settings)
+
+        protected override void OnNavigatedTo(NavigationEventArgs e)
         {
+            if (e.ExtraData is Settings settings)
+                Settings = settings;
+            else
+                throw new ArgumentException("Unexpected Navigation Parameter for Settings");
             InitializeComponent();
-            this.settings = settings;
         }
 
         private void OnAutoStartupChecked(object sender, RoutedEventArgs e)
@@ -46,23 +50,23 @@ private void RemoveStartup()
         {
             using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);
             key?.DeleteValue(Constant.FlowLauncher, false);
-            settings.StartFlowLauncherOnSystemStartup = false;
+            Settings.StartFlowLauncherOnSystemStartup = false;
         }
-        public void SetStartup()
+        private void SetStartup()
         {
             using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);
             key?.SetValue(Constant.FlowLauncher, Constant.ExecutablePath);
-            settings.StartFlowLauncherOnSystemStartup = true;
+            Settings.StartFlowLauncherOnSystemStartup = true;
         }
 
         private void OnHideOnStartupChecked(object sender, RoutedEventArgs e)
         {
-            settings.HideOnStartup = true;
+            Settings.HideOnStartup = true;
 
         }
         private void OnHideOnStartupUnchecked(object sender, RoutedEventArgs e)
         {
-            settings.HideOnStartup = false;
+            Settings.HideOnStartup = false;
         }
 
         private void BtnCancel_OnClick(object sender, RoutedEventArgs e)
diff --git a/Flow.Launcher/WelcomeWindow.xaml.cs b/Flow.Launcher/WelcomeWindow.xaml.cs
@@ -20,43 +20,38 @@ namespace Flow.Launcher
 {
     public partial class WelcomeWindow : Window
     {
-        private readonly List<Page> pages;
         private readonly Settings settings;
 
         public WelcomeWindow(Settings settings)
         {
             InitializeComponent();
             BackButton.IsEnabled = false;
             this.settings = settings;
-
-            pages = new()
-            {
-                new WelcomePage1(settings),
-                new WelcomePage2(settings),
-                new WelcomePage3(),
-                new WelcomePage4(),
-                new WelcomePage5(settings),
-            };
-            ContentFrame.Navigate(pages[0]);
+            ContentFrame.Navigate(PageTypeSelector(1), settings);
         }
 
-        private NavigationTransitionInfo _transitionInfo = new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromRight };
+        private NavigationTransitionInfo _transitionInfo = new SlideNavigationTransitionInfo()
+        {
+            Effect = SlideNavigationTransitionEffect.FromRight
+        };
+        private NavigationTransitionInfo _backTransitionInfo = new SlideNavigationTransitionInfo()
+        {
+            Effect = SlideNavigationTransitionEffect.FromLeft
+        };
         Storyboard sb = new Storyboard();
-        private int page;
         private int pageNum = 1;
         private int MaxPage = 5;
         public string PageDisplay => $"{pageNum}/5";
 
         private void UpdateView()
         {
-            pageNum = page + 1;
             PageNavigation.Text = PageDisplay;
-            if (page == 0)
+            if (pageNum == 1)
             {
                 BackButton.IsEnabled = false;
                 NextButton.IsEnabled = true;
             }
-            else if (page == MaxPage - 1)
+            else if (pageNum == MaxPage)
             {
                 BackButton.IsEnabled = true;
                 NextButton.IsEnabled = false;
@@ -70,20 +65,19 @@ private void UpdateView()
 
         private void ForwardButton_Click(object sender, RoutedEventArgs e)
         {
-            page = page + 1;
+            pageNum++;
             UpdateView();
-            var pageToNavigateTo = pages[page];
 
-            ContentFrame.Navigate(pageToNavigateTo, _transitionInfo);
+            ContentFrame.Navigate(PageTypeSelector(pageNum), settings, _transitionInfo);
         }
 
         private void BackwardButton_Click(object sender, RoutedEventArgs e)
         {
-            if (page > 0)
+            if (pageNum > 1)
             {
-                page--;
+                pageNum--;
                 UpdateView();
-                ContentFrame.GoBack();
+                ContentFrame.Navigate(PageTypeSelector(pageNum), settings, _backTransitionInfo);
             }
             else
             {
@@ -95,6 +89,18 @@ private void BtnCancel_OnClick(object sender, RoutedEventArgs e)
         {
             Close();
         }
-    }
-}
 
+        private static Type PageTypeSelector(int pageNumber)
+        {
+            return pageNumber switch
+            {
+                1 => typeof(WelcomePage1),
+                2 => typeof(WelcomePage2),
+                3 => typeof(WelcomePage3),
+                4 => typeof(WelcomePage4),
+                5 => typeof(WelcomePage5),
+                _ => throw new ArgumentOutOfRangeException(nameof(pageNumber), pageNumber, "Unexpected Page Number")
+            };
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@`
`19`	`19`	`using Flow.Launcher.Infrastructure;`
`20`	`20`	`using Flow.Launcher.ViewModel;`
`21`	`21`	`using Flow.Launcher.Core.Resource;`
	`22`	`+using ModernWpf.Navigation;`
	`23`	`+using Page = ModernWpf.Controls.Page;`
`22`	`24`
`23`	`25`	`namespace Flow.Launcher.Resources.Pages`
`24`	`26`	`{`
`@@ -27,16 +29,21 @@ namespace Flow.Launcher.Resources.Pages`
`27`	`29`	`/// </summary>`
`28`	`30`	`public partial class WelcomePage1 : Page`
`29`	`31`	`{`
`30`		`-`
`31`		`- public WelcomePage1(Settings settings)`
	`32`	`+ private bool initialize = false;`
	`33`	`+`
	`34`	`+ protected override void OnNavigatedTo(NavigationEventArgs e)`
`32`	`35`	`{`
`33`		`- Settings = settings;`
	`36`	`+`
	`37`	`+ if (e.ExtraData is Settings settings)`
	`38`	`+ Settings = settings;`
	`39`	`+ else`
	`40`	`+ throw new ArgumentException("Unexpected Navigation Parameter for Settings");`
`34`	`41`	`InitializeComponent();`
`35`	`42`	`}`
`36`	`43`	`private Internationalization _translater => InternationalizationManager.Instance;`
`37`	`44`	`public List<Language> Languages => _translater.LoadAvailableLanguages();`
`38`	`45`
`39`		`- public Settings Settings { get; }`
	`46`	`+ public Settings Settings { get; set; }`
`40`	`47`
`41`	`48`	`public string CustomLanguage`
`42`	`49`	`{`
`@@ -54,4 +61,4 @@ public string CustomLanguage`
`54`	`61`	`}`
`55`	`62`
`56`	`63`	`}`
`57`		`-}`
	`64`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -13,18 +13,22 @@`
`13`	`13`	`using System.Windows.Media.Imaging;`
`14`	`14`	`using System.Windows.Navigation;`
`15`	`15`	`using System.Windows.Shapes;`
	`16`	`+using Flow.Launcher.Infrastructure.UserSettings;`
`16`	`17`
`17`	`18`	`namespace Flow.Launcher.Resources.Pages`
`18`	`19`	`{`
`19`	`20`
`20`		`- public partial class WelcomePage3 : Page`
	`21`	`+ public partial class WelcomePage3`
`21`	`22`	`{`
`22`		`- public WelcomePage3()`
	`23`	`+ protected override void OnNavigatedTo(NavigationEventArgs e)`
`23`	`24`	`{`
	`25`	`+ if (e.ExtraData is Settings settings)`
	`26`	`+ Settings = settings;`
	`27`	`+ else if(Settings is null)`
	`28`	`+ throw new ArgumentException("Unexpected Navigation Parameter for Settings");`
`24`	`29`	`InitializeComponent();`
`25`		`-`
`26`	`30`	`}`
`27`	`31`
`28`		`-`
	`32`	`+ public Settings Settings { get; set; }`
`29`	`33`	`}`
`30`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System;`
	`1`	`+using Flow.Launcher.Infrastructure.UserSettings;`
	`2`	`+using System;`
`2`	`3`	`using System.Collections.Generic;`
`3`	`4`	`using System.Linq;`
`4`	`5`	`using System.Text;`
`@@ -18,11 +19,17 @@ namespace Flow.Launcher.Resources.Pages`
`18`	`19`	`/// <summary>`
`19`	`20`	`/// WelcomePage4.xaml에 대한 상호 작용 논리`
`20`	`21`	`/// </summary>`
`21`		`- public partial class WelcomePage4 : Page`
	`22`	`+ public partial class WelcomePage4`
`22`	`23`	`{`
`23`		`- public WelcomePage4()`
	`24`	`+ protected override void OnNavigatedTo(NavigationEventArgs e)`
`24`	`25`	`{`
	`26`	`+ if (e.ExtraData is Settings settings)`
	`27`	`+ Settings = settings;`
	`28`	`+ else`
	`29`	`+ throw new ArgumentException("Unexpected Navigation Parameter for Settings");`
`25`	`30`	`InitializeComponent();`
`26`	`31`	`}`
	`32`	`+`
	`33`	`+ public Settings Settings { get; set; }`
`27`	`34`	`}`
`28`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,15 +21,19 @@`
`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`		`- private readonly Settings settings;`
	`27`	`+ public Settings Settings { get; set; }`
`28`	`28`	`public bool HideOnStartup { get; set; }`
`29`		`- public WelcomePage5(Settings settings)`
	`29`	`+`
	`30`	`+ protected override void OnNavigatedTo(NavigationEventArgs e)`
`30`	`31`	`{`
	`32`	`+ if (e.ExtraData is Settings settings)`
	`33`	`+ Settings = settings;`
	`34`	`+ else`
	`35`	`+ throw new ArgumentException("Unexpected Navigation Parameter for Settings");`
`31`	`36`	`InitializeComponent();`
`32`		`- this.settings = settings;`
`33`	`37`	`}`
`34`	`38`
`35`	`39`	`private void OnAutoStartupChecked(object sender, RoutedEventArgs e)`
`@@ -46,23 +50,23 @@ private void RemoveStartup()`
`46`	`50`	`{`
`47`	`51`	`using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);`
`48`	`52`	`key?.DeleteValue(Constant.FlowLauncher, false);`
`49`		`- settings.StartFlowLauncherOnSystemStartup = false;`
	`53`	`+ Settings.StartFlowLauncherOnSystemStartup = false;`
`50`	`54`	`}`
`51`		`- public void SetStartup()`
	`55`	`+ private void SetStartup()`
`52`	`56`	`{`
`53`	`57`	`using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);`
`54`	`58`	`key?.SetValue(Constant.FlowLauncher, Constant.ExecutablePath);`
`55`		`- settings.StartFlowLauncherOnSystemStartup = true;`
	`59`	`+ Settings.StartFlowLauncherOnSystemStartup = true;`
`56`	`60`	`}`
`57`	`61`
`58`	`62`	`private void OnHideOnStartupChecked(object sender, RoutedEventArgs e)`
`59`	`63`	`{`
`60`		`- settings.HideOnStartup = true;`
	`64`	`+ Settings.HideOnStartup = true;`
`61`	`65`
`62`	`66`	`}`
`63`	`67`	`private void OnHideOnStartupUnchecked(object sender, RoutedEventArgs e)`
`64`	`68`	`{`
`65`		`- settings.HideOnStartup = false;`
	`69`	`+ Settings.HideOnStartup = false;`
`66`	`70`	`}`
`67`	`71`
`68`	`72`	`private void BtnCancel_OnClick(object sender, RoutedEventArgs e)`