Site Settings in SwiftUI: General #20855

kean · 2023-06-13T18:23:02Z

HACK week: update Site Settings to use SwiftUI

Previous PR: #20838

This PR adds all of the fields from the "General" section to the new Site Settings screen.

Add the remaining fields to the General section: address, privacy, etc
Introduce SettingsPicker to replace SettingsSelectionViewController
Add support for copying site URL (new feature requested in Offer ways to quickly copy the site URL #15927)

To test:

Add to AppDelegate:

DispatchQueue.main.asyncAfter(deadline: .now() + .seconds(1)) {
    let host = NewSiteSettingsViewController(blog: {
        let context = ContextManager.shared.mainContext
        return Blog.lastUsedOrFirst(in: context)!
    }())

    let nav = UINavigationController(rootViewController: host)
    nav.modalPresentationStyle = .fullScreen
    self.window?.rootViewController?.present(nav, animated: true)
}

Change any of the values in the "General" section
Test that the values are updated (use a different app or the existing settings screen)
Verify that the language picker works the same way as in the production version (make sure to check search!)

Regression Notes

Potential unintended areas of impact: Site Settings screen
What I did to test those areas of impact (or what existing automated tests I relied on): manual tests
What automated tests I added (or what prevented me from doing so): n/a

PR submission checklist:

I have completed the Regression Notes.
I have considered adding unit tests for my changes.
I have considered adding accessibility improvements for my changes.
I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

UI Changes testing checklist:

Portrait and landscape orientations.
Light and dark modes.
Fonts: Larger, smaller and bold text.
High contrast.
VoiceOver.
Languages with large words or with letters/accents not frequently used in English.
Right-to-left languages. (Even if translation isn’t complete, formatting should still respect the right-to-left layout)
iPhone and iPad.
Multi-tasking: Split view and Slide over. (iPad)

kean · 2023-06-13T18:25:48Z

WordPress/Classes/ViewRelated/Blog/Site Settings/LanguageViewController.swift

    @objc func languageSelector(_ selector: LanguageSelectorViewController, didSelect languageId: Int) {
-        _ = navigationController?.popToViewController(self, animated: true)
+        navigationController?.popViewController(animated: true)


This change doesn't affect any of the functionality because LanguageSelectorViewController doesn't push any screens. The change was needed to make it work with SwiftUI.

kean · 2023-06-13T18:27:41Z

WordPress/Classes/ViewRelated/Blog/Settings/SettingsPicker.swift

@@ -0,0 +1,90 @@
+import SwiftUI
+
+struct SettingsPicker<T: Hashable>: View {


There were multiple reasons why we couldn't use SwiftUI.Picker. For example, it has no support for section footers, or even inset-grouped list style.

wpmobilebot · 2023-06-13T19:10:06Z

📲 You can test the changes from this Pull Request in WordPress Alpha by scanning the QR code below to install the corresponding build.

	App Name	WordPress Alpha
	Configuration	Release-Alpha
	Build Number	pr20855-8cfd8c8
	Version	22.6
	Bundle ID	org.wordpress.alpha
	Commit	`8cfd8c8`
	App Center Build	WPiOS - One-Offs #5981

Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

wpmobilebot · 2023-06-13T19:11:36Z

📲 You can test the changes from this Pull Request in Jetpack Alpha by scanning the QR code below to install the corresponding build.

	App Name	Jetpack Alpha
	Configuration	Release-Alpha
	Build Number	pr20855-8cfd8c8
	Version	22.6
	Bundle ID	com.jetpack.alpha
	Commit	`8cfd8c8`
	App Center Build	jetpack-installable-builds #5009

Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

kean · 2023-06-14T16:06:35Z

WordPress/Classes/ViewRelated/Blog/Settings/SiteSettingsView.swift

@@ -3,25 +3,44 @@ import SwiftUI
 import Combine
 import SVProgressHUD

+final class NewSiteSettingsViewController: UIHostingController<SiteSettingsView> {


I'll rename it once the SiteSettingsViewController is removed.

kean · 2023-06-14T16:07:07Z

WordPress/Classes/ViewRelated/Blog/Settings/SiteSettingsViewModel.swift

+    // MARK: - Helpers (Timezone)
+
+    private func startTimezoneObserver() {
+        self.timezoneObserver = TimeZoneObserver { [weak self] _, newState in


Moved this code from the old SiteSettingsViewController with almost no changes.

kean · 2023-06-14T16:48:51Z

WordPress/Classes/ViewRelated/Blog/Settings/Settings+SwiftUI.swift

+    }
+}
+
+struct TimezoneSelectorView: UIViewControllerRepresentable {


I'll try to replace these screens as well if I have time, but it's at the bottom of the priority list because they are already written in Swift, and there aren't many reasons to replace them.

kean · 2023-06-14T16:49:24Z

WordPress/Classes/ViewRelated/Blog/Settings/Settings+SwiftUI.swift

+        // The default `UISearchController` behavior, which is to hide the
+        // navigation bar, was not working properly when presenting using
+        // `UIViewControllerRepresentable`.
+        viewController.hidesNavigationBarDuringPresentation = false


This is pretty much the only limitation I encountered so far.

…gsView from UIKit

kean changed the base branch from trunk to feature/settings-swiftui-01 June 13, 2023 18:24

kean commented Jun 13, 2023

View reviewed changes

kean marked this pull request as draft June 14, 2023 13:08

kean force-pushed the feature/settings-swiftui-02 branch from 0f40ef0 to f25e2ab Compare June 14, 2023 16:00

kean commented Jun 14, 2023

View reviewed changes

kean added this to the Pending milestone Jun 14, 2023

kean added the Site Settings label Jun 14, 2023

kean commented Jun 14, 2023

View reviewed changes

kean requested review from mokagio, momo-ozawa and alpavanoglu June 14, 2023 16:50

kean added 10 commits June 14, 2023 12:51

Add tagline to new Settings screen

fb38a32

Add address row to SiteSettingsView

829b7bd

Allow copying site address (addresses #15927)

93d026c

Fix how placeholders are displayed on site settings screen

dba29b5

Add SettingsPickerView

673300e

Integrate new SettingsPicker to implement privacy settings

fc8b5cc

Add language row to new Site Settings screen

4cc3d93

Add timezone row to SiteSettingsView

d18d0d0

Add NewSiteSettingsViewController for easier access to new SiteSettin…

bc69afb

…gsView from UIKit

Add namespaces to line in SiteSettingsView

8cfd8c8

kean force-pushed the feature/settings-swiftui-02 branch from f25e2ab to 8cfd8c8 Compare June 14, 2023 16:52

kean marked this pull request as ready for review June 14, 2023 18:51

kean removed request for mokagio and momo-ozawa June 14, 2023 19:45

kean removed the request for review from alpavanoglu June 14, 2023 19:45

kean marked this pull request as draft June 14, 2023 19:45

kean marked this pull request as ready for review June 14, 2023 19:58

kean requested review from momo-ozawa, alpavanoglu and mokagio June 14, 2023 19:58

kean mentioned this pull request Jun 14, 2023

Site Settings in SwiftUI #20874

Closed

13 tasks

kean closed this Jun 14, 2023

jkmassel deleted the feature/settings-swiftui-02 branch July 26, 2024 18:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Site Settings in SwiftUI: General #20855

Site Settings in SwiftUI: General #20855

kean commented Jun 13, 2023 •

edited

Loading

kean Jun 13, 2023

kean Jun 13, 2023 •

edited

Loading

wpmobilebot commented Jun 13, 2023 •

edited

Loading

wpmobilebot commented Jun 13, 2023 •

edited

Loading

kean Jun 14, 2023

kean Jun 14, 2023

kean Jun 14, 2023

kean Jun 14, 2023

		@@ -0,0 +1,90 @@
		import SwiftUI

		struct SettingsPicker<T: Hashable>: View {

Site Settings in SwiftUI: General #20855

Site Settings in SwiftUI: General #20855

Conversation

kean commented Jun 13, 2023 • edited Loading

To test:

Regression Notes

kean Jun 13, 2023

Choose a reason for hiding this comment

kean Jun 13, 2023 • edited Loading

Choose a reason for hiding this comment

wpmobilebot commented Jun 13, 2023 • edited Loading

wpmobilebot commented Jun 13, 2023 • edited Loading

kean Jun 14, 2023

Choose a reason for hiding this comment

kean Jun 14, 2023

Choose a reason for hiding this comment

kean Jun 14, 2023

Choose a reason for hiding this comment

kean Jun 14, 2023

Choose a reason for hiding this comment

kean commented Jun 13, 2023 •

edited

Loading

kean Jun 13, 2023 •

edited

Loading

wpmobilebot commented Jun 13, 2023 •

edited

Loading

wpmobilebot commented Jun 13, 2023 •

edited

Loading