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

Jump to bottom

Fix playlists screen item positioning #187

Merged
merged 1 commit into from
Jul 6, 2024
Merged

Fix playlists screen item positioning #187

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
7 changes: 4 additions & 3 deletions feature/album/list/src/main/java/ru/stersh/youamp/feature/albums/ui/AlbumsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package ru.stersh.youamp.feature.albums.ui

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.LazyGridState
Expand Down Expand Up @@ -102,9 +103,9 @@ private fun Content(
state = listState,
contentPadding = PaddingValues(16.dp),
horizontalArrangement = Arrangement.spacedBy(8.dp),
verticalArrangement = Arrangement.spacedBy(8.dp)
)
{
verticalArrangement = Arrangement.spacedBy(8.dp),
modifier = Modifier.fillMaxSize()
) {
items(
key = { it.id },
items = state.items
Expand Down
4 changes: 3 additions & 1 deletion feature/artist/list/src/main/java/ru/stersh/youamp/feature/artists/ui/ArtistsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
Expand Down Expand Up @@ -89,7 +90,8 @@ private fun ArtistsScreen(
columns = GridCells.Fixed(3),
contentPadding = PaddingValues(16.dp),
horizontalArrangement = Arrangement.spacedBy(8.dp),
verticalArrangement = Arrangement.spacedBy(8.dp)
verticalArrangement = Arrangement.spacedBy(8.dp),
modifier = Modifier.fillMaxSize()
) {
items(
items = state.items
Expand Down
29 changes: 15 additions & 14 deletions feature/playlist/list/src/main/java/ru/stersh/youamp/feature/playlists/ui/PlaylistsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package ru.stersh.youamp.feature.playlists.ui
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
Expand Down Expand Up @@ -86,9 +87,9 @@ private fun PlaylistsScreen(
state = listState,
contentPadding = PaddingValues(16.dp),
horizontalArrangement = Arrangement.spacedBy(8.dp),
verticalArrangement = Arrangement.spacedBy(8.dp)
)
{
verticalArrangement = Arrangement.spacedBy(8.dp),
modifier = Modifier.fillMaxSize()
) {
items(
items = state.items
) { playlist ->
Expand Down Expand Up @@ -165,22 +166,22 @@ private fun PlaylistsScreenPreview() {
name = "Test",
artworkUrl = null
),
PlaylistUi(
id = "2",
name = "Test 2",
artworkUrl = null
),
PlaylistUi(
id = "3",
name = "Test 3",
artworkUrl = null
)
// PlaylistUi(
// id = "2",
// name = "Test 2",
// artworkUrl = null
// ),
// PlaylistUi(
// id = "3",
// name = "Test 3",
// artworkUrl = null
// )
)
val state = PlaylistsStateUi(
progress = false,
isRefreshing = true,
error = false,
items = emptyList()
items = items
)
PlaylistsScreen(
state = state,
Expand Down
Loading