refactoring

sahin-a · Mar 12, 2023 · 703bca0 · 703bca0
1 parent 9f05973
commit 703bca0
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 38 deletions.
diff --git a/SteamAccountManager.AvaloniaUI/ViewModels/AccountSwitcherViewModel.cs b/SteamAccountManager.AvaloniaUI/ViewModels/AccountSwitcherViewModel.cs
@@ -26,6 +26,7 @@ public class AccountSwitcherViewModel : RoutableViewModel
         private readonly AccountMapper _accountMapper;
         private readonly ILocalNotificationService _notificationService;
         private readonly IPrivacyConfigStorage _privacyConfigStorage;
+        private readonly EventBus _eventBus;
 
         public AdvancedObservableCollection<Account> Accounts { get; private set; }
         public ICommand ProfileClickedCommand { get; }
@@ -51,19 +52,30 @@ EventBus eventBus
             _accountMapper = accountMapper;
             _notificationService = notificationService;
             _privacyConfigStorage = privacyConfigStorage;
+            _eventBus = eventBus;
 
             Accounts = new AdvancedObservableCollection<Account>();
             ProfileClickedCommand = new ProfileClickedCommand();
             RefreshAccountsCommand = new QuickCommand(LoadAccounts);
             ShowInfoCommand = new QuickCommand(ShowInfo);
             AddAccountCommand = new QuickCommand(AddAccount);
-            eventBus.Subscribe(subscriberKey: GetType().Name, Events.ACCOUNTS_UPDATED, _ => LoadAccounts());
 
-            InitializeVisibilityConfig();
+            RegisterSubscriptions();
+            LoadVisibilityConfig();
             LoadAccounts();
         }
 
-        private void InitializeVisibilityConfig()
+        private void RegisterSubscriptions()
+        {
+            _eventBus.Subscribe(subscriberKey: GetType().Name, Events.ACCOUNTS_UPDATED,
+                _ => LoadAccounts()
+            );
+            _eventBus.Subscribe(subscriberKey: GetType().Name, Events.PRIVACY_CONFIG_UPDATED,
+                _ => LoadVisibilityConfig()
+            );
+        }
+
+        private void LoadVisibilityConfig()
         {
             var config = _privacyConfigStorage.Get()?.DetailSettings;
             if (config is null)
@@ -107,7 +119,7 @@ private async Task<IEnumerable<Account>> GetAccounts()
 
         public async void LoadAccounts()
         {
-            InitializeVisibilityConfig();
+            LoadVisibilityConfig();
             Accounts.SetItems((await GetAccounts()).ToList());
         }
 

diff --git a/SteamAccountManager.AvaloniaUI/ViewModels/SettingsViewModel.cs b/SteamAccountManager.AvaloniaUI/ViewModels/SettingsViewModel.cs
@@ -4,32 +4,17 @@
 using DynamicData;
 using ReactiveUI;
 using SteamAccountManager.AvaloniaUI.Common;
+using SteamAccountManager.Domain.Common.EventSystem;
 using SteamAccountManager.Domain.Steam.Configuration.Model;
 using SteamAccountManager.Domain.Steam.Storage;
 
 namespace SteamAccountManager.AvaloniaUI.ViewModels
 {
-    public class AccountDetailToggle
-    {
-        public string Title { get; set; }
-        public ICommand ToggledCommand { get; set; }
-        public bool IsToggled { get; set; }
-
-        public AccountDetailType DetailType { get; set; }
-
-        public AccountDetailToggle(AccountDetailType detailType, string title, ICommand toggledCommand, bool isToggled)
-        {
-            Title = title;
-            ToggledCommand = toggledCommand;
-            IsToggled = isToggled;
-            DetailType = detailType;
-        }
-    }
-
     public class SettingsViewModel : RoutableViewModel
     {
         private readonly ISteamApiKeyStorage _steamApiKeyStorage;
         private readonly IPrivacyConfigStorage _privacyConfigStorage;
+        private readonly EventBus _eventBus;
 
 
         public AdvancedObservableCollection<AccountDetailToggle> AccountDetailsToggles { get; } = new();
@@ -41,11 +26,14 @@ public SettingsViewModel
         (
             IScreen screen,
             ISteamApiKeyStorage apiKeyStorage,
-            IPrivacyConfigStorage privacyConfigStorage
+            IPrivacyConfigStorage privacyConfigStorage,
+            EventBus eventBus
         ) : base(screen)
         {
             _steamApiKeyStorage = apiKeyStorage;
             _privacyConfigStorage = privacyConfigStorage;
+            _eventBus = eventBus;
+
             SaveApiKeyCommand = ReactiveCommand.Create((string key) => SaveApiKey(key));
 
             InitializeControls();
@@ -99,6 +87,8 @@ private void DetailToggled(AccountDetailToggle detailToggle)
                 var settings = AccountDetailsToggles.Select(x => new DetailSetting(x.DetailType, x.IsToggled));
                 _privacyConfigStorage.Set(new PrivacyConfig(settings.ToList()));
             }
+
+            _eventBus.Notify(Events.PRIVACY_CONFIG_UPDATED, null);
         }
 
         private void SaveApiKey(string key)
@@ -127,4 +117,21 @@ public static string ToTitle(this AccountDetailType type)
             return "";
         }
     }
+
+    public class AccountDetailToggle
+    {
+        public string Title { get; set; }
+        public ICommand ToggledCommand { get; set; }
+        public bool IsToggled { get; set; }
+
+        public AccountDetailType DetailType { get; set; }
+
+        public AccountDetailToggle(AccountDetailType detailType, string title, ICommand toggledCommand, bool isToggled)
+        {
+            Title = title;
+            ToggledCommand = toggledCommand;
+            IsToggled = isToggled;
+            DetailType = detailType;
+        }
+    }
 }
diff --git a/SteamAccountManager.Domain/Common/EventSystem/EventBus.cs b/SteamAccountManager.Domain/Common/EventSystem/EventBus.cs
@@ -1,20 +1,12 @@
-using SteamAccountManager.Domain.Common.CodeExtensions;
-
-namespace SteamAccountManager.Domain.Common.EventSystem;
+namespace SteamAccountManager.Domain.Common.EventSystem;
 
 public class EventBus
 {
     private readonly List<Subscription> _subscribers = new();
 
-    private void RemoveDeadSubscribers()
-    {
-        _subscribers.RemoveAll(x => !x.handler.TryGetTarget(out _));
-    }
-
     public void Subscribe(string subscriberKey, string eventKey, Action<object?> handler)
     {
-        RemoveDeadSubscribers();
-        var subscription = new Subscription(subscriberKey, eventKey, new WeakReference<Action<object?>>(handler));
+        var subscription = new Subscription(subscriberKey, eventKey, handler);
         var index = _subscribers.FindIndex(x => x == subscription);
         if (index == -1)
         {
@@ -27,15 +19,12 @@ public void Subscribe(string subscriberKey, string eventKey, Action<object?> han
 
     public void Unsubscribe(string subscriberKey)
     {
-        RemoveDeadSubscribers();
         _subscribers.RemoveAll(x => x.SubscriberKey == subscriberKey);
     }
 
     public void Notify(string eventKey, object? value)
     {
         _subscribers.FindAll(x => x.EventKey == eventKey)
-            .ForEach(x =>
-                x.handler.TryGetTarget(out Action<object?>? action).IfTrue(() => action?.Invoke(value))
-            );
+            .ForEach(x => x.handler(value));
     }
 }
diff --git a/SteamAccountManager.Domain/Common/EventSystem/Events.cs b/SteamAccountManager.Domain/Common/EventSystem/Events.cs
@@ -3,4 +3,5 @@
 public static class Events
 {
     public const string ACCOUNTS_UPDATED = "ACCOUNTS_UPDATED";
+    public const string PRIVACY_CONFIG_UPDATED = "PRIVACY_CONFIG_UPDATED";
 }
diff --git a/SteamAccountManager.Domain/Common/EventSystem/Subscription.cs b/SteamAccountManager.Domain/Common/EventSystem/Subscription.cs
@@ -4,9 +4,9 @@ class Subscription
 {
     public string SubscriberKey { get; set; }
     public string EventKey { get; set; }
-    public WeakReference<Action<object?>> handler { get; set; }
+    public Action<object?> handler { get; set; }
 
-    public Subscription(string subscriberKey, string eventKey, WeakReference<Action<object?>> handler)
+    public Subscription(string subscriberKey, string eventKey, Action<object?> handler)
     {
         SubscriberKey = subscriberKey;
         EventKey = eventKey;