Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 21 additions & 15 deletions WordPress/Classes/System/Root View/ReaderPresenter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -89,21 +89,26 @@ public final class ReaderPresenter: NSObject, SplitViewDisplayable {
}

private func configure(for selection: ReaderSidebarItem) {
switch selection {
let source = ScreenTrackingSource(ScreenID.Reader.sidebar)

let vc: UIViewController = switch selection {
case .main(let screen):
show(makeViewController(for: screen))
makeViewController(for: screen)
case .allSubscriptions:
show(makeAllSubscriptionsViewController(), isLargeTitle: true)
makeAllSubscriptionsViewController(source: source)
case .subscription(let objectID):
show(makeViewController(withTopicID: objectID))
makeViewController(withTopicID: objectID)
case .list(let objectID):
show(makeViewController(withTopicID: objectID))
makeViewController(withTopicID: objectID)
case .tag(let objectID):
show(makeViewController(withTopicID: objectID))
makeViewController(withTopicID: objectID)
case .organization(let objectID):
show(makeViewController(withTopicID: objectID))
makeViewController(withTopicID: objectID)
}

vc.trackingContext.source = source

show(vc)
hideSupplementaryColumnIfNeeded()
}

Expand Down Expand Up @@ -156,12 +161,16 @@ public final class ReaderPresenter: NSObject, SplitViewDisplayable {
}
}

private func makeAllSubscriptionsViewController() -> UIViewController {
let view = ReaderSubscriptionsView() { [weak self] selection in
private func makeAllSubscriptionsViewController(source: ScreenTrackingSource? = nil) -> UIViewController {
let view = ReaderSubscriptionsView { [weak self] selection in
let streamVC = ReaderStreamViewController.controllerWithTopic(selection)
streamVC.trackingContext.source = ScreenTrackingSource(ScreenID.Reader.subscriptions, component: ElementID.Reader.subscriptionCell)
self?.push(streamVC)
}.environment(\.managedObjectContext, viewContext)
let hostVC = UIHostingController(rootView: view)
}
let hostVC = UIHostingController(rootView: view
.environment(\.managedObjectContext, viewContext)
.environment(\.trackingContext, ScreenTrackingContext(source: source))
)
hostVC.title = SharedStrings.Reader.subscriptions
if sidebarViewModel.isCompact {
hostVC.navigationItem.largeTitleDisplayMode = .never
Expand Down Expand Up @@ -197,7 +206,7 @@ public final class ReaderPresenter: NSObject, SplitViewDisplayable {

/// Shows the given view controller by either displaying it in the `.secondary`
/// column (split view) or pushing to the navigation stack.
private func show(_ viewController: UIViewController, isLargeTitle: Bool = false) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed it for simplify. It was used for the "Subscriptions" screen on iPad. I initially enable large title there, but it looks great without it – and consistent with other screens.

private func show(_ viewController: UIViewController) {
if let splitViewController {
guard !self.contentIsAlreadyDisplayed(viewController, in: splitViewController, for: .secondary) else {
DDLogInfo("View controller for \(viewController.contentIdentifier) already presented – skipping show")
Expand All @@ -206,9 +215,6 @@ public final class ReaderPresenter: NSObject, SplitViewDisplayable {
(viewController as? ReaderStreamViewController)?.isNotificationsBarButtonEnabled = true

let navigationVC = UINavigationController(rootViewController: viewController)
if isLargeTitle {
navigationVC.navigationBar.prefersLargeTitles = true
}
splitViewController.setViewController(navigationVC, for: .secondary)
} else {
// Don't push a view controller on top of another with the same content
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,26 @@ import BuildSettingsKit
}

public func trackString(_ event: String, withProperties properties: [AnyHashable: Any]?) {
if properties == nil {
DDLogInfo("πŸ”΅ Tracked: \(event)")
} else {
let description = (properties ?? [:])
DDLogInfo("\(makeLogMessage(for: event, properties: properties))")
tracksService.trackEventName(event, withCustomProperties: properties)
}

private func makeLogMessage(for event: String, properties: [AnyHashable: Any]?) -> String {
var message = "πŸ”΅ Tracked: \(event)"
if let properties, !properties.isEmpty {
if event == WPAnalyticsEvent.screenShown.value, let screen = properties["screen"] {
message.append(" >> \(screen)")
}
let description = properties
.map { (key: "\($0)", value: $1) }
.sorted {
$0.key.localizedCaseInsensitiveCompare($1.key) == .orderedAscending
}
.map { key, value in "\(key): \(value)" }
.joined(separator: ", ")
DDLogInfo("πŸ”΅ Tracked: \(event) <\(description)>")
message.append(" <\(description)>")
}
tracksService.trackEventName(event, withCustomProperties: properties)
return message
}

// MARK: - Session Management
Expand Down
39 changes: 39 additions & 0 deletions WordPress/Classes/Utility/Analytics/ScreenTracking+IDs.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import Foundation

enum ScreenID {
/// Reader screen identifiers.
enum Reader {
static let sidebar = "reader.sidebar"
static let discover = "reader.discover"
static let following = "reader.following"
static let saved = "reader.saved"
static let likes = "reader.likes"
static let tag = "reader.tag"
static let site = "reader.site"
static let list = "reader.list"
static let organization = "reader.organization"
static let search = "reader.search"
static let article = "reader.article"
static let comments = "reader.comments"
static let subscriptions = "reader.subscriptions"
static let selectInterests = "reader.select_interests"
}
}

enum ElementID {
/// Reader trigger component identifiers.
enum Reader {
static let postCard = "post_card"
static let postCardComment = "post_card.comment"
static let postHeaderSiteName = "post_header.site_name"
static let suggestedSitesCard = "suggested_sites_card"
static let suggestedTagsCard = "suggested_tags_card"
static let relatedPosts = "related_posts"
static let articleHeaderSiteName = "article_header.site_name"
static let tagChip = "tag_chip"
static let commentsSection = "comments_section"
static let toolbarComment = "toolbar.comment"
static let searchResult = "search_result"
static let subscriptionCell = "subscription_cell"
}
}
94 changes: 94 additions & 0 deletions WordPress/Classes/Utility/Analytics/ScreenTracking.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
import Foundation
import WordPressShared

extension WPAnalytics {
/// Fires the `screen_shown` event.
static func track(
screen: String,
context: ScreenTrackingContext = ScreenTrackingContext(),
properties: [String: String] = [:]
) {
var props = context.properties
props["screen"] = screen
props.merge(properties) { _, new in new }
WPAnalytics.track(.screenShown, properties: props)
}
}

/// Describes the source screen and trigger that led to a navigation.
struct ScreenTrackingSource {
/// The screen the user navigated from (e.g. `"reader.discover"`).
let screen: String

/// A sub-section within the screen (e.g. `"recommended"` for a Discover tab).
var section: String?

/// The UI element that triggered the navigation (e.g. `"post_card"`).
var component: String?

/// Position index for list items (0-based).
var position: Int?

init(_ screen: String, section: String? = nil, component: String? = nil, position: Int? = nil) {
self.screen = screen
self.section = section
self.component = component
self.position = position
}
}

/// Describes how the user arrived at the current screen.
struct ScreenTrackingContext {
var source: ScreenTrackingSource?

/// Builds the properties dictionary for the analytics event.
var properties: [String: String] {
var props: [String: String] = [:]
if let source {
props["source"] = [source.screen, source.section, source.component]
.compactMap { $0 }
.joined(separator: ".")
props["source_screen"] = source.screen
if let section = source.section {
props["source_section"] = section
}
if let component = source.component {
props["source_component"] = component
if let position = source.position {
props["source_component_position"] = String(position)
}
}
}
return props
}
}
// MARK: - UIViewController

import UIKit

extension UIViewController {
/// Tracking context describing how the user arrived at this screen.
var trackingContext: ScreenTrackingContext {
get { objc_getAssociatedObject(self, &AssociatedKeys.trackingContext) as? ScreenTrackingContext ?? ScreenTrackingContext() }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you should store the ScreenTrackingContext() instance? Otherwise, every trackingContext getter call creates a new instance.

set { objc_setAssociatedObject(self, &AssociatedKeys.trackingContext, newValue, .OBJC_ASSOCIATION_RETAIN_NONATOMIC) }
}
}

private enum AssociatedKeys {
static var trackingContext: UInt8 = 0
}

// MARK: - SwiftUI

import SwiftUI

private struct ScreenTrackingContextKey: EnvironmentKey {
static let defaultValue = ScreenTrackingContext()
}

extension EnvironmentValues {
var trackingContext: ScreenTrackingContext {
get { self[ScreenTrackingContextKey.self] }
set { self[ScreenTrackingContextKey.self] = newValue }
}
}
6 changes: 6 additions & 0 deletions WordPress/Classes/Utility/Analytics/WPAnalyticsEvent.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import WordPressData
import WordPressShared

@objc public enum WPAnalyticsEvent: Int {
case screenShown

case createSheetShown
case createSheetActionTapped
Expand Down Expand Up @@ -329,6 +330,7 @@ import WordPressShared

// Reader: Discover
case readerDiscoverChannelSelected
case readerDiscoverTabShown
case readerDiscoverEditInterestsTapped

// App Settings
Expand Down Expand Up @@ -710,6 +712,8 @@ import WordPressShared
/// A String that represents the event
var value: String {
switch self {
case .screenShown:
return "screen_shown"
case .createSheetShown:
return "create_sheet_shown"
case .createSheetActionTapped:
Expand Down Expand Up @@ -1282,6 +1286,8 @@ import WordPressShared
// Reader: Discover
case .readerDiscoverChannelSelected:
return "reader_discover_channel_selected"
case .readerDiscoverTabShown:
return "reader_discover_tab_shown"
case .readerDiscoverEditInterestsTapped:
return "reader_discover_edit_interests_tapped"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,15 @@ final class ReaderPostCellViewModel {

func showSiteDetails() {
guard let viewController else { return }
ReaderHeaderAction().execute(post: post, origin: viewController)
ReaderHeaderAction().execute(
post: post,
origin: viewController,
trackingSource: viewController.resolvedSource.map {
var source = $0
source.component = ElementID.Reader.postHeaderSiteName
return source
}
)
}

func toogleBookmark() {
Expand All @@ -104,7 +112,16 @@ final class ReaderPostCellViewModel {

func comment() {
guard let viewController else { return }
ReaderCommentAction().execute(post: post, origin: viewController, source: .postCard)
ReaderCommentAction().execute(
post: post,
origin: viewController,
source: .postCard,
trackingSource: viewController.resolvedSource.map {
var source = $0
source.component = ElementID.Reader.postCardComment
return source
}
)
}

func toggleLike() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@ final class ReaderCommentsViewController: UIViewController, WPContentSyncHelperD
trackCommentsOpened()
}

override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
WPAnalytics.track(screen: ScreenID.Reader.comments, context: trackingContext)
}

override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)

Expand Down
Loading