Fixed several issues with activity items relating to icon colouration and activity item sizing + layout

Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>

1 files changed, 7 insertions, 26 deletions

diff --git a/src/gui/tray/activitydata.cpp b/src/gui/tray/activitydata.cpp
index bd8c566eb..1b8bfc34f 100644
--- a/src/gui/tray/activitydata.cpp
+++ b/src/gui/tray/activitydata.cpp
@@ -63,25 +63,9 @@ OCC::Activity Activity::fromActivityJson(const QJsonObject &json, const AccountP
     activity._file = json.value(QStringLiteral("object_name")).toString();
     activity._link = QUrl(json.value(QStringLiteral("link")).toString());
     activity._dateTime = QDateTime::fromString(json.value(QStringLiteral("datetime")).toString(), Qt::ISODate);
-    activity._darkIcon = json.value(QStringLiteral("icon")).toString();  // We have both dark and light for theming purposes
-    activity._lightIcon = json.value(QStringLiteral("icon")).toString(); // Some icons get changed in the ActivityListModel
+    activity._icon = json.value(QStringLiteral("icon")).toString();
     activity._isCurrentUserFileActivity = activity._objectType == QStringLiteral("files") && activityUser == account->davUser();
 
-    const auto darkIconPath = QStringLiteral("qrc://:/client/theme/white/");
-    const auto lightIconPath = QStringLiteral("qrc://:/client/theme/black/");
-    if(activity._darkIcon.contains("change.svg")) {
-        activity._darkIcon = darkIconPath + QStringLiteral("change.svg");
-        activity._lightIcon = lightIconPath + QStringLiteral("change.svg");
-    } else if(activity._darkIcon.contains("calendar.svg")) {
-        activity._darkIcon = darkIconPath + QStringLiteral("calendar.svg");
-        activity._lightIcon = lightIconPath + QStringLiteral("calendar.svg");
-    } else if(activity._darkIcon.contains("personal.svg")) {
-        activity._darkIcon = darkIconPath + QStringLiteral("user.svg");
-        activity._lightIcon = lightIconPath + QStringLiteral("user.svg");
-    }  else if(activity._darkIcon.contains("core/img/actions")) {
-        activity._darkIcon.insert(activity._darkIcon.indexOf(".svg"), "-white");
-    }
-
     auto richSubjectData = json.value(QStringLiteral("subject_rich")).toArray();
 
     if(richSubjectData.size() > 1) {
@@ -144,15 +128,12 @@ OCC::Activity Activity::fromActivityJson(const QJsonObject &json, const AccountP
     }
 
     if(!previewsData.isEmpty()) {
-        if(activity._darkIcon.contains(QStringLiteral("add-color.svg"))) {
-            activity._darkIcon = "qrc:///client/theme/colored/add-bordered.svg";
-            activity._lightIcon = "qrc:///client/theme/colored/add-bordered.svg";
-        } else if(activity._darkIcon.contains(QStringLiteral("delete-color.svg"))) {
-            activity._darkIcon = "qrc:///client/theme/colored/delete-bordered.svg";
-            activity._lightIcon = "qrc:///client/theme/colored/add-bordered.svg";
-        } else if(activity._darkIcon.contains(QStringLiteral("change.svg"))) {
-            activity._darkIcon = "qrc:///client/theme/colored/change-bordered.svg";
-            activity._lightIcon = "qrc:///client/theme/colored/add-bordered.svg";
+        if(activity._icon.contains(QStringLiteral("add-color.svg"))) {
+            activity._icon = "qrc:///client/theme/colored/add-bordered.svg";
+        } else if(activity._icon.contains(QStringLiteral("delete-color.svg"))) {
+            activity._icon = "qrc:///client/theme/colored/delete-bordered.svg";
+        } else if(activity._icon.contains(QStringLiteral("change.svg"))) {
+            activity._icon = "qrc:///client/theme/colored/change-bordered.svg";
         }
     }