diff --git a/src/Modules/Verdure.Braincase.Settings/ViewModels/SettingsViewModel.cs b/src/Modules/Verdure.Braincase.Settings/ViewModels/SettingsViewModel.cs index ffc36e9..46b294b 100644 --- a/src/Modules/Verdure.Braincase.Settings/ViewModels/SettingsViewModel.cs +++ b/src/Modules/Verdure.Braincase.Settings/ViewModels/SettingsViewModel.cs @@ -14,7 +14,7 @@ using Windows.System; namespace Verdure.Braincase.Settings.ViewModels; -public partial class SettingsViewModel : ObservableRecipient, INavigationAware +public partial class SettingsViewModel : ObservableRecipient { private readonly IThemeSelectorService _themeSelectorService; private readonly ILocalSettingsService _localSettingsService; @@ -765,11 +765,14 @@ public partial class SettingsViewModel : ObservableRecipient, INavigationAware return $"{appName} - {version.Major}.{version.Minor}.{version.Build}.{version.Revision}"; } - public async void OnNavigatedTo(object parameter) + [RelayCommand] + public async Task OnLoadedAsync() { await InitAsync(); } - public void OnNavigatedFrom() + + [RelayCommand] + public async Task OnUnloadedAsync() { UnregisterEvents(); } diff --git a/src/Modules/Verdure.Braincase.Settings/Views/SettingsPage.xaml b/src/Modules/Verdure.Braincase.Settings/Views/SettingsPage.xaml index 0921e87..f12c7a2 100644 --- a/src/Modules/Verdure.Braincase.Settings/Views/SettingsPage.xaml +++ b/src/Modules/Verdure.Braincase.Settings/Views/SettingsPage.xaml @@ -10,6 +10,14 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:xaml="using:Microsoft.UI.Xaml" mc:Ignorable="d"> + + + + + + + +