Merge branch 'main' into main

Author: Krystool

WMF Framework/CommonStrings.swift

@@ -647,8 +647,11 @@ public class CommonStrings: NSObject {
     public static let joinLoginTitle = WMFLocalizedString("profile-page-join-title", value: "Log in / Join Wikipedia", comment: "Link to sign up or sign in")
 
     public static let noThanksTitle = WMFLocalizedString("variants-alert-dismiss-button", value: "No thanks", comment: "Dismiss button on alert used to inform users about variant support.")
+    public static let continueWithoutLoggingIn = WMFLocalizedString("ip-account-cta-bottom", value: "Continue without logging in", comment: "Continue without logging in button title")
 
     public static let notNowTitle = WMFLocalizedString("not-now-title", value: "Not now", comment: "Text for the dismiss button across various features.")
+    
+    public static let youCanAccessYIR = WMFLocalizedString("year-in-review-intro-exit-toast-title", value: "You can access your Year in Review later in Profile.", comment: "Toast displayed to user after the exit Year in Review on the intro slide.")
 
     // Donation history
 

WMFComponents/Sources/WMFComponents/Base/Component Base Classes/WMFComponentNavigationController.swift

@@ -17,17 +17,16 @@ open class WMFComponentNavigationController: UINavigationController {
         return WMFAppEnvironment.current.theme
     }
 
+    private let customBarBackgroundColor: UIColor?
+    
     var forcePortrait = false
 
     // MARK: - Public
 
-    @objc public convenience init(rootViewController: UIViewController, modalPresentationStyle: UIModalPresentationStyle) {
-        self.init(rootViewController: rootViewController)
-        self.modalPresentationStyle = modalPresentationStyle
-    }
-    
-    public override init(rootViewController: UIViewController) {
+    @objc public init(rootViewController: UIViewController, modalPresentationStyle: UIModalPresentationStyle, customBarBackgroundColor: UIColor? = nil) {
+        self.customBarBackgroundColor = customBarBackgroundColor
         super.init(rootViewController: rootViewController)
+        self.modalPresentationStyle = modalPresentationStyle
         subscribeToAppEnvironmentChanges()
         setup()
     }
@@ -87,7 +86,11 @@ open class WMFComponentNavigationController: UINavigationController {
         let barAppearance = UINavigationBarAppearance()
         barAppearance.configureWithOpaqueBackground()
 
-        if modalPresentationStyle == .pageSheet {
+        if let customBarBackgroundColor {
+            barAppearance.backgroundColor = customBarBackgroundColor
+            let backgroundImage = UIImage.roundedRectImage(with: customBarBackgroundColor, cornerRadius: 1)
+            barAppearance.backgroundImage = backgroundImage
+        } else if modalPresentationStyle == .pageSheet {
             barAppearance.backgroundColor = theme.midBackground
             let backgroundImage = UIImage.roundedRectImage(with: theme.midBackground, cornerRadius: 1)
             barAppearance.backgroundImage = backgroundImage

WMFComponents/Sources/WMFComponents/Components/Article Tabs/WMFArticleTabsHostingController.swift

@@ -66,7 +66,7 @@ public class WMFArticleTabsHostingController<HostedView: View>: WMFComponentHost
     }
 
     @objc func tappedDone() {
-        dismiss(animated: true, completion: nil)
+        viewModel.didTapDone()
     }
 
     @objc private func tappedAdd() {
@@ -85,6 +85,7 @@ public class WMFArticleTabsHostingController<HostedView: View>: WMFComponentHost
             handler: { [weak self] _ in
             Task {
                 await self?.presentCloseAllTabsConfirmationDialog()
+                self?.viewModel.loggingDelegate?.logArticleTabsOverviewTappedCloseAllTabs()
             }
         })
 
@@ -94,6 +95,7 @@ public class WMFArticleTabsHostingController<HostedView: View>: WMFComponentHost
             self.overflowButton.menu = self.overflowMenu
             viewModel.didToggleSuggestedArticles()
             viewModel.refreshShouldShowSuggestionsFromDataController()
+            viewModel.loggingDelegate?.logArticleTabsOverviewTappedHideSuggestions()
         })
 
         let showArticleSuggestions = UIAction(title: viewModel.localizedStrings.showSuggestedArticlesTitle, image: WMFSFSymbolIcon.for(symbol: .eye), handler: { [weak self] _ in
@@ -102,6 +104,7 @@ public class WMFArticleTabsHostingController<HostedView: View>: WMFComponentHost
             self.overflowButton.menu = self.overflowMenu
             viewModel.didToggleSuggestedArticles()
             viewModel.refreshShouldShowSuggestionsFromDataController()
+            viewModel.loggingDelegate?.logArticleTabsOverviewTappedShowSuggestions()
         })
 
         var children: [UIMenuElement]
@@ -135,12 +138,15 @@ public class WMFArticleTabsHostingController<HostedView: View>: WMFComponentHost
             preferredStyle: .alert
         )
 
-        let action1 = UIAlertAction(title: button1Title, style: .cancel)
+        let action1 = UIAlertAction(title: button1Title, style: .cancel, handler: { [weak self] _ in
+            self?.viewModel.loggingDelegate?.logArticleTabsOverviewTappedCloseAllTabsConfirmCancel()
+        })
 
         let action2 = UIAlertAction(title: button2Title, style: .destructive) { [weak self] _ in
             guard let self else { return }
             Task {
                 self.viewModel.didTapCloseAllTabs()
+                self.viewModel.loggingDelegate?.logArticleTabsOverviewTappedCloseAllTabsConfirmClose()
             }
         }
 

WMFComponents/Sources/WMFComponents/Components/Article Tabs/WMFArticleTabsView.swift

@@ -21,11 +21,8 @@ public struct WMFArticleTabsView: View {
     @State private var isReady: Bool = false
     @State private var cellFrames: [String: CGRect] = [:]
 
-    private var dykLinkDelegate: UITextViewDelegate?
-
-    public init(viewModel: WMFArticleTabsViewModel, dykLinkDelegate: UITextViewDelegate?) {
+    public init(viewModel: WMFArticleTabsViewModel) {
         self.viewModel = viewModel
-        self.dykLinkDelegate = dykLinkDelegate
     }
 
     public var body: some View {

WMFComponents/Sources/WMFComponents/Components/Article Tabs/WMFArticleTabsViewModel.swift

@@ -6,6 +6,13 @@ import WMFData
 public protocol WMFArticleTabsLoggingDelegate: AnyObject {
     func logArticleTabsOverviewImpression()
     func logArticleTabsArticleClick(wmfProject: WMFProject?)
+    func logArticleTabsOverviewTappedDone()
+    func logArticleTabsOverviewTappedCloseTab()
+    func logArticleTabsOverviewTappedHideSuggestions()
+    func logArticleTabsOverviewTappedShowSuggestions()
+    func logArticleTabsOverviewTappedCloseAllTabs()
+    func logArticleTabsOverviewTappedCloseAllTabsConfirmCancel()
+    func logArticleTabsOverviewTappedCloseAllTabsConfirmClose()
 }
 
 public class WMFArticleTabsViewModel: NSObject, ObservableObject {
@@ -41,6 +48,7 @@ public class WMFArticleTabsViewModel: NSObject, ObservableObject {
     public let didTapTab: (WMFArticleTabsDataController.WMFArticleTab) -> Void
     public let didTapAddTab: () -> Void
     public let didTapShareTab: (WMFArticleTabsDataController.WMFArticleTab, CGRect?) -> Void
+    public let didTapDone: () -> Void
     public let didToggleSuggestedArticles: () -> Void
 
     public let localizedStrings: LocalizedStrings
@@ -51,6 +59,7 @@ public class WMFArticleTabsViewModel: NSObject, ObservableObject {
                 didTapTab: @escaping (WMFArticleTabsDataController.WMFArticleTab) -> Void,
                 didTapAddTab: @escaping () -> Void,
                 didTapShareTab: @escaping (WMFArticleTabsDataController.WMFArticleTab, CGRect?) -> Void,
+                didTapDone: @escaping () -> Void,
                 didToggleSuggestedArticles: @escaping () -> Void) {
         self.dataController = dataController
         self.localizedStrings = localizedStrings
@@ -61,6 +70,7 @@ public class WMFArticleTabsViewModel: NSObject, ObservableObject {
         self.didTapTab = didTapTab
         self.didTapAddTab = didTapAddTab
         self.didTapShareTab = didTapShareTab
+        self.didTapDone = didTapDone
         self.didToggleSuggestedArticles = didToggleSuggestedArticles
         super.init()
         Task {
@@ -276,12 +286,14 @@ public class WMFArticleTabsViewModel: NSObject, ObservableObject {
     }
 
     func closeTab(tab: ArticleTab) {
+        
         Task {
             do {
                 try await dataController.deleteArticleTab(identifier: tab.data.identifier)
 
                 Task { @MainActor [weak self]  in
                     guard let self else { return }
+                    loggingDelegate?.logArticleTabsOverviewTappedCloseTab()
                     articleTabs.removeAll { $0 == tab }
                     updateHasMultipleTabs()
                     maybeStartSecondaryLoads()

WMFComponents/Sources/WMFComponents/Components/Profile/WMFProfileViewModel.swift

@@ -112,7 +112,7 @@ enum ProfileState {
 
         var needsYiRNotification = false
         if let yearInReviewDependencies {
-            needsYiRNotification = yearInReviewDependencies.dataController.shouldShowYiRNotification(primaryAppLanguageProject: yearInReviewDependencies.primaryAppLanguageProject, isLoggedOut: !isLoggedIn, isTemporaryAccount: isTemporaryAccount)
+            needsYiRNotification = yearInReviewDependencies.dataController.shouldShowYiRNotification(isLoggedOut: !isLoggedIn, isTemporaryAccount: isTemporaryAccount)
         }
 
         if isLoggedIn {
@@ -202,7 +202,7 @@ enum ProfileState {
 
             var section3Items = [donateItem]
             if let yearInReviewDependencies,
-               yearInReviewDependencies.dataController.shouldShowYearInReviewEntryPoint(countryCode: yearInReviewDependencies.countryCode, primaryAppLanguageProject: yearInReviewDependencies.primaryAppLanguageProject) {
+               yearInReviewDependencies.dataController.shouldShowYearInReviewEntryPoint(countryCode: yearInReviewDependencies.countryCode) {
                 section3Items = [donateItem, yearInReviewItem]
             }
 
@@ -418,7 +418,7 @@ enum ProfileState {
 
             var sections = [joinSection, donateSection, settingsSection]
             if let yearInReviewDependencies,
-               yearInReviewDependencies.dataController.shouldShowYearInReviewEntryPoint(countryCode: yearInReviewDependencies.countryCode, primaryAppLanguageProject: yearInReviewDependencies.primaryAppLanguageProject) {
+               yearInReviewDependencies.dataController.shouldShowYearInReviewEntryPoint(countryCode: yearInReviewDependencies.countryCode) {
                 sections = [joinSection, donateSection, yearInReviewSection, settingsSection]
             }