fix blur for friends screen

This commit is contained in:
2024-07-13 01:52:49 +03:00
parent 08e82a309f
commit 32b8fc4067
3 changed files with 9 additions and 5 deletions
@@ -65,7 +65,6 @@ import androidx.compose.ui.unit.DpOffset
import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.IntOffset
import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex
import androidx.core.view.HapticFeedbackConstantsCompat import androidx.core.view.HapticFeedbackConstantsCompat
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import coil.imageLoader import coil.imageLoader
@@ -82,7 +81,6 @@ import com.meloda.app.fast.designsystem.MaterialDialog
import com.meloda.app.fast.designsystem.components.FullScreenLoader import com.meloda.app.fast.designsystem.components.FullScreenLoader
import com.meloda.app.fast.model.BaseError import com.meloda.app.fast.model.BaseError
import com.meloda.app.fast.ui.ErrorView import com.meloda.app.fast.ui.ErrorView
import dev.chrisbanes.haze.HazeState
import dev.chrisbanes.haze.haze import dev.chrisbanes.haze.haze
import dev.chrisbanes.haze.hazeChild import dev.chrisbanes.haze.hazeChild
import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi
@@ -149,7 +147,6 @@ fun ConversationsScreen(
} }
} }
// val hazeState = remember { HazeState() }
val hazeState = LocalHazeState.current val hazeState = LocalHazeState.current
var dropDownMenuExpanded by remember { var dropDownMenuExpanded by remember {
@@ -21,6 +21,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.meloda.app.fast.designsystem.ImmutableList import com.meloda.app.fast.designsystem.ImmutableList
import com.meloda.app.fast.designsystem.LocalBottomPadding
import com.meloda.app.fast.friends.model.FriendsScreenState import com.meloda.app.fast.friends.model.FriendsScreenState
import com.meloda.app.fast.friends.model.UiFriend import com.meloda.app.fast.friends.model.UiFriend
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
@@ -39,6 +40,8 @@ fun FriendsList(
val friends = uiFriends.toList() val friends = uiFriends.toList()
val bottomPadding = LocalBottomPadding.current
LazyColumn( LazyColumn(
modifier = modifier, modifier = modifier,
state = listState state = listState
@@ -91,5 +94,9 @@ fun FriendsList(
} }
} }
} }
item {
Spacer(modifier = Modifier.height(bottomPadding))
}
} }
} }
@@ -48,6 +48,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import coil.imageLoader import coil.imageLoader
import coil.request.ImageRequest import coil.request.ImageRequest
import com.meloda.app.fast.designsystem.ImmutableList import com.meloda.app.fast.designsystem.ImmutableList
import com.meloda.app.fast.designsystem.LocalHazeState
import com.meloda.app.fast.designsystem.LocalTheme import com.meloda.app.fast.designsystem.LocalTheme
import com.meloda.app.fast.designsystem.TabItem import com.meloda.app.fast.designsystem.TabItem
import com.meloda.app.fast.designsystem.components.BlurrableTopAppBar import com.meloda.app.fast.designsystem.components.BlurrableTopAppBar
@@ -57,7 +58,6 @@ import com.meloda.app.fast.friends.FriendsViewModel
import com.meloda.app.fast.friends.FriendsViewModelImpl import com.meloda.app.fast.friends.FriendsViewModelImpl
import com.meloda.app.fast.model.BaseError import com.meloda.app.fast.model.BaseError
import com.meloda.app.fast.ui.ErrorView import com.meloda.app.fast.ui.ErrorView
import dev.chrisbanes.haze.HazeState
import dev.chrisbanes.haze.haze import dev.chrisbanes.haze.haze
import dev.chrisbanes.haze.hazeChild import dev.chrisbanes.haze.hazeChild
import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi
@@ -113,7 +113,7 @@ fun FriendsScreen(
} }
} }
val hazeState = remember { HazeState() } val hazeState = LocalHazeState.current
val pullToRefreshAlpha by animateFloatAsState( val pullToRefreshAlpha by animateFloatAsState(
targetValue = if (!listState.canScrollBackward) 1f else 0f, targetValue = if (!listState.canScrollBackward) 1f else 0f,