Keep library toolbar buttons together on folded iPhone Duo

CHANGELOG.md

@@ -14,6 +14,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improved x265, H.266, VC1 and VVC codec replacements
 - Open the exact movie on Letterboxd instead of a search
 
+### Changed
+- Show filter, sort and instance buttons together on folded iPhone Duo
+
 ### Fixed
 - Fixed a freeze when opening some movies and series on iPhone
 

Ruddarr/Utilities/Environment.swift

@@ -14,16 +14,6 @@ extension EnvironmentValues {
     // swiftlint:disable:next implicit_optional_initialization
     @Entry var deleteSeries: Binding<Series?>? = nil
 
-    var hasVerticalToolbar: Bool {
-        #if os(iOS)
-            if #available(iOS 27.1, *) {
-                return toolbarVerticalEdge != nil
-            }
-        #endif
-
-        return false
-    }
-
     var isCompactPhone: Bool {
         deviceType == .phone && horizontalSizeClass != .regular
     }

Ruddarr/Views/Movies/MoviesView+Toolbar.swift

@@ -83,8 +83,7 @@ extension MoviesView {
                 }.pickerStyle(.inline)
             }
         } label: {
-            Label("Sort By", systemImage: "arrow.up.arrow.down")
-                .imageScale(.medium)
+            ToolbarIconLabel(title: Text("Sort By"), systemImage: "arrow.up.arrow.down")
         }
     }
 
@@ -121,15 +120,9 @@ extension MoviesView {
     var toolbarInstancePicker: some ToolbarContent {
         @Bindable var settings = settings
 
-        #if os(iOS)
-            let placement: ToolbarItemPlacement = hasVerticalToolbar ? .bottomBar : .navigation
-        #else
-            let placement: ToolbarItemPlacement = .navigation
-        #endif
+        ToolbarSpacer(.fixed, placement: .navigation)
 
-        ToolbarSpacer(.fixed, placement: placement)
-
-        ToolbarItem(placement: placement) {
+        ToolbarItem(placement: .navigation) {
             Menu {
                 Picker(selection: $settings.radarrInstanceId, label: Text("Instances")) {
                     ForEach(settings.radarrInstances) { instance in
@@ -138,8 +131,8 @@ extension MoviesView {
                 }
                 .pickerStyle(.inline)
             } label: {
-                Label(
-                    settings.radarrInstance?.label ?? String(localized: "Instance"),
+                ToolbarIconLabel(
+                    title: Text(settings.radarrInstance?.label ?? String(localized: "Instance")),
                     systemImage: "internaldrive"
                 )
             }

Ruddarr/Views/MoviesView.swift

@@ -16,8 +16,6 @@ struct MoviesView: View {
     @Environment(RadarrInstance.self) var instance
 
     @Environment(\.deviceType) var deviceType
-    @Environment(\.hasVerticalToolbar) var hasVerticalToolbar
-    @Environment(\.isFolded) private var isFolded
 
     @State private var scrollView: ScrollViewProxy?
 
@@ -88,7 +86,7 @@ struct MoviesView: View {
                 toolbarSearchButton
 
                 if settings.radarrInstances.count > 1 {
-                    if deviceType == .phone && !isFolded { toolbarInstancePicker }
+                    if deviceType == .phone { toolbarInstancePicker }
                     if deviceType == .pad { bottomBarInstancePicker }
                 }
             }

Ruddarr/Views/Series/SeriesView+Toolbar.swift

@@ -83,8 +83,7 @@ extension SeriesView {
                 }.pickerStyle(.inline)
             }
         } label: {
-            Label("Sort By", systemImage: "arrow.up.arrow.down")
-                .imageScale(.medium)
+            ToolbarIconLabel(title: Text("Sort By"), systemImage: "arrow.up.arrow.down")
         }
     }
 
@@ -121,15 +120,9 @@ extension SeriesView {
     var toolbarInstancePicker: some ToolbarContent {
         @Bindable var settings = settings
 
-        #if os(iOS)
-            let placement: ToolbarItemPlacement = hasVerticalToolbar ? .bottomBar : .navigation
-        #else
-            let placement: ToolbarItemPlacement = .navigation
-        #endif
+        ToolbarSpacer(.fixed, placement: .navigation)
 
-        ToolbarSpacer(.fixed, placement: placement)
-
-        ToolbarItem(placement: placement) {
+        ToolbarItem(placement: .navigation) {
             Menu {
                 Picker(selection: $settings.sonarrInstanceId, label: Text("Instances")) {
                     ForEach(settings.sonarrInstances) { instance in
@@ -138,8 +131,8 @@ extension SeriesView {
                 }
                 .pickerStyle(.inline)
             } label: {
-                Label(
-                    settings.sonarrInstance?.label ?? String(localized: "Instance"),
+                ToolbarIconLabel(
+                    title: Text(settings.sonarrInstance?.label ?? String(localized: "Instance")),
                     systemImage: "internaldrive"
                 )
             }

Ruddarr/Views/SeriesView.swift

@@ -17,8 +17,6 @@ struct SeriesView: View {
     @Environment(SonarrInstance.self) var instance
 
     @Environment(\.deviceType) var deviceType
-    @Environment(\.hasVerticalToolbar) var hasVerticalToolbar
-    @Environment(\.isFolded) private var isFolded
 
     @State private var scrollView: ScrollViewProxy?
 
@@ -91,7 +89,7 @@ struct SeriesView: View {
                 toolbarSearchButton
 
                 if settings.sonarrInstances.count > 1 {
-                    if deviceType == .phone && !isFolded { toolbarInstancePicker }
+                    if deviceType == .phone { toolbarInstancePicker }
                     if deviceType == .pad { bottomBarInstancePicker }
                 }
             }

Ruddarr/Views/Shared/Toolbar.swift

@@ -79,6 +79,19 @@ struct ToolbarFilterLabel: View {
     }
 }
 
+struct ToolbarIconLabel: View {
+    var title: Text
+    var systemImage: String
+
+    var body: some View {
+        Image(systemName: systemImage)
+            .background {
+                title.opacity(0)
+            }
+            .accessibilityLabel(title)
+    }
+}
+
 struct MonitorBookmark: View {
     var monitored: Bool
     var loading: Bool = false

TestFlight/WhatToTest.en-US.txt

@@ -6,5 +6,8 @@ Added
 - Improved x265, H.266, VC1 and VVC codec replacements
 - Open the exact movie on Letterboxd instead of a search
 
+Changed
+- Show filter, sort and instance buttons together on folded iPhone Duo
+
 Fixed
 - Fixed a freeze when opening some movies and series on iPhone