From be5c839bcf6f80077cdfd869a4b5ce31db2d9c7c Mon Sep 17 00:00:00 2001
From: Rose <83477269+AtariDreams@users.noreply.github.com>
Date: Wed, 28 Sep 2022 20:07:07 -0400
Subject: [PATCH] Simplify OnAppPropertyChanged (#1914)

Use a switch statement instead of else-if
---
 src/Calculator/Views/MainPage.xaml.cs | 96 +++++++++++++--------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/src/Calculator/Views/MainPage.xaml.cs b/src/Calculator/Views/MainPage.xaml.cs
index a20c92d9..b2dbab7c 100644
--- a/src/Calculator/Views/MainPage.xaml.cs
+++ b/src/Calculator/Views/MainPage.xaml.cs
@@ -206,58 +206,58 @@ namespace CalculatorApp
 
                 KeyboardShortcutManager.DisableShortcuts(false);
 
-                if (newValue == ViewMode.Standard)
+                switch (newValue)
                 {
-                    EnsureCalculator();
-                    Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = true;
-                    m_calculator.AnimateCalculator(NavCategory.IsConverterViewMode(previousMode));
-                    Model.CalculatorViewModel.HistoryVM.ReloadHistory(newValue);
-                }
-                else if (newValue == ViewMode.Scientific)
-                {
-                    EnsureCalculator();
-                    Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = true;
-                    if (Model.PreviousMode != ViewMode.Scientific)
-                    {
+                    case ViewMode.Standard:
+                        EnsureCalculator();
+                        Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = true;
                         m_calculator.AnimateCalculator(NavCategory.IsConverterViewMode(previousMode));
-                    }
-
-                    Model.CalculatorViewModel.HistoryVM.ReloadHistory(newValue);
-                }
-                else if (newValue == ViewMode.Programmer)
-                {
-                    Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = false;
-                    EnsureCalculator();
-                    if (Model.PreviousMode != ViewMode.Programmer)
-                    {
-                        m_calculator.AnimateCalculator(NavCategory.IsConverterViewMode(previousMode));
-                    }
-                }
-                else if (NavCategory.IsDateCalculatorViewMode(newValue))
-                {
-                    if (Model.CalculatorViewModel != null)
-                    {
+                        Model.CalculatorViewModel.HistoryVM.ReloadHistory(newValue);
+                        break;
+                    case ViewMode.Scientific:
+                        EnsureCalculator();
+                        Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = true;
+                        if (Model.PreviousMode != ViewMode.Scientific)
+                        {
+                            m_calculator.AnimateCalculator(NavCategory.IsConverterViewMode(previousMode));
+                        }
+                        Model.CalculatorViewModel.HistoryVM.ReloadHistory(newValue);
+                        break;
+                    case ViewMode.Programmer:
                         Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = false;
-                    }
-                    EnsureDateCalculator();
-                }
-                else if (newValue == ViewMode.Graphing)
-                {
-                    EnsureGraphingCalculator();
-                    KeyboardShortcutManager.DisableShortcuts(true);
-                }
-                else if (NavCategory.IsConverterViewMode(newValue))
-                {
-                    if (Model.CalculatorViewModel != null)
-                    {
-                        Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = false;
-                    }
+                        EnsureCalculator();
+                        if (Model.PreviousMode != ViewMode.Programmer)
+                        {
+                            m_calculator.AnimateCalculator(NavCategory.IsConverterViewMode(previousMode));
+                        }
+                        break;
+                    case ViewMode.Graphing:
+                        EnsureGraphingCalculator();
+                        KeyboardShortcutManager.DisableShortcuts(true);
+                        break;
+                    default:
+                        if (NavCategory.IsDateCalculatorViewMode(newValue))
+                        {
+                            if (Model.CalculatorViewModel != null)
+                            {
+                                Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = false;
+                            }
+                            EnsureDateCalculator();
+                        }
+                        else if (NavCategory.IsConverterViewMode(newValue))
+                        {
+                            if (Model.CalculatorViewModel != null)
+                            {
+                                Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = false;
+                            }
 
-                    EnsureConverter();
-                    if (!NavCategory.IsConverterViewMode(previousMode))
-                    {
-                        m_converter.AnimateConverter();
-                    }
+                            EnsureConverter();
+                            if (!NavCategory.IsConverterViewMode(previousMode))
+                            {
+                                m_converter.AnimateConverter();
+                            }
+                        }
+                        break;
                 }
 
                 ShowHideControls(newValue);