Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
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
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

This file was deleted.

This file was deleted.

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
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
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)
}
}
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
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
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
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
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
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