Fixes

Toolkit.Avalonia/ContentControlHandler.cs

@@ -21,7 +21,7 @@ public class ContentControlHandler :
                     {
                         if (content is IActivated activated)
                         {
-                            await activated.OnActivated();
+                            await activated.Activated();
                         }
                     }
 
@@ -35,7 +35,7 @@ public class ContentControlHandler :
                     {
                         if (content is IDeactivated deactivated)
                         {
-                            await deactivated.OnDeactivated();
+                            await deactivated.Deactivated();
                         }
 
                         if (content is IDisposable disposable)

Toolkit.Avalonia/ContentDialogHandler.cs

@@ -81,7 +81,7 @@ public class ContentDialogHandler(IDispatcher dispatcher) :
                         {
                             if (content is IDeactivating deactivating)
                             {
-                                await deactivating.OnDeactivating();
+                                await deactivating.Deactivating();
                             }
                        }
                     }
@@ -96,7 +96,7 @@ public class ContentDialogHandler(IDispatcher dispatcher) :
                 {
                     if (content is IActivated activated)
                     {
-                        await activated.OnActivated();
+                        await activated.Activated();
                     }
                 }
             }
@@ -109,7 +109,7 @@ public class ContentDialogHandler(IDispatcher dispatcher) :
                 {
                     if (content is IDeactivated deactivated)
                     {
-                        await deactivated.OnDeactivated();
+                        await deactivated.Deactivated();
                     }
                 }
             }

Toolkit.Avalonia/ContentTemplate.cs

@@ -29,7 +29,7 @@ public class ContentTemplate :
                             {
                                 if (content is IActivated activated)
                                 {
-                                    await activated.OnActivated();
+                                    await activated.Activated();
                                 }
                             }
                         }
@@ -41,7 +41,7 @@ public class ContentTemplate :
                             {
                                 if (content is IDeactivated deactivated)
                                 {
-                                    await deactivated.OnDeactivated();
+                                    await deactivated.Deactivated();
                                 }
                             }
                         }

Toolkit.Avalonia/FrameHandler.cs

@@ -37,7 +37,7 @@ public class FrameHandler :
                                 {
                                     if (content is IDeactivated deactivated)
                                     {
-                                        await deactivated.OnDeactivated();
+                                        await deactivated.Deactivated();
                                     }
 
                                     if (content is not IKeepAlive)
@@ -63,7 +63,7 @@ public class FrameHandler :
                                 {
                                     if (content is IDeactivating deactivating)
                                     {
-                                        await deactivating.OnDeactivating();
+                                        await deactivating.Deactivating();
                                     }
                                 }
                             }
@@ -74,7 +74,7 @@ public class FrameHandler :
                         {
                             if (content is IActivated activated)
                             {
-                                await activated.OnActivated();
+                                await activated.Activated();
                             }
                         }
 
@@ -89,7 +89,7 @@ public class FrameHandler :
                             {
                                 if (content is IDeactivated deactivated)
                                 {
-                                    await deactivated.OnDeactivated();
+                                    await deactivated.Deactivated();
                                 }
 
                                 if (content is IDisposable disposable)

Toolkit.Foundation/AppService.cs

@@ -10,7 +10,7 @@ public class AppService(IEnumerable<IInitialization> initializers,
     {
         foreach (IInitialization initializer in initializers)
         {
-            await initializer.OnInitialize();
+            await initializer.Initialize();
         }
 
         publisher.Publish<StartedEventArgs>();

Toolkit.Foundation/ComponentConfigurationViewModel.cs

@@ -51,10 +51,10 @@ public partial class ComponentConfigurationViewModel<TConfiguration, TValue, TAc
     [ObservableProperty]
     private object description = description;
 
-    public override Task OnActivated()
+    public override Task Activated()
     {
         Value = valueDelegate.Invoke(configuration);
-        return base.OnActivated();
+        return base.Activated();
     }
 
     public Task Handle(ChangedEventArgs<TConfiguration> args)
@@ -93,10 +93,10 @@ public partial class ComponentConfigurationViewModel<TConfiguration, TValue, TDe
     [ObservableProperty]
     private TDescription description = description;
 
-    public override Task OnActivated()
+    public override Task Activated()
     {
         Value = valueDelegate.Invoke(configuration);
-        return base.OnActivated();
+        return base.Activated();
     }
 
     public Task Handle(ChangedEventArgs<TConfiguration> args)

Toolkit.Foundation/ComponentHost.cs

@@ -23,7 +23,7 @@ public class ComponentHost(IServiceProvider services,
     {
         foreach (IInitialization initializer in initializers)
         {
-            await initializer.OnInitialize();
+            await initializer.Initialize();
         }
 
         foreach (IHostedService service in hostedServices)

Toolkit.Foundation/ComponentInitializer.cs

@@ -9,7 +9,7 @@ public class ComponentInitializer(IEnumerable<IComponent> components,
     IServiceProvider provider) :
     IInitialization
 {
-    public async Task OnInitialize()
+    public async Task Initialize()
     {
         foreach (IComponent component in components)
         {

Toolkit.Foundation/ConfigurationInitializer.cs

@@ -9,7 +9,7 @@ public class ConfigurationInitializer<TConfiguration>(IConfigurationReader<TConf
     where TConfiguration :
     class
 {
-    public Task OnInitialize()
+    public Task Initialize()
     {
         if (!reader.TryRead(out TConfiguration? configuration))
         {

Toolkit.Foundation/ContentFactory.cs

@@ -20,14 +20,14 @@ public class ContentFactory(IMediator mediator,
                 {
                     if (args is IInitialization initialization)
                     {
-                        initialization.OnInitialize();
+                        initialization.Initialize();
                     }
                 }, parameters)
                 : provider.GetRequiredKeyedService(descriptor.ContentType, args =>
                 {
                     if (args is IInitialization initialization)
                     {
-                        initialization.OnInitialize();
+                        initialization.Initialize();
                     }
                 }, descriptor.Key);
 

Toolkit.Foundation/IActivated.cs

@@ -2,5 +2,5 @@
 
 public interface IActivated
 {
-    Task OnActivated();
+    Task Activated();
 }

Toolkit.Foundation/IConfigurationInitializer.cs

@@ -4,5 +4,5 @@ public interface IConfigurationInitializer<TConfiguration>
     where TConfiguration :
     class
 {
-    Task OnInitialize();
+    Task Initialize();
 }

Toolkit.Foundation/IDeactivated.cs

@@ -2,5 +2,5 @@
 
 public interface IDeactivated
 {
-    Task OnDeactivated();
+    Task Deactivated();
 }

Toolkit.Foundation/IDeactivating.cs

@@ -2,5 +2,5 @@
 
 public interface IDeactivating
 {
-    Task OnDeactivating();
+    Task Deactivating();
 }

Toolkit.Foundation/IInitialization.cs

@@ -2,5 +2,5 @@
 
 public interface IInitialization
 {
-    Task OnInitialize();
+    Task Initialize();
 }

Toolkit.Foundation/ISelectable.cs

@@ -2,5 +2,5 @@
 
 public interface ISelectable
 {
-    bool Selected { get; set; }
+    bool IsSelected { get; set; }
 }

Toolkit.Foundation/IValidation.cs

@@ -6,7 +6,7 @@ namespace Toolkit.Foundation;
 public interface IValidation : 
     INotifyPropertyChanged
 {
-    ValidationErrorCollection Errors { get; }
+    IReadOnlyDictionary<string, string> Errors { get; }
 
     bool HasErrors { get; }
 

Toolkit.Foundation/Observable.cs

@@ -56,7 +56,7 @@ public partial class Observable(IServiceProvider provider,
         Disposer.Dispose(this);
     }
 
-    public virtual Task OnInitialize()
+    public virtual Task Initialize()
     {
         if (IsInitialized)
         {
@@ -72,20 +72,20 @@ public partial class Observable(IServiceProvider provider,
     [ObservableProperty]
     private bool isActivated;
 
-    public virtual Task OnActivated()
+    public virtual Task Activated()
     {
         IsActivated = true;
         return Task.CompletedTask;
     }
 
 
-    public virtual Task OnDeactivated()
+    public virtual Task Deactivated()
     {
         IsActivated = false;
         return Task.CompletedTask;
     }
 
-    public virtual Task OnDeactivating() =>
+    public virtual Task Deactivating() =>
         Task.CompletedTask;
 
     public void Revert()

Toolkit.Foundation/ObservableCollection.cs

@@ -37,6 +37,7 @@ public partial class ObservableCollection<TItem> :
     private readonly System.Collections.ObjectModel.ObservableCollection<TItem> collection = [];
 
     private readonly IDispatcher dispatcher;
+
     private readonly Queue<object> pendingEvents = [];
 
     private readonly Dictionary<string, object> trackedProperties = [];
@@ -151,7 +152,7 @@ public partial class ObservableCollection<TItem> :
         {
             if (args is IInitialization initialization)
             {
-                initialization.OnInitialize();
+                initialization.Initialize();
             }
         }, parameters);
 
@@ -403,7 +404,7 @@ public partial class ObservableCollection<TItem> :
         {
             if (args is IInitialization initialization)
             {
-                initialization.OnInitialize();
+                initialization.Initialize();
             }
         }, parameters);
 
@@ -442,7 +443,7 @@ public partial class ObservableCollection<TItem> :
         bool moveSelection = false;
         if (item is ISelectable oldSelection)
         {
-            if (oldSelection.Selected)
+            if (oldSelection.IsSelected)
             {
                 moveSelection = true;
                 SelectedItem = default;
@@ -456,7 +457,7 @@ public partial class ObservableCollection<TItem> :
         {
             if (item is ISelectable newSelection)
             {
-                newSelection.Selected = true;
+                newSelection.IsSelected = true;
                 dispatcher.Invoke(() => SelectedItem = item);
             }
         }
@@ -478,7 +479,7 @@ public partial class ObservableCollection<TItem> :
         return true;
     }
 
-    public virtual Task OnActivated()
+    public virtual Task Activated()
     {
         IsActivated = true;
         while (pendingEvents.Count > 0)
@@ -490,16 +491,16 @@ public partial class ObservableCollection<TItem> :
         return Task.CompletedTask;
     }
 
-    public virtual Task OnDeactivated()
+    public virtual Task Deactivated()
     {
         IsActivated = false;
         return Task.CompletedTask;
     }
 
-    public virtual Task OnDeactivating() =>
+    public virtual Task Deactivating() =>
         Task.CompletedTask;
 
-    public virtual Task OnInitialize()
+    public virtual Task Initialize()
     {
         if (IsInitialized)
         {
@@ -634,12 +635,12 @@ public partial class ObservableCollection<TItem> :
     {
         if (oldValue is ISelectable oldSelection)
         {
-            oldSelection.Selected = false;
+            oldSelection.IsSelected = false;
         }
 
         if (newValue is ISelectable newSelection)
         {
-            newSelection.Selected = true;
+            newSelection.IsSelected = true;
         }
     }
 
@@ -647,11 +648,11 @@ public partial class ObservableCollection<TItem> :
     {
         if (item is ISelectable newSelection)
         {
-            if (newSelection.Selected)
+            if (newSelection.IsSelected)
             {
                 if (SelectedItem is ISelectable oldSelection)
                 {
-                    oldSelection.Selected = false;
+                    oldSelection.IsSelected = false;
                 }
 
                 dispatcher.Invoke(() => SelectedItem = item);

Toolkit.Foundation/Validation.cs

@@ -8,7 +8,10 @@ public class Validation(IValidatorCollection validators) :
 {
     public event PropertyChangedEventHandler? PropertyChanged;
 
-    public ValidationErrorCollection Errors { get; } = [];
+    private readonly ValidationErrorCollection errors = [];
+
+    public IReadOnlyDictionary<string, string> Errors => 
+        errors.AsReadOnly();
 
     public bool HasErrors => 
         Errors.Count > 0;
@@ -38,7 +41,7 @@ public class Validation(IValidatorCollection validators) :
     {
         if (Errors.ContainsKey(name))
         {
-            Errors.Remove(name);
+            errors.Remove(name);
         }
 
         if (Validators.TryGet(name, out Validator? validator))
@@ -47,7 +50,7 @@ public class Validation(IValidatorCollection validators) :
             {
                 if (!validator.TryValidate(out string? message))
                 {
-                    Errors[name] = message ?? "";
+                    errors[name] = message ?? "";
                 }
             }
         }
@@ -60,14 +63,14 @@ public class Validation(IValidatorCollection validators) :
 
     public bool Validate()
     {
-        Errors.Clear();
+        errors.Clear();
         foreach (Validator? validator in Validators)
         {
             if (validator.PropertyName is string name)
             {
                 if (!validator.TryValidate(out string? message))
                 {
-                    Errors[name] = message ?? "";
+                    errors[name] = message ?? "";
                 }
             }
         }

Toolkit.Foundation/ValidationErrorCollection.cs

@@ -42,7 +42,7 @@ public class ValidationErrorCollection :
 
     public string this[string key]
     {
-        get => items.ContainsKey(key) ? items[key] : "";
+        get => items.TryGetValue(key, out string? value) ? value : "";
         set
         {
             bool replace = items.TryGetValue(key, out var old);

Toolkit.UI.Avalonia/InvokeNavigationViewItemAction.cs

@@ -21,7 +21,7 @@ public class InvokeNavigationViewItemAction :
                 {
                     if (collection is { Count: > 0 } && collection[0] is ISelectable selectable)
                     {
-                        selectable.Selected = true;
+                        selectable.IsSelected = true;
                     }
                 }
             }, DispatcherPriority.ContextIdle);
@@ -35,7 +35,7 @@ public class InvokeNavigationViewItemAction :
                 {
                     if (collection is { Count: > 0 } && collection[0] is ISelectable selectable)
                     {
-                        selectable.Selected = true;
+                        selectable.IsSelected = true;
                     }
                 }
             }, DispatcherPriority.ContextIdle);