Skip to content

Commit 0111945

Browse files
authored
Translate BlogDetailsViewController to Swift (#24981)
* Extract the table view in Blog Details to Swift * Fix cards on the blog details * Remove an unused function * Fix compilation issues * Delete irrelevant unit tests * Translate BlogDetailsViewController to Swift * Delete an import statement * Remove an empty line * Assign cell identifier as accessibly identifier (when not set) Porting the original Objective-C code * Update localizable string keys
1 parent 4d2cb56 commit 0111945

29 files changed

+1886
-2315
lines changed

Sources/Keystone/WordPress.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ FOUNDATION_EXPORT const unsigned char WordPressVersionString[];
1212

1313
#import <WordPress/BlogService.h>
1414
#import <WordPress/BlogSyncFacade.h>
15-
#import <WordPress/BlogDetailsViewController.h>
1615

1716
#import <WordPress/CommentService.h>
1817
#import <WordPress/CommentsViewController.h>

Tests/KeystoneTests/Tests/Features/Blog/BlogDetailsSectionIndexTests.swift

Lines changed: 0 additions & 30 deletions
This file was deleted.

Tests/KeystoneTests/Tests/Features/Blog/BlogDetailsSubsectionToSectionCategoryTests.swift

Lines changed: 0 additions & 38 deletions
This file was deleted.

WordPress/Classes/Apps/Reader/ReaderRootViewPresenter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ final class ReaderRootViewPresenter: RootViewPresenter {
1818
// TODO: (reader) optional?
1919
}
2020

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

WordPress/Classes/System/Root View/RootViewPresenter.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ protocol RootViewPresenter: AnyObject {
99

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

1414
func showReader(path: ReaderNavigationPath?)
1515

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

31-
func showBlogDetails(for blog: Blog, then subsection: BlogDetailsSubsection) {
31+
func showBlogDetails(for blog: Blog, then subsection: BlogDetailsRowKind) {
3232
showBlogDetails(for: blog, then: subsection, userInfo: [:])
3333
}
3434

@@ -47,7 +47,7 @@ extension RootViewPresenter {
4747
}
4848
var userInfo: [AnyHashable: Any] = [:]
4949
if let source {
50-
userInfo[BlogDetailsViewController.userInfoSourceKey()] = NSNumber(value: source.rawValue)
50+
userInfo[BlogDetailsUserInfoKeys.source] = NSNumber(value: source.rawValue)
5151
}
5252
showBlogDetails(for: blog, then: .stats)
5353
}

WordPress/Classes/System/Root View/SplitViewRootPresenter+Site.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class SiteSplitViewContent: SiteMenuViewControllerDelegate, SplitViewDisplayable
4949
}
5050
}
5151

52-
func showSubsection(_ subsection: BlogDetailsSubsection, userInfo: [AnyHashable: Any]) {
52+
func showSubsection(_ subsection: BlogDetailsRowKind, userInfo: [String: Any]) {
5353
siteMenuVC.showSubsection(subsection, userInfo: userInfo)
5454
}
5555
}

WordPress/Classes/System/Root View/SplitViewRootPresenter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ final class SplitViewRootPresenter: RootViewPresenter {
241241
return siteContent?.blog
242242
}
243243

244-
func showBlogDetails(for blog: Blog, then subsection: BlogDetailsSubsection?, userInfo: [AnyHashable: Any]) {
244+
func showBlogDetails(for blog: Blog, then subsection: BlogDetailsRowKind?, userInfo: [String: Any]) {
245245
if splitVC.isCollapsed {
246246
tabBarVC.showBlogDetails(for: blog, then: subsection, userInfo: userInfo)
247247
} else {

WordPress/Classes/System/Root View/StaticScreensTabBarWrapper.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class StaticScreensTabBarWrapper: RootViewPresenter {
2020
tabBarController.currentlySelectedScreen()
2121
}
2222

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

WordPress/Classes/System/Root View/WPTabBarController+RootViewPresenter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ extension WPTabBarController: RootViewPresenter {
1212
return self
1313
}
1414

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

WordPress/Classes/System/WordPress-Bridging-Header.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
#import "BlogService.h"
99
#import "BlogSyncFacade.h"
10-
#import "BlogDetailsViewController.h"
1110

1211
#import "CommentService.h"
1312
#import "CommentsViewController.h"

0 commit comments

Comments
 (0)