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

Commit 089bbe59 authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Android (Google) Code Review
Browse files

Merge changes from topic "shade-scene-sysuiviewmodel" into main 

* changes:
  [flexiglass] ShadeHeaderViewModel is a SysUiViewModel
  [flexiglass] BrightnessMirrorViewModel is a SysUiViewModel
  [flexiglass] Shade scene view-models are SysUiViewModel
parents c08967fb aa9d072a

packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt

+3 −4
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ fun SceneScope.NotificationScrollingStack( 
    shouldReserveSpaceForNavBar: Boolean = true,

    shouldIncludeHeadsUpSpace: Boolean = true,

    shadeMode: ShadeMode,

    onEmptySpaceClick: (() -> Unit)? = null,

    modifier: Modifier = Modifier,

) {

    val coroutineScope = rememberCoroutineScope()
@@ -328,8 +329,6 @@ fun SceneScope.NotificationScrollingStack( 
    // The height of the scrim visible on screen when it is in its resting (collapsed) state.

    val minVisibleScrimHeight: () -> Float = { screenHeight - maxScrimTop() }



    val isClickable by viewModel.isClickable.collectAsStateWithLifecycle()



    // we are not scrolled to the top unless the scrim is at its maximum offset.

    LaunchedEffect(viewModel, scrimOffset) {

        snapshotFlow { scrimOffset.value >= 0f }
@@ -437,8 +436,8 @@ fun SceneScope.NotificationScrollingStack( 
                        )

                    )

                }

                .thenIf(isClickable) {

                    Modifier.clickable(onClick = { viewModel.onEmptySpaceClicked() })

                .thenIf(onEmptySpaceClick != null) {

                    Modifier.clickable(onClick = { onEmptySpaceClick?.invoke() })

                }

    ) {

        // Creates a cutout in the background scrim in the shape of the notifications scrim.

packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/NotificationsShadeScene.kt

+25 −7
Original line number Diff line number Diff line
@@ -20,15 +20,19 @@ import androidx.compose.foundation.layout.Column 
import androidx.compose.foundation.layout.fillMaxWidth

import androidx.compose.foundation.layout.padding

import androidx.compose.runtime.Composable

import androidx.compose.runtime.getValue

import androidx.compose.ui.Modifier

import androidx.compose.ui.unit.dp

import androidx.lifecycle.compose.collectAsStateWithLifecycle

import com.android.compose.animation.scene.SceneScope

import com.android.compose.animation.scene.UserAction

import com.android.compose.animation.scene.UserActionResult

import com.android.systemui.battery.BatteryMeterViewController

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.keyguard.ui.composable.LockscreenContent

import com.android.systemui.notifications.ui.viewmodel.NotificationsShadeSceneViewModel

import com.android.systemui.lifecycle.rememberViewModel

import com.android.systemui.notifications.ui.viewmodel.NotificationsShadeSceneActionsViewModel

import com.android.systemui.notifications.ui.viewmodel.NotificationsShadeSceneContentViewModel

import com.android.systemui.scene.session.ui.composable.SaveableSession

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.scene.ui.composable.ComposableScene
@@ -50,9 +54,10 @@ import kotlinx.coroutines.flow.Flow 
class NotificationsShadeScene

@Inject

constructor(

    sceneViewModel: NotificationsShadeSceneViewModel,

    private val overlayShadeViewModel: OverlayShadeViewModel,

    private val shadeHeaderViewModel: ShadeHeaderViewModel,

    private val contentViewModelFactory: NotificationsShadeSceneContentViewModel.Factory,

    private val actionsViewModelFactory: NotificationsShadeSceneActionsViewModel.Factory,

    private val overlayShadeViewModelFactory: OverlayShadeViewModel.Factory,

    private val shadeHeaderViewModelFactory: ShadeHeaderViewModel.Factory,

    private val notificationsPlaceholderViewModel: NotificationsPlaceholderViewModel,

    private val tintedIconManagerFactory: TintedIconManager.Factory,

    private val batteryMeterViewControllerFactory: BatteryMeterViewController.Factory,
@@ -64,21 +69,32 @@ constructor( 


    override val key = Scenes.NotificationsShade



    private val actionsViewModel: NotificationsShadeSceneActionsViewModel by lazy {

        actionsViewModelFactory.create()

    }



    override val destinationScenes: Flow<Map<UserAction, UserActionResult>> =

        sceneViewModel.destinationScenes

        actionsViewModel.actions



    override suspend fun activate() {

        actionsViewModel.activate()

    }



    @Composable

    override fun SceneScope.Content(

        modifier: Modifier,

    ) {

        val viewModel = rememberViewModel { contentViewModelFactory.create() }

        val isEmptySpaceClickable by viewModel.isEmptySpaceClickable.collectAsStateWithLifecycle()



        OverlayShade(

            modifier = modifier,

            viewModel = overlayShadeViewModel,

            viewModelFactory = overlayShadeViewModelFactory,

            lockscreenContent = lockscreenContent,

        ) {

            Column {

                ExpandedShadeHeader(

                    viewModel = shadeHeaderViewModel,

                    viewModelFactory = shadeHeaderViewModelFactory,

                    createTintedIconManager = tintedIconManagerFactory::create,

                    createBatteryMeterViewController = batteryMeterViewControllerFactory::create,

                    statusBarIconController = statusBarIconController,
@@ -94,6 +110,8 @@ constructor( 
                    shouldFillMaxSize = false,

                    shouldReserveSpaceForNavBar = false,

                    shadeMode = ShadeMode.Dual,

                    onEmptySpaceClick =

                        viewModel::onEmptySpaceClicked.takeIf { isEmptySpaceClickable },

                    modifier = Modifier.fillMaxWidth(),

                )

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt

+8 −5
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ import com.android.systemui.common.ui.compose.windowinsets.LocalDisplayCutout 
import com.android.systemui.common.ui.compose.windowinsets.LocalRawScreenHeight

import com.android.systemui.compose.modifiers.sysuiResTag

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.lifecycle.rememberViewModel

import com.android.systemui.media.controls.ui.composable.MediaCarousel

import com.android.systemui.media.controls.ui.controller.MediaCarouselController

import com.android.systemui.media.controls.ui.view.MediaHost
@@ -166,8 +167,10 @@ private fun SceneScope.QuickSettingsScene( 
) {

    val cutoutLocation = LocalDisplayCutout.current.location



    val brightnessMirrorShowing by

        viewModel.brightnessMirrorViewModel.isShowing.collectAsStateWithLifecycle()

    val brightnessMirrorViewModel = rememberViewModel {

        viewModel.brightnessMirrorViewModelFactory.create()

    }

    val brightnessMirrorShowing by brightnessMirrorViewModel.isShowing.collectAsStateWithLifecycle()

    val contentAlpha by

        animateFloatAsState(

            targetValue = if (brightnessMirrorShowing) 0f else 1f,
@@ -178,7 +181,7 @@ private fun SceneScope.QuickSettingsScene( 
    DisposableEffect(Unit) { onDispose { viewModel.notifications.setAlphaForBrightnessMirror(1f) } }



    BrightnessMirror(

        viewModel = viewModel.brightnessMirrorViewModel,

        viewModel = brightnessMirrorViewModel,

        qsSceneAdapter = viewModel.qsSceneAdapter,

        modifier =

            Modifier.thenIf(cutoutLocation != CutoutLocation.CENTER) {
@@ -337,7 +340,7 @@ private fun SceneScope.QuickSettingsScene( 
                                        fadeOut(tween(customizingAnimationDuration)),

                            ) {

                                ExpandedShadeHeader(

                                    viewModel = viewModel.shadeHeaderViewModel,

                                    viewModelFactory = viewModel.shadeHeaderViewModelFactory,

                                    createTintedIconManager = createTintedIconManager,

                                    createBatteryMeterViewController =

                                        createBatteryMeterViewController,
@@ -347,7 +350,7 @@ private fun SceneScope.QuickSettingsScene( 
                            }

                        else ->

                            CollapsedShadeHeader(

                                viewModel = viewModel.shadeHeaderViewModel,

                                viewModelFactory = viewModel.shadeHeaderViewModelFactory,

                                createTintedIconManager = createTintedIconManager,

                                createBatteryMeterViewController = createBatteryMeterViewController,

                                statusBarIconController = statusBarIconController,

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsShadeScene.kt

+14 −6
Original line number Diff line number Diff line
@@ -44,12 +44,14 @@ import com.android.systemui.battery.BatteryMeterViewController 
import com.android.systemui.brightness.ui.compose.BrightnessSliderContainer

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.keyguard.ui.composable.LockscreenContent

import com.android.systemui.lifecycle.rememberViewModel

import com.android.systemui.qs.panels.ui.compose.EditMode

import com.android.systemui.qs.panels.ui.compose.TileGrid

import com.android.systemui.qs.ui.composable.QuickSettingsShade.Transitions.QuickSettingsLayoutEnter

import com.android.systemui.qs.ui.composable.QuickSettingsShade.Transitions.QuickSettingsLayoutExit

import com.android.systemui.qs.ui.viewmodel.QuickSettingsContainerViewModel

import com.android.systemui.qs.ui.viewmodel.QuickSettingsShadeSceneViewModel

import com.android.systemui.qs.ui.viewmodel.QuickSettingsShadeSceneActionsViewModel

import com.android.systemui.qs.ui.viewmodel.QuickSettingsShadeSceneContentViewModel

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.scene.ui.composable.ComposableScene

import com.android.systemui.shade.ui.composable.ExpandedShadeHeader
@@ -66,9 +68,10 @@ import kotlinx.coroutines.flow.Flow 
class QuickSettingsShadeScene

@Inject

constructor(

    private val viewModel: QuickSettingsShadeSceneViewModel,

    private val actionsViewModelFactory: QuickSettingsShadeSceneActionsViewModel.Factory,

    private val contentViewModelFactory: QuickSettingsShadeSceneContentViewModel.Factory,

    private val lockscreenContent: Lazy<Optional<LockscreenContent>>,

    private val shadeHeaderViewModel: ShadeHeaderViewModel,

    private val shadeHeaderViewModelFactory: ShadeHeaderViewModel.Factory,

    private val tintedIconManagerFactory: TintedIconManager.Factory,

    private val batteryMeterViewControllerFactory: BatteryMeterViewController.Factory,

    private val statusBarIconController: StatusBarIconController,
@@ -76,21 +79,26 @@ constructor( 


    override val key = Scenes.QuickSettingsShade



    private val actionsViewModel: QuickSettingsShadeSceneActionsViewModel by lazy {

        actionsViewModelFactory.create()

    }



    override val destinationScenes: Flow<Map<UserAction, UserActionResult>> =

        viewModel.destinationScenes

        actionsViewModel.actions



    @Composable

    override fun SceneScope.Content(

        modifier: Modifier,

    ) {

        val viewModel = rememberViewModel { contentViewModelFactory.create() }

        OverlayShade(

            viewModel = viewModel.overlayShadeViewModel,

            viewModelFactory = viewModel.overlayShadeViewModelFactory,

            lockscreenContent = lockscreenContent,

            modifier = modifier,

        ) {

            Column {

                ExpandedShadeHeader(

                    viewModel = shadeHeaderViewModel,

                    viewModelFactory = shadeHeaderViewModelFactory,

                    createTintedIconManager = tintedIconManagerFactory::create,

                    createBatteryMeterViewController = batteryMeterViewControllerFactory::create,

                    statusBarIconController = statusBarIconController,

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/OverlayShade.kt

+3 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import com.android.compose.animation.scene.LowestZIndexContentPicker 
import com.android.compose.animation.scene.SceneScope

import com.android.compose.windowsizeclass.LocalWindowSizeClass

import com.android.systemui.keyguard.ui.composable.LockscreenContent

import com.android.systemui.lifecycle.rememberViewModel

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.shade.shared.model.ShadeAlignment

import com.android.systemui.shade.ui.viewmodel.OverlayShadeViewModel
@@ -63,11 +64,12 @@ import java.util.Optional 
/** The overlay shade renders a lightweight shade UI container on top of a background scene. */

@Composable

fun SceneScope.OverlayShade(

    viewModel: OverlayShadeViewModel,

    viewModelFactory: OverlayShadeViewModel.Factory,

    lockscreenContent: Lazy<Optional<LockscreenContent>>,

    modifier: Modifier = Modifier,

    content: @Composable () -> Unit,

) {

    val viewModel = rememberViewModel { viewModelFactory.create() }

    val backgroundScene by viewModel.backgroundScene.collectAsStateWithLifecycle()



    Box(modifier) {