Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: blank lists or flickering on Home Destinations - wrong lazyListStates [WPB-14276] #3627

Merged
merged 1 commit into from
Nov 14, 2024
Merged

fix: blank lists or flickering on Home Destinations - wrong lazyListStates [WPB-14276] #3627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/wire/android/ui/home/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ fun HomeContent(
}
},
collapsingEnabled = !searchBarState.isSearchActive,
contentLazyListState = homeStateHolder.currentLazyListState,
contentLazyListState = homeStateHolder.lazyListStateFor(currentNavigationItem),
content = {
/**
* This "if" is a workaround, otherwise it can crash because of the SubcomposeLayout's nature.
Expand Down
38 changes: 21 additions & 17 deletions app/src/main/kotlin/com/wire/android/ui/home/HomeStateHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ import androidx.compose.material3.DrawerState
import androidx.compose.material3.DrawerValue
import androidx.compose.material3.rememberDrawerState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.State
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
Expand All @@ -42,12 +44,15 @@ class HomeStateHolder(
val coroutineScope: CoroutineScope,
val navController: NavHostController,
val drawerState: DrawerState,
val currentNavigationItem: HomeDestination,
val searchBarState: SearchBarState,
val navigator: Navigator,
lazyListStates: Map<HomeDestination, LazyListState>,
private val currentNavigationItemState: State<HomeDestination>,
private val lazyListStates: Map<HomeDestination, LazyListState>,
) {
val currentLazyListState = lazyListStates[currentNavigationItem] ?: error("No LazyListState found for $currentNavigationItem")
val currentNavigationItem
get() = currentNavigationItemState.value
fun lazyListStateFor(destination: HomeDestination): LazyListState =
lazyListStates[destination] ?: error("No LazyListState found for $destination")

fun closeDrawer() {
coroutineScope.launch {
Expand All @@ -73,23 +78,22 @@ fun rememberHomeScreenState(
): HomeStateHolder {
val searchBarState = rememberSearchbarState()
val navBackStackEntry by navController.currentBackStackEntryAsState()
val currentRoute = navBackStackEntry?.destination?.route
val currentNavigationItem = currentRoute?.let { HomeDestination.fromRoute(it) } ?: HomeDestination.Conversations
val currentNavigationItemState = remember {
derivedStateOf {
navBackStackEntry?.destination?.route?.let { HomeDestination.fromRoute(it) } ?: HomeDestination.Conversations
}
}
val lazyListStates = HomeDestination.values().associateWith { rememberLazyListState() }

val homeState = remember(
currentNavigationItem
) {
return remember {
HomeStateHolder(
coroutineScope,
navController,
drawerState,
currentNavigationItem,
searchBarState,
navigator,
lazyListStates
coroutineScope = coroutineScope,
navController = navController,
drawerState = drawerState,
searchBarState = searchBarState,
navigator = navigator,
currentNavigationItemState = currentNavigationItemState,
lazyListStates = lazyListStates
)
}

return homeState
}
3 changes: 2 additions & 1 deletion app/src/main/kotlin/com/wire/android/ui/home/archive/ArchiveScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package com.wire.android.ui.home.archive

import androidx.compose.foundation.text.input.TextFieldState
import androidx.compose.runtime.Composable
import com.wire.android.navigation.HomeDestination
import com.wire.android.navigation.HomeNavGraph
import com.wire.android.navigation.WireDestination
import com.wire.android.navigation.rememberNavigator
Expand All @@ -42,7 +43,7 @@ fun ArchiveScreen(homeStateHolder: HomeStateHolder) {
navigator = navigator,
searchBarState = searchBarState,
conversationsSource = ConversationsSource.ARCHIVE,
lazyListState = currentLazyListState,
lazyListState = lazyListStateFor(HomeDestination.Archive),
emptyListContent = { ArchiveEmptyContent() }
)
}
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/kotlin/com/wire/android/ui/home/conversationslist/all/AllConversationsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package com.wire.android.ui.home.conversationslist.all

import androidx.compose.foundation.text.input.TextFieldState
import androidx.compose.runtime.Composable
import com.wire.android.navigation.HomeDestination
import com.wire.android.navigation.HomeNavGraph
import com.wire.android.navigation.WireDestination
import com.wire.android.navigation.rememberNavigator
Expand All @@ -42,7 +43,7 @@ fun AllConversationsScreen(homeStateHolder: HomeStateHolder) {
navigator = navigator,
searchBarState = searchBarState,
conversationsSource = ConversationsSource.MAIN,
lazyListState = currentLazyListState,
lazyListState = lazyListStateFor(HomeDestination.Conversations),
emptyListContent = { AllConversationsEmptyContent() }
)
}
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/kotlin/com/wire/android/ui/home/settings/SettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import com.wire.android.R
import com.wire.android.appLogger
import com.wire.android.model.Clickable
import com.wire.android.navigation.BackStackMode
import com.wire.android.navigation.HomeDestination
import com.wire.android.navigation.HomeNavGraph
import com.wire.android.navigation.NavigationCommand
import com.wire.android.navigation.WireDestination
Expand Down Expand Up @@ -62,7 +63,7 @@ fun SettingsScreen(

val context = LocalContext.current
SettingsScreenContent(
lazyListState = homeStateHolder.currentLazyListState,
lazyListState = homeStateHolder.lazyListStateFor(HomeDestination.Settings),
settingsState = viewModel.state,
onItemClicked = remember {
{
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/kotlin/com/wire/android/ui/home/whatsnew/WhatsNewScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
import com.wire.android.BuildConfig
import com.wire.android.R
import com.wire.android.model.Clickable
import com.wire.android.navigation.HomeDestination
import com.wire.android.navigation.HomeNavGraph
import com.wire.android.navigation.NavigationCommand
import com.wire.android.navigation.WireDestination
Expand All @@ -51,7 +52,7 @@ fun WhatsNewScreen(
val context = LocalContext.current
WhatsNewScreenContent(
state = whatsNewViewModel.state,
lazyListState = homeStateHolder.currentLazyListState,
lazyListState = homeStateHolder.lazyListStateFor(HomeDestination.WhatsNew),
onItemClicked = remember {
{
it.direction.handleNavigation(
Expand Down
Loading