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

Commit 2f383802 authored by burakov's avatar burakov
Browse files

[flexiglass] Refactor destinationScenes->userActions + extract interface

Bug: 359173565
Bug: 356596436
Bug: 363206563
Flag: com.android.systemui.scene_container
Test: Existing unit tests still pass.
Change-Id: I87b462e12c7533d5582ecefb62d4438cb8ce8a7a
parent ad0e7a64
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -64,8 +64,7 @@ constructor(
        actionsViewModelFactory.create()
    }

    override val destinationScenes: Flow<Map<UserAction, UserActionResult>> =
        actionsViewModel.actions
    override val userActions: Flow<Map<UserAction, UserActionResult>> = actionsViewModel.actions

    override suspend fun onActivated(): Nothing {
        actionsViewModel.activate()
+3 −3
Original line number Diff line number Diff line
@@ -49,10 +49,10 @@ constructor(
) : ExclusiveActivatable(), Scene {
    override val key = Scenes.Communal

    override val destinationScenes: Flow<Map<UserAction, UserActionResult>> =
        MutableStateFlow<Map<UserAction, UserActionResult>>(
    override val userActions: Flow<Map<UserAction, UserActionResult>> =
        MutableStateFlow(
                mapOf(
                    Swipe(SwipeDirection.End) to UserActionResult(Scenes.Lockscreen),
                    Swipe(SwipeDirection.End) to Scenes.Lockscreen,
                )
            )
            .asStateFlow()
+1 −2
Original line number Diff line number Diff line
@@ -47,8 +47,7 @@ constructor(
        actionsViewModelFactory.create()
    }

    override val destinationScenes: Flow<Map<UserAction, UserActionResult>> =
        actionsViewModel.actions
    override val userActions: Flow<Map<UserAction, UserActionResult>> = actionsViewModel.actions

    override suspend fun onActivated(): Nothing {
        actionsViewModel.activate()
+5 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import com.android.compose.animation.scene.ContentScope
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.lifecycle.rememberViewModel
@@ -39,6 +41,7 @@ import com.android.systemui.statusbar.phone.ui.StatusBarIconController
import com.android.systemui.statusbar.phone.ui.TintedIconManager
import dagger.Lazy
import javax.inject.Inject
import kotlinx.coroutines.flow.Flow

@SysUISingleton
class NotificationsShadeOverlay
@@ -59,6 +62,8 @@ constructor(
        actionsViewModelFactory.create()
    }

    override val userActions: Flow<Map<UserAction, UserActionResult>> = actionsViewModel.actions

    override suspend fun activate(): Nothing {
        actionsViewModel.activate()
    }
+1 −2
Original line number Diff line number Diff line
@@ -65,8 +65,7 @@ constructor(
        actionsViewModelFactory.create()
    }

    override val destinationScenes: Flow<Map<UserAction, UserActionResult>> =
        actionsViewModel.actions
    override val userActions: Flow<Map<UserAction, UserActionResult>> = actionsViewModel.actions

    override suspend fun onActivated(): Nothing {
        actionsViewModel.activate()
Loading