ThemeEngine: Add accentColor property

Author: adazem009

src/ui/internal/themeengine.cpp

@@ -7,6 +7,7 @@ using namespace scratchcpp;
 
 static const QString MODULE = "ui";
 static const QString THEME_KEY = "theme";
+static const QString ACCENT_COLOR_KEY = "accentColor";
 
 std::shared_ptr<ThemeEngine> ThemeEngine::m_instance = std::make_shared<ThemeEngine>();
 
@@ -31,6 +32,7 @@ void ThemeEngine::reloadTheme()
  emit bgColorChanged();
  emit foregroundColorChanged();
  emit borderColorChanged();
+ emit accentColorChanged();
  emit themeChanged();
 }
 
@@ -59,3 +61,14 @@ const QColor &ThemeEngine::borderColor() const
  static const QColor light = QColor(0, 0, 0, 64);
  return theme() == Theme::DarkTheme ? dark : light;
 }
+
+QColor ThemeEngine::accentColor() const
+{
+ return settings()->getValue(MODULE, ACCENT_COLOR_KEY).value<QColor>();
+}
+
+void ThemeEngine::setAccentColor(const QColor &newAccentColor)
+{
+ settings()->setValue(MODULE, ACCENT_COLOR_KEY, newAccentColor);
+ emit accentColorChanged();
+}

src/ui/internal/themeengine.h

@@ -21,6 +21,7 @@ class ThemeEngine : public IThemeEngine
  Q_PROPERTY(QColor bgColor READ bgColor NOTIFY bgColorChanged FINAL)
  Q_PROPERTY(QColor foregroundColor READ foregroundColor NOTIFY foregroundColorChanged FINAL)
  Q_PROPERTY(QColor borderColor READ borderColor NOTIFY borderColorChanged FINAL)
+ Q_PROPERTY(QColor accentColor READ accentColor WRITE setAccentColor NOTIFY accentColorChanged FINAL)
  public:
  static std::shared_ptr<ThemeEngine> instance();
 
@@ -33,11 +34,15 @@ class ThemeEngine : public IThemeEngine
  const QColor &foregroundColor() const override;
  const QColor &borderColor() const override;
 
+ QColor accentColor() const override;
+ void setAccentColor(const QColor &newAccentColor) override;
+
  signals:
  void themeChanged();
  void bgColorChanged();
  void foregroundColorChanged();
  void borderColorChanged();
+ void accentColorChanged();
 
  private:
  static std::shared_ptr<ThemeEngine> m_instance;

src/ui/ithemeengine.h

@@ -32,6 +32,9 @@ class IThemeEngine
  virtual const QColor &bgColor() const = 0;
  virtual const QColor &foregroundColor() const = 0;
  virtual const QColor &borderColor() const = 0;
+
+ virtual QColor accentColor() const = 0;
+ virtual void setAccentColor(const QColor &newAccentColor) = 0;
 };
 
 } // namespace scratchcpp

src/ui/test/themeengine.cpp

@@ -13,6 +13,7 @@ using ::testing::_;
 
 static const QString MODULE = "ui";
 static const QString THEME_KEY = "theme";
+static const QString ACCENT_COLOR_KEY = "accentColor";
 
 class ThemeEngineTest : public testing::Test
 {
@@ -26,6 +27,7 @@ class ThemeEngineTest : public testing::Test
  m_themeSpies.push_back(std::make_unique<QSignalSpy>(&m_themeEngine, &ThemeEngine::bgColorChanged));
  m_themeSpies.push_back(std::make_unique<QSignalSpy>(&m_themeEngine, &ThemeEngine::foregroundColorChanged));
  m_themeSpies.push_back(std::make_unique<QSignalSpy>(&m_themeEngine, &ThemeEngine::borderColorChanged));
+ m_themeSpies.push_back(std::make_unique<QSignalSpy>(&m_themeEngine, &ThemeEngine::accentColorChanged));
  }
 
  void TearDown() override { m_themeEngine.setsettings(nullptr); }
@@ -70,3 +72,24 @@ TEST_F(ThemeEngineTest, Theme)
  m_themeEngine.reloadTheme();
  checkThemeSpies(4);
 }
+
+TEST_F(ThemeEngineTest, AccentColor)
+{
+ QSignalSpy spy(&m_themeEngine, &ThemeEngine::accentColorChanged);
+
+ EXPECT_CALL(*m_settings, getValue(MODULE, ACCENT_COLOR_KEY)).WillOnce(Return(QColor(255, 0, 0)));
+ ASSERT_EQ(m_themeEngine.accentColor(), QColor(255, 0, 0));
+ ASSERT_EQ(spy.count(), 0);
+
+ EXPECT_CALL(*m_settings, getValue(MODULE, ACCENT_COLOR_KEY)).WillOnce(Return(QColor(0, 255, 128)));
+ ASSERT_EQ(m_themeEngine.accentColor(), QColor(0, 255, 128));
+ ASSERT_EQ(spy.count(), 0);
+
+ EXPECT_CALL(*m_settings, setValue(MODULE, ACCENT_COLOR_KEY, QVariant(QColor(255, 255, 255))));
+ m_themeEngine.setAccentColor(QColor(255, 255, 255));
+ ASSERT_EQ(spy.count(), 1);
+
+ EXPECT_CALL(*m_settings, setValue(MODULE, ACCENT_COLOR_KEY, QVariant(QColor(0, 0, 0))));
+ m_themeEngine.setAccentColor(QColor(0, 0, 0));
+ ASSERT_EQ(spy.count(), 2);
+}