Skip to content

Fixed non-square album art pushing adjacent albums out of alignment #136

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

Open
Emberr wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fixed non-square album art pushing adjacent albums out of alignment #136

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
53 changes: 18 additions & 35 deletions flo/AlbumsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,54 +22,24 @@ struct AlbumsView: View {
contentsOfFile: viewModel.getAlbumCoverArt(
id: album.id, artistName: album.artist, albumName: album.name, albumCover: album.albumCover))
{
Image(uiImage: image)
.resizable()
.aspectRatio(contentMode: .fill)
.frame(maxWidth: .infinity, maxHeight: 300)
.clipShape(
RoundedRectangle(cornerRadius: 5, style: .continuous)
)
albumArtwork(Image(uiImage: image))
} else {
if let image = UIImage(named: "placeholder") {
Image(uiImage: image)
.resizable()
.aspectRatio(contentMode: .fill)
.frame(maxWidth: .infinity, maxHeight: 300)
.clipShape(
RoundedRectangle(cornerRadius: 5, style: .continuous)
)
albumArtwork(Image(uiImage: image))
}
}
} else {
if let image = UIImage(
contentsOfFile: viewModel.getAlbumCoverArt(id: album.id, albumCover: album.albumCover))
{
Image(uiImage: image)
.resizable()
.aspectRatio(contentMode: .fill)
.frame(maxWidth: .infinity, maxHeight: 300)
.clipShape(
RoundedRectangle(cornerRadius: 5, style: .continuous)
)
albumArtwork(Image(uiImage: image))
} else {
LazyImage(url: URL(string: viewModel.getAlbumCoverArt(id: album.id, albumCover: album.albumCover))) { state in
if let image = state.image {
image
.resizable()
.aspectRatio(contentMode: .fill)
.frame(maxWidth: .infinity, maxHeight: 300)
.clipShape(
RoundedRectangle(cornerRadius: 5, style: .continuous)
)
albumArtwork(image)
} else {
if let image = UIImage(named: "placeholder") {
Image(uiImage: image)
.resizable()
.aspectRatio(contentMode: .fill)
.frame(maxWidth: .infinity, maxHeight: 300)
.clipShape(
RoundedRectangle(cornerRadius: 5, style: .continuous)
)
albumArtwork(Image(uiImage: image))
}
}
}
Expand All @@ -96,6 +66,19 @@ struct AlbumsView: View {
}.padding()
}
}

private func albumArtwork(_ image: Image) -> some View {
GeometryReader { proxy in
image
.resizable()
.scaledToFill()
.frame(width: proxy.size.width, height: proxy.size.width)
.clipShape(
RoundedRectangle(cornerRadius: 5, style: .continuous)
)
}
.aspectRatio(1, contentMode: .fit)
}
}

struct AlbumsView_Preview: PreviewProvider {
Expand Down