Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bbfe59e authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Stop edit mode if the shade is closed" into main

parents 34a1b9fd 73930286
Loading
Loading
Loading
Loading
+19 −5
Original line number Diff line number Diff line
@@ -348,12 +348,26 @@ constructor(
            )

        LaunchedEffect(Unit) {
            launch {
                synchronizeQsState(
                    sceneState,
                    viewModel.containerViewModel.editModeViewModel.isEditing,
                    snapshotFlow { viewModel.expansionState }.map { it.progress },
                )
            }
            if (alwaysCompose) {
                // Normally, the Edit mode will stop if the composable leaves, but if the shade
                // is closed, because we are always composed, we don't stop edit mode.
                launch {
                    snapshotFlow { viewModel.isQsVisibleAndAnyShadeExpanded }
                        .collect {
                            if (!it) {
                                viewModel.containerViewModel.editModeViewModel.stopEditing()
                            }
                        }
                }
            }
        }

        SceneTransitionLayout(state = sceneState, modifier = Modifier.fillMaxSize()) {
            scene(QuickSettings, alwaysCompose = alwaysCompose) {