Merge pull request #7725 from nextcloud/bugfix/tray-ui-colours

mgallien · web-flow · commit 7f0ea06025de · 2025-01-07T10:56:45.000+01:00
gui/tray: Fix colour for secondary text items being too pale
diff --git a/src/gui/macOS/ui/FileProviderFileDelegate.qml b/src/gui/macOS/ui/FileProviderFileDelegate.qml
@@ -81,7 +81,7 @@ Item {
                 EnforcedPlainTextLabel {
                     id: fileTypeLabel
                     text: root.fileTypeString
-                    color: palette.midlight
+                    color: palette.dark
                 }
             }
         }
diff --git a/src/gui/macOS/ui/FileProviderSettings.qml b/src/gui/macOS/ui/FileProviderSettings.qml
@@ -74,7 +74,7 @@ Page {
                 Rectangle {
                     Layout.fillWidth: true
                     height: Style.normalBorderWidth
-                    color: palette.midlight
+                    color: palette.dark
                 }
 
                 FileProviderSyncStatus {
diff --git a/src/gui/macOS/ui/FileProviderStorageInfo.qml b/src/gui/macOS/ui/FileProviderStorageInfo.qml
@@ -48,7 +48,7 @@ GridLayout {
         Layout.fillWidth: true
         text: qsTr("%1 GB of %2 GB remote files synced").arg(root.localUsedStorage.toFixed(2)).arg(root.remoteUsedStorage.toFixed(2));
         elide: Text.ElideRight
-        color: palette.midlight
+        color: palette.dark
         horizontalAlignment: Text.AlignRight
     }
 
diff --git a/src/gui/tray/ActivityList.qml b/src/gui/tray/ActivityList.qml
@@ -126,7 +126,7 @@ ScrollView {
                 verticalAlignment: Image.AlignVCenter
                 horizontalAlignment: Image.AlignHCenter
                 fillMode: Image.PreserveAspectFit
-                source: "image://svgimage-custom-color/activity.svg/" + palette.midlight
+                source: "image://svgimage-custom-color/activity.svg/" + palette.dark
             }
 
             EnforcedPlainTextLabel {
diff --git a/src/gui/tray/ListItemLineAndSubline.qml b/src/gui/tray/ListItemLineAndSubline.qml
@@ -30,7 +30,7 @@ ColumnLayout {
     property int sublineFontSize: Style.unifiedSearchResultSublineFontSize
 
     property color titleColor: palette.windowText
-    property color sublineColor: palette.midlight
+    property color sublineColor: palette.dark
 
     EnforcedPlainTextLabel {
         id: title
diff --git a/src/gui/tray/NCBusyIndicator.qml b/src/gui/tray/NCBusyIndicator.qml
@@ -19,7 +19,7 @@ import Style
 BusyIndicator {
     id: root
 
-    property color color: palette.midlight
+    property color color: palette.dark
     property string imageSource: "image://svgimage-custom-color/change.svg/"
 
     property int imageSourceSizeWidth: 64
diff --git a/src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml b/src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml
@@ -26,7 +26,7 @@ ColumnLayout {
 
     property int fontSize: Style.unifiedSearchResultTitleFontSize
 
-    property string textColor: palette.midlight
+    property string textColor: palette.dark
 
     Accessible.role: Accessible.ListItem
     Accessible.name: unifiedSearchResultItemFetchMoreText.text
diff --git a/src/gui/tray/UnifiedSearchResultItem.qml b/src/gui/tray/UnifiedSearchResultItem.qml
@@ -36,7 +36,7 @@ RowLayout {
     property int sublineFontSize: Style.unifiedSearchResultSublineFontSize
 
     property color titleColor: palette.buttonText
-    property color sublineColor: palette.midlight
+    property color sublineColor: palette.dark
 
 
     Accessible.role: Accessible.ListItem

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ Item {`
`81`	`81`	`EnforcedPlainTextLabel {`
`82`	`82`	`id: fileTypeLabel`
`83`	`83`	`text: root.fileTypeString`
`84`		`- color: palette.midlight`
	`84`	`+ color: palette.dark`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ Page {`
`74`	`74`	`Rectangle {`
`75`	`75`	`Layout.fillWidth: true`
`76`	`76`	`height: Style.normalBorderWidth`
`77`		`- color: palette.midlight`
	`77`	`+ color: palette.dark`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`FileProviderSyncStatus {`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ GridLayout {`
`48`	`48`	`Layout.fillWidth: true`
`49`	`49`	`text: qsTr("%1 GB of %2 GB remote files synced").arg(root.localUsedStorage.toFixed(2)).arg(root.remoteUsedStorage.toFixed(2));`
`50`	`50`	`elide: Text.ElideRight`
`51`		`- color: palette.midlight`
	`51`	`+ color: palette.dark`
`52`	`52`	`horizontalAlignment: Text.AlignRight`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ ScrollView {`
`126`	`126`	`verticalAlignment: Image.AlignVCenter`
`127`	`127`	`horizontalAlignment: Image.AlignHCenter`
`128`	`128`	`fillMode: Image.PreserveAspectFit`
`129`		`- source: "image://svgimage-custom-color/activity.svg/" + palette.midlight`
	`129`	`+ source: "image://svgimage-custom-color/activity.svg/" + palette.dark`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`EnforcedPlainTextLabel {`