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

Commit f6980e1d authored by Alejandro Nijamkin's avatar Alejandro Nijamkin
Browse files

[flexiglass] Navigation stack. 

Adds Navigation repository and interactor.

Bug: 343297387
Flag: NONE there are no callers so this code does nothing
Test: manually verified with CLs on the chain
Test: unit tests included
Change-Id: Ic03240690f8d4c4790a464d3c2ddfd241b890e58
parent dac5670a

packages/SystemUI/multivalentTests/src/com/android/systemui/navigation/data/repository/NavigationRepositoryTest.kt

0 → 100644
+76 −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.navigation.data.repository



import android.view.WindowManagerPolicyConstants

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

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.kosmos.testScope

import com.android.systemui.navigationbar.NavigationModeController.ModeChangedListener

import com.android.systemui.navigationbar.navigationModeController

import com.android.systemui.testKosmos

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

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.kotlin.any

import org.mockito.kotlin.whenever



@SmallTest

@RunWith(AndroidJUnit4::class)

class NavigationRepositoryTest : SysuiTestCase() {



    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

    private val navigationModeControllerMock = kosmos.navigationModeController



    private val underTest = kosmos.navigationRepository



    private var currentMode = WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON

    private val modeChangedListeners = mutableListOf<ModeChangedListener>()



    @Before

    fun setUp() {

        whenever(navigationModeControllerMock.addListener(any())).thenAnswer { invocation ->

            val listener = invocation.arguments[0] as ModeChangedListener

            modeChangedListeners.add(listener)

            currentMode

        }

    }



    @Test

    fun isGesturalMode() =

        testScope.runTest {

            val isGesturalMode by collectLastValue(underTest.isGesturalMode)

            assertThat(isGesturalMode).isFalse()



            currentMode = WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL

            notifyModeChangedListeners()

            assertThat(isGesturalMode).isTrue()



            currentMode = WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON

            notifyModeChangedListeners()

            assertThat(isGesturalMode).isFalse()

        }



    private fun notifyModeChangedListeners() {

        modeChangedListeners.forEach { listener -> listener.onNavigationModeChanged(currentMode) }

    }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/navigation/domain/interactor/NavigationInteractorTest.kt

0 → 100644
+76 −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.navigation.domain.interactor



import android.view.WindowManagerPolicyConstants

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

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.kosmos.testScope

import com.android.systemui.navigationbar.NavigationModeController.ModeChangedListener

import com.android.systemui.navigationbar.navigationModeController

import com.android.systemui.testKosmos

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

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.kotlin.any

import org.mockito.kotlin.whenever



@SmallTest

@RunWith(AndroidJUnit4::class)

class NavigationInteractorTest : SysuiTestCase() {



    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

    private val navigationModeControllerMock = kosmos.navigationModeController



    private val underTest = kosmos.navigationInteractor



    private var currentMode = WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON

    private val modeChangedListeners = mutableListOf<ModeChangedListener>()



    @Before

    fun setUp() {

        whenever(navigationModeControllerMock.addListener(any())).thenAnswer { invocation ->

            val listener = invocation.arguments[0] as ModeChangedListener

            modeChangedListeners.add(listener)

            currentMode

        }

    }



    @Test

    fun isGesturalMode() =

        testScope.runTest {

            val isGesturalMode by collectLastValue(underTest.isGesturalMode)

            assertThat(isGesturalMode).isFalse()



            currentMode = WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL

            notifyModeChangedListeners()

            assertThat(isGesturalMode).isTrue()



            currentMode = WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON

            notifyModeChangedListeners()

            assertThat(isGesturalMode).isFalse()

        }



    private fun notifyModeChangedListeners() {

        modeChangedListeners.forEach { listener -> listener.onNavigationModeChanged(currentMode) }

    }

}

packages/SystemUI/src/com/android/systemui/navigation/data/repository/NavigationRepository.kt

0 → 100644
+46 −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.navigation.data.repository



import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.navigationbar.NavigationModeController

import com.android.systemui.shared.system.QuickStepContract

import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow

import javax.inject.Inject

import kotlinx.coroutines.channels.awaitClose

import kotlinx.coroutines.flow.Flow



@SysUISingleton

class NavigationRepository

@Inject

constructor(

    private val controller: NavigationModeController,

) {



    /** Whether the current navigation bar mode is edge-to-edge. */

    val isGesturalMode: Flow<Boolean> = conflatedCallbackFlow {

        val listener =

            NavigationModeController.ModeChangedListener { mode ->

                trySend(QuickStepContract.isGesturalMode(mode))

            }



        val currentMode = controller.addListener(listener)

        trySend(QuickStepContract.isGesturalMode(currentMode))



        awaitClose { controller.removeListener(listener) }

    }

}

packages/SystemUI/src/com/android/systemui/navigation/domain/interactor/NavigationInteractor.kt

0 → 100644
+33 −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.navigation.domain.interactor



import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.navigation.data.repository.NavigationRepository

import javax.inject.Inject

import kotlinx.coroutines.flow.Flow



@SysUISingleton

class NavigationInteractor

@Inject

constructor(

    repository: NavigationRepository,

) {



    /** Whether the current navigation bar mode is edge-to-edge. */

    val isGesturalMode: Flow<Boolean> = repository.isGesturalMode

}

packages/SystemUI/tests/utils/src/com/android/systemui/navigation/data/repository/NavigationRepositoryKosmos.kt

0 → 100644
+27 −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.navigation.data.repository



import com.android.systemui.kosmos.Kosmos

import com.android.systemui.kosmos.Kosmos.Fixture

import com.android.systemui.navigationbar.navigationModeController



val Kosmos.navigationRepository by Fixture {

    NavigationRepository(

        controller = navigationModeController,

    )

}