nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

controlcenter: corrected typeerror null checks

Browse source
This commit is contained in:
ATMDA 2025-11-17 08:38:25 -05:00
parent eb0286a282
commit 338b636de7
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
modules/controlcenter/bluetooth/DeviceList.qml
View file

@ -163,8 +163,8 @@ ColumnLayout {
id: device id: device
required property BluetoothDevice modelData required property BluetoothDevice modelData
readonly property bool loading: modelData.state === BluetoothDeviceState.Connecting || modelData.state === BluetoothDeviceState.Disconnecting readonly property bool loading: modelData && (modelData.state === BluetoothDeviceState.Connecting || modelData.state === BluetoothDeviceState.Disconnecting)
readonly property bool connected: modelData.state === BluetoothDeviceState.Connected readonly property bool connected: modelData && modelData.state === BluetoothDeviceState.Connected
anchors.left: view.contentItem.left anchors.left: view.contentItem.left
anchors.right: view.contentItem.right anchors.right: view.contentItem.right
@ -177,7 +177,8 @@ ColumnLayout {
id: stateLayer id: stateLayer
function onClicked(): void { function onClicked(): void {
root.session.bt.active = device.modelData; if (device.modelData)
root.session.bt.active = device.modelData;
} }
} }
@ -194,20 +195,20 @@ ColumnLayout {
implicitHeight: icon.implicitHeight + Appearance.padding.normal * 2 implicitHeight: icon.implicitHeight + Appearance.padding.normal * 2
radius: Appearance.rounding.normal radius: Appearance.rounding.normal
color: device.connected ? Colours.palette.m3primaryContainer : device.modelData.bonded ? Colours.palette.m3secondaryContainer : Colours.tPalette.m3surfaceContainerHigh color: device.connected ? Colours.palette.m3primaryContainer : (device.modelData && device.modelData.bonded) ? Colours.palette.m3secondaryContainer : Colours.tPalette.m3surfaceContainerHigh
StyledRect { StyledRect {
anchors.fill: parent anchors.fill: parent
radius: parent.radius radius: parent.radius
color: Qt.alpha(device.connected ? Colours.palette.m3onPrimaryContainer : device.modelData.bonded ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface, stateLayer.pressed ? 0.1 : stateLayer.containsMouse ? 0.08 : 0) color: Qt.alpha(device.connected ? Colours.palette.m3onPrimaryContainer : (device.modelData && device.modelData.bonded) ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface, stateLayer.pressed ? 0.1 : stateLayer.containsMouse ? 0.08 : 0)
} }
MaterialIcon { MaterialIcon {
id: icon id: icon
anchors.centerIn: parent anchors.centerIn: parent
text: Icons.getBluetoothIcon(device.modelData.icon) text: Icons.getBluetoothIcon(device.modelData ? device.modelData.icon : "")
color: device.connected ? Colours.palette.m3onPrimaryContainer : device.modelData.bonded ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface color: device.connected ? Colours.palette.m3onPrimaryContainer : (device.modelData && device.modelData.bonded) ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface
font.pointSize: Appearance.font.size.large font.pointSize: Appearance.font.size.large
fill: device.connected ? 1 : 0 fill: device.connected ? 1 : 0
@ -224,13 +225,13 @@ ColumnLayout {
StyledText { StyledText {
Layout.fillWidth: true Layout.fillWidth: true
text: device.modelData.name text: device.modelData ? device.modelData.name : qsTr("Unknown")
elide: Text.ElideRight elide: Text.ElideRight
} }
StyledText { StyledText {
Layout.fillWidth: true Layout.fillWidth: true
text: device.modelData.address + (device.connected ? qsTr(" (Connected)") : device.modelData.bonded ? qsTr(" (Paired)") : "") text: (device.modelData ? device.modelData.address : "") + (device.connected ? qsTr(" (Connected)") : (device.modelData && device.modelData.bonded) ? qsTr(" (Paired)") : "")
color: Colours.palette.m3outline color: Colours.palette.m3outline
font.pointSize: Appearance.font.size.small font.pointSize: Appearance.font.size.small
elide: Text.ElideRight elide: Text.ElideRight
@ -256,7 +257,8 @@ ColumnLayout {
disabled: device.loading disabled: device.loading
function onClicked(): void { function onClicked(): void {
device.modelData.connected = !device.modelData.connected; if (device.modelData)
device.modelData.connected = !device.modelData.connected;
} }
} }
@ -265,7 +267,7 @@ ColumnLayout {
anchors.centerIn: parent anchors.centerIn: parent
animate: true animate: true
text: device.modelData.connected ? "link_off" : "link" text: (device.modelData && device.modelData.connected) ? "link_off" : "link"
color: device.connected ? Colours.palette.m3onPrimaryContainer : Colours.palette.m3onSurface color: device.connected ? Colours.palette.m3onPrimaryContainer : Colours.palette.m3onSurface
opacity: device.loading ? 0 : 1 opacity: device.loading ? 0 : 1