Skip to content

Show Bluetooth connection state in dashboard icon #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
d4rken merged 1 commit into from
Apr 14, 2026
Merged

Show Bluetooth connection state in dashboard icon #208

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions app/src/main/java/eu/darken/bluemusic/devices/ui/dashboard/DashboardScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.BluetoothDisabled
import androidx.compose.material.icons.twotone.Add
import androidx.compose.material.icons.twotone.Bluetooth
import androidx.compose.material.icons.twotone.BluetoothConnected
import androidx.compose.material.icons.twotone.Lock
import androidx.compose.material.icons.twotone.Settings
import androidx.compose.material.icons.twotone.Stars
Expand Down Expand Up @@ -53,6 +54,7 @@ import androidx.compose.ui.unit.dp
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import eu.darken.bluemusic.R
import eu.darken.bluemusic.bluetooth.core.MockDevice
import eu.darken.bluemusic.bluetooth.core.SourceDevice
import eu.darken.bluemusic.common.compose.ColoredTitleText
import eu.darken.bluemusic.common.compose.Preview2
import eu.darken.bluemusic.common.compose.PreviewWrapper
Expand Down Expand Up @@ -127,6 +129,11 @@ fun DevicesScreen(
topBar = {
ManagedDevicesTopBar(
isProVersion = state.isProVersion,
isBluetoothEnabled = state.isBluetoothEnabled,
hasBluetoothPermission = state.hasBluetoothPermission,
hasConnectedDevice = state.devicesWithApps.any {
it.device.type != SourceDevice.Type.PHONE_SPEAKER && it.device.isConnected
},
onNavigateToSettings = onNavigateToSettings,
onNavigateToUpgrade = onNavigateToUpgrade
)
Expand Down Expand Up @@ -230,6 +237,9 @@ fun DevicesScreen(
@Composable
private fun ManagedDevicesTopBar(
isProVersion: Boolean,
isBluetoothEnabled: Boolean,
hasBluetoothPermission: Boolean,
hasConnectedDevice: Boolean,
onNavigateToSettings: () -> Unit,
onNavigateToUpgrade: () -> Unit
) {
Expand Down Expand Up @@ -266,9 +276,19 @@ private fun ManagedDevicesTopBar(
}
}
}) {
val isBluetoothReady = isBluetoothEnabled && hasBluetoothPermission
Icon(
imageVector = Icons.TwoTone.Bluetooth,
contentDescription = stringResource(R.string.label_bluetooth_settings)
imageVector = when {
!isBluetoothReady -> Icons.Filled.BluetoothDisabled
hasConnectedDevice -> Icons.TwoTone.BluetoothConnected
else -> Icons.TwoTone.Bluetooth
},
contentDescription = stringResource(R.string.label_bluetooth_settings),
tint = if (isBluetoothReady && hasConnectedDevice) {
MaterialTheme.colorScheme.primary
} else {
MaterialTheme.colorScheme.onSurface
}
)
}
if (!isProVersion) {
Expand Down