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

Commit a388ad63 authored by Evan Laird's avatar Evan Laird
Browse files

[Sb refactor] Move icon to the interactor 

MobileIconViewModel was doing a little bit too much business logic to
calculate the correct SignalDrawble icon for the view. This logic will
also be needed elsewhere, so it makes sense to move the calculation to
the Interactor.

It is still up to the ViewModel to map from the icon model into actual
UI via the binder, so this shouldn't change anything other than where to
look for the model.

Test: MobileIconInteractorTest
Test: MobileIconViewModelTest
Bug: 265342892
Change-Id: I85bad6310485a4ea57c4b32e3fd632868779212f
parent ddb303bb

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractor.kt

+55 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.statusbar.pipeline.mobile.domain.interactor 
import android.content.Context

import android.telephony.CarrierConfigManager

import com.android.settingslib.SignalIcon.MobileIconGroup

import com.android.settingslib.graph.SignalDrawable

import com.android.settingslib.mobile.MobileIconCarrierIdOverrides

import com.android.settingslib.mobile.MobileIconCarrierIdOverridesImpl

import com.android.systemui.dagger.qualifiers.Application
@@ -31,6 +32,7 @@ import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConn 
import com.android.systemui.statusbar.pipeline.mobile.domain.model.NetworkTypeIconModel

import com.android.systemui.statusbar.pipeline.mobile.domain.model.NetworkTypeIconModel.DefaultIcon

import com.android.systemui.statusbar.pipeline.mobile.domain.model.NetworkTypeIconModel.OverriddenIcon

import com.android.systemui.statusbar.pipeline.mobile.domain.model.SignalIconModel

import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -79,6 +81,9 @@ interface MobileIconInteractor { 
    /** True if the CDMA level should be preferred over the primary level. */

    val alwaysUseCdmaLevel: StateFlow<Boolean>



    /** Canonical representation of the current mobile signal strength as a triangle. */

    val signalLevelIcon: StateFlow<SignalIconModel>



    /** Observable for RAT type (network type) indicator */

    val networkTypeIconGroup: StateFlow<NetworkTypeIconModel>
@@ -305,4 +310,54 @@ class MobileIconInteractorImpl( 
    override val isInService = connectionRepository.isInService



    override val isAllowedDuringAirplaneMode = connectionRepository.isAllowedDuringAirplaneMode



    /** Whether or not to show the error state of [SignalDrawable] */

    private val showExclamationMark: StateFlow<Boolean> =

        combine(

                isDefaultDataEnabled,

                isDefaultConnectionFailed,

                isInService,

            ) { isDefaultDataEnabled, isDefaultConnectionFailed, isInService ->

                !isDefaultDataEnabled || isDefaultConnectionFailed || !isInService

            }

            .stateIn(scope, SharingStarted.WhileSubscribed(), true)



    private val shownLevel: StateFlow<Int> =

        combine(

                level,

                isInService,

            ) { level, isInService ->

                if (isInService) level else 0

            }

            .stateIn(scope, SharingStarted.WhileSubscribed(), 0)



    override val signalLevelIcon: StateFlow<SignalIconModel> = run {

        val initial =

            SignalIconModel(

                level = shownLevel.value,

                numberOfLevels = numberOfLevels.value,

                showExclamationMark = showExclamationMark.value,

                carrierNetworkChange = carrierNetworkChangeActive.value,

            )

        combine(

                shownLevel,

                numberOfLevels,

                showExclamationMark,

                carrierNetworkChangeActive,

            ) { shownLevel, numberOfLevels, showExclamationMark, carrierNetworkChange ->

                SignalIconModel(

                    shownLevel,

                    numberOfLevels,

                    showExclamationMark,

                    carrierNetworkChange,

                )

            }

            .distinctUntilChanged()

            .logDiffsForTable(

                tableLogBuffer,

                columnPrefix = "icon",

                initialValue = initial,

            )

            .stateIn(scope, SharingStarted.WhileSubscribed(), initial)

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/model/SignalIconModel.kt→packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/model/SignalIconModel.kt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.statusbar.pipeline.mobile.ui.model

package com.android.systemui.statusbar.pipeline.mobile.domain.model



import com.android.settingslib.graph.SignalDrawable

import com.android.systemui.log.table.Diffable

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/VerboseMobileViewLogger.kt

+1 −1
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ import com.android.systemui.dagger.SysUISingleton 
import com.android.systemui.log.LogBuffer

import com.android.systemui.log.core.LogLevel

import com.android.systemui.statusbar.pipeline.dagger.VerboseMobileViewLog

import com.android.systemui.statusbar.pipeline.mobile.domain.model.SignalIconModel

import com.android.systemui.statusbar.pipeline.mobile.ui.MobileViewLogger.Companion.getIdForLogging

import com.android.systemui.statusbar.pipeline.mobile.ui.model.SignalIconModel

import javax.inject.Inject



/**

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconViewModel.kt

+4 −53
Original line number Diff line number Diff line
@@ -17,14 +17,13 @@ 
package com.android.systemui.statusbar.pipeline.mobile.ui.viewmodel



import com.android.settingslib.AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH

import com.android.settingslib.graph.SignalDrawable

import com.android.systemui.common.shared.model.ContentDescription

import com.android.systemui.common.shared.model.Icon

import com.android.systemui.log.table.logDiffsForTable

import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.AirplaneModeInteractor

import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.MobileIconInteractor

import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.MobileIconsInteractor

import com.android.systemui.statusbar.pipeline.mobile.ui.model.SignalIconModel

import com.android.systemui.statusbar.pipeline.mobile.domain.model.SignalIconModel

import com.android.systemui.statusbar.pipeline.shared.ConnectivityConstants

import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel

import kotlinx.coroutines.CoroutineScope
@@ -76,26 +75,6 @@ constructor( 
    constants: ConnectivityConstants,

    scope: CoroutineScope,

) : MobileIconViewModelCommon {

    /** Whether or not to show the error state of [SignalDrawable] */

    private val showExclamationMark: StateFlow<Boolean> =

        combine(

                iconInteractor.isDefaultDataEnabled,

                iconInteractor.isDefaultConnectionFailed,

                iconInteractor.isInService,

            ) { isDefaultDataEnabled, isDefaultConnectionFailed, isInService ->

                !isDefaultDataEnabled || isDefaultConnectionFailed || !isInService

            }

            .stateIn(scope, SharingStarted.WhileSubscribed(), true)



    private val shownLevel: StateFlow<Int> =

        combine(

                iconInteractor.level,

                iconInteractor.isInService,

            ) { level, isInService ->

                if (isInService) level else 0

            }

            .stateIn(scope, SharingStarted.WhileSubscribed(), 0)



    override val isVisible: StateFlow<Boolean> =

        if (!constants.hasDataCapabilities) {

                flowOf(false)
@@ -123,40 +102,12 @@ constructor( 
            )

            .stateIn(scope, SharingStarted.WhileSubscribed(), false)



    override val icon: Flow<SignalIconModel> = run {

        val initial =

            SignalIconModel(

                level = shownLevel.value,

                numberOfLevels = iconInteractor.numberOfLevels.value,

                showExclamationMark = showExclamationMark.value,

                carrierNetworkChange = iconInteractor.carrierNetworkChangeActive.value,

            )

        combine(

                shownLevel,

                iconInteractor.numberOfLevels,

                showExclamationMark,

                iconInteractor.carrierNetworkChangeActive,

            ) { shownLevel, numberOfLevels, showExclamationMark, carrierNetworkChange ->

                SignalIconModel(

                    shownLevel,

                    numberOfLevels,

                    showExclamationMark,

                    carrierNetworkChange,

                )

            }

            .distinctUntilChanged()

            .logDiffsForTable(

                iconInteractor.tableLogBuffer,

                columnPrefix = "icon",

                initialValue = initial,

            )

            .stateIn(scope, SharingStarted.WhileSubscribed(), initial)

    }

    override val icon: Flow<SignalIconModel> = iconInteractor.signalLevelIcon



    override val contentDescription: Flow<ContentDescription> = run {

        val initial = ContentDescription.Resource(PHONE_SIGNAL_STRENGTH[0])

        shownLevel

            .map { ContentDescription.Resource(PHONE_SIGNAL_STRENGTH[it]) }

        iconInteractor.signalLevelIcon

            .map { ContentDescription.Resource(PHONE_SIGNAL_STRENGTH[it.level]) }

            .stateIn(scope, SharingStarted.WhileSubscribed(), initial)

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/FakeMobileIconInteractor.kt

+11 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import com.android.systemui.log.table.TableLogBuffer 
import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameModel

import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository.Companion.DEFAULT_NUM_LEVELS

import com.android.systemui.statusbar.pipeline.mobile.domain.model.NetworkTypeIconModel

import com.android.systemui.statusbar.pipeline.mobile.domain.model.SignalIconModel

import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel

import kotlinx.coroutines.flow.MutableStateFlow
@@ -83,6 +84,16 @@ class FakeMobileIconInteractor( 


    override val isAllowedDuringAirplaneMode = MutableStateFlow(false)



    override val signalLevelIcon: MutableStateFlow<SignalIconModel> =

        MutableStateFlow(

            SignalIconModel(

                level = level.value,

                numberOfLevels = numberOfLevels.value,

                showExclamationMark = false,

                carrierNetworkChange = false,

            )

        )



    fun setIsEmergencyOnly(emergency: Boolean) {

        _isEmergencyOnly.value = emergency

    }