@@ -75,7 +75,7 @@ void ApplicationViewModel::Categories::set(IObservableVector<NavCategoryGroup ^>
7575
7676void ApplicationViewModel::Initialize (ViewMode mode)
7777{
78- if (!NavCategory ::IsValidViewMode (mode) || !NavCategory ::IsViewModeEnabled (mode))
78+ if (!NavCategoryStates ::IsValidViewMode (mode) || !NavCategoryStates ::IsViewModeEnabled (mode))
7979 {
8080 mode = ViewMode::Standard;
8181 }
@@ -124,7 +124,7 @@ bool ApplicationViewModel::TryRecoverFromNavigationModeFailure()
124124
125125void ApplicationViewModel::OnModeChanged ()
126126{
127- assert (NavCategory ::IsValidViewMode (m_mode));
127+ assert (NavCategoryStates ::IsValidViewMode (m_mode));
128128 if (NavCategory::IsCalculatorViewMode (m_mode))
129129 {
130130 if (!m_CalculatorViewModel)
@@ -160,15 +160,15 @@ void ApplicationViewModel::OnModeChanged()
160160 }
161161
162162 auto resProvider = AppResourceProvider::GetInstance ();
163- CategoryName = resProvider->GetResourceString (NavCategory ::GetNameResourceKey (m_mode));
163+ CategoryName = resProvider->GetResourceString (NavCategoryStates ::GetNameResourceKey (m_mode));
164164
165165 // Cast mode to an int in order to save it to app data.
166166 // Save the changed mode, so that the new window launches in this mode.
167167 // Don't save until after we have adjusted to the new mode, so we don't save a mode that fails to load.
168- ApplicationData::Current->LocalSettings ->Values ->Insert (ModePropertyName, NavCategory ::Serialize (m_mode));
168+ ApplicationData::Current->LocalSettings ->Values ->Insert (ModePropertyName, NavCategoryStates ::Serialize (m_mode));
169169
170170 // Log ModeChange event when not first launch, log WindowCreated on first launch
171- if (NavCategory ::IsValidViewMode (m_PreviousMode))
171+ if (NavCategoryStates ::IsValidViewMode (m_PreviousMode))
172172 {
173173 TraceLogger::GetInstance ()->LogModeChange (m_mode);
174174 }
@@ -213,7 +213,7 @@ void ApplicationViewModel::SetMenuCategories()
213213 // Use the Categories property instead of the backing variable
214214 // because we want to take advantage of binding updates and
215215 // property setter logic.
216- Categories = NavCategoryGroup ::CreateMenuOptions ();
216+ Categories = NavCategoryStates ::CreateMenuOptions ();
217217}
218218
219219void ApplicationViewModel::ToggleAlwaysOnTop (float width, float height)
0 commit comments