Release/2 (iOS 26+ stuff)

flo/AlbumView.swift

@@ -277,42 +277,43 @@ struct AlbumView: View {
 struct AlbumViewPreview_Previews: PreviewProvider {
   static var songs: [Song] = [
     Song(
-      id: "0", title: "Song 1", albumId: "", artist: "", trackNumber: 1, discNumber: 0, bitRate: 0,
+      id: "0", title: "Song 1", albumId: "", albumName: "Album name", artist: "",
+      trackNumber: 1, discNumber: 0, bitRate: 0,
       sampleRate: 44100,
       suffix: "mp4a", duration: 200, mediaFileId: "0"),
     Song(
-      id: "1", title: "Song 2", albumId: "", artist: "Artist Name", trackNumber: 2, discNumber: 0,
-      bitRate: 0,
+      id: "1", title: "Song 2", albumId: "", albumName: "Album name", artist: "Artist Name",
+      trackNumber: 2, discNumber: 0, bitRate: 0,
       sampleRate: 44100,
       suffix: "mp4a", duration: 200, mediaFileId: "1"),
     Song(
-      id: "2", title: "Song 3", albumId: "", artist: "Artist Name", trackNumber: 3, discNumber: 0,
-      bitRate: 0,
+      id: "2", title: "Song 3", albumId: "", albumName: "Album name", artist: "Artist Name",
+      trackNumber: 3, discNumber: 0, bitRate: 0,
       sampleRate: 44100,
       suffix: "mp4a", duration: 200, mediaFileId: "2"),
     Song(
-      id: "3", title: "Song 4", albumId: "", artist: "Artist Name", trackNumber: 4, discNumber: 0,
-      bitRate: 0,
+      id: "3", title: "Song 4", albumId: "", albumName: "Album name", artist: "Artist Name",
+      trackNumber: 4, discNumber: 0, bitRate: 0,
       sampleRate: 44100,
       suffix: "mp4a", duration: 200, mediaFileId: "3"),
     Song(
-      id: "4", title: "Song 6", albumId: "", artist: "Artist Name", trackNumber: 5, discNumber: 0,
-      bitRate: 0,
+      id: "4", title: "Song 6", albumId: "", albumName: "Album name", artist: "Artist Name",
+      trackNumber: 5, discNumber: 0, bitRate: 0,
       sampleRate: 44100,
       suffix: "mp4a", duration: 200, mediaFileId: "4"),
     Song(
-      id: "5", title: "Song 6", albumId: "", artist: "Artist Name", trackNumber: 6, discNumber: 0,
-      bitRate: 0,
+      id: "5", title: "Song 6", albumId: "", albumName: "Album name", artist: "Artist Name",
+      trackNumber: 6, discNumber: 0, bitRate: 0,
       sampleRate: 44100,
       suffix: "mp4a", duration: 200, mediaFileId: "5"),
     Song(
-      id: "6", title: "Song 7", albumId: "", artist: "Artist Name", trackNumber: 7, discNumber: 0,
-      bitRate: 0,
+      id: "6", title: "Song 7", albumId: "", albumName: "Album name", artist: "Artist Name",
+      trackNumber: 7, discNumber: 0, bitRate: 0,
       sampleRate: 44100,
       suffix: "mp4a", duration: 200, mediaFileId: "6"),
     Song(
-      id: "7", title: "Song 8", albumId: "", artist: "Artist Name", trackNumber: 8, discNumber: 0,
-      bitRate: 0,
+      id: "7", title: "Song 8", albumId: "", albumName: "Album name", artist: "Artist Name",
+      trackNumber: 8, discNumber: 0, bitRate: 0,
       sampleRate: 44100,
       suffix: "mp4a", duration: 200, mediaFileId: "7"),
   ]

flo/ArtistDetailView.swift

@@ -39,7 +39,7 @@ struct ArtistDetailView: View {
           .padding(.bottom, 3)
           .frame(maxWidth: .infinity, alignment: .leading)
 
-        Text(stripBiography(biography: artist.biography))
+        Text(stripBiography(biography: artist.biography ?? ""))
           .customFont(.subheadline)
           .lineSpacing(3)
           .multilineTextAlignment(.leading)

flo/ArtistsView.swift

@@ -11,17 +11,15 @@ struct ArtistsView: View {
   @EnvironmentObject private var viewModel: AlbumViewModel
 
   @State private var searchArtist = ""
+  @State private var filterAlbumArtistOnly: Bool = true
 
   let artists: [Artist]
 
   var filteredArtists: [Artist] {
-    if searchArtist.isEmpty {
-      return artists
-    } else {
-      return artists.filter { artist in
-        artist.name.localizedCaseInsensitiveContains(searchArtist)
-          || artist.fullText.localizedCaseInsensitiveContains(searchArtist)
-      }
+    artists.filter { artist in
+      let matchesAlbumArtist = !filterAlbumArtistOnly || artist.stats.albumartist != nil
+      let matchesSearch = searchArtist.isEmpty || artist.name.localizedCaseInsensitiveContains(searchArtist)
+      return matchesAlbumArtist && matchesSearch
     }
   }
 
@@ -39,16 +37,16 @@ struct ArtistsView: View {
                   Text(artist.name)
                     .customFont(.headline)
                     .multilineTextAlignment(.leading)
-
+                  
                   Spacer()
-
+                  
                   Image(systemName: "chevron.right")
                     .foregroundColor(.gray)
                     .font(.caption)
                 }
                 .padding(.horizontal)
                 .padding(.vertical, 5)
-
+                
                 Divider()
               }
             }
@@ -59,6 +57,17 @@ struct ArtistsView: View {
       .searchable(
         text: $searchArtist, placement: .navigationBarDrawer(displayMode: .always), prompt: "Search"
       )
+      .toolbar {
+        Menu {
+          Button {
+            self.filterAlbumArtistOnly.toggle()
+          } label: {
+            Label("Album Artist Only", systemImage: self.filterAlbumArtistOnly ?  "checkmark.circle" :  "circle")
+          }
+        } label: {
+          Label("", systemImage: "ellipsis.circle")
+        }
+      }
     }
   }
 }

flo/ContentView.swift

@@ -74,6 +74,7 @@ struct ContentView: View {
         Spacer()
 
         if playerViewModel.hasNowPlaying() && !playerViewModel.shouldHidePlayer {
+          let bottomPaddingForSmallerScreens: CGFloat = UIScreen.screenWidth <= 375 ? 32 : 0
           FloatingPlayerView(viewModel: playerViewModel)
             .padding(.bottom, 50)
             .opacity(playerViewModel.hasNowPlaying() ? 1 : 0)
@@ -106,6 +107,7 @@ struct ContentView: View {
                   self.isSwipping = false
                 }
             )
+            .padding(.bottom, bottomPaddingForSmallerScreens)
         }
       }
     }

flo/FloatingPlayerView.swift

@@ -8,110 +8,121 @@
 import NukeUI
 import SwiftUI
 
+extension View {
+  @ViewBuilder
+  func glassedEffect(in shape: some Shape, interactive: Bool = false) -> some View {
+    if #available(iOS 26.0, *) {
+      self.glassEffect(interactive ? .regular.interactive() : .regular, in: shape)
+        .contentShape(shape)
+    } else {
+      self.background {
+        shape.glassed()
+      }
+    }
+  }
+}
+
+extension Shape {
+  func glassed() -> some View {
+    ZStack {
+      Color.clear
+        .background(.ultraThinMaterial)
+
+      LinearGradient(
+        gradient: Gradient(colors: [
+          Color.primary.opacity(0.08),
+          Color.primary.opacity(0.05),
+          Color.primary.opacity(0.01),
+          Color.clear,
+          Color.clear,
+          Color.clear,
+        ]),
+        startPoint: .topLeading,
+        endPoint: .bottomTrailing
+      )
+    }
+    .mask(self)
+    .overlay(
+      self.stroke(Color.primary.opacity(0.2), lineWidth: 0.7)
+    )
+  }
+}
+
 struct FloatingPlayerView: View {
   @ObservedObject var viewModel: PlayerViewModel
 
-  var range: ClosedRange<Double> = 0...1
-
   var body: some View {
     ZStack {
-      HStack {
-        if let image = UIImage(contentsOfFile: viewModel.getAlbumCoverArt()) {
-          Image(uiImage: image)
-            .resizable()
-            .aspectRatio(contentMode: .fit)
-            .frame(width: 50, height: 50)
-            .clipShape(
-              RoundedRectangle(cornerRadius: 10, style: .continuous)
-            )
-        } else {
-          LazyImage(url: URL(string: viewModel.getAlbumCoverArt())) { state in
-            if let image = state.image {
-              image
-                .resizable()
-                .aspectRatio(contentMode: .fit)
-                .frame(width: 50, height: 50)
-                .clipShape(
-                  RoundedRectangle(cornerRadius: 5, style: .continuous)
-                )
-            } else {
-              Color.gray.opacity(0.3).frame(width: 50, height: 50)
-                .clipShape(RoundedRectangle(cornerRadius: 5, style: .continuous))
+      HStack(spacing: 10) {
+        Group {
+          if let image = UIImage(contentsOfFile: viewModel.getAlbumCoverArt()) {
+            Image(uiImage: image)
+              .resizable()
+              .aspectRatio(contentMode: .fit)
+          } else {
+            LazyImage(url: URL(string: viewModel.getAlbumCoverArt())) { state in
+              if state.isLoading {
+                Color.gray.opacity(0.3)
+              } else {
+                if let image = state.image {
+                  image.resizable().aspectRatio(contentMode: .fit)
+                } else {
+                  Image("placeholder")
+                    .resizable()
+                    .scaledToFit()
+                    .padding(8)
+                }
+              }
             }
           }
         }
+        .frame(width: 40, height: 40)
+        .clipShape(RoundedRectangle(cornerRadius: 10, style: .continuous))
+        .shadow(radius: 2)
 
-        VStack(alignment: .leading) {
+        VStack(alignment: .leading, spacing: 1) {
           Text(viewModel.nowPlaying.songName ?? "")
-            .foregroundColor(.white)
-            .customFont(.headline)
+            .foregroundColor(.accent)
+            .customFont(.callout)
+            .fontWeight(.bold)
             .lineLimit(1)
+
           Text(viewModel.nowPlaying.artistName ?? "")
-            .foregroundColor(.white)
-            .customFont(.subheadline)
+            .customFont(.caption1)
             .lineLimit(1)
-
-          GeometryReader { geometry in
-            ZStack(alignment: .leading) {
-              Rectangle()
-                .foregroundColor(Color.gray.opacity(0.3))
-                .frame(height: 3)
-                .cornerRadius(10)
-
-              Rectangle()
-                .foregroundColor(Color.white)
-                .frame(
-                  width: CGFloat(
-                    (viewModel.progress - range.lowerBound) / (range.upperBound - range.lowerBound))
-                    * geometry.size.width, height: 3
-                )
-                .cornerRadius(10).opacity(viewModel.isMediaLoading ? 0 : 1)
-            }.frame(height: 3)
-          }.frame(height: 3)
         }
 
-        HStack(spacing: 20) {
+        Spacer()
+
+        HStack(spacing: 16) {
           if viewModel.isMediaLoading {
-            ProgressView().progressViewStyle(CircularProgressViewStyle(tint: .white))
+            ProgressView()
+              .progressViewStyle(CircularProgressViewStyle())
+              .scaleEffect(0.7)
           } else {
             Button {
               viewModel.isPlaying ? viewModel.pause() : viewModel.play()
             } label: {
               Image(systemName: viewModel.isPlaying ? "pause.fill" : "play.fill")
-                .font(.system(size: 20))
-                .disabled(viewModel.isMediaLoading)
-            }.opacity(viewModel.isMediaFailed ? 0 : 1)
-          }
-        }.padding()
-      }.padding(8).foregroundColor(.white)
-    }.background {
-      if UserDefaultsManager.playerBackground == PlayerBackground.translucent {
-        ZStack {
-          if let image = UIImage(contentsOfFile: viewModel.getAlbumCoverArt()) {
-            Image(uiImage: image)
-              .resizable()
-              .frame(maxWidth: .infinity, maxHeight: .infinity)
-              .blur(radius: 50, opaque: true)
-              .edgesIgnoringSafeArea(.all)
-          } else {
-            LazyImage(url: URL(string: viewModel.getAlbumCoverArt())) { state in
-              if let image = state.image {
-                image
-                  .resizable()
-                  .frame(maxWidth: .infinity, maxHeight: .infinity)
-                  .blur(radius: 50, opaque: true)
-                  .edgesIgnoringSafeArea(.all)
-              }
+                .font(.system(size: 20, weight: .semibold))
+                .symbolRenderingMode(.hierarchical)
             }
+            .buttonStyle(.plain)
+            .opacity(viewModel.isMediaFailed ? 0.3 : 1)
           }
-
-          Rectangle().fill(.thinMaterial).edgesIgnoringSafeArea(.all)
-        }.environment(\.colorScheme, .dark)
-      } else {
-        Rectangle().fill(Color("PlayerColor"))
+        }
+        .padding(.trailing, 8)
       }
+      .padding(.horizontal, 12)
+      .padding(.vertical, 8)
     }
-    .cornerRadius(10).padding(8)
+    .contentShape(RoundedRectangle(cornerRadius: 24, style: .continuous))
+    .glassedEffect(in: RoundedRectangle(cornerRadius: 24, style: .continuous))
+    .clipShape(RoundedRectangle(cornerRadius: 24, style: .continuous))
+    .shadow(color: .black.opacity(0.15), radius: 16, x: 0, y: 6)
+    .shadow(color: .black.opacity(0.05), radius: 4, x: 0, y: 2)
+    .padding(.horizontal, 16)
+    .padding(.bottom, 8)
   }
 }