awesome-bookmarks/Meshtastic-Android
3
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-06-01 22:19:18 +02:00
Code Issues Packages Projects Releases 2 Wiki Activity

refactor(firmware): replace PlatformBackHandler with NavigationBackHandler (#5376)

Browse Source 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
James Rich
2026-05-06 15:01:40 -05:00
committed by GitHub
parent 8d621bc6f4
commit 213c380514
5 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
feature/firmware/src/commonMain/kotlin/org/meshtastic/feature/firmware/FirmwareUpdateScreen.kt
+9 -2
View File
@@ -70,6 +70,9 @@ import androidx.compose.ui.platform.LocalHapticFeedback
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.navigationevent.NavigationEventInfo
import androidx.navigationevent.compose.NavigationBackHandler
import androidx.navigationevent.compose.rememberNavigationEventState
import coil3.compose.AsyncImage
import coil3.compose.LocalPlatformContext
import coil3.request.ImageRequest
@@ -141,7 +144,6 @@ import org.meshtastic.core.ui.icon.Usb
import org.meshtastic.core.ui.icon.Warning
import org.meshtastic.core.ui.icon.Wifi
import org.meshtastic.core.ui.util.KeepScreenOn
import org.meshtastic.core.ui.util.PlatformBackHandler
import org.meshtastic.core.ui.util.rememberOpenFileLauncher
import org.meshtastic.core.ui.util.rememberOpenUrl
import org.meshtastic.core.ui.util.rememberSaveFileLauncher
@@ -185,7 +187,12 @@ fun FirmwareUpdateScreen(onNavigateUp: () -> Unit, viewModel: FirmwareUpdateView
KeepScreenOn(shouldKeepFirmwareScreenOn(state))
PlatformBackHandler(enabled = shouldKeepFirmwareScreenOn(state)) { showExitConfirmation = true }
val backHandlerState = rememberNavigationEventState(NavigationEventInfo.None)
NavigationBackHandler(
state = backHandlerState,
isBackEnabled = shouldKeepFirmwareScreenOn(state),
onBackCompleted = { showExitConfirmation = true },
)
if (showExitConfirmation) {
MeshtasticDialog(