Revert "refactor: clean up deprecations using recommendations" (#2864)

2026-03-13 03:17:48 -04:00 · 2025-08-26 20:37:05 -05:00
parent e89bcda299
commit 86c0285f69
8 changed files with 24 additions and 37 deletions
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/StreamInterface.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/StreamInterface.kt
@@ -20,8 +20,7 @@ package com.geeksville.mesh.repository.radio
 import com.geeksville.mesh.android.Logging

 /**
- * An interface that assumes we are talking to a meshtastic device over some sort of stream connection (serial or TCP
- * probably)
+ * An interface that assumes we are talking to a meshtastic device over some sort of stream connection (serial or TCP probably)
 */
 abstract class StreamInterface(protected val service: RadioInterfaceService) :
    Logging,
@@ -47,16 +46,12 @@ abstract class StreamInterface(protected val service: RadioInterfaceService) :
        onDeviceDisconnect(true)
    }

-    /**
-     * Tell MeshService our device has gone away, but wait for it to come back
+    /** Tell MeshService our device has gone away, but wait for it to come back
     *
-     * @param waitForStopped if true we should wait for the manager to finish - must be false if called from inside the
-     *   manager callbacks
-     */
+     * @param waitForStopped if true we should wait for the manager to finish - must be false if called from inside the manager callbacks
+     *  */
    protected open fun onDeviceDisconnect(waitForStopped: Boolean) {
-        service.onDisconnect(
-            isPermanent = true,
-        ) // if USB device disconnects it is definitely permanently gone, not sleeping)
+        service.onDisconnect(isPermanent = true) // if USB device disconnects it is definitely permanently gone, not sleeping)
    }

    protected open fun connect() {
@@ -89,13 +84,15 @@ abstract class StreamInterface(protected val service: RadioInterfaceService) :

    /** Print device serial debug output somewhere */
    private fun debugOut(b: Byte) {
-        when (val c = b.toInt().toChar()) {
-            '\r' -> {} // ignore
+        when (val c = b.toChar()) {
+            '\r' -> {
+            } // ignore
            '\n' -> {
                debug("DeviceLog: $debugLineBuf")
                debugLineBuf.clear()
            }
-            else -> debugLineBuf.append(c)
+            else ->
+                debugLineBuf.append(c)
        }
    }

@@ -136,19 +133,16 @@ abstract class StreamInterface(protected val service: RadioInterfaceService) :
                // We've read our header, do one big read for the packet itself
                packetLen = (msb shl 8) or lsb
                if (packetLen > MAX_TO_FROM_RADIO_SIZE) {
-                    lostSync() // If packet len is too long, the bytes must have been corrupted, start looking for
-                    // START1 again
+                    lostSync() // If packet len is too long, the bytes must have been corrupted, start looking for START1 again
                } else if (packetLen == 0) {
-                    deliverPacket() // zero length packets are valid and should be delivered immediately (because there
-                    // won't be a next byte of payload)
+                    deliverPacket() // zero length packets are valid and should be delivered immediately (because there won't be a next byte of payload)
                }
            }
            else -> {
                // We are looking at the packet bytes now
                rxPacket[ptr - 4] = c

-                // Note: we have to check if ptr +1 is equal to packet length (for example, for a 1 byte packetlen, this
-                // code will be run with ptr of4
+                // Note: we have to check if ptr +1 is equal to packet length (for example, for a 1 byte packetlen, this code will be run with ptr of4
                if (ptr - 4 + 1 == packetLen) {
                    deliverPacket()
                }
--- a/app/src/main/java/com/geeksville/mesh/ui/Main.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/Main.kt
@@ -41,7 +41,6 @@ import androidx.compose.material3.PlainTooltip
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.Text
-import androidx.compose.material3.TooltipAnchorPosition
 import androidx.compose.material3.TooltipBox
 import androidx.compose.material3.TooltipDefaults
 import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
@@ -269,8 +268,7 @@ fun MainScreen(
                item(
                    icon = {
                        TooltipBox(
-                            positionProvider =
-                            TooltipDefaults.rememberTooltipPositionProvider(TooltipAnchorPosition.Above),
+                            positionProvider = TooltipDefaults.rememberTooltipPositionProvider(),
                            tooltip = {
                                PlainTooltip {
                                    Text(
--- a/app/src/main/java/com/geeksville/mesh/ui/common/components/IndoorAirQuality.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/common/components/IndoorAirQuality.kt
@@ -162,7 +162,7 @@ fun IndoorAirQuality(iaq: Int?, displayMode: IaqDisplayMode = IaqDisplayMode.Pil

                IaqDisplayMode.Gauge -> {
                    CircularProgressIndicator(
-                        progress = { iaq / 500f },
+                        progress = iaq / 500f,
                        modifier = Modifier.size(60.dp).clickable { isLegendOpen = true },
                        strokeWidth = 8.dp,
                        color = iaqEnum.color,
@@ -176,7 +176,7 @@ fun IndoorAirQuality(iaq: Int?, displayMode: IaqDisplayMode = IaqDisplayMode.Pil
                        modifier = Modifier.clickable { isLegendOpen = true },
                    ) {
                        LinearProgressIndicator(
-                            progress = { iaq / 500f },
+                            progress = iaq / 500f,
                            modifier = Modifier.fillMaxWidth().height(20.dp),
                            color = iaqEnum.color,
                        )
--- a/app/src/main/java/com/geeksville/mesh/ui/intro/NotificationsScreen.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/intro/NotificationsScreen.kt
@@ -23,7 +23,6 @@ import android.provider.Settings
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.outlined.Message
 import androidx.compose.material.icons.filled.Notifications
 import androidx.compose.material.icons.outlined.BatteryAlert
 import androidx.compose.material.icons.outlined.Message
@@ -62,7 +61,7 @@ internal fun NotificationsScreen(showNextButton: Boolean, onSkip: () -> Unit, on
    val features = remember {
        listOf(
            FeatureUIData(
-                icon = Icons.AutoMirrored.Outlined.Message,
+                icon = Icons.Outlined.Message,
                titleRes = R.string.incoming_messages,
                subtitleRes = R.string.notifications_for_channel_and_direct_messages,
            ),
--- a/app/src/main/java/com/geeksville/mesh/ui/message/Message.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/message/Message.kt
@@ -48,7 +48,6 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.automirrored.filled.Reply
 import androidx.compose.material.icons.automirrored.filled.Send
-import androidx.compose.material.icons.automirrored.filled.SpeakerNotes
 import androidx.compose.material.icons.filled.ArrowDownward
 import androidx.compose.material.icons.filled.ChatBubbleOutline
 import androidx.compose.material.icons.filled.Close
@@ -673,7 +672,7 @@ private fun OverFlowMenu(
                        if (showQuickChat) {
                            Icons.Default.SpeakerNotesOff
                        } else {
-                            Icons.AutoMirrored.Filled.SpeakerNotes
+                            Icons.Default.SpeakerNotes
                        },
                        contentDescription = quickChatToggleTitle,
                    )
--- a/app/src/main/java/com/geeksville/mesh/ui/node/components/NodeStatusIcons.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/node/components/NodeStatusIcons.kt
@@ -31,7 +31,6 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.PlainTooltip
 import androidx.compose.material3.Text
-import androidx.compose.material3.TooltipAnchorPosition
 import androidx.compose.material3.TooltipBox
 import androidx.compose.material3.TooltipDefaults
 import androidx.compose.material3.rememberTooltipState
@@ -52,7 +51,7 @@ fun NodeStatusIcons(isThisNode: Boolean, isUnmessageable: Boolean, isFavorite: B
    Row(modifier = Modifier.padding(4.dp)) {
        if (isThisNode) {
            TooltipBox(
-                positionProvider = TooltipDefaults.rememberTooltipPositionProvider(TooltipAnchorPosition.Above),
+                positionProvider = TooltipDefaults.rememberTooltipPositionProvider(),
                tooltip = {
                    PlainTooltip {
                        Text(
@@ -89,7 +88,7 @@ fun NodeStatusIcons(isThisNode: Boolean, isUnmessageable: Boolean, isFavorite: B

        if (isUnmessageable) {
            TooltipBox(
-                positionProvider = TooltipDefaults.rememberTooltipPositionProvider(TooltipAnchorPosition.Above),
+                positionProvider = TooltipDefaults.rememberTooltipPositionProvider(),
                tooltip = { PlainTooltip { Text(stringResource(R.string.unmonitored_or_infrastructure)) } },
                state = rememberTooltipState(),
            ) {
@@ -104,7 +103,7 @@ fun NodeStatusIcons(isThisNode: Boolean, isUnmessageable: Boolean, isFavorite: B
        }
        if (isFavorite && !isThisNode) {
            TooltipBox(
-                positionProvider = TooltipDefaults.rememberTooltipPositionProvider(TooltipAnchorPosition.Above),
+                positionProvider = TooltipDefaults.rememberTooltipPositionProvider(),
                tooltip = { PlainTooltip { Text(stringResource(R.string.favorite)) } },
                state = rememberTooltipState(),
            ) {
--- a/app/src/main/java/com/geeksville/mesh/ui/settings/radio/components/AudioConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/settings/radio/components/AudioConfigItemList.kt
@@ -20,6 +20,7 @@ package com.geeksville.mesh.ui.settings.radio.components
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.material3.Divider
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -102,7 +103,7 @@ fun AudioConfigItemList(audioConfig: AudioConfig, enabled: Boolean, onSaveClicke
                onItemSelected = { audioInput = audioInput.copy { bitrate = it } },
            )
        }
-        item { HorizontalDivider() }
+        item { Divider() }

        item {
            EditTextPreference(
--- a/app/src/main/java/com/geeksville/mesh/ui/settings/radio/components/PacketResponseStateDialog.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/settings/radio/components/PacketResponseStateDialog.kt
@@ -54,10 +54,7 @@ fun <T> PacketResponseStateDialog(state: ResponseState<T>, onDismiss: () -> Unit
                            label = "progress",
                        )
                    Text("%.0f%%".format(progress * 100))
-                    LinearProgressIndicator(
-                        progress = { progress },
-                        modifier = Modifier.fillMaxWidth().padding(top = 8.dp),
-                    )
+                    LinearProgressIndicator(progress = progress, modifier = Modifier.fillMaxWidth().padding(top = 8.dp))
                    if (state.total == state.completed) onComplete()
                }
                if (state is ResponseState.Success) {