MSEssentials/MSEssentials.UI.Common.MVVM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Activity

refactoring
All checks were successful
Build / Build (push) Successful in 19s
Details

Browse Source
This commit is contained in:
Mateusz Skoczek
2026-04-12 23:01:45 +02:00
Unverified
parent e0ad5ceab9
commit 025b9456b9
2 changed files with 28 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
MSEssentials.UI.Common.MVVM/ObservableDictionary.cs
View File

@@ -1,37 +1,18 @@
using System; using System.Collections.ObjectModel;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MSEssentials.UI.Common.MVVM namespace MSEssentials.UI.Common.MVVM
{ {
public class ObservableDictionary<TKey, TValue> : ObservableCollection<ObservableKeyValuePair<TKey, TValue>>, IDictionary<TKey, TValue>, IEnumerable<ObservableKeyValuePair<TKey, TValue>> public class ObservableDictionary<TKey, TValue> : ObservableCollection<ObservableKeyValuePair<TKey, TValue>>, IDictionary<TKey, TValue>, IEnumerable<ObservableKeyValuePair<TKey, TValue>>
{ {
#region PROPERTIES
public ICollection<TKey> Keys => Items.Select(p => p.Key).ToList(); public ICollection<TKey> Keys => Items.Select(p => p.Key).ToList();
public ICollection<TValue> Values => Items.Select(p => p.Value).ToList(); public ICollection<TValue> Values => Items.Select(p => p.Value).ToList();
public bool IsReadOnly => false; public bool IsReadOnly => false;
#endregion
#region INDEXERS
public TValue this[TKey key] public TValue this[TKey key]
{ {
get get => !TryGetValue(key, out TValue result) ? throw new ArgumentException("Key not found") : result;
{
if (!TryGetValue(key, out TValue result))
{
throw new ArgumentException("Key not found");
}
return result;
}
set set
{ {
if (ContainsKey(key)) if (ContainsKey(key))
@@ -45,16 +26,11 @@ namespace MSEssentials.UI.Common.MVVM
} }
} }
#endregion
public ObservableDictionary()
#region CONSTRUCTORS
public ObservableDictionary() : base()
{ } { }
public ObservableDictionary(IDictionary<TKey, TValue> dictionary) : base() public ObservableDictionary(IDictionary<TKey, TValue> dictionary)
{ {
foreach (KeyValuePair<TKey, TValue> pair in dictionary) foreach (KeyValuePair<TKey, TValue> pair in dictionary)
{ {
@@ -62,12 +38,8 @@ namespace MSEssentials.UI.Common.MVVM
} }
} }
#endregion
public void Add(KeyValuePair<TKey, TValue> item) => Add(item.Key, item.Value);
#region PUBLIC METHODS
public void Add(TKey key, TValue value) public void Add(TKey key, TValue value)
{ {
if (ContainsKey(key)) if (ContainsKey(key))
@@ -77,8 +49,6 @@ namespace MSEssentials.UI.Common.MVVM
Add(new ObservableKeyValuePair<TKey, TValue>(key, value)); Add(new ObservableKeyValuePair<TKey, TValue>(key, value));
} }
public void Add(KeyValuePair<TKey, TValue> item) => Add(item.Key, item.Value);
public bool Contains(KeyValuePair<TKey, TValue> item) public bool Contains(KeyValuePair<TKey, TValue> item)
{ {
ObservableKeyValuePair<TKey, TValue> pair = GetKeyValuePairByTheKey(item.Key); ObservableKeyValuePair<TKey, TValue> pair = GetKeyValuePairByTheKey(item.Key);
@@ -96,20 +66,8 @@ namespace MSEssentials.UI.Common.MVVM
return !Equals(default(ObservableKeyValuePair<TKey, TValue>), pair); return !Equals(default(ObservableKeyValuePair<TKey, TValue>), pair);
} }
public void CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex) public void CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex) =>
{
throw new NotImplementedException(); throw new NotImplementedException();
}
public bool Remove(TKey key)
{
List<ObservableKeyValuePair<TKey, TValue>> remove = ((ObservableCollection<ObservableKeyValuePair<TKey, TValue>>)this).Where(pair => Equals(key, pair.Key)).ToList();
foreach (ObservableKeyValuePair<TKey, TValue> pair in remove)
{
Remove(pair);
}
return remove.Count > 0;
}
public bool Remove(KeyValuePair<TKey, TValue> item) public bool Remove(KeyValuePair<TKey, TValue> item)
{ {
@@ -124,6 +82,16 @@ namespace MSEssentials.UI.Common.MVVM
} }
return Remove(pair); return Remove(pair);
} }
public bool Remove(TKey key)
{
List<ObservableKeyValuePair<TKey, TValue>> remove = ((ObservableCollection<ObservableKeyValuePair<TKey, TValue>>)this).Where(pair => Equals(key, pair.Key)).ToList();
foreach (ObservableKeyValuePair<TKey, TValue> pair in remove)
{
Remove(pair);
}
return remove.Count > 0;
}
public bool TryGetValue(TKey key, [MaybeNullWhen(false)] out TValue value) public bool TryGetValue(TKey key, [MaybeNullWhen(false)] out TValue value)
{ {
@@ -137,16 +105,11 @@ namespace MSEssentials.UI.Common.MVVM
return true; return true;
} }
IEnumerator<KeyValuePair<TKey, TValue>> IEnumerable<KeyValuePair<TKey, TValue>>.GetEnumerator() => ((ObservableCollection<ObservableKeyValuePair<TKey, TValue>>)this).Select(i => new KeyValuePair<TKey, TValue>(i.Key, i.Value)).GetEnumerator(); IEnumerator<KeyValuePair<TKey, TValue>> IEnumerable<KeyValuePair<TKey, TValue>>.GetEnumerator() =>
((ObservableCollection<ObservableKeyValuePair<TKey, TValue>>)this).Select(i => new KeyValuePair<TKey, TValue>(i.Key, i.Value)).GetEnumerator();
#endregion
private ObservableKeyValuePair<TKey, TValue> GetKeyValuePairByTheKey(TKey key) =>
((ObservableCollection<ObservableKeyValuePair<TKey, TValue>>)this).FirstOrDefault(i => i.Key.Equals(key));
#region PRIVATE METHODS
private ObservableKeyValuePair<TKey, TValue> GetKeyValuePairByTheKey(TKey key) => ((ObservableCollection<ObservableKeyValuePair<TKey, TValue>>)this).FirstOrDefault(i => i.Key.Equals(key));
#endregion
} }
} }

32
MSEssentials.UI.Common.MVVM/ObservableKeyValuePair.cs
View File

@@ -9,17 +9,10 @@ namespace MSEssentials.UI.Common.MVVM
{ {
public class ObservableKeyValuePair<TKey, TValue> : INotifyPropertyChanged public class ObservableKeyValuePair<TKey, TValue> : INotifyPropertyChanged
{ {
#region FIELDS
private TKey _key; private TKey _key;
private TValue _value; private TValue _value;
#endregion
#region PROPERTIES
public TKey Key public TKey Key
{ {
get => _key; get => _key;
@@ -38,12 +31,7 @@ namespace MSEssentials.UI.Common.MVVM
NotifyPropertyChanged(nameof(Value)); NotifyPropertyChanged(nameof(Value));
} }
} }
#endregion
#region CONSTRUCTORS
public ObservableKeyValuePair() : this(default, default) public ObservableKeyValuePair() : this(default, default)
{ } { }
@@ -54,22 +42,10 @@ namespace MSEssentials.UI.Common.MVVM
_value = value; _value = value;
} }
#endregion
#region PRIVATE METHODS
private void NotifyPropertyChanged(string name) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name)); private void NotifyPropertyChanged(string name) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
#endregion
#region EVENTS
public event PropertyChangedEventHandler? PropertyChanged; public event PropertyChangedEventHandler? PropertyChanged;
#endregion
} }
} }