Release/2.4

flo/AlbumView.swift

@@ -29,6 +29,32 @@ struct AlbumView: View {
 
   var isDownloadScreen: Bool = false
 
+  @ViewBuilder
+  private var albumArtistLabel: some View {
+    let artistName = viewModel.album.albumArtist
+
+    if let artist = viewModel.artistForNavigation(
+      id: viewModel.album.resolvedArtistId, name: artistName)
+    {
+      NavigationLink {
+        ArtistDetailView(artist: artist)
+          .environmentObject(viewModel)
+          .environmentObject(playerViewModel)
+          .environmentObject(downloadViewModel)
+      } label: {
+        Text(artistName)
+          .customFont(.title3)
+          .multilineTextAlignment(.center)
+          .foregroundColor(.accentColor)
+      }
+      .buttonStyle(.plain)
+    } else {
+      Text(artistName)
+        .customFont(.title3)
+        .multilineTextAlignment(.center)
+    }
+  }
+
   var body: some View {
     ScrollView {
       VStack {
@@ -81,15 +107,19 @@ struct AlbumView: View {
         }
 
         VStack {
-          Text(viewModel.album.name)
-            .customFont(.title)
-            .fontWeight(.bold)
-            .multilineTextAlignment(.center)
-            .padding(.bottom, 5)
+          HStack(alignment: .center, spacing: 8) {
+            Text(viewModel.album.name)
+              .customFont(.title)
+              .fontWeight(.bold)
+              .multilineTextAlignment(.center)
 
-          Text(viewModel.album.albumArtist)
-            .customFont(.title3)
-            .multilineTextAlignment(.center)
+            if viewModel.album.isExplicit {
+              ExplicitBadge()
+            }
+          }
+          .padding(.bottom, 5)
+
+          albumArtistLabel
             .padding(.bottom, 10)
 
           HStack {
@@ -225,6 +255,9 @@ struct AlbumView: View {
         }
       }
     }
+    .onAppear {
+      viewModel.getArtists()
+    }
     .onReceive(downloadViewModel.$downloadWatcher) { newValue in
       if newValue {
         viewModel.setActiveAlbum(album: viewModel.album)

flo/AlbumViewModel.swift

@@ -179,7 +179,8 @@ class AlbumViewModel: ObservableObject {
   // MARK: - Fetch methods
 
   func fetchAllSongs() {
-    fetchCached(current: songs, cacheKey: .songs,
+    fetchCached(
+      current: songs, cacheKey: .songs,
       assign: { self.songs = $0 }, request: AlbumService.shared.getAllSongs)
   }
 
@@ -213,11 +214,22 @@ class AlbumViewModel: ObservableObject {
     }
   }
 
-  func getAlbumCoverArt(id: String, artistName: String = "", albumName: String = "", albumCover: String = "") -> String {
+  func getAlbumCoverArt(
+    id: String, artistName: String = "", albumName: String = "", albumCover: String = ""
+  ) -> String {
     return AlbumService.shared.getAlbumCover(
       artistName: artistName, albumName: albumName, albumId: id, albumCover: albumCover)
   }
 
+  func getPlaylistCoverArt(id: String, coverArtId: String? = nil) -> String {
+    let artId = coverArtId ?? id
+    return AlbumService.shared.getPlaylistCover(playlistId: artId)
+  }
+
+  func getArtistCoverArt(id: String, imageURL: String = "") -> String {
+    return AlbumService.shared.getArtistCover(artistId: id, imageURL: imageURL)
+  }
+
   func shareAlbum(description: String, completion: @escaping (String) -> Void) {
     AlbumService.shared.share(albumId: self.album.id, description: description, downloadable: false)
     { result in
@@ -343,7 +355,8 @@ class AlbumViewModel: ObservableObject {
   }
 
   func fetchAlbums() {
-    fetchCached(current: albums, cacheKey: .albums, showsLoading: true,
+    fetchCached(
+      current: albums, cacheKey: .albums, showsLoading: true,
       assign: { self.albums = $0 }, request: AlbumService.shared.getAlbum)
   }
 
@@ -383,34 +396,106 @@ class AlbumViewModel: ObservableObject {
   }
 
   func getPlaylists() {
-    fetchCached(current: playlists, cacheKey: .playlists,
+    fetchCached(
+      current: playlists, cacheKey: .playlists,
       assign: { self.playlists = $0 }, request: AlbumService.shared.getPlaylists)
   }
 
   func getArtists() {
-    fetchCached(current: artists, cacheKey: .artists,
+    fetchCached(
+      current: artists, cacheKey: .artists,
       assign: { self.artists = $0 }, request: AlbumService.shared.getArtists)
   }
 
+  func artistForNavigation(id: String = "", name: String) -> Artist? {
+    let trimmedName = name.trimmingCharacters(in: .whitespacesAndNewlines)
+    let hasName = !trimmedName.isEmpty && trimmedName != "N/A"
+
+    if !id.isEmpty, let match = artists.first(where: { $0.id == id }) {
+      return match
+    }
+
+    if hasName,
+      let match = artists.first(where: {
+        $0.name.caseInsensitiveCompare(trimmedName) == .orderedSame
+      })
+    {
+      return match
+    }
+
+    if !id.isEmpty {
+      return Artist.placeholder(id: id, name: hasName ? trimmedName : name)
+    }
+
+    return nil
+  }
+
+  func albumForNavigation(id: String = "", name: String, artist: String = "") -> Album? {
+    let trimmedName = name.trimmingCharacters(in: .whitespacesAndNewlines)
+    let hasName = !trimmedName.isEmpty && trimmedName != "N/A"
+
+    if !id.isEmpty {
+      if let match = albums.first(where: { $0.id == id }) {
+        return match
+      }
+
+      if let match = downloadedAlbums.first(where: { $0.id == id }) {
+        return match
+      }
+
+      return Album(
+        id: id,
+        name: hasName ? trimmedName : name,
+        albumArtist: artist,
+        artist: artist
+      )
+    }
+
+    guard hasName else { return nil }
+
+    let matchingAlbums = albums.filter {
+      $0.name.caseInsensitiveCompare(trimmedName) == .orderedSame
+    }
+
+    if matchingAlbums.isEmpty {
+      return downloadedAlbums.first(where: {
+        $0.name.caseInsensitiveCompare(trimmedName) == .orderedSame
+      })
+    }
+
+    if artist.isEmpty || artist == "N/A" {
+      return matchingAlbums.first
+    }
+
+    return matchingAlbums.first(where: {
+      $0.albumArtist.caseInsensitiveCompare(artist) == .orderedSame
+        || $0.artist.caseInsensitiveCompare(artist) == .orderedSame
+    }) ?? matchingAlbums.first
+  }
+
   // MARK: - Async refresh variants
 
   @MainActor func refreshAlbums() async {
-    await refreshCached(cacheKey: .albums, assign: { self.albums = $0 },
+    await refreshCached(
+      cacheKey: .albums, assign: { self.albums = $0 },
       request: AlbumService.shared.getAlbum)
   }
 
   @MainActor func refreshArtists() async {
-    await refreshCached(cacheKey: .artists, assign: { self.artists = $0 },
+    await refreshCached(
+      cacheKey: .artists, assign: { self.artists = $0 },
       request: AlbumService.shared.getArtists)
   }
 
   @MainActor func refreshPlaylists() async {
-    await refreshCached(cacheKey: .playlists, assign: { self.playlists = $0 },
+    await refreshCached(
+      cacheKey: .playlists, assign: { self.playlists = $0 },
       request: AlbumService.shared.getPlaylists)
   }
 
   @MainActor func refreshAllSongs() async {
-    await refreshCached(cacheKey: .songs, assign: { self.songs = $0 },
+    await refreshCached(
+      cacheKey: .songs, assign: { self.songs = $0 },
       request: AlbumService.shared.getAllSongs)
   }
 

flo/AlbumsView.swift

@@ -20,71 +20,51 @@ struct AlbumsView: View {
         if self.isDownloadScreen {
           if let image = UIImage(
             contentsOfFile: viewModel.getAlbumCoverArt(
-              id: album.id, artistName: album.artist, albumName: album.name, albumCover: album.albumCover))
+              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
+            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))
                 }
               }
             }
           }
         }
 
-        Text(album.name)
-          .customFont(.caption1)
-          .fontWeight(.bold)
-          .foregroundColor(.primary)
-          .truncationMode(.tail)
-          .padding(.trailing, 20)
-          .lineLimit(1)
-          .multilineTextAlignment(.leading)
-          .frame(maxWidth: .infinity, alignment: .leading)
+        HStack(alignment: .center, spacing: 4) {
+          Text(album.name)
+            .customFont(.caption1)
+            .fontWeight(.bold)
+            .foregroundColor(.primary)
+            .truncationMode(.tail)
+            .lineLimit(1)
+            .multilineTextAlignment(.leading)
+
+          if album.isExplicit {
+            ExplicitBadge(size: .compact)
+          }
+        }
+        .padding(.trailing, 20)
+        .frame(maxWidth: .infinity, alignment: .leading)
 
         Text(album.albumArtist)
           .customFont(.caption2)
@@ -96,6 +76,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 {

flo/Artists/ArtistDetailView.swift

@@ -46,21 +46,26 @@ struct ArtistDetailView: View {
   var body: some View {
     ScrollView {
       VStack(alignment: .leading) {
-        Text(artist.name)
-          .customFont(.title)
-          .fontWeight(.bold)
-          .multilineTextAlignment(.leading)
-          .padding(.bottom, 3)
-          .frame(maxWidth: .infinity, alignment: .leading)
-
-        Text(stripBiography(biography: artist.biography ?? ""))
-          .customFont(.subheadline)
-          .lineSpacing(3)
-          .multilineTextAlignment(.leading)
-          .lineLimit(isExpanded ? nil : 3)
-          .onTapGesture {
-            isExpanded.toggle()
+        HStack(alignment: .top, spacing: 16) {
+          ArtistImageView(artist: artist, size: 88)
+
+          VStack(alignment: .leading, spacing: 6) {
+            Text(artist.name)
+              .customFont(.title)
+              .fontWeight(.bold)
+              .multilineTextAlignment(.leading)
+              .frame(maxWidth: .infinity, alignment: .leading)
+
+            Text(stripBiography(biography: artist.biography ?? ""))
+              .customFont(.subheadline)
+              .lineSpacing(3)
+              .multilineTextAlignment(.leading)
+              .lineLimit(isExpanded ? nil : 3)
+              .onTapGesture {
+                isExpanded.toggle()
+              }
           }
+        }
       }
       .padding()
       .onAppear {