diff --git a/src/App/Pages/BaseViewModel.cs b/src/App/Pages/BaseViewModel.cs index 9060c5118..1f2e412c8 100644 --- a/src/App/Pages/BaseViewModel.cs +++ b/src/App/Pages/BaseViewModel.cs @@ -1,38 +1,15 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Runtime.CompilerServices; +using Bit.Core.Utilities; namespace Bit.App.Pages { - public abstract class BaseViewModel : INotifyPropertyChanged + public abstract class BaseViewModel : ExtendedViewModel { private string _pageTitle = string.Empty; - public event PropertyChangedEventHandler PropertyChanged; - public string PageTitle { get => _pageTitle; set => SetProperty(ref _pageTitle, value); } - - protected bool SetProperty(ref T backingStore, T value, [CallerMemberName]string propertyName = "", - Action onChanged = null) - { - if(EqualityComparer.Default.Equals(backingStore, value)) - { - return false; - } - backingStore = value; - onChanged?.Invoke(); - OnPropertyChanged(propertyName); - return true; - } - - protected void OnPropertyChanged([CallerMemberName] string propertyName = "") - { - PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); - } } } diff --git a/src/App/Pages/VaultGroupingsPage.xaml b/src/App/Pages/VaultGroupingsPage.xaml index 62885ca02..920b1c166 100644 --- a/src/App/Pages/VaultGroupingsPage.xaml +++ b/src/App/Pages/VaultGroupingsPage.xaml @@ -6,27 +6,72 @@ xmlns:pages="clr-namespace:Bit.App.Pages" x:DataType="pages:VaultGroupingsPageViewModel" Title="{Binding PageTitle}"> + - - -