Skip to content

fix view saves memes #109

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

Merged
IvanCRA merged 4 commits into from
May 29, 2025
Merged

fix view saves memes #109

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b29b5e6
fix view saves memes
IvanCRA May 29, 2025
2f693b4
delete draft
IvanCRA May 29, 2025
80b43a6
delete public
IvanCRA May 29, 2025
cb20097
Merge branch 'develop' into fix/savemem
IvanCRA May 29, 2025
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
43 changes: 21 additions & 22 deletions app/src/main/java/com/codekotliners/memify/features/profile/presentation/ui/ProfileScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.LazyGridState
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.foundation.lazy.grid.rememberLazyGridState
import androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridState
import androidx.compose.foundation.lazy.staggeredgrid.LazyVerticalStaggeredGrid
Expand Down Expand Up @@ -115,7 +113,7 @@ fun ProfileScreen(
val scrollOffset = rememberScrollOffset(scrollState)
val isExtended = scrollOffset >= 0.1f
val likedScrollState = rememberLazyStaggeredGridState()
val savedScrollState = rememberLazyGridState()
val savedScrollState = rememberLazyStaggeredGridState()

AppScaffold(
navController = navController,
Expand Down Expand Up @@ -335,7 +333,7 @@ private fun FeedTabBar(
state: ProfileState,
onSelectTab: (Int) -> Unit,
likedScrollState: LazyStaggeredGridState,
savedScrollState: LazyGridState,
savedScrollState: LazyStaggeredGridState,
) {
val savedUris = viewModel.savedUris.value
val likedPosts = viewModel.likedPosts.value
Expand All @@ -345,13 +343,13 @@ private fun FeedTabBar(
listOf(
stringResource(R.string.created),
stringResource(R.string.liked),
stringResource(R.string.published),
stringResource(R.string.drafts),
// stringResource(R.string.published),
// stringResource(R.string.drafts),
)
} else {
listOf(
stringResource(R.string.created),
stringResource(R.string.drafts),
// stringResource(R.string.drafts),
)
}

Expand Down Expand Up @@ -392,13 +390,13 @@ private fun FeedTabBar(
when (state.selectedTab) {
0 -> SavedMemesGrid(savedUris = savedUris, scrollState = savedScrollState)
1 -> LikedMemesGrid(likedPosts = likedPosts, scrollState = likedScrollState)
2 -> {}
3 -> {}
// 2 -> {}
// 3 -> {}
}
} else {
when (state.selectedTab) {
0 -> SavedMemesGrid(savedUris = savedUris, scrollState = savedScrollState)
1 -> {}
// 1 -> {}
}
}
}
Expand All @@ -407,25 +405,26 @@ private fun FeedTabBar(
@Composable
fun SavedMemesGrid(
savedUris: List<UriEntity>,
scrollState: LazyGridState,
scrollState: LazyStaggeredGridState,
) {
LazyVerticalGrid(
columns = GridCells.Fixed(2),
LazyVerticalStaggeredGrid(
columns = StaggeredGridCells.Fixed(2),
state = scrollState,
verticalItemSpacing = 10.dp,
horizontalArrangement = Arrangement.spacedBy(10.dp),
modifier =
Modifier.padding(
start = 10.dp,
end = 10.dp,
top = 10.dp,
bottom = 0.dp,
),
Modifier
.padding(horizontal = 16.dp, vertical = 8.dp)
.fillMaxSize(),
contentPadding = PaddingValues(0.dp),
) {
items(savedUris.size) { index ->
val imageUri = Uri.parse(savedUris[index].uri)
items(savedUris) { item ->
val imageUri = Uri.parse(item.uri)

Card(
modifier =
Modifier
.padding(6.dp)
.fillMaxWidth()
.aspectRatio(1f),
) {
Image(
Expand Down