nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #2918 from vitorpamplona/claude/fix-bottombar-reorder-icons-M57CG

Browse Source 
Remove collectAsStateWithLifecycle from BottomBarSettingsContent
This commit is contained in:
Vitor Pamplona
2026-05-15 18:19:42 -04:00
committed by GitHub
parent 0d90df2dbf 1151106cdf
commit 0953862cfd
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/BottomBarSettingsScreen.kt
+3 -8
View File
@@ -58,7 +58,6 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex import androidx.compose.ui.zIndex
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.vitorpamplona.amethyst.R import com.vitorpamplona.amethyst.R
import com.vitorpamplona.amethyst.commons.icons.symbols.Icon import com.vitorpamplona.amethyst.commons.icons.symbols.Icon
import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols
@@ -104,16 +103,12 @@ fun BottomBarSettingsScreen(
@Composable @Composable
fun BottomBarSettingsContent(accountViewModel: AccountViewModel) { fun BottomBarSettingsContent(accountViewModel: AccountViewModel) {
val pinned by accountViewModel.settings.uiSettingsFlow.bottomBarItems val bottomBarItemsFlow = accountViewModel.settings.uiSettingsFlow.bottomBarItems
.collectAsStateWithLifecycle() var items by remember { mutableStateOf(initialRows(bottomBarItemsFlow.value)) }
var items by remember(pinned) {
mutableStateOf(initialRows(pinned))
}
fun save(newItems: List<Row>) { fun save(newItems: List<Row>) {
items = newItems items = newItems
accountViewModel.settings.uiSettingsFlow.bottomBarItems.tryEmit( bottomBarItemsFlow.tryEmit(
newItems.filter { it.pinned }.map { it.item }, newItems.filter { it.pinned }.map { it.item },
) )
} }