Feature: Jetpack Activity Logs

.claude/settings.json

@@ -0,0 +1,17 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(cat:*)",
+      "Bash(ls:*)",
+      "Bash(rg:*)",
+      "Bash(find:*)",
+      "Bash(grep:*)",
+      "Bash(head:*)",
+      "Bash(tail:*)",
+      "Bash(wc:*)",
+      "Bash(tree:*)",
+      "Bash(git:log,status,diff,branch)",
+    ],
+    "deny": []
+  }
+}

.gitignore

@@ -25,6 +25,9 @@ DerivedData
 *.hmap
 *.xcscmblueprint
 
+# Claude
+.claude/settings.local.json
+
 # Windows
 Thumbs.db
 ehthumbs.db

CLAUDE.md

@@ -8,18 +8,6 @@ WordPress for iOS is the official mobile app for WordPress that lets users creat
 
 Minimum requires iOS version is iOS 16.
 
-## Common Development Commands
-
-### Build & Dependencies
-- `rake build` - Build the app
-- `xcodebuild -scheme <target> -destination 'platform=iOS Simulator,name=iPhone 16' | bundle exec xcpretty` build targets from `Modules/`.
-
-### Testing
-- `rake test` - Run all tests
-
-### Code Quality
-- `rake lint` - Check for SwiftLint errors
-
 ## High-Level Architecture
 
 ### Project Structure
@@ -54,8 +42,11 @@ WordPress-iOS uses a modular architecture with the main app and separate Swift p
 - Follow Swift API Design Guidelines
 - Use strict access control modifiers where possible
 - Use four spaces (not tabs)
+- Follow the standard formatting practices enforced by SwiftLint
+- Don't create `body` for `View` that are too long
+- Use semantics text sizes like `.headline`
 
-### Development Workflow
+## Development Workflow
 - Branch from `trunk` (main branch)
 - PR target should be `trunk`
 - When writing commit messages, never include references to Claude

Modules/Package.swift

@@ -37,7 +37,6 @@ let package = Package(
         .package(url: "https://github.com/erikdoe/ocmock", revision: "2c0bfd373289f4a7716db5d6db471640f91a6507"),
         .package(url: "https://github.com/johnxnguyen/Down", branch: "master"),
         .package(url: "https://github.com/kaishin/Gifu", from: "3.4.1"),
-        .package(url: "https://github.com/patchthecode/JTAppleCalendar", from: "8.0.5"),
         .package(url: "https://github.com/Quick/Nimble", from: "10.0.0"),
         .package(url: "https://github.com/scinfu/SwiftSoup", exact: "2.7.5"),
         .package(url: "https://github.com/squarefrog/UIDeviceIdentifier", from: "2.3.0"),
@@ -50,7 +49,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: "cc7fd8a7ea609fc139e7b9d9f53b12c51002ddf4" // see wpios-edition branch
+            revision: "ae3961ce89ac0c43a90e88d4963a04aa92008443" // 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.
@@ -300,7 +299,6 @@ enum XcodeSupport {
             .product(name: "GravatarUI", package: "Gravatar-SDK-iOS"),
             .product(name: "Gridicons", package: "Gridicons-iOS"),
             .product(name: "GutenbergKit", package: "GutenbergKit"),
-            .product(name: "JTAppleCalendar", package: "JTAppleCalendar"),
             .product(name: "Lottie", package: "lottie-ios"),
             .product(name: "MediaEditor", package: "MediaEditor-iOS"),
             .product(name: "NSObject-SafeExpectations", package: "NSObject-SafeExpectations"),

Modules/Sources/BuildSettingsKit/BuildSettingsEnvironment.swift

@@ -21,7 +21,7 @@ public enum BuildSettingsEnvironment: Sendable {
 
 private extension ProcessInfo {
     var isXcodePreview: Bool {
-        environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1"
+        environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1" || environment["WP_USE_PREVIEW_ENVIRONMENT"] == "1"
     }
 
     var isTesting: Bool {

Modules/Sources/UITestsFoundation/Screens/ActivityLogScreen.swift

@@ -2,35 +2,16 @@ import ScreenObject
 import XCTest
 
 public class ActivityLogScreen: ScreenObject {
-    private let dateRangeButtonGetter: (XCUIApplication) -> XCUIElement = {
-        $0.buttons["Date Range"].firstMatch
-    }
-
-    private let activityTypeButtonGetter: (XCUIApplication) -> XCUIElement = {
-        $0.buttons["Activity Type"].firstMatch
-    }
-
-    var activityTypeButton: XCUIElement { activityTypeButtonGetter(app) }
-    var dateRangeButton: XCUIElement { dateRangeButtonGetter(app) }
-
-    // Timeout duration to overwrite value defined in XCUITestHelpers
-    var duration: TimeInterval = 10.0
-
     public init(app: XCUIApplication = XCUIApplication()) throws {
-        try super.init(
-            expectedElementGetters: [ dateRangeButtonGetter, activityTypeButtonGetter ],
-            app: app
-        )
-    }
-
-    public static func isLoaded() -> Bool {
-        (try? ActivityLogScreen().isLoaded) ?? false
+        try super.init {
+            $0.collectionViews["activity_logs_list"].firstMatch
+        }
     }
 
     @discardableResult
     public func verifyActivityLogScreen(hasActivityPartial activityTitle: String) -> Self {
         XCTAssertTrue(
-            app.staticTexts.matching(NSPredicate(format: "label CONTAINS[c] %@", activityTitle)).firstMatch.waitForIsHittable(timeout: duration),
+            app.staticTexts.matching(NSPredicate(format: "label CONTAINS[c] %@", activityTitle)).firstMatch.waitForIsHittable(timeout: 10),
             "Activity Log Screen: \"\(activityTitle)\" activity not displayed.")
         return self
     }

Modules/Sources/WordPressUI/Views/CardView.swift

@@ -0,0 +1,54 @@
+import SwiftUI
+
+/// A reusable card view component that provides a consistent container style
+/// with optional title and customizable content.
+public struct CardView<Content: View>: View {
+    let title: String?
+    @ViewBuilder let content: () -> Content
+
+    public init(_ title: String? = nil, @ViewBuilder content: @escaping () -> Content) {
+        self.title = title
+        self.content = content
+    }
+
+    public var body: some View {
+        VStack(alignment: .leading, spacing: 16) {
+            if let title {
+                Text(title.uppercased())
+                    .font(.caption)
+                    .foregroundStyle(.secondary)
+            }
+            content()
+        }
+        .frame(maxWidth: .infinity, alignment: .leading)
+        .padding()
+        .clipShape(RoundedRectangle(cornerRadius: 8))
+        .overlay(
+            RoundedRectangle(cornerRadius: 8)
+                .stroke(Color(.separator), lineWidth: 0.5)
+        )
+    }
+}
+
+#Preview("With Title") {
+    CardView("Section Title") {
+        VStack(alignment: .leading, spacing: 12) {
+            Text("Card Content")
+            Text("More content here")
+                .foregroundStyle(.secondary)
+        }
+    }
+    .padding()
+}
+
+#Preview("Without Title") {
+    CardView {
+        HStack {
+            Image(systemName: "star.fill")
+                .foregroundStyle(.yellow)
+            Text("Featured Item")
+            Spacer()
+        }
+    }
+    .padding()
+}

Modules/Sources/WordPressUI/Views/DataView/DataViewPaginatedForEach.swift

@@ -0,0 +1,35 @@
+import SwiftUI
+
+/// A view that displays paginated data using ForEach with automatic loading triggers.
+public struct DataViewPaginatedForEach<Response: DataViewPaginatedResponseProtocol, Content: View>: View {
+    @ObservedObject private var response: Response
+    private let content: (Response.Element) -> Content
+
+    /// Creates a paginated ForEach view.
+    ///
+    /// - Parameters:
+    ///   - response: The paginated response handler that manages the data.
+    ///   - content: A view builder that creates the content for each item.
+    public init(
+        response: Response,
+        @ViewBuilder content: @escaping (Response.Element) -> Content
+    ) {
+        self.response = response
+        self.content = content
+    }
+
+    public var body: some View {
+        ForEach(response.items) { item in
+            content(item)
+                .onAppear {
+                    response.onRowAppeared(item)
+                }
+        }
+        if response.isLoading {
+            DataViewPagingFooterView(.loading)
+        } else if response.error != nil {
+            DataViewPagingFooterView(.failure)
+                .onRetry { response.loadMore() }
+        }
+    }
+}

Modules/Sources/WordPressUI/Views/DataView/DataViewPaginatedResponse.swift

@@ -0,0 +1,122 @@
+import Foundation
+import SwiftUI
+
+@MainActor
+public protocol DataViewPaginatedResponseProtocol: ObservableObject {
+    associatedtype Element: Identifiable
+
+    var items: [Element] { get }
+    var isLoading: Bool { get }
+    var error: Error? { get }
+
+    func onRowAppeared(_ item: Element)
+    @discardableResult func loadMore() -> Task<Void, Error>?
+}
+
+/// A generic paginated response handler that manages loading items with flexible pagination.
+/// This class is designed to be used in the UI in conjunction with `PaginatedForEach`.
+@MainActor
+public final class DataViewPaginatedResponse<Element: Identifiable, PageIndex>: DataViewPaginatedResponseProtocol {
+    @Published public private(set) var total: Int?
+    @Published public private(set) var items: [Element] = []
+    @Published public private(set) var hasMore = true
+    @Published public private(set) var isLoading = false
+    @Published public private(set) var error: Error?
+
+    /// Result of a paginated load operation.
+    public struct Page {
+        public let items: [Element]
+        public let total: Int?
+        public let hasMore: Bool
+        public let nextPage: PageIndex?
+
+        public init(items: [Element], total: Int? = nil, hasMore: Bool, nextPage: PageIndex?) {
+            self.items = items
+            self.total = total
+            self.hasMore = hasMore
+            self.nextPage = nextPage
+        }
+    }
+
+    public var isEmpty: Bool { items.isEmpty }
+
+    private var nextPage: PageIndex?
+    private let loadPage: (PageIndex?) async throws -> Page
+
+    /// Creates a new paginated response handler.
+    ///
+    /// - Parameter loadPage: A closure that loads items using pagination.
+    ///   - Parameter pageIndex: The page index to load (nil for initial load).
+    ///   - Returns: A PaginatedResult containing the items, total count, whether more pages exist, and next page index.
+    /// - Throws: Any error from the initial page load.
+    public init(loadPage: @escaping (PageIndex?) async throws -> Page) async throws {
+        self.loadPage = loadPage
+
+        let response = try await loadPage(nil)
+        didLoad(response)
+    }
+
+    /// Loads the next page of items.
+    ///
+    /// This method will do nothing if:
+    /// - There are no more pages to load
+    /// - A page is currently being loaded
+    @discardableResult
+    public func loadMore() -> Task<Void, Error>? {
+        guard hasMore && !isLoading else {
+            return nil
+        }
+        error = nil
+        isLoading = true
+        return Task {
+            defer { isLoading = false }
+            do {
+                let response = try await loadPage(nextPage)
+                didLoad(response)
+            } catch {
+                self.error = error
+                throw error
+            }
+        }
+    }
+
+    private func didLoad(_ response: Page) {
+        total = response.total
+        nextPage = response.nextPage
+        hasMore = response.hasMore
+
+        let existingIDs = Set(items.map(\.id))
+        let newItems = response.items.filter {
+            !existingIDs.contains($0.id)
+        }
+        items += newItems
+    }
+
+    /// Triggers loading more items when a row appears.
+    ///
+    /// Call this method when a row becomes visible. If the row is within the last 10 items
+    /// and there's no current error, it will trigger loading the next page.
+    ///
+    /// - Parameter row: The row that appeared.
+    public func onRowAppeared(_ row: Element) {
+        guard items.suffix(10).contains(where: { $0.id == row.id }) else {
+            return
+        }
+        if error == nil {
+            loadMore()
+        }
+    }
+
+    /// Removes an item with the specified ID from the loaded items.
+    ///
+    /// - Parameter id: The ID of the item to remove.
+    public func deleteItem(withID id: Element.ID) {
+        guard let index = items.firstIndex(where: { $0.id == id }) else {
+            return
+        }
+        items.remove(at: index)
+        if let total {
+            self.total = total - 1
+        }
+    }
+}

Modules/Sources/WordPressUI/Views/LoadMoreFooterView.swift → Modules/Sources/WordPressUI/Views/DataView/DataViewPagingFooterView.swift

@@ -1,6 +1,6 @@
 import SwiftUI
 
-public struct LoadMoreFooterView: View {
+public struct DataViewPagingFooterView: View {
     public enum State {
         case loading
         case failure
@@ -13,7 +13,7 @@ public struct LoadMoreFooterView: View {
         self.state = state
     }
 
-    public func onRetry(_ closure: (() -> Void)?) -> LoadMoreFooterView {
+    public func onRetry(_ closure: (() -> Void)?) -> DataViewPagingFooterView {
         var copy = self
         copy.onRetry = closure
         return copy