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

Commit 5ea65de0 authored by Fabián Kozynski's avatar Fabián Kozynski
Browse files

Fix some organization of view model 

Also, make sure that going back when editing is not a valid destination
to close QS.

Test: manual, back when editing
Test: atest QuickSettingsShadeSceneViewModelTest
Flag: com.android.systemui.qs_ui_refactor
Flag: com.android.systemui.dual_shade
Bug: 331598956

Change-Id: If176f62f8ab3fc346aba219047c44ccee0616309
parent 999a6a71

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

+4 −3
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import com.android.systemui.dagger.SysUISingleton 
import com.android.systemui.keyguard.ui.composable.LockscreenContent

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

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

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

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

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

import com.android.systemui.scene.ui.composable.ComposableScene
@@ -95,7 +96,7 @@ constructor( 
                )



                ShadeBody(

                    viewModel = viewModel,

                    viewModel = viewModel.quickSettingsContainerViewModel,

                )

            }

        }
@@ -104,7 +105,7 @@ constructor( 


@Composable

private fun ShadeBody(

    viewModel: QuickSettingsShadeSceneViewModel,

    viewModel: QuickSettingsContainerViewModel,

) {

    val isEditing by viewModel.editModeViewModel.isEditing.collectAsStateWithLifecycle()
@@ -136,7 +137,7 @@ private fun ShadeBody( 


@Composable

private fun QuickSettingsLayout(

    viewModel: QuickSettingsShadeSceneViewModel,

    viewModel: QuickSettingsContainerViewModel,

    modifier: Modifier = Modifier,

) {

    Column(

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsShadeSceneViewModelTest.kt

+20 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.qs.ui.viewmodel 
import android.testing.TestableLooper

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.compose.animation.scene.Back

import com.android.compose.animation.scene.Swipe

import com.android.systemui.SysuiTestCase

import com.android.systemui.authentication.data.repository.fakeAuthenticationRepository
@@ -31,12 +32,12 @@ import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFingerprintA 
import com.android.systemui.keyguard.domain.interactor.keyguardEnabledInteractor

import com.android.systemui.keyguard.shared.model.SuccessFingerprintAuthenticationStatus

import com.android.systemui.kosmos.testScope

import com.android.systemui.qs.panels.ui.viewmodel.editModeViewModel

import com.android.systemui.scene.domain.interactor.sceneInteractor

import com.android.systemui.scene.domain.resolver.homeSceneFamilyResolver

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

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

import com.android.systemui.shade.data.repository.fakeShadeRepository

import com.android.systemui.shade.ui.viewmodel.quickSettingsShadeSceneViewModel

import com.android.systemui.testKosmos

import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -155,6 +156,24 @@ class QuickSettingsShadeSceneViewModelTest : SysuiTestCase() { 
            assertThat(homeScene).isEqualTo(Scenes.Gone)

        }



    @Test

    fun backTransitionSceneKey_notEditing_Home() =

        testScope.runTest {

            val destinationScenes by collectLastValue(underTest.destinationScenes)



            assertThat(destinationScenes?.get(Back)?.toScene).isEqualTo(SceneFamilies.Home)

        }



    @Test

    fun backTransition_editing_noDestination() =

        testScope.runTest {

            val destinationScenes by collectLastValue(underTest.destinationScenes)

            kosmos.editModeViewModel.startEditing()



            assertThat(destinationScenes!!).isNotEmpty()

            assertThat(destinationScenes?.get(Back)).isNull()

        }



    private fun TestScope.lockDevice() {

        val deviceUnlockStatus by collectLastValue(deviceUnlockedInteractor.deviceUnlockStatus)

packages/SystemUI/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsShadeSceneViewModel.kt

+33 −21
Original line number Diff line number Diff line
@@ -20,42 +20,54 @@ import com.android.compose.animation.scene.Back 
import com.android.compose.animation.scene.Swipe

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

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

import com.android.systemui.brightness.ui.viewmodel.BrightnessSliderViewModel

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.qs.panels.ui.viewmodel.EditModeViewModel

import com.android.systemui.qs.panels.ui.viewmodel.TileGridViewModel

import com.android.systemui.qs.ui.adapter.QSSceneAdapter

import com.android.systemui.dagger.qualifiers.Application

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

import com.android.systemui.shade.domain.interactor.ShadeInteractor

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

import com.android.systemui.shade.ui.viewmodel.OverlayShadeViewModel

import javax.inject.Inject

import kotlinx.coroutines.flow.MutableStateFlow

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.flow.SharingStarted

import kotlinx.coroutines.flow.StateFlow

import kotlinx.coroutines.flow.asStateFlow

import kotlinx.coroutines.flow.map

import kotlinx.coroutines.flow.stateIn



/** Models UI state and handles user input for the Quick Settings Shade scene. */

@SysUISingleton

class QuickSettingsShadeSceneViewModel

@Inject

constructor(

    shadeInteractor: ShadeInteractor,

    private val shadeInteractor: ShadeInteractor,

    val overlayShadeViewModel: OverlayShadeViewModel,

    val brightnessSliderViewModel: BrightnessSliderViewModel,

    val tileGridViewModel: TileGridViewModel,

    val editModeViewModel: EditModeViewModel,

    val qsSceneAdapter: QSSceneAdapter,

    val quickSettingsContainerViewModel: QuickSettingsContainerViewModel,

    @Application applicationScope: CoroutineScope,

) {



    val isEditing: StateFlow<Boolean> = quickSettingsContainerViewModel.editModeViewModel.isEditing



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

        MutableStateFlow(

                mapOf(

        isEditing

            .map { editing -> destinations(editing) }

            .stateIn(

                applicationScope,

                SharingStarted.WhileSubscribed(),

                destinations(isEditing.value)

            )



    private fun destinations(editing: Boolean): Map<UserAction, UserActionResult> {

        return buildMap {

            put(

                if (shadeInteractor.shadeAlignment == ShadeAlignment.Top) {

                    Swipe.Up

                } else {

                    Swipe.Down

                    } to SceneFamilies.Home,

                    Back to SceneFamilies.Home,

                },

                UserActionResult(SceneFamilies.Home)

            )

            )

            .asStateFlow()

            if (!editing) {

                put(Back, UserActionResult(SceneFamilies.Home))

            }

        }

    }

}

packages/SystemUI/tests/utils/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsContainerViewModelKosmos.kt

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.qs.ui.viewmodel



import com.android.systemui.brightness.ui.viewmodel.brightnessSliderViewModel

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.qs.panels.ui.viewmodel.editModeViewModel

import com.android.systemui.qs.panels.ui.viewmodel.tileGridViewModel



val Kosmos.quickSettingsContainerViewModel by

    Kosmos.Fixture {

        QuickSettingsContainerViewModel(

            brightnessSliderViewModel,

            tileGridViewModel,

            editModeViewModel,

        )

    }

packages/SystemUI/tests/utils/src/com/android/systemui/shade/ui/viewmodel/QuickSettingsShadeSceneViewModelKosmos.kt→packages/SystemUI/tests/utils/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsShadeSceneViewModelKosmos.kt

+6 −11
Original line number Diff line number Diff line
@@ -14,24 +14,19 @@ 
 * limitations under the License.

 */



package com.android.systemui.shade.ui.viewmodel

package com.android.systemui.qs.ui.viewmodel



import com.android.systemui.brightness.ui.viewmodel.brightnessSliderViewModel

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.qs.panels.ui.viewmodel.editModeViewModel

import com.android.systemui.qs.panels.ui.viewmodel.tileGridViewModel

import com.android.systemui.qs.ui.adapter.qsSceneAdapter

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

import com.android.systemui.kosmos.applicationCoroutineScope

import com.android.systemui.shade.domain.interactor.shadeInteractor

import com.android.systemui.shade.ui.viewmodel.overlayShadeViewModel



val Kosmos.quickSettingsShadeSceneViewModel: QuickSettingsShadeSceneViewModel by

    Kosmos.Fixture {

        QuickSettingsShadeSceneViewModel(

            overlayShadeViewModel = overlayShadeViewModel,

            brightnessSliderViewModel = brightnessSliderViewModel,

            tileGridViewModel = tileGridViewModel,

            editModeViewModel = editModeViewModel,

            qsSceneAdapter = qsSceneAdapter,

            shadeInteractor = shadeInteractor,

            overlayShadeViewModel = overlayShadeViewModel,

            quickSettingsContainerViewModel = quickSettingsContainerViewModel,

            applicationScope = applicationCoroutineScope,

        )

    }