Fix review comments.

Signed-off-by: alex-z <[email protected]>
nextcloud · Sep 20, 2023 · f99d883 · f99d883
1 parent f48c459
commit f99d883
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 30 deletions.
diff --git a/src/gui/tray/ActivityList.qml b/src/gui/tray/ActivityList.qml
@@ -16,7 +16,8 @@ ScrollView {
     property bool scrollingToTop: false
 
     function scrollToTop() {
-        scrollingToTop = true;
+        // Triggers activation of repeating upward flick timer
+        scrollingToTop = true
     }
 
     signal openFile(string filePath)
@@ -45,15 +46,15 @@ ScrollView {
         interactive: true
 
         Timer {
-            id: disappearTimer
-            interval: 50;
+            id: repeatUpFlickTimer
+            interval: 50
             running: controlRoot.scrollingToTop
             repeat: true
             onTriggered: {
                 if (!activityList.atYBeginning) {
                     activityList.flick(0, 10000)
                 } else {
-                    controlRoot.scrollingToTop = false;
+                    controlRoot.scrollingToTop = false
                 }
             }
         }

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
@@ -853,11 +853,14 @@ ApplicationWindow {
 
         Loader {
             id: newActivitiesButtonLoader
+
             anchors.top: activityList.top
             anchors.topMargin: 5
+            anchors.horizontalCenter: activityList.horizontalCenter
+
             width: Style.newActivitiesButtonWidth
             height: Style.newActivitiesButtonHeight
-            anchors.horizontalCenter: activityList.horizontalCenter
+
             z: 1
 
             active: false
@@ -872,8 +875,8 @@ ApplicationWindow {
                 contentsFont.bold: true
                 bgNormalColor: Qt.lighter(bgHoverColor, 1.25)
                 bgHoverColor: Style.currentUserHeaderColor
-                bgNormalOpacity: 0.8
-                bgHoverOpacity: 1.0
+                bgNormalOpacity: Style.newActivitiesBgNormalOpacity
+                bgHoverOpacity: Style.newActivitiesBgHoverOpacity
 
                 anchors.fill: parent
 
@@ -885,26 +888,26 @@ ApplicationWindow {
 
                 onClicked: {
                     activityList.scrollToTop();
-                    newActivitiesButtonLoader.active = false;
+                    newActivitiesButtonLoader.active = false
                 }
 
                 Timer {
-                    id: disappearTimer
-                    interval: 5000;
-                    running: newActivitiesButtonLoader.active && !newActivitiesButton.hovered;
+                    id: newActivitiesButtonDisappearTimer
+                    interval: 5000
+                    running: newActivitiesButtonLoader.active && !newActivitiesButton.hovered
                     repeat: false
-                    onTriggered: fadeoutDisappearTimer.running = true
+                    onTriggered: fadeoutActivitiesButtonDisappear.running = true
                 }
 
                 OpacityAnimator {
-                    id: fadeoutDisappearTimer
+                    id: fadeoutActivitiesButtonDisappear
                     target: newActivitiesButton;
                     from: 1;
                     to: 0;
                     duration: 250
                     loops: 1
                     running: false
-                    onFinished: newActivitiesButtonLoader.active = false;
+                    onFinished: newActivitiesButtonLoader.active = false
                 }
             }
         }

diff --git a/src/gui/tray/sortedactivitylistmodel.cpp b/src/gui/tray/sortedactivitylistmodel.cpp
@@ -99,24 +99,24 @@ bool SortedActivityListModel::lessThan(const QModelIndex &sourceLeft, const QMod
         return leftIsErrorFileItemStatus;
     }
 
-    const auto leftActiviyVerbsSearchResult = searchForVerbsInLinks(leftActivity._links);
-    const auto rightActiviyVerbsSearchResult = searchForVerbsInLinks(rightActivity._links);
+    const auto leftActivityVerbsSearchResult = searchForVerbsInLinks(leftActivity._links);
+    const auto rightActivityVerbsSearchResult = searchForVerbsInLinks(rightActivity._links);
 
-    if (leftActiviyVerbsSearchResult.hasPOST && !rightActiviyVerbsSearchResult.hasPOST) {
+    if (leftActivityVerbsSearchResult.hasPOST && !rightActivityVerbsSearchResult.hasPOST) {
         return true;
-    } else if (!leftActiviyVerbsSearchResult.hasPOST && rightActiviyVerbsSearchResult.hasPOST) {
+    } else if (!leftActivityVerbsSearchResult.hasPOST && rightActivityVerbsSearchResult.hasPOST) {
         return false;
     }
 
-    if (leftActiviyVerbsSearchResult.hasREPLY && !rightActiviyVerbsSearchResult.hasREPLY) {
+    if (leftActivityVerbsSearchResult.hasREPLY && !rightActivityVerbsSearchResult.hasREPLY) {
         return true;
-    } else if (!leftActiviyVerbsSearchResult.hasREPLY && rightActiviyVerbsSearchResult.hasREPLY) {
+    } else if (!leftActivityVerbsSearchResult.hasREPLY && rightActivityVerbsSearchResult.hasREPLY) {
         return false;
     }
 
-    if (leftActiviyVerbsSearchResult.hasWEB && !rightActiviyVerbsSearchResult.hasWEB) {
+    if (leftActivityVerbsSearchResult.hasWEB && !rightActivityVerbsSearchResult.hasWEB) {
         return true;
-    } else if (!leftActiviyVerbsSearchResult.hasWEB && rightActiviyVerbsSearchResult.hasWEB) {
+    } else if (!leftActivityVerbsSearchResult.hasWEB && rightActivityVerbsSearchResult.hasWEB) {
         return false;
     }
 

diff --git a/src/gui/tray/syncstatussummary.cpp b/src/gui/tray/syncstatussummary.cpp
@@ -214,15 +214,15 @@ void SyncStatusSummary::onFolderProgressInfo(const ProgressInfo &progress)
     const qint64 currentFile = progress.currentFile();
     const qint64 completedFile = progress.completedFiles();
     const qint64 totalSize = qMax(completedSize, progress.totalSize());
-    const qint64 totalFileCount = qMax(currentFile, progress.totalFiles());
+    const qint64 numFilesInProgress = qMax(currentFile, progress.totalFiles());
 
-    if (_totalFiles <= 0 && totalFileCount > 0) {
+    if (_totalFiles <= 0 && numFilesInProgress > 0) {
         setSyncStatusString(tr("Syncing"));
     }
 
-    setTotalFiles(totalFileCount);
+    setTotalFiles(numFilesInProgress);
 
-    setSyncProgress(calculateOverallPercent(totalFileCount, completedFile, totalSize, completedSize));
+    setSyncProgress(calculateOverallPercent(numFilesInProgress, completedFile, totalSize, completedSize));
 
     if (totalSize > 0) {
         const auto completedSizeString = Utility::octetsToString(completedSize);
@@ -238,8 +238,8 @@ void SyncStatusSummary::onFolderProgressInfo(const ProgressInfo &progress)
         }
     }
 
-    if (totalFileCount > 0) {
-        setSyncStatusString(tr("Syncing file %1 of %2").arg(currentFile).arg(totalFileCount));
+    if (numFilesInProgress > 0) {
+        setSyncStatusString(tr("Syncing file %1 of %2").arg(currentFile).arg(numFilesInProgress));
     }
 }
 
@@ -253,7 +253,7 @@ void SyncStatusSummary::setSyncing(bool value)
     emit syncingChanged();
 }
 
-void SyncStatusSummary::setTotalFiles(qint64 value)
+void SyncStatusSummary::setTotalFiles(const qint64 value)
 {
     if (value != _totalFiles) {
         _totalFiles = value;

diff --git a/src/gui/tray/syncstatussummary.h b/src/gui/tray/syncstatussummary.h
@@ -82,7 +82,7 @@ public slots:
     void setSyncStatusDetailString(const QString &value);
     void setSyncIcon(const QUrl &value);
     void setAccountState(AccountStatePtr accountState);
-    void setTotalFiles(qint64 value);
+    void setTotalFiles(const qint64 value);
 
     AccountStatePtr _accountState;
     std::set<QString> _foldersWithErrors;

diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
@@ -175,6 +175,9 @@ QtObject {
     property int newActivitiesButtonWidth: 150
     property int newActivitiesButtonHeight: 40
 
+    property real newActivitiesBgNormalOpacity: 0.8
+    property real newActivitiesBgHoverOpacity: 1.0
+
     function variableSize(size) {
         return size * (1 + Math.min(pixelSize / 100, 1));
     }