Skip to content
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

Update site title when it changes from site settings #18543

Merged
merged 4 commits into from
May 10, 2022
Merged

Update site title when it changes from site settings #18543

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abbf425
Update SitePickerViewController, add observer for title changes in or…
May 9, 2022
0848927
Update release notes with changes in 18543
May 9, 2022
ff6a64d
Merge branch 'trunk' of https://github.com/wordpress-mobile/WordPress…
May 10, 2022
3cb1edf
Merge branch 'trunk' into issue/18484-site-title-updates-mt-site
Gio2018 May 10, 2022
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
2 changes: 1 addition & 1 deletion RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
19.9
-----

[*] Site Settings: we fixed an issue that prevented the site title to be updated when it changed in Site Settings [#18543]

19.8
-----
Expand Down
30 changes: 21 additions & 9 deletions WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ final class SitePickerViewController: UIViewController {
super.viewDidLoad()
setupHeaderView()
startObservingQuickStart()
startObservingTitleChanges()
}

deinit {
Expand All @@ -57,6 +58,15 @@ final class SitePickerViewController: UIViewController {
view.addSubview(blogDetailHeaderView)
view.pinSubviewToAllEdges(blogDetailHeaderView)
}

private func startObservingTitleChanges() {
NotificationCenter.default.addObserver(forName: NSNotification.Name.WPBlogUpdated,
object: nil,
queue: .main) { [weak self] _ in

self?.updateTitles()
}
}
}

// MARK: - BlogDetailHeaderViewDelegate
Expand Down Expand Up @@ -191,22 +201,14 @@ extension SitePickerViewController {
silentlyForBlog: blog)

blogService.updateSettings(for: blog, success: { [weak self] in
NotificationCenter.default.post(name: NSNotification.Name.WPBlogUpdated, object: nil)

let notice = Notice(title: title,
message: SiteTitleStrings.titleChangeSuccessfulMessage,
feedbackType: .success)
ActionDispatcher.global.dispatch(NoticeAction.post(notice))

self?.blogDetailHeaderView.setTitleLoading(false)
self?.blogDetailHeaderView.refreshSiteTitle()

guard let parent = self?.parent as? MySiteViewController else {
return
}

parent.updateNavigationTitle(for: blog)

NotificationCenter.default.post(name: NSNotification.Name.WPBlogUpdated, object: nil)
}, failure: { [weak self] error in
self?.blog.settings?.name = existingBlogTitle
self?.blogDetailHeaderView.setTitleLoading(false)
Expand All @@ -219,6 +221,16 @@ extension SitePickerViewController {
})
}

/// Updates site title and navigation bar title
private func updateTitles() {
blogDetailHeaderView.refreshSiteTitle()

guard let parent = parent as? MySiteViewController else {
return
}
parent.updateNavigationTitle(for: blog)
}

private func showViewSite() {
WPAppAnalytics.track(.openedViewSite, withProperties: [WPAppAnalyticsKeyTapSource: "link"], with: blog)

Expand Down