Improve navigation by removing redundant calls

sabihoshi · May 30, 2021 · 235a808 · 235a808
1 parent 2af27d6
commit 235a808
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/GenshinLyreMidiPlayer.WPF/GenshinLyreMidiPlayer.WPF.csproj b/GenshinLyreMidiPlayer.WPF/GenshinLyreMidiPlayer.WPF.csproj
@@ -6,7 +6,7 @@
     <UseWPF>true</UseWPF>
     <StartupObject>GenshinLyreMidiPlayer.WPF.App</StartupObject>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-    <Version>2.2.0</Version>
+    <Version>2.2.0.1</Version>
     <ApplicationIcon>item_windsong_lyre.ico</ApplicationIcon>
     <Nullable>enable</Nullable>
     <RepositoryUrl>https://github.com/sabihoshi/GenshinLyreMidiPlayer</RepositoryUrl>

diff --git a/GenshinLyreMidiPlayer.WPF/ViewModels/MainWindowViewModel.cs b/GenshinLyreMidiPlayer.WPF/ViewModels/MainWindowViewModel.cs
@@ -75,9 +75,6 @@ private void AutoSuggestBoxOnTextChanged(AutoSuggestBox sender, AutoSuggestBoxTe
 
         private void NavigateBack(NavigationView sender, NavigationViewBackRequestedEventArgs args)
         {
-            GoBack();
-
-            // Work around to select the navigation item that this IScreen is a part of
             _history.Pop();
             sender.SelectedItem  = _history.Pop();
             sender.IsBackEnabled = _history.Count > 1;
@@ -86,22 +83,18 @@ private void NavigateBack(NavigationView sender, NavigationViewBackRequestedEven
         private void Navigate(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
         {
             if (args.IsSettingsSelected)
-                NavigateToSettings();
+                Activate(SettingsView);
             else if ((args.SelectedItem as NavigationViewItem)?.Tag is IScreen viewModel)
-            {
-                ActivateItem(viewModel);
-                _history.Push((NavigationViewItem) sender.SelectedItem);
-            }
+                Activate(viewModel);
 
             sender.IsBackEnabled = _history.Count > 1;
             NotifyOfPropertyChange(() => ShowUpdate);
-        }
 
-        public void NavigateToSettings()
-        {
-            ActivateItem(SettingsView);
-            _history.Push((NavigationViewItem) _navView.SettingsItem);
-            _navView.SelectedItem = _navView.SettingsItem;
+            void Activate(IScreen viewModel)
+            {
+                ActivateItem(viewModel);
+                _history.Push((NavigationViewItem) sender.SelectedItem);
+            }
         }
     }
 }