refact: extract notifyItem content for notification

debian/dde-shell.install

@@ -23,6 +23,7 @@ usr/share/dsg/configs/org.deepin.dde.shell/org.deepin.dde.shell.notification.jso
 usr/share/dsg/configs/org.deepin.dde.shell/org.deepin.ds.dde-apps.json
 usr/share/dde-shell/*/translations
 usr/share/dde-dock/icons/dcc-setting/*.svg
+usr/lib/*/qt6/qml/org/deepin/ds/notification/*
 usr/lib/*/qt6/qml/org/deepin/ds/notificationcenter/*
 usr/lib/*/dde-shell/org.deepin.ds.notificationcenter*
 usr/share/dde-shell/org.deepin.ds.notificationcenter*/

panels/notification/CMakeLists.txt

@@ -33,6 +33,7 @@ target_link_libraries(ds-notification-shared PUBLIC
 install(TARGETS ds-notification-shared DESTINATION "${LIB_INSTALL_DIR}")
 ds_install_package(PACKAGE org.deepin.ds.notification TARGET ds-notification)
 
+add_subdirectory(plugin)
 add_subdirectory(bubble)
 add_subdirectory(center)
 add_subdirectory(osd)

panels/notification/bubble/bubbleitem.cpp

@@ -172,6 +172,7 @@
 void BubbleItem::setEntity(const NotifyEntity &entity)
 {
     m_entity = entity;
+    updateActions();
 
     QVariantMap hints = entity.hints();
     if (hints.contains("urgency")) {
@@ -229,68 +230,36 @@
     return m_entity.cTime();
 }
 
-bool BubbleItem::hasDisplayAction() const
+QString BubbleItem::defaultAction() const
 {
-    return displayActions().count() >= 2;
+    return m_defaultAction;
 }
 
-bool BubbleItem::hasDefaultAction() const
+QVariantList BubbleItem::actions() const
 {
-    return defaultActionIdIndex() >= 0;
+    return m_actions;
 }
 
-QString BubbleItem::defaultActionText() const
+void BubbleItem::updateActions()
 {
-    const auto index = defaultActionTextIndex();
-    if (index < 0)
-        return QString();
-
-    return m_entity.actions().at(index);
-}
-
-QString BubbleItem::defaultActionId() const
-{
-    const auto index = defaultActionIdIndex();
-    if (index < 0)
-        return QString();
-
-    return m_entity.actions().at(index);
-}
-
-QString BubbleItem::firstActionText() const
-{
-    if (!hasDisplayAction())
-        return QString();
-
-    return displayActions().at(1);
-}
-
-QString BubbleItem::firstActionId() const
-{
-    if (!hasDisplayAction())
-        return QString();
-
-    return displayActions().at(0);
-}
-
-QStringList BubbleItem::actionTexts() const
-{
-    QStringList res;
-    const auto tmp = displayActions();
-    for (int i = 3; i < tmp.count(); i += 2)
-        res << tmp[i];
-
-    return res;
-}
+    QStringList actions = m_entity.actions();
+    const auto defaultIndex = actions.indexOf(QLatin1String("default"));
+    if (defaultIndex >= 0) {
+        actions.remove(defaultIndex, 2);
+        m_defaultAction = QLatin1String("default");
+    }
 
-QStringList BubbleItem::actionIds() const
-{
-    QStringList res;
-    const auto tmp = displayActions();
-    for (int i = 2; i < tmp.count(); i += 2)
-        res << tmp[i];
+    QVariantList array;
+    for (int i = 0; i < actions.size(); i += 2) {
+        const auto id = actions[i];
+        const auto text = actions[i + 1];
+        QVariantMap item;
+        item["id"] = id;
+        item["text"] = text;
+        array.append(item);
+    }
 
-    return res;
+    m_actions = array;
 }
 
 int BubbleItem::level() const
@@ -330,33 +299,7 @@
     m_enablePreview = enable;
 }
 
-int BubbleItem::defaultActionIdIndex() const
-{
-    return m_entity.actions().indexOf("default");
-}
-
-int BubbleItem::defaultActionTextIndex() const
-{
-    const auto index = defaultActionIdIndex();
-    if (index >= 0)
-        return index + 1;
-
-    return -1;
-}
-
-QStringList BubbleItem::displayActions() const
-{
-    const auto defaultIndex = defaultActionIdIndex();
-    if (defaultIndex >= 0) {
-        auto tmp = m_entity.actions();
-        tmp.remove(defaultIndex, 1);
-        return tmp;
-    }
-
-    return m_entity.actions();
-}
-
 QString BubbleItem::displayText() const
 {
     return m_enablePreview ? m_entity.body() : tr("1 new message");
 }

panels/notification/bubble/bubbleitem.h

@@ -34,14 +34,9 @@ class BubbleItem : public QObject
     QString bodyImagePath() const;
     qint64 ctime() const;
 
-    bool hasDisplayAction() const;
-    bool hasDefaultAction() const;
-    QString defaultActionText() const;
-    QString defaultActionId() const;
-    QString firstActionText() const;
-    QString firstActionId() const;
-    QStringList actionTexts() const;
-    QStringList actionIds() const;
+    QString defaultAction() const;
+    QVariantList actions() const;
+    void updateActions();
 
     int level() const;
     void setLevel(int level);
@@ -57,19 +52,16 @@ class BubbleItem : public QObject
     void timeTipChanged();
 
 private:
-    int defaultActionIdIndex() const;
-    int defaultActionTextIndex() const;
-    QStringList displayActions() const;
     QString displayText() const;
 
 private:
     NotifyEntity m_entity;
-
-private:
     int m_level = 0;
     int m_urgency = NotifyEntity::Normal;
     QString m_timeTip;
     bool m_enablePreview = true;
+    QVariantList m_actions;
+    QString m_defaultAction;
 };
 
 }

panels/notification/bubble/bubblemodel.cpp

@@ -174,18 +174,10 @@ QVariant BubbleModel::data(const QModelIndex &index, int role) const
         return m_bubbles[row]->bodyImagePath();
     case BubbleModel::OverlayCount:
         return overlayCount();
-    case BubbleModel::hasDefaultAction:
-        return m_bubbles[row]->hasDefaultAction();
-    case BubbleModel::hasDisplayAction:
-        return m_bubbles[row]->hasDisplayAction();
-    case BubbleModel::FirstActionText:
-        return m_bubbles[row]->firstActionText();
-    case BubbleModel::FirstActionId:
-        return m_bubbles[row]->firstActionId();
-    case BubbleModel::ActionTexts:
-        return m_bubbles[row]->actionTexts();
-    case BubbleModel::ActionIds:
-        return m_bubbles[row]->actionIds();
+    case BubbleModel::DefaultAction:
+        return m_bubbles[row]->defaultAction();
+    case BubbleModel::Actions:
+        return m_bubbles[row]->actions();
     case BubbleModel::Urgency:
         return m_bubbles[row]->urgency();
     default:
@@ -207,12 +199,8 @@ QHash<int, QByteArray> BubbleModel::roleNames() const
     mapRoleNames[BubbleModel::Urgency] = "urgency";
     mapRoleNames[BubbleModel::BodyImagePath] = "bodyImagePath";
     mapRoleNames[BubbleModel::OverlayCount] = "overlayCount";
-    mapRoleNames[BubbleModel::hasDefaultAction] = "hasDefaultAction";
-    mapRoleNames[BubbleModel::hasDisplayAction] = "hasDisplayAction";
-    mapRoleNames[BubbleModel::FirstActionText] = "firstActionText";
-    mapRoleNames[BubbleModel::FirstActionId] = "firstActionId";
-    mapRoleNames[BubbleModel::ActionTexts] = "actionTexts";
-    mapRoleNames[BubbleModel::ActionIds] = "actionIds";
+    mapRoleNames[BubbleModel::DefaultAction] = "defaultAction";
+    mapRoleNames[BubbleModel::Actions] = "actions";
     return mapRoleNames;
 }
 

panels/notification/bubble/bubblemodel.h

@@ -27,13 +27,8 @@ class BubbleModel : public QAbstractListModel
         TimeTip,
         BodyImagePath,
         OverlayCount,
-        hasDefaultAction,
-        hasDisplayAction,
-        FirstActionText,
-        FirstActionId,
-        DefaultActionId,
-        ActionTexts,
-        ActionIds,
+        DefaultAction,
+        Actions,
         Urgency,
     } BubbleRole;
 

panels/notification/bubble/bubblepanel.cpp

@@ -78,16 +78,6 @@ BubbleModel *BubblePanel::bubbles() const
     return m_bubbles;
 }
 
-void BubblePanel::invokeDefaultAction(int bubbleIndex)
-{
-    auto bubble = bubbleItem(bubbleIndex);
-    if (!bubble)
-        return;
-
-    m_bubbles->remove(bubbleIndex);
-    onActionInvoked(bubble->id(), bubble->bubbleId(), bubble->defaultActionId());
-}
-
 void BubblePanel::invokeAction(int bubbleIndex, const QString &actionId)
 {
     auto bubble = bubbleItem(bubbleIndex);

panels/notification/bubble/bubblepanel.h

@@ -43,7 +43,6 @@ class BubblePanel : public DS_NAMESPACE::DPanel
     bool enabled() const;
 
 public Q_SLOTS:
-    void invokeDefaultAction(int bubbleIndex);
     void invokeAction(int bubbleIndex, const QString &actionId);
     void close(int bubbleIndex);
     void delayProcess(int bubbleIndex);