Skip to content

Commit 91c8c2d

Browse files
wpmobilebotcrazytonylikean
authored
Merge release/26.3 into trunk (#24847)
* Add editorialized release notes for 26.3 * Update metadata strings * Update metadata strings * Remove an unnecessary dispatch-async * Fix rendering mode for icons in the Create sheet * Fix CMM-753: Crash in the Share App extension * Use the same tint color for WPiOS and JPiOS * Fix search bar placement in WPiOS * Fix date controls showing multiple in standalone charts * Fix an issue with Enable New Stats prompt not shown * Disable auto-hiding for tab bar * Update app translations – `Localizable.strings` * Update WordPress metadata translations * Update Jetpack metadata translations * Bump version number --------- Co-authored-by: Tony Li <[email protected]> Co-authored-by: Alex Grebenyuk <[email protected]>
1 parent 203abd5 commit 91c8c2d

File tree

19 files changed

+84
-48
lines changed

19 files changed

+84
-48
lines changed

Modules/Sources/DesignSystem/Foundation/AppColor.swift

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,8 @@ import BuildSettingsKit
55

66
public enum UIAppColor {
77
/// A tint color used in places like navigation bars.
8-
///
9-
/// - note: The Jetpack app uses
108
public static var tint: UIColor {
11-
switch AppBrand.current {
12-
case .wordpress: primary
13-
case .jetpack: UIColor.label
14-
case .reader: primary
15-
}
9+
UIColor.label
1610
}
1711

1812
public static var primary: UIColor {

Modules/Sources/JetpackStats/Cards/StandaloneChartCard.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ struct StandaloneChartCard: View {
197197
}
198198

199199
private var dateRangeControls: some View {
200-
HStack(spacing: Constants.step1) {
200+
HStack {
201201
// Date range menu button
202202
Menu {
203203
StatsDateRangePickerMenu(selection: $dateRange, isShowingCustomRangePicker: $isShowingDatePicker)
@@ -216,14 +216,15 @@ struct StandaloneChartCard: View {
216216
}
217217
.tint(Color.primary)
218218

219-
Spacer()
219+
Spacer(minLength: Constants.step1)
220220

221221
// Navigation controls
222222
HStack(spacing: 4) {
223223
navigationButton(direction: .backward)
224224
navigationButton(direction: .forward)
225225
}
226226
}
227+
.lineLimit(1)
227228
}
228229

229230
@ViewBuilder

Modules/Sources/WordPressUI/Views/AdaptiveTabBarController.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public final class AdaptiveTabBarController<Item: AdaptiveTabBarItem> {
3030
}
3131

3232
public let filterBar = AdaptiveTabBar()
33-
private var filterBarContainer = UIView()
33+
private var filterBarContainer = UIVisualEffectView(effect: UIBlurEffect(style: .regular))
3434

3535
public let segmentedControl = UISegmentedControl()
3636

@@ -51,8 +51,8 @@ public final class AdaptiveTabBarController<Item: AdaptiveTabBarItem> {
5151
}
5252

5353
private func setupFilterBar() {
54-
filterBarContainer.backgroundColor = .secondarySystemGroupedBackground
55-
filterBarContainer.addSubview(filterBar)
54+
// filterBarContainer.backgroundColor = .systemGroupedBackground // .secondarySystemGroupedBackground
55+
filterBarContainer.contentView.addSubview(filterBar)
5656
filterBar.pinEdges(.top, to: filterBarContainer.safeAreaLayoutGuide, insets: UIEdgeInsets(.top, -filterBar.tabBarHeight))
5757
filterBar.pinEdges([.horizontal, .bottom])
5858

WordPress/Classes/System/WindowManager.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,6 @@ class WindowManager: NSObject {
104104
completion: { _ in
105105
completion?()
106106
})
107-
108-
DispatchQueue.main.asyncAfter(deadline: .now() + .seconds(2)) {
109-
self.window.rootViewController = viewController
110-
}
111107
}
112108

113109
// MARK: Temporary Overlaying Window

WordPress/Classes/Utility/Sharing/ShareExtensionSessionManager.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import WordPressKit
2626
fileprivate lazy var backgroundSession: URLSession = {
2727
let configuration = URLSessionConfiguration.background(withIdentifier: self.backgroundSessionIdentifier)
2828
configuration.sharedContainerIdentifier = self.appGroup
29-
let session = URLSession(configuration: configuration, delegate: self, delegateQueue: nil)
29+
let session = URLSession(configuration: configuration, delegate: self, delegateQueue: OperationQueue.main)
3030
return session
3131
}()
3232

WordPress/Classes/ViewRelated/Media/SiteMedia/Controllers/SiteMediaCollectionViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ final class SiteMediaCollectionViewController: UIViewController, NSFetchedResult
9494

9595
#if compiler(>=6.2)
9696
if #available(iOS 26, *) {
97-
parentViewController.navigationItem.preferredSearchBarPlacement = traitCollection.horizontalSizeClass == .regular ? .integrated : .integratedButton
97+
parentViewController.navigationItem.preferredSearchBarPlacement = .integrated
9898
}
9999
#endif
100100
}

WordPress/Classes/ViewRelated/Media/SiteMedia/SiteMediaViewController.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import PhotosUI
33
import SVProgressHUD
44
import WordPressData
55
import WordPressShared
6+
import WordPressUI
67

78
/// The main Site Media screen.
89
final class SiteMediaViewController: UIViewController, SiteMediaCollectionViewControllerDelegate {
@@ -83,6 +84,7 @@ final class SiteMediaViewController: UIViewController, SiteMediaCollectionViewCo
8384
let config = UIImage.SymbolConfiguration(textStyle: .body, scale: .large)
8485
let image = UIImage(systemName: "plus", withConfiguration: config) ?? .gridicon(.plus)
8586
button.setImage(image, for: .normal)
87+
button.tintColor = UIAppColor.tint
8688
button.menu = buttonAddMediaMenuController.makeMenu(for: self)
8789
button.showsMenuAsPrimaryAction = true
8890
button.accessibilityLabel = Strings.addButtonAccessibilityLabel

WordPress/Classes/ViewRelated/Post/Controllers/AbstractPostListViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ class AbstractPostListViewController: UIViewController,
199199

200200
#if compiler(>=6.2)
201201
if #available(iOS 26, *) {
202-
navigationItem.preferredSearchBarPlacement = traitCollection.horizontalSizeClass == .regular ? .integrated : .integratedButton
202+
navigationItem.preferredSearchBarPlacement = .integrated
203203
}
204204
#endif
205205

WordPress/Classes/ViewRelated/Stats/SiteStatsDashboardViewController.swift

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -297,12 +297,10 @@ public class SiteStatsDashboardViewController: UIViewController {
297297

298298
@available(iOS 17, *)
299299
private func showNewStatsTip() {
300-
guard let button = parent?.navigationItem.rightBarButtonItem else { return }
301-
302300
tipObserver?.cancel()
303301
tipObserver = registerTipPopover(
304302
AppTips.NewStatsTip(),
305-
sourceItem: button,
303+
sourceItem: statsMenuButton,
306304
arrowDirection: .up
307305
) { [weak self] action in
308306
guard let self else { return }
@@ -462,13 +460,6 @@ private extension SiteStatsDashboardViewController {
462460
])
463461

464462
child.didMove(toParent: self)
465-
466-
// Delay for SwiftUI-based views that don't render immediatelly
467-
DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(100)) {
468-
if let scrollView = child.contentScrollView(for: .top) {
469-
self.filterBarController.enableAutomaticHiding(in: scrollView)
470-
}
471-
}
472463
}
473464

474465
private func _removeChildViewController(_ child: UIViewController) {

WordPress/Classes/ViewRelated/System/Floating Create Button/SheetActions.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ struct PostAction: ActionSheetItem {
1111
func makeButton() -> ActionSheetButton {
1212
return ActionSheetButton(
1313
title: NSLocalizedString("Blog post", comment: "Create new Blog Post button title"),
14-
image: UIImage(named: "wpl-posts") ?? .init(),
14+
image: UIImage(named: "wpl-posts")?.withRenderingMode(.alwaysTemplate) ?? .init(),
1515
identifier: "blogPostButton",
1616
action: {
1717
WPAnalytics.track(.createSheetActionTapped, properties: ["source": source, "action": action])
@@ -47,7 +47,7 @@ struct PageAction: ActionSheetItem {
4747
func makeButton() -> ActionSheetButton {
4848
return ActionSheetButton(
4949
title: NSLocalizedString("Site page", comment: "Create new Site Page button title"),
50-
image: UIImage(named: "wpl-pages") ?? .init(),
50+
image: UIImage(named: "wpl-pages")?.withRenderingMode(.alwaysTemplate) ?? .init(),
5151
identifier: "sitePageButton",
5252
action: {
5353
WPAnalytics.track(.createSheetActionTapped, properties: ["source": source, "action": action])

0 commit comments

Comments
 (0)