Skip to content

Translate BlogDetailsViewController to Swift #24981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: trunk
Choose a base branch
from
Open

Translate BlogDetailsViewController to Swift #24981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5314eaa
Extract the table view in Blog Details to Swift
crazytonyli Nov 6, 2025
1990e3b
Fix cards on the blog details
crazytonyli Nov 7, 2025
e5da942
Remove an unused function
crazytonyli Nov 7, 2025
72b2e1e
Fix compilation issues
crazytonyli Nov 9, 2025
02e5651
Delete irrelevant unit tests
crazytonyli Nov 9, 2025
8cde896
Translate BlogDetailsViewController to Swift
crazytonyli Nov 11, 2025
6450d80
Delete an import statement
crazytonyli Nov 11, 2025
06e6f7c
Remove an empty line
crazytonyli Nov 11, 2025
922d411
Assign cell identifier as accessibly identifier (when not set)
crazytonyli Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Sources/Keystone/WordPress.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ FOUNDATION_EXPORT const unsigned char WordPressVersionString[];

#import <WordPress/BlogService.h>
#import <WordPress/BlogSyncFacade.h>
#import <WordPress/BlogDetailsViewController.h>

#import <WordPress/CommentService.h>
#import <WordPress/CommentsViewController.h>
Expand Down
30 changes: 0 additions & 30 deletions Tests/KeystoneTests/Tests/Features/Blog/BlogDetailsSectionIndexTests.swift
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions Tests/KeystoneTests/Tests/Features/Blog/BlogDetailsSubsectionToSectionCategoryTests.swift
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion WordPress/Classes/Apps/Reader/ReaderRootViewPresenter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ final class ReaderRootViewPresenter: RootViewPresenter {
// TODO: (reader) optional?
}

func showBlogDetails(for blog: Blog, then subsection: BlogDetailsSubsection?, userInfo: [AnyHashable: Any]) {
func showBlogDetails(for blog: Blog, then subsection: BlogDetailsRowKind?, userInfo: [String: Any]) {
// TODO: (reader) optional?
}

Expand Down
6 changes: 3 additions & 3 deletions WordPress/Classes/System/Root View/RootViewPresenter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ protocol RootViewPresenter: AnyObject {

func currentlyVisibleBlog() -> Blog?
func showMySitesTab()
func showBlogDetails(for blog: Blog, then subsection: BlogDetailsSubsection?, userInfo: [AnyHashable: Any])
func showBlogDetails(for blog: Blog, then subsection: BlogDetailsRowKind?, userInfo: [String: Any])

func showReader(path: ReaderNavigationPath?)

Expand All @@ -28,7 +28,7 @@ extension RootViewPresenter {
showBlogDetails(for: blog, then: nil, userInfo: [:])
}

func showBlogDetails(for blog: Blog, then subsection: BlogDetailsSubsection) {
func showBlogDetails(for blog: Blog, then subsection: BlogDetailsRowKind) {
showBlogDetails(for: blog, then: subsection, userInfo: [:])
}

Expand All @@ -47,7 +47,7 @@ extension RootViewPresenter {
}
var userInfo: [AnyHashable: Any] = [:]
if let source {
userInfo[BlogDetailsViewController.userInfoSourceKey()] = NSNumber(value: source.rawValue)
userInfo[BlogDetailsUserInfoKeys.source] = NSNumber(value: source.rawValue)
}
showBlogDetails(for: blog, then: .stats)
}
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/System/Root View/SplitViewRootPresenter+Site.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class SiteSplitViewContent: SiteMenuViewControllerDelegate, SplitViewDisplayable
}
}

func showSubsection(_ subsection: BlogDetailsSubsection, userInfo: [AnyHashable: Any]) {
func showSubsection(_ subsection: BlogDetailsRowKind, userInfo: [String: Any]) {
siteMenuVC.showSubsection(subsection, userInfo: userInfo)
}
}
2 changes: 1 addition & 1 deletion WordPress/Classes/System/Root View/SplitViewRootPresenter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ final class SplitViewRootPresenter: RootViewPresenter {
return siteContent?.blog
}

func showBlogDetails(for blog: Blog, then subsection: BlogDetailsSubsection?, userInfo: [AnyHashable: Any]) {
func showBlogDetails(for blog: Blog, then subsection: BlogDetailsRowKind?, userInfo: [String: Any]) {
if splitVC.isCollapsed {
tabBarVC.showBlogDetails(for: blog, then: subsection, userInfo: userInfo)
} else {
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/System/Root View/StaticScreensTabBarWrapper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class StaticScreensTabBarWrapper: RootViewPresenter {
tabBarController.currentlySelectedScreen()
}

func showBlogDetails(for blog: Blog, then subsection: BlogDetailsSubsection?, userInfo: [AnyHashable: Any]) {
func showBlogDetails(for blog: Blog, then subsection: BlogDetailsRowKind?, userInfo: [String: Any]) {
tabBarController.showBlogDetails(for: blog, then: subsection, userInfo: userInfo)
}

Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/System/Root View/WPTabBarController+RootViewPresenter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ extension WPTabBarController: RootViewPresenter {
return self
}

func showBlogDetails(for blog: Blog, then subsection: BlogDetailsSubsection?, userInfo: [AnyHashable: Any]) {
func showBlogDetails(for blog: Blog, then subsection: BlogDetailsRowKind?, userInfo: [String: Any]) {
mySitesCoordinator.showBlogDetails(for: blog, then: subsection, userInfo: userInfo)
}

Expand Down
1 change: 0 additions & 1 deletion WordPress/Classes/System/WordPress-Bridging-Header.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

#import "BlogService.h"
#import "BlogSyncFacade.h"
#import "BlogDetailsViewController.h"

#import "CommentService.h"
#import "CommentsViewController.h"
Expand Down
6 changes: 3 additions & 3 deletions WordPress/Classes/Utility/Universal Links/Routes+MySites.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ extension MySitesRoute: NavigationAction {
presenter.showBlogDetails(for: blog, then: .plugins)
case .managePlugins:
presenter.showBlogDetails(for: blog, then: .plugins, userInfo: [
BlogDetailsViewController.userInfoShowManagemenetScreenKey(): true
BlogDetailsUserInfoKeys.showManagePlugins: true
])
case .siteMonitoring:
presenter.showSiteMonitoring(for: blog, selectedTab: .metrics)
Expand All @@ -143,13 +143,13 @@ extension MySitesRoute: NavigationAction {
private extension RootViewPresenter {
func showMediaPicker(for blog: Blog) {
showBlogDetails(for: blog, then: .media, userInfo: [
BlogDetailsViewController.userInfoShowPickerKey(): true
BlogDetailsUserInfoKeys.showPicker: true
])
}

func showSiteMonitoring(for blog: Blog, selectedTab: SiteMonitoringTab) {
showBlogDetails(for: blog, then: .siteMonitoring, userInfo: [
BlogDetailsViewController.userInfoSiteMonitoringTabKey(): selectedTab.rawValue
BlogDetailsUserInfoKeys.siteMonitoringTab: selectedTab.rawValue
])
}
}
Expand Down
7 changes: 3 additions & 4 deletions ...s/ViewRelated/Blog/Blog Dashboard/Cards/Quick Actions/DashboardQuickActionsCardCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,9 @@ final class DashboardQuickActionsCardCell: UICollectionViewCell, Reusable, UITab
let statsVC = StatsHostingViewController.makeStatsViewController(for: blog)
parentViewController.show(statsVC, sender: nil)
case .more:
let viewController = BlogDetailsViewController()
let viewController = BlogDetailsViewController(blog: blog)
viewController.isScrollEnabled = true
viewController.tableView.isScrollEnabled = true
viewController.blog = blog
viewController.tableView?.isScrollEnabled = true
viewController.presentationDelegate = self
self.blogDetailsViewController = viewController
self.parentViewController?.show(viewController, sender: nil)
Expand All @@ -137,7 +136,7 @@ final class DashboardQuickActionsCardCell: UICollectionViewCell, Reusable, UITab
// MARK: - DashboardQuickActionsCardCell (BlogDetailsPresentationDelegate)

extension DashboardQuickActionsCardCell: BlogDetailsPresentationDelegate {
func showBlogDetailsSubsection(_ subsection: BlogDetailsSubsection) {
func showBlogDetailsSubsection(_ subsection: BlogDetailsRowKind) {
self.blogDetailsViewController?.showDetailView(for: subsection)
}

Expand Down
Loading