Unify developer mode indicator with tint and device swap warning

- Use icon tint to signal developer mode instead of swapping the icon, keeping the connection state visible in the top bar
- Append a developer-mode note to the icon's content description so screen readers still convey the active state
- Warn in the developer-mode dialog when selecting a different scale will replace the currently saved device
- Replace the generic warning icon in Bluetooth settings with the bug report icon to match the top bar indicator

Author: oliexdev

android_app/app/src/main/java/com/health/openscale/ui/navigation/AppNavigation.kt

@@ -367,7 +367,11 @@ fun AppNavigation(sharedViewModel: SharedViewModel) {
                             val contentDesc = action.contentDescriptionResId?.let { stringResource(id = it) }
                                 ?: action.contentDescription
                             IconButton(onClick = action.onClick) {
-                                Icon(imageVector = action.icon, contentDescription = contentDesc)
+                                Icon(
+                                    imageVector = action.icon,
+                                    contentDescription = contentDesc,
+                                    tint = action.tint ?: LocalContentColor.current
+                                )
                             }
                             // If the action has associated dropdown content, invoke it here.
                             // This allows TopAppBar actions to also host DropdownMenus.

android_app/app/src/main/java/com/health/openscale/ui/screen/components/BluetoothActionButton.kt

@@ -29,7 +29,7 @@ import androidx.compose.material.icons.automirrored.filled.BluetoothSearching
 import androidx.compose.material.icons.filled.Bluetooth
 import androidx.compose.material.icons.filled.BluetoothConnected
 import androidx.compose.material.icons.filled.BluetoothDisabled
-import androidx.compose.material.icons.filled.BugReport
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.SnackbarDuration
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -84,6 +84,15 @@ fun rememberBluetoothActionButton(
     val currentUser by sharedViewModel.selectedUser.collectAsState()
     val developerMode by bluetoothViewModel.developerModeEnabled.collectAsStateWithLifecycle(false)
 
+    // Developer mode never stores a measurement, so mark the icon where the user actually weighs –
+    // as a tint, so the connection state stays readable from the icon itself.
+    val developerModeTint = MaterialTheme.colorScheme.error.takeIf { developerMode }
+
+    /** Keeps the action's own description and only appends the developer-mode note for screen readers. */
+    fun withDeveloperNote(description: String): String =
+        if (developerMode) "$description – ${context.getString(R.string.developer_mode_active_icon_desc)}"
+        else description
+
     return remember(connStatus, savedDevice, connectedDevice, currentUser, developerMode) {
         val savedAddr = savedDevice?.address
         val deviceName = savedDevice?.name ?: context.getString(R.string.fallback_device_name_saved_scale)
@@ -127,12 +136,11 @@ fun rememberBluetoothActionButton(
 
             // 3. Already connected -> Disconnect on click
             connStatus == ConnectionStatus.CONNECTED -> TopBarAction(
-                // Developer mode never stores a measurement; show it where the user weighs.
-                icon = if (developerMode) Icons.Default.BugReport else Icons.Filled.BluetoothConnected,
-                contentDescription = if (developerMode)
-                    context.getString(R.string.developer_mode_active_icon_desc)
-                else
-                    context.getString(R.string.bluetooth_action_disconnect_desc, deviceName),
+                icon = Icons.Filled.BluetoothConnected,
+                tint = developerModeTint,
+                contentDescription = withDeveloperNote(
+                    context.getString(R.string.bluetooth_action_disconnect_desc, deviceName)
+                ),
                 onClick = {
                     sharedViewModel.setPendingReferenceUserForBle(null)
                     bluetoothViewModel.disconnectDevice()
@@ -145,11 +153,11 @@ fun rememberBluetoothActionButton(
 
             // 4. Disconnected -> Request permissions/enable BT/connect
             else -> TopBarAction(
-                icon = if (developerMode) Icons.Default.BugReport else Icons.Filled.BluetoothDisabled,
-                contentDescription = if (developerMode)
-                    context.getString(R.string.developer_mode_active_icon_desc)
-                else
-                    context.getString(R.string.bluetooth_action_disconnect_desc, deviceName),
+                icon = Icons.Filled.BluetoothDisabled,
+                tint = developerModeTint,
+                contentDescription = withDeveloperNote(
+                    context.getString(R.string.bluetooth_action_disconnect_desc, deviceName)
+                ),
                 onClick = {
                     // Check for BOTH permissions (Scan and Connect)
                     val hasScanPerm = ContextCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_SCAN) == PackageManager.PERMISSION_GRANTED

android_app/app/src/main/java/com/health/openscale/ui/screen/settings/BluetoothDetailScreen.kt

@@ -37,7 +37,6 @@ import androidx.compose.material.icons.filled.BluetoothConnected
 import androidx.compose.material.icons.filled.BugReport
 import androidx.compose.material.icons.filled.DeleteForever
 import androidx.compose.material.icons.filled.People
-import androidx.compose.material.icons.filled.Warning
 import androidx.compose.material3.Card
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -271,7 +270,9 @@ fun BluetoothDetailScreen(
                             verticalAlignment = Alignment.CenterVertically
                         ) {
                             Icon(
-                                imageVector = Icons.Default.Warning,
+                                // Same marker as the Bluetooth screen banner and the top-bar icon,
+                                // so the active mode is recognisable everywhere it shows up.
+                                imageVector = Icons.Default.BugReport,
                                 contentDescription = null,
                                 tint = MaterialTheme.colorScheme.error,
                                 modifier = Modifier.padding(end = 16.dp)

android_app/app/src/main/java/com/health/openscale/ui/screen/settings/BluetoothScreen.kt

@@ -388,6 +388,9 @@ fun BluetoothScreen(
         deviceToDebug?.let { device ->
             DeveloperModeAlertDialog(
                 deviceName = device.name.ifEmpty { stringResource(R.string.unknown_device) },
+                replacedDeviceName = savedDevice
+                    ?.takeIf { it.address != device.address }
+                    ?.let { it.name.ifEmpty { stringResource(R.string.unknown_device) } },
                 onConfirm = {
                     // The device is stored with its real identity; only the setting marks the
                     // developer session, so turning it off later restores normal operation.
@@ -548,14 +551,27 @@ private fun CompatibilityAlertDialog(
 @Composable
 private fun DeveloperModeAlertDialog(
     deviceName: String,
+    replacedDeviceName: String?,
     onConfirm: () -> Unit,
     onDismiss: () -> Unit
 ) {
     AlertDialog(
         onDismissRequest = onDismiss,
         icon = { Icon(Icons.Default.BugReport, contentDescription = null) },
         title = { Text(stringResource(R.string.developer_mode_dialog_title)) },
-        text = { Text(stringResource(R.string.developer_mode_dialog_message, deviceName)) },
+        text = {
+            Column {
+                Text(stringResource(R.string.developer_mode_dialog_message, deviceName))
+                // Picking a different scale here silently swapped the saved one before.
+                replacedDeviceName?.let { replaced ->
+                    Spacer(Modifier.height(12.dp))
+                    Text(
+                        text = stringResource(R.string.developer_mode_dialog_replaces, deviceName, replaced),
+                        color = MaterialTheme.colorScheme.error
+                    )
+                }
+            }
+        },
         confirmButton = {
             TextButton(
                 onClick = {

android_app/app/src/main/java/com/health/openscale/ui/shared/TopBarAction.kt

@@ -19,12 +19,18 @@ package com.health.openscale.ui.shared
 
 import androidx.annotation.StringRes
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 
+/**
+ * @property tint Overrides the default icon color; use it to flag a state that must stay visible
+ *   without giving up the icon itself (e.g. Bluetooth developer mode). `null` keeps the theme color.
+ */
 data class TopBarAction(
     val icon: ImageVector,
     val onClick: () -> Unit,
     @param:StringRes val contentDescriptionResId: Int? = null,
     val contentDescription: String? = null,
+    val tint: Color? = null,
     val dropdownContent: (@Composable () -> Unit)? = null
 )

android_app/app/src/main/res/values/strings.xml

@@ -357,6 +357,7 @@
     <string name="developer_banner_enable_logs_hint">Please enable log file: Settings → General → Enable log file.</string>
     <string name="developer_mode_dialog_title">Enable developer mode?</string>
     <string name="developer_mode_dialog_message">openScale will only log the Bluetooth traffic of %1$s for diagnostics. As long as developer mode is active, no measurement is saved. You can switch it off again on the Bluetooth screen or in the device settings.</string>
+    <string name="developer_mode_dialog_replaces">%1$s becomes your saved scale and replaces %2$s.</string>
     <string name="developer_mode_dialog_confirm_button">Enable</string>
     <string name="developer_mode_disable_action">Disable</string>
     <string name="developer_mode_active_icon_desc">Developer mode is active</string>