iOS 26: Minor visual fixes

Modules/Sources/JetpackStats/Screens/ChartDataListView.swift

@@ -1,4 +1,5 @@
 import SwiftUI
+import WordPressUI
 import UniformTypeIdentifiers
 
 struct ChartDataListView: View {
@@ -33,8 +34,14 @@ struct ChartDataListView: View {
         .navigationBarTitleDisplayMode(.inline)
         .toolbar {
             ToolbarItem(placement: .topBarLeading) {
-                Button(Strings.Buttons.done) {
-                    dismiss()
+                if #available(iOS 26, *) {
+                    SwiftUI.Button(role: .close) {
+                        dismiss()
+                    }
+                } else {
+                    SwiftUI.Button(Strings.Buttons.cancel) {
+                        dismiss()
+                    }
                 }
             }
             ToolbarItem(placement: .topBarTrailing) {

RELEASE-NOTES.txt

@@ -1,6 +1,6 @@
 26.4
 -----
-* [*] Fix a few minor visual issues on iOS 26 [#24863], [#24863], [#24865], [#24866], [#24867]
+* [*] Fix a few minor visual issues on iOS 26 [#24863], [#24863], [#24865], [#24866], [#24867], [#24890]
 * [*] [Intelligence] Add support for generating excerpts for posts [#24852]
 * [*] Fix performance issues with search in Reader Subscriptions [#24841]
 * [*] Improve performance and animations when showing a full Top List with a large number of items [#24868]

WordPress/Classes/Utility/Button+Extensions.swift

@@ -2,7 +2,7 @@ import SwiftUI
 
 extension Button where Label == Text {
     @ViewBuilder
-    public static func make(role: BackportButtonRole, _ action: @escaping () -> Void) -> some View {
+    public static func make(role: BackportButtonRole, action: @escaping () -> Void) -> some View {
         if #available(iOS 26, *) {
             SwiftUI.Button(role: ButtonRole(role), action: action)
         } else {

WordPress/Classes/ViewRelated/Blog/Blog Dashboard/BlogDashboardViewController.swift

@@ -238,8 +238,12 @@ extension BlogDashboardViewController {
     private enum Constants {
         static let estimatedHeight: CGFloat = 44
         static let horizontalSectionInset: CGFloat = 12
-        static let verticalSectionInset: CGFloat = 20
-        static let cellSpacing: CGFloat = 20
+        static let verticalSectionInset: CGFloat = verticalInset
+        static let cellSpacing: CGFloat = verticalInset
+
+        static var verticalInset: CGFloat {
+            if #available(iOS 26, *) { 28 } else { 20 }
+        }
     }
 }
 

WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController.swift

@@ -289,7 +289,6 @@ final class MySiteViewController: UIViewController, UIScrollViewDelegate, NoSite
     private func setupNavigationItem() {
         navigationItem.largeTitleDisplayMode = .never
         navigationItem.title = Strings.mySite
-        navigationItem.backButtonTitle = Strings.mySite
 
         // Set the nav bar
         navigationController?.navigationBar.accessibilityIdentifier = "my-site-navigation-bar"

WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController/NotificationsViewController.swift

@@ -458,11 +458,6 @@ private extension NotificationsViewController {
             navigationController?.navigationBar.prefersLargeTitles = false
             navigationItem.largeTitleDisplayMode = .never
         }
-
-        // Don't show 'Notifications' in the next-view back button
-        // we are using a space character because we need a non-empty string to ensure a smooth
-        // transition back, with large titles enabled.
-        navigationItem.backBarButtonItem = UIBarButtonItem(title: " ", style: .plain, target: nil, action: nil)
         navigationItem.title = NSLocalizedString("Notifications", comment: "Notifications View Controller title")
     }
 

WordPress/Classes/ViewRelated/Post/Categories/PostCategoryCreateView.swift

@@ -20,15 +20,15 @@ struct PostCategoryCreateView: View {
         }
         .toolbar {
             ToolbarItem(placement: .cancellationAction) {
-                Button(SharedStrings.Button.cancel) {
+                Button.make(role: .cancel) {
                     dismiss()
                 }
             }
             ToolbarItem(placement: .confirmationAction) {
                 if isSaving {
                     ProgressView()
                 } else {
-                    Button(SharedStrings.Button.save, action: buttonSaveTapped)
+                    Button.make(role: .confirm, action: buttonSaveTapped)
                         .disabled(title.trimmingCharacters(in: .whitespaces).isEmpty)
                 }
             }

WordPress/Classes/ViewRelated/Post/PostSettings/PostSettingsView.swift

@@ -85,7 +85,7 @@ private struct PostSettingsView: View {
     }
 
     private var buttonCancel: some View {
-        Button(SharedStrings.Button.cancel) {
+        Button.make(role: .cancel) {
             if viewModel.hasChanges {
                 isShowingDiscardChangesAlert = true
             } else {
@@ -101,19 +101,8 @@ private struct PostSettingsView: View {
         if viewModel.isSaving {
             ProgressView()
         } else {
-            Group {
-                if viewModel.isStandalone {
-                    Button(SharedStrings.Button.save) {
-                        viewModel.buttonSaveTapped()
-                    }
-                    .buttonStyle(.borderedProminent)
-                    .buttonBorderShape(.capsule)
-                } else {
-                    Button(SharedStrings.Button.done) {
-                        viewModel.buttonSaveTapped()
-                    }
-                    .fontWeight(.medium)
-                }
+            Button.make(role: .confirm) {
+                viewModel.buttonSaveTapped()
             }
             .accessibilityIdentifier("post_settings_save_button")
             .disabled(!viewModel.hasChanges)