Pull to reload, Umplatzierung Search-Button, Album-Artist

Mobile Music Assistant/ViewsLibraryArtistsView.swift

@@ -10,15 +10,17 @@ import UIKit
 
 struct ArtistsView: View {
     @Environment(MAService.self) private var service
+    var albumArtistsOnly: Bool = false
     @State private var errorMessage: String?
     @State private var showError = false
+    @State private var scrollPosition: String?
 
     private var artists: [MAArtist] {
-        service.libraryManager.artists
+        albumArtistsOnly ? service.libraryManager.albumArtists : service.libraryManager.artists
     }
 
     private var isLoading: Bool {
-        service.libraryManager.isLoadingArtists
+        albumArtistsOnly ? service.libraryManager.isLoadingAlbumArtists : service.libraryManager.isLoadingArtists
     }
 
     private let columns = [
@@ -60,7 +62,7 @@ struct ArtistsView: View {
                             .padding(.horizontal, 12)
                             .padding(.top, 10)
                             .padding(.bottom, 4)
-                            .id(letter)
+                            .id("section-\(letter)")
 
                         // Grid of artists in this section
                         LazyVGrid(columns: columns, spacing: 8) {
@@ -69,6 +71,7 @@ struct ArtistsView: View {
                                     ArtistGridItem(artist: artist)
                                 }
                                 .buttonStyle(.plain)
+                                .id(artist.uri)
                                 .task {
                                     await loadMoreIfNeeded(currentItem: artist)
                                 }
@@ -86,14 +89,15 @@ struct ArtistsView: View {
                 }
                 .padding(.trailing, 28)
             }
+            .scrollPosition(id: $scrollPosition)
             .overlay(alignment: .trailing) {
                 AlphabetIndexView(
                     letters: allLetters,
                     itemHeight: 17,
                     onSelect: { letter in
-                        // Scroll to this letter's section, or the nearest one after it
-                        let target = availableLetters.first { $0 >= letter } ?? availableLetters.last
-                        if let target { proxy.scrollTo(target, anchor: .top) }
+                        let target = "section-\(letter)"
+                        scrollPosition = target
+                        proxy.scrollTo(target, anchor: .top)
                     }
                 )
                 .padding(.vertical, 8)
@@ -104,7 +108,9 @@ struct ArtistsView: View {
             await loadArtists(refresh: true)
         }
         .task {
-            await loadArtists(refresh: !artists.isEmpty)
+            if artists.isEmpty {
+                await loadArtists(refresh: true)
+            }
         }
         .alert("Error", isPresented: $showError) {
             Button("OK", role: .cancel) { }
@@ -116,9 +122,11 @@ struct ArtistsView: View {
         .overlay {
             if artists.isEmpty && !isLoading {
                 ContentUnavailableView(
-                    "No Artists",
+                    albumArtistsOnly ? "No Album Artists" : "No Artists",
                     systemImage: "music.mic",
-                    description: Text("Your library doesn't contain any artists yet")
+                    description: Text(albumArtistsOnly
+                        ? "Your library doesn't contain any album artists yet"
+                        : "Your library doesn't contain any artists yet")
                 )
             }
         }
@@ -126,7 +134,11 @@ struct ArtistsView: View {
 
     private func loadArtists(refresh: Bool) async {
         do {
-            try await service.libraryManager.loadArtists(refresh: refresh)
+            if albumArtistsOnly {
+                try await service.libraryManager.loadAlbumArtists(refresh: refresh)
+            } else {
+                try await service.libraryManager.loadArtists(refresh: refresh)
+            }
         } catch {
             errorMessage = error.localizedDescription
             showError = true
@@ -135,7 +147,11 @@ struct ArtistsView: View {
 
     private func loadMoreIfNeeded(currentItem: MAArtist) async {
         do {
-            try await service.libraryManager.loadMoreArtistsIfNeeded(currentItem: currentItem)
+            if albumArtistsOnly {
+                try await service.libraryManager.loadMoreAlbumArtistsIfNeeded(currentItem: currentItem)
+            } else {
+                try await service.libraryManager.loadMoreArtistsIfNeeded(currentItem: currentItem)
+            }
         } catch {
             errorMessage = error.localizedDescription
             showError = true