Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-28 07:22:50 -05:00
Code Packages Releases Activity

bluetooth: cleanup service usage, add rssi

Browse Source
This commit is contained in:
bbedward
2025-07-17 16:56:28 -04:00
parent 60395b5646
commit cbb42df3a9
2 changed files with 164 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
Services/BluetoothService.qml
View File

@@ -12,91 +12,44 @@ Singleton {
readonly property bool enabled: adapter?.enabled ?? false readonly property bool enabled: adapter?.enabled ?? false
readonly property bool discovering: adapter?.discovering ?? false readonly property bool discovering: adapter?.discovering ?? false
readonly property var devices: { readonly property var devices: adapter ? adapter.devices : null
var deviceList = []
if (!adapter) return deviceList
for (var i = 0; i < adapter.devices.count; i++) { function sortByRssi(devices) {
var dev = adapter.devices.get(i) return devices.sort((a, b) => {
if (dev && dev.ready && _isValidDevice(dev)) { var aRssi = (a.rssi !== undefined && a.rssi !== 0) ? a.rssi : -100
deviceList.push({ var bRssi = (b.rssi !== undefined && b.rssi !== 0) ? b.rssi : -100
address: dev.address, return bRssi - aRssi
name: dev.name || dev.deviceName, })
paired: dev.paired,
connected: dev.connected,
iconName: _getDeviceIcon(dev),
type: _getDeviceType(dev),
batteryLevel: dev.batteryAvailable ? Math.round(dev.battery * 100) : -1,
batteryAvailable: dev.batteryAvailable,
native: dev
})
}
}
return deviceList
} }
readonly property var pairedDevices: { readonly property var pairedDevices: {
return devices.filter(dev => dev.paired) if (!adapter || !adapter.devices) return []
return adapter.devices.values.filter(dev => dev && dev.paired && isValidDevice(dev))
} }
readonly property var availableDevices: { readonly property var availableDevices: {
if (!discovering) return [] if (!adapter || !adapter.discovering || !Bluetooth.devices) return []
var availableList = [] var filtered = Bluetooth.devices.values
.filter(dev => dev && !dev.paired && !dev.pairing && !dev.blocked && isValidDevice(dev) && (dev.rssi === undefined || dev.rssi !== 0))
if (Bluetooth.devices && Bluetooth.devices.values) { return sortByRssi(filtered)
for (var device of Bluetooth.devices.values) {
if (device && device.ready && !device.paired && _isValidDevice(device)) {
availableList.push({
address: device.address,
name: device.name || device.deviceName,
paired: false,
connected: false,
iconName: _getDeviceIcon(device),
type: _getDeviceType(device),
batteryLevel: -1,
batteryAvailable: false,
native: device
})
}
}
}
return availableList
} }
readonly property var allDevicesWithBattery: { readonly property var allDevicesWithBattery: {
return devices.filter(dev => dev.batteryAvailable && dev.batteryLevel >= 0) if (!adapter || !adapter.devices) return []
return adapter.devices.values.filter(dev => dev && dev.batteryAvailable && dev.battery > 0)
} }
Component.onCompleted: {
if (adapter && adapter.devices) {
adapter.devices.itemAdded.connect(devicesChanged)
adapter.devices.itemRemoved.connect(devicesChanged)
}
if (Bluetooth.devices) { function isValidDevice(device) {
Bluetooth.devices.itemAdded.connect(devicesChanged) if (!device) return false
Bluetooth.devices.itemRemoved.connect(devicesChanged)
}
}
Connections {
target: Bluetooth
function onDefaultAdapterChanged() {
if (adapter && adapter.devices) {
adapter.devices.itemAdded.connect(devicesChanged)
adapter.devices.itemRemoved.connect(devicesChanged)
}
}
}
function _isValidDevice(device) {
var displayName = device.name || device.deviceName var displayName = device.name || device.deviceName
if (!displayName || displayName.length < 2) return false if (!displayName || displayName.length < 2) return false
if (displayName.startsWith('/org/bluez') || displayName.includes('hci0')) return false if (displayName.startsWith('/org/bluez') || displayName.includes('hci0')) return false
return displayName.length >= 3 return displayName.length >= 3
} }
function _getDeviceIcon(device) { function getDeviceIcon(device) {
if (!device) return "bluetooth"
var name = (device.name || device.deviceName || "").toLowerCase() var name = (device.name || device.deviceName || "").toLowerCase()
var icon = (device.icon || "").toLowerCase() var icon = (device.icon || "").toLowerCase()
@@ -112,7 +65,8 @@ Singleton {
return "bluetooth" return "bluetooth"
} }
function _getDeviceType(device) { function getDeviceType(device) {
if (!device) return "bluetooth"
var name = (device.name || device.deviceName || "").toLowerCase() var name = (device.name || device.deviceName || "").toLowerCase()
var icon = (device.icon || "").toLowerCase() var icon = (device.icon || "").toLowerCase()
@@ -128,6 +82,43 @@ Singleton {
return "bluetooth" return "bluetooth"
} }
function canPair(device) {
if (!device) return false
return !device.paired && !device.pairing && !device.blocked
}
function debugDevice(device) {
console.log("Device:", device.name, "paired:", device.paired, "connected:", device.connected, "rssi:", device.rssi)
}
function getPairingStatus(device) {
if (!device) return "unknown"
if (device.pairing) return "pairing"
if (device.paired) return "paired"
if (device.blocked) return "blocked"
return "available"
}
function getSignalStrength(device) {
if (!device || device.rssi === undefined || device.rssi === 0) return "Unknown"
var rssi = device.rssi
if (rssi >= -50) return "Excellent"
if (rssi >= -60) return "Good"
if (rssi >= -70) return "Fair"
if (rssi >= -80) return "Poor"
return "Very Poor"
}
function getSignalIcon(device) {
if (!device || device.rssi === undefined || device.rssi === 0) return "signal_cellular_null"
var rssi = device.rssi
if (rssi >= -50) return "signal_cellular_4_bar"
if (rssi >= -60) return "signal_cellular_3_bar"
if (rssi >= -70) return "signal_cellular_2_bar"
if (rssi >= -80) return "signal_cellular_1_bar"
return "signal_cellular_0_bar"
}
function toggleAdapter() { function toggleAdapter() {
if (adapter) adapter.enabled = !adapter.enabled if (adapter) adapter.enabled = !adapter.enabled
} }
@@ -152,7 +143,7 @@ Singleton {
function pair(address) { function pair(address) {
var device = _findDevice(address) var device = _findDevice(address)
if (device) device.pair() if (device && canPair(device)) device.pair()
} }
function forget(address) { function forget(address) {
@@ -170,7 +161,7 @@ Singleton {
function _findDevice(address) { function _findDevice(address) {
if (!adapter) return null if (!adapter) return null
return adapter.devices.values.find(d => d.address === address) || return adapter.devices.values.find(d => d && d.address === address) ||
(Bluetooth.devices ? Bluetooth.devices.values.find(d => d.address === address) : null) (Bluetooth.devices ? Bluetooth.devices.values.find(d => d && d.address === address) : null)
} }
} }

148
Widgets/ControlCenter/BluetoothTab.qml
View File

@@ -3,6 +3,7 @@ import QtQuick.Controls
import Quickshell import Quickshell
import Quickshell.Widgets import Quickshell.Widgets
import Quickshell.Io import Quickshell.Io
import Quickshell.Bluetooth
import qs.Common import qs.Common
import qs.Services import qs.Services
@@ -25,8 +26,8 @@ Item {
height: 60 height: 60
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: bluetoothToggle.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : color: bluetoothToggle.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) :
(BluetoothService.enabled ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16) : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.12)) (BluetoothService.adapter && BluetoothService.adapter.enabled ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16) : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.12))
border.color: BluetoothService.enabled ? Theme.primary : "transparent" border.color: BluetoothService.adapter && BluetoothService.adapter.enabled ? Theme.primary : "transparent"
border.width: 2 border.width: 2
Row { Row {
@@ -39,7 +40,7 @@ Item {
text: "bluetooth" text: "bluetooth"
font.family: Theme.iconFont font.family: Theme.iconFont
font.pixelSize: Theme.iconSizeLarge font.pixelSize: Theme.iconSizeLarge
color: BluetoothService.enabled ? Theme.primary : Theme.surfaceText color: BluetoothService.adapter && BluetoothService.adapter.enabled ? Theme.primary : Theme.surfaceText
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
@@ -50,12 +51,12 @@ Item {
Text { Text {
text: "Bluetooth" text: "Bluetooth"
font.pixelSize: Theme.fontSizeLarge font.pixelSize: Theme.fontSizeLarge
color: BluetoothService.enabled ? Theme.primary : Theme.surfaceText color: BluetoothService.adapter && BluetoothService.adapter.enabled ? Theme.primary : Theme.surfaceText
font.weight: Font.Medium font.weight: Font.Medium
} }
Text { Text {
text: BluetoothService.enabled ? "Enabled" : "Disabled" text: BluetoothService.adapter && BluetoothService.adapter.enabled ? "Enabled" : "Disabled"
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7) color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)
} }
@@ -77,7 +78,7 @@ Item {
Column { Column {
width: parent.width width: parent.width
spacing: Theme.spacingM spacing: Theme.spacingM
visible: BluetoothService.enabled visible: BluetoothService.adapter && BluetoothService.adapter.enabled
Text { Text {
text: "Paired Devices" text: "Paired Devices"
@@ -87,7 +88,7 @@ Item {
} }
Repeater { Repeater {
model: BluetoothService.pairedDevices model: BluetoothService.adapter && BluetoothService.adapter.devices ? BluetoothService.adapter.devices.values.filter(dev => dev && dev.paired && BluetoothService.isValidDevice(dev)) : []
Rectangle { Rectangle {
width: parent.width width: parent.width
@@ -105,7 +106,7 @@ Item {
spacing: Theme.spacingM spacing: Theme.spacingM
Text { Text {
text: modelData.iconName text: BluetoothService.getDeviceIcon(modelData)
font.family: Theme.iconFont font.family: Theme.iconFont
font.pixelSize: Theme.iconSize font.pixelSize: Theme.iconSize
color: modelData.connected ? Theme.primary : Theme.surfaceText color: modelData.connected ? Theme.primary : Theme.surfaceText
@@ -117,7 +118,7 @@ Item {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
Text { Text {
text: modelData.name text: modelData.name || modelData.deviceName
font.pixelSize: Theme.fontSizeMedium font.pixelSize: Theme.fontSizeMedium
color: modelData.connected ? Theme.primary : Theme.surfaceText color: modelData.connected ? Theme.primary : Theme.surfaceText
font.weight: modelData.connected ? Font.Medium : Font.Normal font.weight: modelData.connected ? Font.Medium : Font.Normal
@@ -134,13 +135,13 @@ Item {
Text { Text {
text: { text: {
if (modelData.batteryAvailable && modelData.batteryLevel >= 0) { if (modelData.batteryAvailable && modelData.battery > 0) {
return "• " + modelData.batteryLevel + "%" return "• " + Math.round(modelData.battery * 100) + "%"
} }
var btBattery = BatteryService.bluetoothDevices.find(dev => var btBattery = BatteryService.bluetoothDevices.find(dev =>
dev.name === modelData.name || dev.name === (modelData.name || modelData.deviceName) ||
dev.name.toLowerCase().includes(modelData.name.toLowerCase()) || dev.name.toLowerCase().includes((modelData.name || modelData.deviceName).toLowerCase()) ||
modelData.name.toLowerCase().includes(dev.name.toLowerCase()) (modelData.name || modelData.deviceName).toLowerCase().includes(dev.name.toLowerCase())
) )
return btBattery ? "• " + btBattery.percentage + "%" : "" return btBattery ? "• " + btBattery.percentage + "%" : ""
} }
@@ -195,11 +196,12 @@ Item {
MouseArea { MouseArea {
id: btDeviceArea id: btDeviceArea
anchors.fill: parent anchors.fill: parent
anchors.rightMargin: 40 // Don't overlap with menu button anchors.rightMargin: 40
hoverEnabled: true hoverEnabled: true
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
onClicked: { onClicked: {
BluetoothService.debugDevice(modelData)
BluetoothService.toggle(modelData.address) BluetoothService.toggle(modelData.address)
} }
} }
@@ -210,7 +212,7 @@ Item {
Column { Column {
width: parent.width width: parent.width
spacing: Theme.spacingM spacing: Theme.spacingM
visible: BluetoothService.enabled visible: BluetoothService.adapter && BluetoothService.adapter.enabled
Row { Row {
width: parent.width width: parent.width
@@ -239,7 +241,7 @@ Item {
spacing: Theme.spacingXS spacing: Theme.spacingXS
Text { Text {
text: BluetoothService.discovering ? "stop" : "bluetooth_searching" text: BluetoothService.adapter && BluetoothService.adapter.discovering ? "stop" : "bluetooth_searching"
font.family: Theme.iconFont font.family: Theme.iconFont
font.pixelSize: Theme.iconSize - 4 font.pixelSize: Theme.iconSize - 4
color: Theme.primary color: Theme.primary
@@ -248,7 +250,7 @@ Item {
Text { Text {
id: scanText id: scanText
text: BluetoothService.discovering ? "Stop Scanning" : "Start Scanning" text: BluetoothService.adapter && BluetoothService.adapter.discovering ? "Stop Scanning" : "Start Scanning"
font.pixelSize: Theme.fontSizeMedium font.pixelSize: Theme.fontSizeMedium
color: Theme.primary color: Theme.primary
font.weight: Font.Medium font.weight: Font.Medium
@@ -263,7 +265,7 @@ Item {
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
onClicked: { onClicked: {
if (BluetoothService.discovering) { if (BluetoothService.adapter && BluetoothService.adapter.discovering) {
BluetoothService.stopScan() BluetoothService.stopScan()
} else { } else {
BluetoothService.startScan() BluetoothService.startScan()
@@ -277,12 +279,23 @@ Item {
model: BluetoothService.availableDevices model: BluetoothService.availableDevices
Rectangle { Rectangle {
property bool canPair: BluetoothService.canPair(modelData)
property string pairingStatus: BluetoothService.getPairingStatus(modelData)
width: parent.width width: parent.width
height: 70 height: 70
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: availableDeviceArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : color: {
(modelData.paired ? Qt.rgba(Theme.secondary.r, Theme.secondary.g, Theme.secondary.b, 0.12) : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08)) if (availableDeviceArea.containsMouse) return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08)
border.color: modelData.paired ? Theme.secondary : (modelData.canPair ? Theme.primary : "transparent") if (modelData.pairing) return Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.12)
if (modelData.blocked) return Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.08)
return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08)
}
border.color: {
if (modelData.pairing) return Theme.warning
if (modelData.blocked) return Theme.error
return Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
}
border.width: 1 border.width: 1
Row { Row {
@@ -292,10 +305,14 @@ Item {
spacing: Theme.spacingM spacing: Theme.spacingM
Text { Text {
text: modelData.iconName text: BluetoothService.getDeviceIcon(modelData)
font.family: Theme.iconFont font.family: Theme.iconFont
font.pixelSize: Theme.iconSize font.pixelSize: Theme.iconSize
color: modelData.paired ? Theme.secondary : Theme.surfaceText color: {
if (modelData.pairing) return Theme.warning
if (modelData.blocked) return Theme.error
return Theme.surfaceText
}
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
@@ -304,19 +321,52 @@ Item {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
Text { Text {
text: modelData.name text: modelData.name || modelData.deviceName
font.pixelSize: Theme.fontSizeMedium font.pixelSize: Theme.fontSizeMedium
color: modelData.paired ? Theme.secondary : Theme.surfaceText color: {
font.weight: modelData.paired ? Font.Medium : Font.Normal if (modelData.pairing) return Theme.warning
if (modelData.blocked) return Theme.error
return Theme.surfaceText
}
font.weight: modelData.pairing ? Font.Medium : Font.Normal
} }
Row { Row {
spacing: Theme.spacingXS spacing: Theme.spacingXS
Text { Row {
text: modelData.paired ? "Available" : "Not paired" spacing: Theme.spacingS
font.pixelSize: Theme.fontSizeSmall
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7) Text {
text: {
switch (pairingStatus) {
case "pairing": return "Pairing..."
case "blocked": return "Blocked"
default: return BluetoothService.getSignalStrength(modelData)
}
}
font.pixelSize: Theme.fontSizeSmall
color: {
if (modelData.pairing) return Theme.warning
if (modelData.blocked) return Theme.error
return Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)
}
}
Text {
text: BluetoothService.getSignalIcon(modelData)
font.family: Theme.iconFont
font.pixelSize: Theme.fontSizeSmall
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)
visible: modelData.rssi !== undefined && modelData.rssi !== 0 && pairingStatus === "available"
}
Text {
text: (modelData.rssi !== undefined && modelData.rssi !== 0) ? modelData.rssi + "dBm" : ""
font.pixelSize: Theme.fontSizeSmall
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.5)
visible: modelData.rssi !== undefined && modelData.rssi !== 0 && pairingStatus === "available"
}
} }
} }
} }
@@ -329,16 +379,24 @@ Item {
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: Theme.spacingM anchors.rightMargin: Theme.spacingM
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
color: actionButtonArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent" color: {
border.color: Theme.primary if (!canPair && !modelData.pairing) return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3)
if (actionButtonArea.containsMouse) return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12)
return "transparent"
}
border.color: canPair || modelData.pairing ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
border.width: 1 border.width: 1
visible: true opacity: canPair || modelData.pairing ? 1.0 : 0.5
Text { Text {
anchors.centerIn: parent anchors.centerIn: parent
text: modelData.paired ? "Connect" : "Pair" text: {
if (modelData.pairing) return "Pairing..."
if (modelData.blocked) return "Blocked"
return "Pair"
}
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
color: Theme.primary color: canPair || modelData.pairing ? Theme.primary : Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.5)
font.weight: Font.Medium font.weight: Font.Medium
} }
@@ -346,12 +404,11 @@ Item {
id: actionButtonArea id: actionButtonArea
anchors.fill: parent anchors.fill: parent
hoverEnabled: true hoverEnabled: true
cursorShape: Qt.PointingHandCursor cursorShape: canPair ? Qt.PointingHandCursor : Qt.ArrowCursor
enabled: canPair
onClicked: { onClicked: {
if (modelData.paired) { if (canPair) {
BluetoothService.connect(modelData.address)
} else {
BluetoothService.pair(modelData.address) BluetoothService.pair(modelData.address)
} }
} }
@@ -363,12 +420,11 @@ Item {
anchors.fill: parent anchors.fill: parent
anchors.rightMargin: 90 // Don't overlap with action button anchors.rightMargin: 90 // Don't overlap with action button
hoverEnabled: true hoverEnabled: true
cursorShape: Qt.PointingHandCursor cursorShape: canPair ? Qt.PointingHandCursor : Qt.ArrowCursor
enabled: canPair
onClicked: { onClicked: {
if (modelData.paired) { if (canPair) {
BluetoothService.connect(modelData.address)
} else {
BluetoothService.pair(modelData.address) BluetoothService.pair(modelData.address)
} }
} }
@@ -379,7 +435,7 @@ Item {
Column { Column {
width: parent.width width: parent.width
spacing: Theme.spacingM spacing: Theme.spacingM
visible: BluetoothService.discovering && BluetoothService.availableDevices.length === 0 visible: BluetoothService.adapter && BluetoothService.adapter.discovering && BluetoothService.availableDevices.length === 0
Row { Row {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
@@ -422,7 +478,7 @@ Item {
text: "No devices found. Put your device in pairing mode and click Start Scanning." text: "No devices found. Put your device in pairing mode and click Start Scanning."
font.pixelSize: Theme.fontSizeMedium font.pixelSize: Theme.fontSizeMedium
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7) color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)
visible: BluetoothService.availableDevices.length === 0 && !BluetoothService.discovering visible: BluetoothService.availableDevices.length === 0 && (!BluetoothService.adapter || !BluetoothService.adapter.discovering)
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
width: parent.width width: parent.width
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter