Add Subscribers screen (#24513)

* Add new Subscribers screen

* Add subscibers row

* Remove filter from PeopleViewController and rename it

* Remove Followers role

* Implemenet initial SubscribersView

* Add paging

* Add ListFooterView

* Hide private APIs

* Extract SubscribersPaginatedResponse

* Implement search

* Simplify paging and searching

* Add SubscribersListViewModel

* Rework how search is shown

* Remove isLoadingFromSearch

* Add separate search view

* Add basic filtering

* Simplify search

* Fix search

* Extract SubscribersMenu

* Move bindings to SubscribersMenu

* Add SubscriberRowView

* Fix when we show email/user

* Remove temporary code

* Update UI tests

* Fix UI tests

* Update WordPressKit

* Add delete confirmation dialog

* Add initial SubscriberDetailsView

* Add initial API

* Fix unwanted reload of SubscribersListView on reappear

* Remove the cell when subscriber is deleted

* Hide disclosure indicators

* Show subscribed sice

* Show number of subscribers

* Add a note about supporters

* Add SubscriberInviteView

* Integrate the API

* Apply correct tint

* Update how we show dates

* Display how many months ago you subscribed

* Update permissions

* Update Stats to use the new Subscribers screen

* Fix an issue with top email subsribers not shown

* Add delete to context menu

* Add swipe actions

* Extract SubscriberDetailsHeaderView

* Fix XML encoded characters

* Prefetch earlier

* Fix tests

* Rename to LoadMoreFooterView

Author: kean

Modules/Package.resolved

@@ -50,7 +50,7 @@ let package = Package(
         .package(url: "https://github.com/wordpress-mobile/NSURL-IDN", revision: "b34794c9a3f32312e1593d4a3d120572afa0d010"),
         .package(
             url: "https://github.com/wordpress-mobile/WordPressKit-iOS",
-            revision: "5bc08764d2025e21685816065f611e884c8672d1" // see wpios-edition branch
+            revision: "cc7fd8a7ea609fc139e7b9d9f53b12c51002ddf4" // see wpios-edition branch
         ),
         .package(url: "https://github.com/zendesk/support_sdk_ios", from: "8.0.3"),
         // We can't use wordpress-rs branches nor commits here. Only tags work.

Modules/Package.swift

@@ -33,6 +33,10 @@ public enum UIAppColor {
         case .reader: CSColor.WordPressBlue.shade(shade)
         }
     }
+
+    public static var secondary: UIColor {
+        UIColor(light: CSColor.Gray.shade(.shade60), dark: CSColor.Gray.shade(.shade20))
+    }
 }
 
 extension UIAppColor {
@@ -148,6 +152,7 @@ extension UIAppColor {
 public enum AppColor {
     public static var tint: Color { Color(UIAppColor.tint) }
     public static var primary: Color { Color(UIAppColor.primary) }
+    public static var secondary: Color { Color(UIAppColor.secondary) }
 }
 
 private extension UIColor {

Modules/Sources/DesignSystem/Foundation/AppColor.swift

@@ -43,8 +43,8 @@ public class MySiteMoreMenuScreen: ScreenObject {
         $0.cells["Settings Row"]
     }
 
-    private let peopleButtonGetter: (XCUIApplication) -> XCUIElement = {
-        $0.cells["People Row"]
+    private let usersButtonGetter: (XCUIApplication) -> XCUIElement = {
+        $0.cells["Users Row"]
     }
 
     var activityLogButton: XCUIElement { activityLogButtonGetter(app) }
@@ -54,7 +54,7 @@ public class MySiteMoreMenuScreen: ScreenObject {
     var jetpackScanButton: XCUIElement { jetpackScanButtonGetter(app) }
     var mediaButton: XCUIElement { mediaButtonGetter(app) }
     var mySiteNavigationBar: XCUIElement { mySiteNavigationBarGetter(app) }
-    var peopleButton: XCUIElement { peopleButtonGetter(app) }
+    var usersButton: XCUIElement { usersButtonGetter(app) }
     var postsButton: XCUIElement { postsButtonGetter(app) }
     var settingsButton: XCUIElement { settingsButtonGetter(app) }
     var statsButton: XCUIElement { statsButtonGetter(app) }
@@ -112,9 +112,9 @@ public class MySiteMoreMenuScreen: ScreenObject {
     }
 
     @discardableResult
-    public func goToPeople() throws -> PeopleScreen {
-        peopleButton.tap()
-        return try PeopleScreen()
+    public func goToUsers() throws -> UsersScreen {
+        usersButton.tap()
+        return try UsersScreen()
     }
 
     public static func isLoaded() -> Bool {

Modules/Sources/UITestsFoundation/Screens/MySiteMoreMenuScreen.swift

@@ -0,0 +1,20 @@
+import ScreenObject
+import XCTest
+
+public class UsersScreen: ScreenObject {
+
+    private let usersTableGetter: (XCUIApplication) -> XCUIElement = {
+        $0.tables["users_table_view"].firstMatch
+    }
+
+    init(app: XCUIApplication = XCUIApplication()) throws {
+        try super.init(
+            expectedElementGetters: [usersTableGetter],
+            app: app
+        )
+    }
+
+    public static func isLoaded() -> Bool {
+        (try? UsersScreen().isLoaded) ?? false
+    }
+}

Modules/Sources/UITestsFoundation/Screens/PeopleScreen.swift

@@ -0,0 +1,48 @@
+import SwiftUI
+
+public struct LoadMoreFooterView: View {
+    public enum State {
+        case loading
+        case failure
+    }
+
+    let state: State
+    var onRetry: (() -> Void)?
+
+    public init(_ state: State) {
+        self.state = state
+    }
+
+    public func onRetry(_ closure: (() -> Void)?) -> LoadMoreFooterView {
+        var copy = self
+        copy.onRetry = closure
+        return copy
+    }
+
+    public var body: some View {
+        contentView
+            .frame(maxWidth: .infinity)
+            .listRowSeparator(.hidden)
+    }
+
+    @ViewBuilder
+    private var contentView: some View {
+        switch state {
+        case .loading:
+            ProgressView()
+        case .failure:
+            Button(action: onRetry ?? {}) {
+                HStack {
+                    Image(systemName: "exclamationmark.circle")
+                    if onRetry != nil {
+                        Text(AppLocalizedString("shared.button.retry", value: "Retry", comment: "A shared button title used in different contexts"))
+                    } else {
+                        Text(AppLocalizedString("shared.error.geneirc", value: "Something went wrong", comment: "A generic error message"))
+                    }
+                }
+                .lineLimit(1)
+            }
+            .disabled(onRetry == nil)
+        }
+    }
+}

Modules/Sources/UITestsFoundation/Screens/UsersScreen.swift

@@ -2,6 +2,7 @@
 -----
 * [**] Add new “Subscribers” screen that shows both your email and Reader subscribers [#24513]
 * [*] Fix an issue with “Stats / Subscribers” sometimes not showing the latest email subscribers [#24513]
+* [*] Fix an issue with "Stats" / "Subscribers" / "Emails" showing html encoded characters [#24513]
 
 25.9
 -----

Modules/Sources/WordPressUI/Views/LoadMoreFooterView.swift

@@ -12,14 +12,16 @@ extension EmptyStateView where Label == SwiftUI.Label<Text, Image>, Description
     }
 }
 
-extension EmptyStateView where Label == SwiftUI.Label<Text, Image>, Description == Text?, Actions == Button<Text> {
-    static func failure(error: Error, onRetry: @escaping () -> Void) -> Self {
+extension EmptyStateView where Label == SwiftUI.Label<Text, Image>, Description == Text?, Actions == Button<Text>? {
+    static func failure(error: Error, onRetry: (() -> Void)? = nil) -> Self {
         EmptyStateView {
             Label(SharedStrings.Error.generic, systemImage: "exclamationmark.circle")
         } description: {
             Text(error.localizedDescription)
         } actions: {
-            Button(SharedStrings.Button.retry, action: onRetry)
+            if let onRetry {
+                Button(SharedStrings.Button.retry, action: onRetry)
+            }
         }
     }
 }

RELEASE-NOTES.txt

@@ -80,7 +80,7 @@ public enum FeatureFlag: Int, CaseIterable {
         case .nativeJetpackConnection:
             return BuildConfiguration.current == .debug
         case .newsletterSubscribers:
-            return BuildConfiguration.current == .debug
+            return true
         }
     }