Settings page was added

viewmodels/usersviewmodel.cpp

@@ -1,18 +1,15 @@
 #include "usersviewmodel.h"
 
-#include "services/beerservice.h"
+#include "services/settingsservice.h"
 
 UsersViewModel::UsersViewModel(QObject *parent)
     : QObject{parent}
 {
-    connect(this, &UsersViewModel::selectedUserChanged, this, [this]() {
-        BeerService::instance()->connectSrv(m_selectedUser);
-    });
-
-    setSelectedUser(m_settings.selectedUserId());
-
     connect(&m_usersModel, &AbstractModel::dataChanged, this, &UsersViewModel::usersChanged);
     connect(&m_usersModel, &AbstractModel::dataChanged, this, &UsersViewModel::selectedUserNameChanged);
+
+    connect(settings(), &SettingsService::selectedUserIdChanged, this, &UsersViewModel::selectedUserChanged);
+    connect(settings(), &SettingsService::selectedUserIdChanged, this, &UsersViewModel::selectedUserNameChanged);
 }
 
 QVariantList UsersViewModel::users() const
@@ -22,22 +19,24 @@ QVariantList UsersViewModel::users() const
 
 QString UsersViewModel::selectedUser() const
 {
-    return m_selectedUser;
+    return settings()->selectedUserId();
 }
 
 void UsersViewModel::setSelectedUser(const QString &newSelectedUser)
 {
-    if (m_selectedUser == newSelectedUser) {
+    if (selectedUser() == newSelectedUser) {
         return;
     }
 
-    m_selectedUser = newSelectedUser;
-    m_settings.setSelectedUserId(m_selectedUser);
-    emit selectedUserChanged();
-    emit selectedUserNameChanged();
+    settings()->setSelectedUserId(newSelectedUser);
 }
 
 QString UsersViewModel::selectedUserName() const
 {
-    return m_usersModel.userName(m_selectedUser);
+    return m_usersModel.userName(selectedUser());
+}
+
+SettingsService *UsersViewModel::settings() const
+{
+    return SettingsService::instance();
 }

viewmodels/usersviewmodel.h

@@ -5,6 +5,7 @@
 
 #include "models/usersmodel.h"
 
+class SettingsService;
 class UsersViewModel : public QObject
 {
     Q_OBJECT
@@ -27,10 +28,9 @@ signals:
     void selectedUserNameChanged();
 
 private:
-    QString m_selectedUser;
+    SettingsService *settings() const;
 
     UsersModel m_usersModel;
-    SettingsService m_settings;
 };
 
 #endif // USERSVIEWMODEL_H