Merge branch 'android_origin_hints' into 'master'

[lipstick] Expose android origin and color info on notifications. Contributes to JB#51447 See merge request mer-core/lipstick!161
sailfishos · Oct 16, 2020 · 34bde4a · 34bde4a
2 parents 83c4721 + 2bbb079
commit 34bde4a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/notifications/lipsticknotification.cpp b/src/notifications/lipsticknotification.cpp
@@ -232,6 +232,7 @@ void LipstickNotification::setHints(const QVariantHash &hints)
     qreal oldProgress = progress();
     bool oldHasProgress = hasProgress();
     bool oldIsTransient = isTransient();
+    QString oldColor = color();
 
     m_hints = hints;
     updateHintValues();
@@ -286,6 +287,10 @@ void LipstickNotification::setHints(const QVariantHash &hints)
         emit isTransientChanged();
     }
 
+    if (oldColor != color()) {
+        emit colorChanged();
+    }
+
     emit hintsChanged();
 }
 
@@ -344,6 +349,11 @@ bool LipstickNotification::isTransient() const
     return m_hints.value(LipstickNotification::HINT_TRANSIENT).toBool();
 }
 
+QString LipstickNotification::color() const
+{
+    return m_hints.value(QLatin1String("x-nemo-color")).toString();
+}
+
 bool LipstickNotification::isUserRemovable() const
 {
     if (hasProgress() && m_activeProgressTimer && m_activeProgressTimer->isActive()) {

diff --git a/src/notifications/lipsticknotification.h b/src/notifications/lipsticknotification.h
@@ -56,6 +56,7 @@ class LIPSTICK_EXPORT LipstickNotification : public QObject
     Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
     Q_PROPERTY(bool hasProgress READ hasProgress NOTIFY hasProgressChanged)
     Q_PROPERTY(bool isTransient READ isTransient NOTIFY isTransientChanged)
+    Q_PROPERTY(QString color READ color NOTIFY colorChanged)
 
 public:
     enum Urgency { Low = 0, Normal = 1, Critical = 2 };
@@ -241,6 +242,9 @@ class LIPSTICK_EXPORT LipstickNotification : public QObject
     //! Returns whether the notification is transient
     bool isTransient() const;
 
+    //! Returns the color set for notification, commonly just for Android compatibility
+    QString color() const;
+
     //! Returns the user removability of the notification
     bool isUserRemovable() const;
 
@@ -334,6 +338,7 @@ class LIPSTICK_EXPORT LipstickNotification : public QObject
     void progressChanged();
 
     void isTransientChanged();
+    void colorChanged();
 
 private:
     void updateHintValues();