diff options
10 files changed, 55 insertions, 84 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/IconTilesRepository.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/IconTilesRepository.kt index e581bfceb18f..095bdf2ff5bd 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/IconTilesRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/IconTilesRepository.kt @@ -19,38 +19,26 @@ package com.android.systemui.qs.panels.data.repository import com.android.systemui.dagger.SysUISingleton import com.android.systemui.qs.pipeline.shared.TileSpec import javax.inject.Inject -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.asStateFlow -/** Repository for retrieving the list of [TileSpec] to be displayed as icons. */ +/** Repository for checking if a tile should be displayed as an icon. */ interface IconTilesRepository { - val iconTilesSpecs: StateFlow<Set<TileSpec>> + fun isIconTile(spec: TileSpec): Boolean } @SysUISingleton class IconTilesRepositoryImpl @Inject constructor() : IconTilesRepository { - private val _iconTilesSpecs = - MutableStateFlow( + override fun isIconTile(spec: TileSpec): Boolean { + return !LARGE_TILES.contains(spec) + } + + companion object { + private val LARGE_TILES = setOf( - TileSpec.create("airplane"), - TileSpec.create("battery"), - TileSpec.create("cameratoggle"), - TileSpec.create("cast"), - TileSpec.create("color_correction"), - TileSpec.create("inversion"), - TileSpec.create("saver"), + TileSpec.create("internet"), + TileSpec.create("bt"), TileSpec.create("dnd"), - TileSpec.create("flashlight"), - TileSpec.create("location"), - TileSpec.create("mictoggle"), - TileSpec.create("nfc"), - TileSpec.create("night"), - TileSpec.create("rotation") + TileSpec.create("cast"), ) - ) - - /** Set of toggleable tiles that are suitable for being shown as an icon. */ - override val iconTilesSpecs: StateFlow<Set<TileSpec>> = _iconTilesSpecs.asStateFlow() + } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/IconTilesInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/IconTilesInteractor.kt index ccc1c6e9135c..524ea8b70100 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/IconTilesInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/IconTilesInteractor.kt @@ -20,10 +20,9 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.qs.panels.data.repository.IconTilesRepository import com.android.systemui.qs.pipeline.shared.TileSpec import javax.inject.Inject -import kotlinx.coroutines.flow.StateFlow /** Interactor for retrieving the list of [TileSpec] to be displayed as icons. */ @SysUISingleton -class IconTilesInteractor @Inject constructor(repo: IconTilesRepository) { - val iconTilesSpecs: StateFlow<Set<TileSpec>> = repo.iconTilesSpecs +class IconTilesInteractor @Inject constructor(private val repo: IconTilesRepository) { + fun isIconTile(spec: TileSpec): Boolean = repo.isIconTile(spec) } diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/InfiniteGridConsistencyInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/InfiniteGridConsistencyInteractor.kt index b437f645d4bc..e99c64c8c1f3 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/InfiniteGridConsistencyInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/InfiniteGridConsistencyInteractor.kt @@ -38,14 +38,13 @@ constructor( override fun reconcileTiles(tiles: List<TileSpec>): List<TileSpec> { val newTiles: MutableList<TileSpec> = mutableListOf() val row = TileRow<TileSpec>(columns = gridSizeInteractor.columns.value) - val iconTilesSet = iconTilesInteractor.iconTilesSpecs.value val tilesQueue = ArrayDeque( tiles.map { SizedTile( it, width = - if (iconTilesSet.contains(it)) { + if (iconTilesInteractor.isIconTile(it)) { 1 } else { 2 diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/InfiniteGridLayout.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/InfiniteGridLayout.kt index 4aeaa7d23771..2f0fe221a2b4 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/InfiniteGridLayout.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/InfiniteGridLayout.kt @@ -52,15 +52,13 @@ constructor( tiles.forEach { it.startListening(token) } onDispose { tiles.forEach { it.stopListening(token) } } } - val iconTilesSpecs by iconTilesViewModel.iconTilesSpecs.collectAsStateWithLifecycle() val columns by gridSizeViewModel.columns.collectAsStateWithLifecycle() TileLazyGrid(modifier = modifier, columns = GridCells.Fixed(columns)) { items( tiles.size, span = { index -> - val iconOnly = iconTilesSpecs.contains(tiles[index].spec) - if (iconOnly) { + if (iconTilesViewModel.isIconTile(tiles[index].spec)) { GridItemSpan(1) } else { GridItemSpan(2) @@ -69,7 +67,7 @@ constructor( ) { index -> Tile( tile = tiles[index], - iconOnly = iconTilesSpecs.contains(tiles[index].spec), + iconOnly = iconTilesViewModel.isIconTile(tiles[index].spec), modifier = Modifier.height(dimensionResource(id = R.dimen.qs_tile_height)) ) } @@ -83,12 +81,11 @@ constructor( onAddTile: (TileSpec, Int) -> Unit, onRemoveTile: (TileSpec) -> Unit, ) { - val iconOnlySpecs by iconTilesViewModel.iconTilesSpecs.collectAsStateWithLifecycle() val columns by gridSizeViewModel.columns.collectAsStateWithLifecycle() DefaultEditTileGrid( tiles = tiles, - iconOnlySpecs = iconOnlySpecs, + isIconOnly = iconTilesViewModel::isIconTile, columns = GridCells.Fixed(columns), modifier = modifier, onAddTile = onAddTile, diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/PartitionedGridLayout.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/PartitionedGridLayout.kt index 708ef0dd7ff6..d60076745a78 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/PartitionedGridLayout.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/PartitionedGridLayout.kt @@ -38,7 +38,6 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.getValue -import androidx.compose.runtime.remember import androidx.compose.runtime.rememberUpdatedState import androidx.compose.ui.Modifier import androidx.compose.ui.res.dimensionResource @@ -66,12 +65,11 @@ class PartitionedGridLayout @Inject constructor(private val viewModel: Partition tiles.forEach { it.startListening(token) } onDispose { tiles.forEach { it.stopListening(token) } } } - val iconTilesSpecs by viewModel.iconTilesSpecs.collectAsStateWithLifecycle() val columns by viewModel.columns.collectAsStateWithLifecycle() val showLabels by viewModel.showLabels.collectAsStateWithLifecycle() val largeTileHeight = tileHeight() val iconTileHeight = tileHeight(showLabels) - val (smallTiles, largeTiles) = tiles.partition { iconTilesSpecs.contains(it.spec) } + val (smallTiles, largeTiles) = tiles.partition { viewModel.isIconTile(it.spec) } TileLazyGrid(modifier = modifier, columns = GridCells.Fixed(columns)) { // Large tiles @@ -103,7 +101,6 @@ class PartitionedGridLayout @Inject constructor(private val viewModel: Partition onAddTile: (TileSpec, Int) -> Unit, onRemoveTile: (TileSpec) -> Unit ) { - val iconOnlySpecs by viewModel.iconTilesSpecs.collectAsStateWithLifecycle() val columns by viewModel.columns.collectAsStateWithLifecycle() val showLabels by viewModel.showLabels.collectAsStateWithLifecycle() @@ -111,8 +108,6 @@ class PartitionedGridLayout @Inject constructor(private val viewModel: Partition val addTileToEnd: (TileSpec) -> Unit by rememberUpdatedState { onAddTile(it, CurrentTilesInteractor.POSITION_AT_END) } - val isIconOnly: (TileSpec) -> Boolean = - remember(iconOnlySpecs) { { tileSpec: TileSpec -> tileSpec in iconOnlySpecs } } val largeTileHeight = tileHeight() val iconTileHeight = tileHeight(showLabels) val tilePadding = dimensionResource(R.dimen.qs_tile_margin_vertical) @@ -151,7 +146,7 @@ class PartitionedGridLayout @Inject constructor(private val viewModel: Partition iconTileHeight = iconTileHeight, tilePadding = tilePadding, onRemoveTile = onRemoveTile, - isIconOnly = isIconOnly, + isIconOnly = viewModel::isIconTile, columns = columns, showLabels = showLabels, ) @@ -161,7 +156,7 @@ class PartitionedGridLayout @Inject constructor(private val viewModel: Partition iconTileHeight = iconTileHeight, tilePadding = tilePadding, addTileToEnd = addTileToEnd, - isIconOnly = isIconOnly, + isIconOnly = viewModel::isIconTile, showLabels = showLabels, columns = columns, ) @@ -232,7 +227,7 @@ class PartitionedGridLayout @Inject constructor(private val viewModel: Partition val largeGridHeight = gridHeight(largeTiles.size, largeTileHeight, columns / 2, tilePadding) val smallGridHeight = gridHeight(smallTiles.size, iconTileHeight, columns, tilePadding) val largeGridHeightCustom = - gridHeight(tilesCustom.size, largeTileHeight, columns / 2, tilePadding) + gridHeight(tilesCustom.size, iconTileHeight, columns, tilePadding) // Add up the height of all three grids and add padding in between val gridHeight = @@ -257,8 +252,14 @@ class PartitionedGridLayout @Inject constructor(private val viewModel: Partition ) fillUpRow(nTiles = smallTiles.size, columns = columns) - // Custom tiles, all large - editTiles(tilesCustom, ClickAction.ADD, addTileToEnd, isIconOnly) + // Custom tiles, all icons + editTiles( + tilesCustom, + ClickAction.ADD, + addTileToEnd, + isIconOnly, + showLabels = showLabels + ) } } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/StretchedGridLayout.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/StretchedGridLayout.kt index 70d629fa7c70..7f4e0a7047b8 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/StretchedGridLayout.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/StretchedGridLayout.kt @@ -60,14 +60,13 @@ constructor( // Icon [3 | 4] // Large [6 | 8] val columns = 12 - val iconTilesSpecs by iconTilesViewModel.iconTilesSpecs.collectAsStateWithLifecycle() val stretchedTiles = remember(tiles) { val sizedTiles = tiles.map { SizedTile( it, - if (iconTilesSpecs.contains(it.spec)) { + if (iconTilesViewModel.isIconTile(it.spec)) { 3 } else { 6 @@ -81,7 +80,7 @@ constructor( items(stretchedTiles.size, span = { GridItemSpan(stretchedTiles[it].width) }) { index -> Tile( tile = stretchedTiles[index].tile, - iconOnly = iconTilesSpecs.contains(stretchedTiles[index].tile.spec), + iconOnly = iconTilesViewModel.isIconTile(stretchedTiles[index].tile.spec), modifier = Modifier.height(dimensionResource(id = R.dimen.qs_tile_height)) ) } @@ -95,12 +94,11 @@ constructor( onAddTile: (TileSpec, Int) -> Unit, onRemoveTile: (TileSpec) -> Unit ) { - val iconOnlySpecs by iconTilesViewModel.iconTilesSpecs.collectAsStateWithLifecycle() val columns by gridSizeViewModel.columns.collectAsStateWithLifecycle() DefaultEditTileGrid( tiles = tiles, - iconOnlySpecs = iconOnlySpecs, + isIconOnly = iconTilesViewModel::isIconTile, columns = GridCells.Fixed(columns), modifier = modifier, onAddTile = onAddTile, diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/Tile.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/Tile.kt index a6838c0c06a2..f776bf08c9e4 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/Tile.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/Tile.kt @@ -165,7 +165,7 @@ fun TileLazyGrid( @Composable fun DefaultEditTileGrid( tiles: List<EditTileViewModel>, - iconOnlySpecs: Set<TileSpec>, + isIconOnly: (TileSpec) -> Boolean, columns: GridCells, modifier: Modifier, onAddTile: (TileSpec, Int) -> Unit, @@ -176,8 +176,6 @@ fun DefaultEditTileGrid( val addTileToEnd: (TileSpec) -> Unit by rememberUpdatedState { onAddTile(it, CurrentTilesInteractor.POSITION_AT_END) } - val isIconOnly: (TileSpec) -> Boolean = - remember(iconOnlySpecs) { { tileSpec: TileSpec -> tileSpec in iconOnlySpecs } } TileLazyGrid(modifier = modifier, columns = columns) { // These Text are just placeholders to see the different sections. Not final UI. diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/IconTilesViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/IconTilesViewModel.kt index 9ad00c8d3cfa..117c85c9c3ba 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/IconTilesViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/IconTilesViewModel.kt @@ -20,14 +20,13 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.qs.panels.domain.interactor.IconTilesInteractor import com.android.systemui.qs.pipeline.shared.TileSpec import javax.inject.Inject -import kotlinx.coroutines.flow.StateFlow interface IconTilesViewModel { - val iconTilesSpecs: StateFlow<Set<TileSpec>> + fun isIconTile(spec: TileSpec): Boolean } @SysUISingleton -class IconTilesViewModelImpl @Inject constructor(interactor: IconTilesInteractor) : +class IconTilesViewModelImpl @Inject constructor(private val interactor: IconTilesInteractor) : IconTilesViewModel { - override val iconTilesSpecs = interactor.iconTilesSpecs + override fun isIconTile(spec: TileSpec): Boolean = interactor.isIconTile(spec) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/panels/domain/interactor/GridConsistencyInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/panels/domain/interactor/GridConsistencyInteractorTest.kt index 2da4b7296c35..87031d93db15 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/panels/domain/interactor/GridConsistencyInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/panels/domain/interactor/GridConsistencyInteractorTest.kt @@ -31,9 +31,6 @@ import com.android.systemui.qs.pipeline.shared.TileSpec import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest import org.junit.Before @@ -46,22 +43,21 @@ import org.junit.runner.RunWith class GridConsistencyInteractorTest : SysuiTestCase() { private val iconOnlyTiles = - MutableStateFlow( - setOf( - TileSpec.create("smallA"), - TileSpec.create("smallB"), - TileSpec.create("smallC"), - TileSpec.create("smallD"), - TileSpec.create("smallE"), - ) + setOf( + TileSpec.create("smallA"), + TileSpec.create("smallB"), + TileSpec.create("smallC"), + TileSpec.create("smallD"), + TileSpec.create("smallE"), ) private val kosmos = testKosmos().apply { iconTilesRepository = object : IconTilesRepository { - override val iconTilesSpecs: StateFlow<Set<TileSpec>> - get() = iconOnlyTiles.asStateFlow() + override fun isIconTile(spec: TileSpec): Boolean { + return iconOnlyTiles.contains(spec) + } } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/panels/domain/interactor/InfiniteGridConsistencyInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/panels/domain/interactor/InfiniteGridConsistencyInteractorTest.kt index bda48adbfcc3..1eb6d63c5a39 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/panels/domain/interactor/InfiniteGridConsistencyInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/panels/domain/interactor/InfiniteGridConsistencyInteractorTest.kt @@ -25,9 +25,6 @@ import com.android.systemui.qs.panels.data.repository.iconTilesRepository import com.android.systemui.qs.pipeline.shared.TileSpec import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.test.runTest import org.junit.Test import org.junit.runner.RunWith @@ -37,21 +34,20 @@ import org.junit.runner.RunWith class InfiniteGridConsistencyInteractorTest : SysuiTestCase() { private val iconOnlyTiles = - MutableStateFlow( - setOf( - TileSpec.create("smallA"), - TileSpec.create("smallB"), - TileSpec.create("smallC"), - TileSpec.create("smallD"), - TileSpec.create("smallE"), - ) + setOf( + TileSpec.create("smallA"), + TileSpec.create("smallB"), + TileSpec.create("smallC"), + TileSpec.create("smallD"), + TileSpec.create("smallE"), ) private val kosmos = testKosmos().apply { iconTilesRepository = object : IconTilesRepository { - override val iconTilesSpecs: StateFlow<Set<TileSpec>> - get() = iconOnlyTiles.asStateFlow() + override fun isIconTile(spec: TileSpec): Boolean { + return iconOnlyTiles.contains(spec) + } } } private val underTest = with(kosmos) { infiniteGridConsistencyInteractor } |