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

Commit b571f1df authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Rename SceneKey.Foo to Scenes.Foo 

This CL changes the SysUI scenes accessors to Scenes.Foo instead of
SceneKey.Foo, making them normal `val` instead of objects. This will
make the removal of the fork of STL SceneKey easier.

Bug: 293899074
Test: m sysuig
Test: m SystemUITests
Test: Manual, enabled Flexiglass and used it.
Flag: N/A
Change-Id: Ib5233b53bc404e38217fe001cd98b03cc071cee3
parent c041a183

packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerScene.kt

+4 −4
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import com.android.systemui.bouncer.ui.BouncerDialogFactory 
import com.android.systemui.bouncer.ui.viewmodel.BouncerViewModel

import com.android.systemui.dagger.SysUISingleton

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

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

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

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

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

import com.android.systemui.scene.ui.composable.ComposableScene
@@ -52,13 +52,13 @@ constructor( 
    private val viewModel: BouncerViewModel,

    private val dialogFactory: BouncerDialogFactory,

) : ComposableScene {

    override val key = SceneKey.Bouncer

    override val key = Scenes.Bouncer



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

        MutableStateFlow(

                mapOf(

                    UserAction.Back to UserActionResult(SceneKey.Lockscreen),

                    UserAction.Swipe(Direction.DOWN) to UserActionResult(SceneKey.Lockscreen),

                    UserAction.Back to UserActionResult(Scenes.Lockscreen),

                    UserAction.Swipe(Direction.DOWN) to UserActionResult(Scenes.Lockscreen),

                )

            )

            .asStateFlow()

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalScene.kt

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import com.android.compose.animation.scene.SceneScope 
import com.android.systemui.communal.ui.viewmodel.CommunalViewModel

import com.android.systemui.dagger.SysUISingleton

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

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

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

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

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

import com.android.systemui.scene.ui.composable.ComposableScene
@@ -38,12 +38,12 @@ class CommunalScene 
constructor(

    private val viewModel: CommunalViewModel,

) : ComposableScene {

    override val key = SceneKey.Communal

    override val key = Scenes.Communal



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

        MutableStateFlow<Map<UserAction, UserActionResult>>(

                mapOf(

                    UserAction.Swipe(Direction.RIGHT) to UserActionResult(SceneKey.Lockscreen),

                    UserAction.Swipe(Direction.RIGHT) to UserActionResult(Scenes.Lockscreen),

                )

            )

            .asStateFlow()

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenScene.kt

+4 −4
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.keyguard.ui.composable 


import androidx.compose.foundation.layout.fillMaxSize

import androidx.compose.runtime.Composable

import androidx.compose.runtime.getValue

import androidx.compose.ui.Modifier

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

import com.android.compose.animation.scene.animateSceneFloatAsState
@@ -29,6 +28,7 @@ import com.android.systemui.qs.ui.composable.QuickSettings 
import com.android.systemui.scene.shared.model.Direction

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

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

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

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

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

import com.android.systemui.scene.ui.composable.ComposableScene
@@ -50,7 +50,7 @@ constructor( 
    viewModel: LockscreenSceneViewModel,

    private val lockscreenContent: Lazy<LockscreenContent>,

) : ComposableScene {

    override val key = SceneKey.Lockscreen

    override val key = Scenes.Lockscreen



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

        combine(viewModel.upDestinationSceneKey, viewModel.leftDestinationSceneKey, ::Pair)
@@ -83,8 +83,8 @@ constructor( 
            up?.let { this[UserAction.Swipe(Direction.UP)] = UserActionResult(up) }

            left?.let { this[UserAction.Swipe(Direction.LEFT)] = UserActionResult(left) }

            this[UserAction.Swipe(fromEdge = Edge.TOP, direction = Direction.DOWN)] =

                UserActionResult(SceneKey.QuickSettings)

            this[UserAction.Swipe(direction = Direction.DOWN)] = UserActionResult(SceneKey.Shade)

                UserActionResult(Scenes.QuickSettings)

            this[UserAction.Swipe(direction = Direction.DOWN)] = UserActionResult(Scenes.Shade)

        }

    }

}

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

+3 −3
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ import com.android.systemui.dagger.qualifiers.Application 
import com.android.systemui.qs.footer.ui.compose.FooterActions

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

import com.android.systemui.res.R

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

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

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

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

import com.android.systemui.shade.ui.composable.CollapsedShadeHeader
@@ -89,7 +89,7 @@ constructor( 
    private val batteryMeterViewControllerFactory: BatteryMeterViewController.Factory,

    private val statusBarIconController: StatusBarIconController,

) : ComposableScene {

    override val key = SceneKey.QuickSettings

    override val key = Scenes.QuickSettings



    override val destinationScenes =

        viewModel.destinationScenes.stateIn(
@@ -141,7 +141,7 @@ private fun SceneScope.QuickSettingsScene( 
            when (val state = layoutState.transitionState) {

                is TransitionState.Idle -> true

                is TransitionState.Transition -> {

                    state.fromScene == SceneKey.QuickSettings.asComposeAware()

                    state.fromScene == Scenes.QuickSettings.asComposeAware()

                }

            }

packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/GoneScene.kt

+4 −6
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.systemui.scene.ui.composable 
import androidx.compose.foundation.layout.Spacer

import androidx.compose.foundation.layout.fillMaxSize

import androidx.compose.runtime.Composable

import androidx.compose.runtime.getValue

import androidx.compose.ui.Modifier

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

import com.android.compose.animation.scene.animateSceneFloatAsState
@@ -27,7 +26,7 @@ import com.android.systemui.dagger.SysUISingleton 
import com.android.systemui.qs.ui.composable.QuickSettings

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

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

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

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

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

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

import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationsPlaceholderViewModel
@@ -46,7 +45,7 @@ class GoneScene 
constructor(

    private val notificationsViewModel: NotificationsPlaceholderViewModel,

) : ComposableScene {

    override val key = SceneKey.Gone

    override val key = Scenes.Gone



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

        MutableStateFlow<Map<UserAction, UserActionResult>>(
@@ -55,9 +54,8 @@ constructor( 
                        pointerCount = 2,

                        fromEdge = Edge.TOP,

                        direction = Direction.DOWN,

                    ) to UserActionResult(SceneKey.QuickSettings),

                    UserAction.Swipe(direction = Direction.DOWN) to

                        UserActionResult(SceneKey.Shade),

                    ) to UserActionResult(Scenes.QuickSettings),

                    UserAction.Swipe(direction = Direction.DOWN) to UserActionResult(Scenes.Shade),

                )

            )

            .asStateFlow()