Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2025-12-10 07:25:37 -05:00
Code Packages Releases Activity

ControlCenter styling consistency fixes

Browse Source
This commit is contained in:
bbedward
2025-09-25 18:19:07 -04:00
parent a6a41d4de1
commit 934f4b2210
12 changed files with 45 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Modules/ControlCenter/Components/WidgetGrid.qml
View File

@@ -178,21 +178,6 @@ Column {
if (!BluetoothService.adapter || !BluetoothService.adapter.enabled) { if (!BluetoothService.adapter || !BluetoothService.adapter.enabled) {
return "bluetooth_disabled" return "bluetooth_disabled"
} }
const primaryDevice = (() => {
if (!BluetoothService.adapter || !BluetoothService.adapter.devices) {
return null
}
let devices = [...BluetoothService.adapter.devices.values.filter(dev => dev && (dev.paired || dev.trusted))]
for (let device of devices) {
if (device && device.connected) {
return device
}
}
return null
})()
if (primaryDevice) {
return BluetoothService.getDeviceIcon(primaryDevice)
}
return "bluetooth" return "bluetooth"
} }
case "audioOutput": { case "audioOutput": {

16
Modules/ControlCenter/Details/AudioInputDetail.qml
View File

@@ -57,10 +57,6 @@ Rectangle {
radius: (Theme.iconSize + Theme.spacingS * 2) / 2 radius: (Theme.iconSize + Theme.spacingS * 2) / 2
color: iconArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent" color: iconArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
Behavior on color {
ColorAnimation { duration: Theme.shortDuration }
}
MouseArea { MouseArea {
id: iconArea id: iconArea
anchors.fill: parent anchors.fill: parent
@@ -138,9 +134,9 @@ Rectangle {
width: parent.width width: parent.width
height: 50 height: 50
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: deviceMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.surfaceContainerHigh color: deviceMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.surfaceContainerHighest
border.color: modelData === AudioService.source ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12) border.color: modelData === AudioService.source ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
border.width: modelData === AudioService.source ? 2 : 1 border.width: 0
Row { Row {
anchors.left: parent.left anchors.left: parent.left
@@ -198,14 +194,6 @@ Rectangle {
} }
} }
} }
Behavior on color {
ColorAnimation { duration: Theme.shortDuration }
}
Behavior on border.color {
ColorAnimation { duration: Theme.shortDuration }
}
} }
} }
} }

16
Modules/ControlCenter/Details/AudioOutputDetail.qml
View File

@@ -57,10 +57,6 @@ Rectangle {
radius: (Theme.iconSize + Theme.spacingS * 2) / 2 radius: (Theme.iconSize + Theme.spacingS * 2) / 2
color: iconArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent" color: iconArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
Behavior on color {
ColorAnimation { duration: Theme.shortDuration }
}
MouseArea { MouseArea {
id: iconArea id: iconArea
anchors.fill: parent anchors.fill: parent
@@ -143,9 +139,9 @@ Rectangle {
width: parent.width width: parent.width
height: 50 height: 50
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: deviceMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.surfaceContainerHigh color: deviceMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.surfaceContainerHighest
border.color: modelData === AudioService.sink ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12) border.color: modelData === AudioService.sink ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
border.width: modelData === AudioService.sink ? 2 : 1 border.width: 0
Row { Row {
anchors.left: parent.left anchors.left: parent.left
@@ -205,14 +201,6 @@ Rectangle {
} }
} }
} }
Behavior on color {
ColorAnimation { duration: Theme.shortDuration }
}
Behavior on border.color {
ColorAnimation { duration: Theme.shortDuration }
}
} }
} }
} }

8
Modules/ControlCenter/Details/BluetoothCodecSelector.qml
View File

@@ -206,7 +206,7 @@ Item {
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: { color: {
if (modelData.name === currentCodec) if (modelData.name === currentCodec)
return Theme.surfaceContainerHigh; return Theme.surfaceContainerHighest;
else if (codecMouseArea.containsMouse) else if (codecMouseArea.containsMouse)
return Theme.surfaceHover; return Theme.surfaceHover;
else else
@@ -272,12 +272,6 @@ Item {
} }
} }
Behavior on color {
ColorAnimation {
duration: Theme.shortDuration
}
}
} }

24
Modules/ControlCenter/Details/BluetoothDetail.qml
View File

@@ -96,13 +96,6 @@ Rectangle {
BluetoothService.adapter.discovering = !BluetoothService.adapter.discovering BluetoothService.adapter.discovering = !BluetoothService.adapter.discovering
} }
} }
Behavior on color {
ColorAnimation {
duration: Theme.shortDuration
easing.type: Theme.standardEasing
}
}
} }
} }
@@ -159,7 +152,7 @@ Rectangle {
return Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.12) return Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.12)
if (deviceMouseArea.containsMouse) if (deviceMouseArea.containsMouse)
return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08)
return Theme.surfaceContainerHigh return Theme.surfaceContainerHighest
} }
border.color: { border.color: {
if (modelData.state === BluetoothDeviceState.Connecting) if (modelData.state === BluetoothDeviceState.Connecting)
@@ -168,7 +161,7 @@ Rectangle {
return Theme.primary return Theme.primary
return Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12) return Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
} }
border.width: (modelData.connected || modelData.state === BluetoothDeviceState.Connecting) ? 2 : 1 border.width: 0
Row { Row {
anchors.left: parent.left anchors.left: parent.left
@@ -284,14 +277,6 @@ Rectangle {
} }
} }
} }
Behavior on color {
ColorAnimation { duration: Theme.shortDuration }
}
Behavior on border.color {
ColorAnimation { duration: Theme.shortDuration }
}
} }
} }
@@ -347,7 +332,7 @@ Rectangle {
width: parent.width width: parent.width
height: 50 height: 50
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: availableMouseArea.containsMouse && !isBusy ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.surfaceContainerHigh color: availableMouseArea.containsMouse && !isBusy ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.surfaceContainerHighest
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
border.width: 0 border.width: 0
opacity: canConnect ? 1 : 0.6 opacity: canConnect ? 1 : 0.6
@@ -427,9 +412,6 @@ Rectangle {
} }
} }
Behavior on color {
ColorAnimation { duration: Theme.shortDuration }
}
} }
} }

15
Modules/ControlCenter/Details/DiskUsageDetail.qml
View File

@@ -6,6 +6,8 @@ import qs.Services
import qs.Widgets import qs.Widgets
Rectangle { Rectangle {
id: root
property string currentMountPath: "/" property string currentMountPath: "/"
property string instanceId: "" property string instanceId: ""
@@ -76,9 +78,9 @@ Rectangle {
width: parent.width width: parent.width
height: 80 height: 80
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Theme.surfaceContainerHigh color: Theme.surfaceContainerHighest
border.color: modelData.mount === currentMountPath ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12) border.color: modelData.mount === currentMountPath ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
border.width: modelData.mount === currentMountPath ? 2 : 1 border.width: modelData.mount === currentMountPath ? 2 : 0
Row { Row {
anchors.left: parent.left anchors.left: parent.left
@@ -152,16 +154,11 @@ Rectangle {
hoverEnabled: true hoverEnabled: true
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
onClicked: { onClicked: {
if (modelData.mount !== currentMountPath) { currentMountPath = modelData.mount
currentMountPath = modelData.mount mountPathChanged(modelData.mount)
mountPathChanged(modelData.mount)
}
} }
} }
Behavior on border.color {
ColorAnimation { duration: Theme.shortDuration }
}
} }
} }
} }

62
Modules/ControlCenter/Details/NetworkDetail.qml
View File

@@ -27,20 +27,11 @@ Rectangle {
NetworkService.scanWifi() NetworkService.scanWifi()
} }
} }
Component.onDestruction: { Component.onDestruction: {
NetworkService.removeRef() NetworkService.removeRef()
} }
property var wifiPasswordModalRef: {
wifiPasswordModalLoader.active = true
return wifiPasswordModalLoader.item
}
property var networkInfoModalRef: {
networkInfoModalLoader.active = true
return networkInfoModalLoader.item
}
Row { Row {
id: headerRow id: headerRow
anchors.left: parent.left anchors.left: parent.left
@@ -177,12 +168,6 @@ Rectangle {
onClicked: NetworkService.toggleWifiRadio() onClicked: NetworkService.toggleWifiRadio()
} }
Behavior on color {
ColorAnimation {
duration: Theme.shortDuration
easing.type: Theme.standardEasing
}
}
} }
} }
} }
@@ -242,9 +227,9 @@ Rectangle {
width: parent.width width: parent.width
height: 50 height: 50
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: networkMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.surfaceContainerHigh color: networkMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.surfaceContainerHighest
border.color: modelData.ssid === NetworkService.currentWifiSSID ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12) border.color: modelData.ssid === NetworkService.currentWifiSSID ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
border.width: modelData.ssid === NetworkService.currentWifiSSID ? 2 : 1 border.width: 0
Row { Row {
anchors.left: parent.left anchors.left: parent.left
@@ -332,9 +317,7 @@ Rectangle {
onClicked: function(event) { onClicked: function(event) {
if (modelData.ssid !== NetworkService.currentWifiSSID) { if (modelData.ssid !== NetworkService.currentWifiSSID) {
if (modelData.secured && !modelData.saved) { if (modelData.secured && !modelData.saved) {
if (wifiPasswordModalRef) { wifiPasswordModal.show(modelData.ssid)
wifiPasswordModalRef.show(modelData.ssid)
}
} else { } else {
NetworkService.connectToWifi(modelData.ssid) NetworkService.connectToWifi(modelData.ssid)
} }
@@ -343,13 +326,6 @@ Rectangle {
} }
} }
Behavior on color {
ColorAnimation { duration: Theme.shortDuration }
}
Behavior on border.color {
ColorAnimation { duration: Theme.shortDuration }
}
} }
} }
} }
@@ -395,9 +371,7 @@ Rectangle {
NetworkService.disconnectWifi() NetworkService.disconnectWifi()
} else { } else {
if (networkContextMenu.currentSecured && !networkContextMenu.currentSaved) { if (networkContextMenu.currentSecured && !networkContextMenu.currentSaved) {
if (wifiPasswordModalRef) { wifiPasswordModal.show(networkContextMenu.currentSSID)
wifiPasswordModalRef.show(networkContextMenu.currentSSID)
}
} else { } else {
NetworkService.connectToWifi(networkContextMenu.currentSSID) NetworkService.connectToWifi(networkContextMenu.currentSSID)
} }
@@ -423,10 +397,8 @@ Rectangle {
} }
onTriggered: { onTriggered: {
if (networkInfoModalRef) { let networkData = NetworkService.getNetworkInfo(networkContextMenu.currentSSID)
let networkData = NetworkService.getNetworkInfo(networkContextMenu.currentSSID) networkInfoModal.showNetworkInfo(networkContextMenu.currentSSID, networkData)
networkInfoModalRef.showNetworkInfo(networkContextMenu.currentSSID, networkData)
}
} }
} }
@@ -454,22 +426,12 @@ Rectangle {
} }
} }
LazyLoader { WifiPasswordModal {
id: wifiPasswordModalLoader id: wifiPasswordModal
active: false
WifiPasswordModal {
id: wifiPasswordModal
}
} }
LazyLoader { NetworkInfoModal {
id: networkInfoModalLoader id: networkInfoModal
active: false
NetworkInfoModal {
id: networkInfoModal
}
} }

3
Modules/ControlCenter/Widgets/BluetoothPill.qml
View File

@@ -30,9 +30,6 @@ CompoundPill {
if (!BluetoothService.adapter || !BluetoothService.adapter.enabled) { if (!BluetoothService.adapter || !BluetoothService.adapter.enabled) {
return "bluetooth_disabled" return "bluetooth_disabled"
} }
if (primaryDevice) {
return BluetoothService.getDeviceIcon(primaryDevice)
}
return "bluetooth" return "bluetooth"
} }

5
Modules/ControlCenter/Widgets/CompoundPill.qml
View File

@@ -29,7 +29,10 @@ Rectangle {
readonly property color _containerBg: Theme.surfaceContainerHigh readonly property color _containerBg: Theme.surfaceContainerHigh
color: _containerBg color: {
const baseColor = bodyMouse.containsMouse ? Theme.widgetBaseHoverColor : _containerBg
return baseColor
}
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.10) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.10)
border.width: 0 border.width: 0
antialiasing: true antialiasing: true

6
Modules/ControlCenter/Widgets/SmallBatteryButton.qml
View File

@@ -31,7 +31,11 @@ Rectangle {
readonly property color _tileIconActive: Theme.primaryContainer readonly property color _tileIconActive: Theme.primaryContainer
readonly property color _tileIconInactive: Theme.primary readonly property color _tileIconInactive: Theme.primary
color: isActive ? _tileBgActive : _tileBgInactive color: {
if (isActive) return _tileBgActive
const baseColor = mouseArea.containsMouse ? Theme.widgetBaseHoverColor : _tileBgInactive
return baseColor
}
border.color: isActive ? _tileRingActive : "transparent" border.color: isActive ? _tileRingActive : "transparent"
border.width: isActive ? 1 : 0 border.width: isActive ? 1 : 0
antialiasing: true antialiasing: true

6
Modules/ControlCenter/Widgets/SmallToggleButton.qml
View File

@@ -32,7 +32,11 @@ Rectangle {
readonly property color _tileIconActive: Theme.primaryContainer readonly property color _tileIconActive: Theme.primaryContainer
readonly property color _tileIconInactive: Theme.primary readonly property color _tileIconInactive: Theme.primary
color: isActive ? _tileBgActive : _tileBgInactive color: {
if (isActive) return _tileBgActive
const baseColor = mouseArea.containsMouse ? Theme.widgetBaseHoverColor : _tileBgInactive
return baseColor
}
border.color: isActive ? _tileRingActive : "transparent" border.color: isActive ? _tileRingActive : "transparent"
border.width: isActive ? 1 : 0 border.width: isActive ? 1 : 0
antialiasing: true antialiasing: true

6
Modules/ControlCenter/Widgets/ToggleButton.qml
View File

@@ -27,7 +27,11 @@ Rectangle {
readonly property color _tileRingActive: readonly property color _tileRingActive:
Qt.rgba(Theme.primaryText.r, Theme.primaryText.g, Theme.primaryText.b, 0.22) Qt.rgba(Theme.primaryText.r, Theme.primaryText.g, Theme.primaryText.b, 0.22)
color: isActive ? _tileBgActive : _tileBgInactive color: {
if (isActive) return _tileBgActive
const baseColor = mouseArea.containsMouse ? Theme.widgetBaseHoverColor : _tileBgInactive
return baseColor
}
border.color: isActive ? _tileRingActive : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08) border.color: isActive ? _tileRingActive : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
border.width: 0 border.width: 0
opacity: enabled ? 1.0 : 0.6 opacity: enabled ? 1.0 : 0.6