Fix notification settings issues and add settings to Site Details (#24134)

* Extract ReaderSubscriptionNotificationSettingsButton

* Slightly tweak the spacings in NotificationSiteSubscriptionViewController

* Fix an issue with bell status not reloading in the list when changing subscription

* Update the logic for determining when to show bell-and-waves

* Update release notes

* Update the share buttons

Author: kean

RELEASE-NOTES.txt

@@ -24,6 +24,9 @@
 * [*] Fix Reader: Opening comments is slow [#21887]
 * [*] Fix an issue with comments button being disabled when shown from Comments or Notifications [#24120]
 * [*] Fix unexpected "unsaved changes" notice when closing an un-edited post containing media in the experimental editor [#24102]
+* [*] Add "Notification Settings" bell to the "Site Details" screen [#24134]
+* [*] Fix an issue where the "Notifications Settings" bell for site subscriptions was not updated after the changes [#24134]
+* [*] Update the logic behind the bell. It now show the "bell with waves" when push notifications are enabled [#24134]
 
 25.7
 -----

WordPress/Classes/Models/ReaderSiteTopic.swift

@@ -48,6 +48,10 @@ import Foundation
         return postSubscription?.sendPosts ?? false
     }
 
+    var canManageNotifications: Bool {
+        !isExternal
+    }
+
     /// Creates a new ReaderTagTopic object from a RemoteReaderInterest
     convenience init(remoteInfo: RemoteReaderSiteInfo, context: NSManagedObjectContext) {
         self.init(context: context)

WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationSiteSubscriptionViewController.swift

@@ -132,6 +132,9 @@ class NotificationSiteSubscriptionViewController: UITableViewController {
         // Hide the separators, whenever the table is empty
         tableView.tableFooterView = UIView()
 
+        tableView.tableHeaderView = UIView(frame: CGRect(x: 0.0, y: 0.0, width: 0.0, height: 8))
+        tableView.sectionHeaderHeight = 12
+
         // Style!
         WPStyleGuide.configureColors(view: view, tableView: tableView)
         WPStyleGuide.configureAutomaticHeightRows(for: tableView)

WordPress/Classes/ViewRelated/Reader/Controllers/ReaderStreamViewController+Sharing.swift

@@ -15,7 +15,7 @@ extension ReaderStreamViewController {
             removeShareButton()
             return
         }
-        let button = UIBarButtonItem(title: nil, image: UIImage(systemName: "square.and.arrow.up"), target: self, action: #selector(shareButtonTapped))
+        let button = UIBarButtonItem(title: nil, image: UIImage(named: "wpl-share"), target: self, action: #selector(shareButtonTapped))
         button.tag = NavigationItemTag.share.rawValue
         button.accessibilityLabel = SharedStrings.Button.share
         addRightBarButtonItem(button)

WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailViewController.swift

@@ -1125,7 +1125,7 @@ private extension ReaderDetailViewController {
     }
 
     func shareButtonItem(enabled: Bool = true) -> UIBarButtonItem? {
-        let button = barButtonItem(with: .gridicon(.shareiOS), action: #selector(didTapShareButton(_:)))
+        let button = barButtonItem(with: UIImage(named: "wpl-share") ?? UIImage(), action: #selector(didTapShareButton(_:)))
         button.accessibilityLabel = SharedStrings.Button.share
         button.isEnabled = enabled
 

WordPress/Classes/ViewRelated/Reader/Headers/ReaderSiteHeaderView.swift

@@ -45,7 +45,6 @@ class ReaderSiteHeaderView: ReaderBaseHeaderView, ReaderStreamHeader {
 // MARK: - ReaderSiteHeader
 
 private struct ReaderSiteHeader: View {
-
     @ObservedObject var viewModel: ReaderSiteHeaderViewModel
 
     var body: some View {
@@ -74,10 +73,21 @@ private struct ReaderSiteHeader: View {
             if viewModel.site?.isExternal == false {
                 countsDisplay
             }
-            ReaderFollowButton(isFollowing: viewModel.isFollowingSite,
-                               isEnabled: viewModel.isFollowEnabled,
-                               size: .regular) {
-                viewModel.updateFollowStatus()
+            HStack {
+                ReaderFollowButton(isFollowing: viewModel.isFollowingSite,
+                                   isEnabled: viewModel.isFollowEnabled,
+                                   size: .regular) {
+                    viewModel.updateFollowStatus()
+                }
+                if let site = viewModel.site, site.canManageNotifications {
+                    ReaderSubscriptionNotificationSettingsButton(site: site)
+                        .padding(.horizontal, 2)
+                        .padding(.vertical, 8)
+                        .overlay(
+                            RoundedRectangle(cornerRadius: 5)
+                                .stroke(Color(.separator), lineWidth: 1)
+                        )
+                }
             }
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
@@ -107,7 +117,6 @@ private struct ReaderSiteHeader: View {
                                                     "'%2$@' is a placeholder for the blog subscriber count. " +
                                                     "Example: `5,000 posts • 10M subscribers`")
     }
-
 }
 
 // MARK: - ReaderSiteHeaderViewModel
@@ -148,5 +157,4 @@ private final class ReaderSiteHeaderViewModel: ObservableObject {
             self?.isFollowEnabled = true
         }
     }
-
 }

WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionCell.swift

@@ -39,8 +39,8 @@ struct ReaderSubscriptionCell: View {
             Spacer()
 
             HStack(spacing: 0) {
-                if let status = ReaderSubscriptionNotificationsStatus(site: site) {
-                    makeButtonNotificationSettings(with: status)
+                if site.canManageNotifications {
+                    ReaderSubscriptionNotificationSettingsButton(site: site)
                 }
                 buttonMore
             }
@@ -53,36 +53,6 @@ struct ReaderSubscriptionCell: View {
         })
     }
 
-    private func makeButtonNotificationSettings(with status: ReaderSubscriptionNotificationsStatus) -> some View {
-        Button {
-            isShowingSettings = true
-        } label: {
-            Group {
-                switch status {
-                case .all:
-                    Image(systemName: "bell.and.waves.left.and.right")
-                        .foregroundStyle(AppColor.primary)
-                case .personalized:
-                    Image(systemName: "bell")
-                        .foregroundStyle(AppColor.primary)
-                case .none:
-                    Image(systemName: "bell.slash")
-                        .foregroundStyle(.secondary)
-                        .opacity(0.6)
-                }
-            }
-            .font(.subheadline)
-            .frame(width: 34, alignment: .center)
-            .contentShape(Rectangle())
-        }
-        .buttonStyle(.plain)
-        .sheet(isPresented: $isShowingSettings) {
-            ReaderSubscriptionNotificationSettingsView(siteID: site.siteID.intValue)
-                .presentationDetents([.medium, .large])
-                .edgesIgnoringSafeArea(.bottom)
-        }
-    }
-
     private var buttonMore: some View {
         Menu {
             ReaderSubscriptionContextMenu(site: site, isShowingSettings: $isShowingSettings)

WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionHelper.swift

@@ -98,30 +98,3 @@ private func makeURL(fromUserInput string: String) -> URL? {
     }
     return nil
 }
-
-enum ReaderSubscriptionNotificationsStatus {
-    /// Receives both posts and notifications
-    case all
-    /// Receives some notifications
-    case personalized
-    /// Receives none
-    case none
-
-    init?(site: ReaderSiteTopic) {
-        guard !site.isExternal else {
-            return nil
-        }
-        let posts = site.postSubscription
-        let emails = site.emailSubscription
-
-        let sendPosts = (posts?.sendPosts ?? false) || (emails?.sendPosts ?? false)
-        let sendComments = emails?.sendComments ?? false
-        if sendPosts && sendComments {
-            self = .all
-        } else if sendPosts || sendComments {
-            self = .personalized
-        } else {
-            self = .none
-        }
-    }
-}

WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionNotificationSettingsButton.swift

@@ -0,0 +1,74 @@
+import SwiftUI
+
+struct ReaderSubscriptionNotificationSettingsButton: View {
+    @ObservedObject var site: ReaderSiteTopic
+
+    @State private var isShowingSettings = false
+    @State private var status: ReaderSubscriptionNotificationsStatus = .none
+
+    var body: some View {
+        Button {
+            isShowingSettings = true
+        } label: {
+            Group {
+                switch status {
+                case .notify:
+                    Image(systemName: "bell.and.waves.left.and.right")
+                        .foregroundStyle(AppColor.primary)
+                case .personalized:
+                    Image(systemName: "bell")
+                        .foregroundStyle(AppColor.primary)
+                case .none:
+                    Image(systemName: "bell.slash")
+                        .foregroundStyle(.secondary)
+                        .opacity(0.6)
+                }
+            }
+            .font(.subheadline)
+            .frame(width: 34, alignment: .center)
+            .contentShape(Rectangle())
+        }
+        .buttonStyle(.plain)
+        .sheet(isPresented: $isShowingSettings) {
+            ReaderSubscriptionNotificationSettingsView(siteID: site.siteID.intValue)
+                .presentationDetents([.medium, .large])
+                .edgesIgnoringSafeArea(.bottom)
+        }
+        .onReceive(site.emailSubscription?.objectWillChange ?? .init()) {
+            refresh()
+        }
+        .onReceive(site.postSubscription?.objectWillChange ?? .init()) {
+            refresh()
+        }
+        .onAppear { refresh() }
+    }
+
+    private func refresh() {
+        status = ReaderSubscriptionNotificationsStatus(site: site)
+    }
+}
+
+private enum ReaderSubscriptionNotificationsStatus {
+    /// Receive push notifications.
+    case notify
+    /// Receives emails notifications.
+    case personalized
+    /// Receives none.
+    case none
+
+    init(site: ReaderSiteTopic) {
+        let notifications = site.postSubscription
+        let emails = site.emailSubscription
+
+        let sendNotifications = notifications?.sendPosts ?? false
+        let sendEmails = (emails?.sendPosts ?? false) || (emails?.sendComments ?? false)
+
+        if sendNotifications {
+            self = .notify
+        } else if sendEmails {
+            self = .personalized
+        } else {
+            self = .none
+        }
+    }
+}