From b29b5e6b34b477fefd6a87f159730337e737650c Mon Sep 17 00:00:00 2001 From: IvanCRA <101933328+IvanCRA@users.noreply.github.com> Date: Thu, 29 May 2025 15:26:40 +0300 Subject: [PATCH 1/3] fix view saves memes --- .../profile/presentation/ui/ProfileScreen.kt | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/codekotliners/memify/features/profile/presentation/ui/ProfileScreen.kt b/app/src/main/java/com/codekotliners/memify/features/profile/presentation/ui/ProfileScreen.kt index 90bafcca..21e220d4 100644 --- a/app/src/main/java/com/codekotliners/memify/features/profile/presentation/ui/ProfileScreen.kt +++ b/app/src/main/java/com/codekotliners/memify/features/profile/presentation/ui/ProfileScreen.kt @@ -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 @@ -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, @@ -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 @@ -407,25 +405,26 @@ private fun FeedTabBar( @Composable fun SavedMemesGrid( savedUris: List, - 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( From 2f693b4f8f8b2fa777ab6e5124606e5ccd136875 Mon Sep 17 00:00:00 2001 From: IvanCRA <101933328+IvanCRA@users.noreply.github.com> Date: Thu, 29 May 2025 18:03:13 +0300 Subject: [PATCH 2/3] delete draft --- .../features/profile/presentation/ui/ProfileScreen.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/codekotliners/memify/features/profile/presentation/ui/ProfileScreen.kt b/app/src/main/java/com/codekotliners/memify/features/profile/presentation/ui/ProfileScreen.kt index 21e220d4..a7aa8ce8 100644 --- a/app/src/main/java/com/codekotliners/memify/features/profile/presentation/ui/ProfileScreen.kt +++ b/app/src/main/java/com/codekotliners/memify/features/profile/presentation/ui/ProfileScreen.kt @@ -344,12 +344,12 @@ private fun FeedTabBar( stringResource(R.string.created), stringResource(R.string.liked), stringResource(R.string.published), - stringResource(R.string.drafts), + // stringResource(R.string.drafts), ) } else { listOf( stringResource(R.string.created), - stringResource(R.string.drafts), + // stringResource(R.string.drafts), ) } @@ -391,12 +391,12 @@ private fun FeedTabBar( 0 -> SavedMemesGrid(savedUris = savedUris, scrollState = savedScrollState) 1 -> LikedMemesGrid(likedPosts = likedPosts, scrollState = likedScrollState) 2 -> {} - 3 -> {} + // 3 -> {} } } else { when (state.selectedTab) { 0 -> SavedMemesGrid(savedUris = savedUris, scrollState = savedScrollState) - 1 -> {} + // 1 -> {} } } } From 80b43a694d49a83016a90d7b8b70abd30b1a9ef9 Mon Sep 17 00:00:00 2001 From: IvanCRA <101933328+IvanCRA@users.noreply.github.com> Date: Thu, 29 May 2025 18:20:18 +0300 Subject: [PATCH 3/3] delete public --- .../memify/features/profile/presentation/ui/ProfileScreen.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/codekotliners/memify/features/profile/presentation/ui/ProfileScreen.kt b/app/src/main/java/com/codekotliners/memify/features/profile/presentation/ui/ProfileScreen.kt index a7aa8ce8..6cb63754 100644 --- a/app/src/main/java/com/codekotliners/memify/features/profile/presentation/ui/ProfileScreen.kt +++ b/app/src/main/java/com/codekotliners/memify/features/profile/presentation/ui/ProfileScreen.kt @@ -343,7 +343,7 @@ private fun FeedTabBar( listOf( stringResource(R.string.created), stringResource(R.string.liked), - stringResource(R.string.published), + // stringResource(R.string.published), // stringResource(R.string.drafts), ) } else { @@ -390,7 +390,7 @@ private fun FeedTabBar( when (state.selectedTab) { 0 -> SavedMemesGrid(savedUris = savedUris, scrollState = savedScrollState) 1 -> LikedMemesGrid(likedPosts = likedPosts, scrollState = likedScrollState) - 2 -> {} + // 2 -> {} // 3 -> {} } } else {