Merge branch 'liquid-glass' into T416194

Author: tonisevener

WMF Framework/WMFContentGroup+Display.swift

@@ -135,7 +135,7 @@ extension WMFContentGroup {
             return false
         }
         switch contentGroupKind {
-        case .announcement, .notification, .theme, .readingList:
+        case .announcement, .theme, .readingList:
             return false
         default:
             return true

WMF Framework/WMFContentGroup+Extensions.h

@@ -30,7 +30,6 @@ typedef NS_ENUM(int32_t, WMFContentGroupKind) {
     WMFContentGroupKindFeaturedArticle = 7,
     WMFContentGroupKindTopRead = 8,
     WMFContentGroupKindNews = 9,
-    WMFContentGroupKindNotification = 10,
     WMFContentGroupKindAnnouncement = 11,
     WMFContentGroupKindLocationPlaceholder = 12,
     WMFContentGroupKindOnThisDay = 13,

WMF Framework/WMFContentGroup+Extensions.m

@@ -73,9 +73,6 @@ - (void)updateKey {
         case WMFContentGroupKindOnThisDay:
             URL = [WMFContentGroup onThisDayContentGroupURLForSiteURL:self.siteURL midnightUTCDate:self.midnightUTCDate];
             break;
-        case WMFContentGroupKindNotification:
-            URL = [WMFContentGroup notificationContentGroupURLWithLanguageVariantCode:self.siteURL.wmf_languageVariantCode];
-            break;
         case WMFContentGroupKindTheme:
             URL = [WMFContentGroup themeContentGroupURLWithLanguageVariantCode:self.siteURL.wmf_languageVariantCode];
             break;
@@ -114,9 +111,6 @@ - (void)updateContentType {
         case WMFContentGroupKindAnnouncement:
             self.contentType = WMFContentTypeAnnouncement;
             break;
-        case WMFContentGroupKindNotification:
-            self.contentType = WMFContentTypeNotification;
-            break;
         case WMFContentGroupKindTheme:
             self.contentType = WMFContentTypeTheme;
             break;
@@ -181,9 +175,6 @@ - (void)updateDailySortPriorityWithSortOrderByContentLanguageCode:(nullable NSDi
         case WMFContentGroupKindNews:
             updatedDailySortPriority = contentLanguageSortOrder + 6;
             break;
-        case WMFContentGroupKindNotification:
-            updatedDailySortPriority = -1;
-            break;
         case WMFContentGroupKindPictureOfTheDay:
             updatedDailySortPriority = 8;
             break;
@@ -345,7 +336,6 @@ - (void)updateContentPreviewWithContent:(id)content {
 
         } break;
         case WMFContentGroupKindMainPage:
-        case WMFContentGroupKindNotification:
         case WMFContentGroupKindLocationPlaceholder:
         case WMFContentGroupKindPictureOfTheDay:
         case WMFContentGroupKindRandom:

WMF Framework/WMFExploreFeedContentController.m

@@ -415,7 +415,7 @@ - (BOOL)anyContentGroupsVisibleInTheFeedForSiteURL:(NSURL *)siteURL {
     static NSSet *customizableContentGroupKindNumbers;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        customizableContentGroupKindNumbers = [NSSet setWithArray:@[@(WMFContentGroupKindFeaturedArticle), @(WMFContentGroupKindNews), @(WMFContentGroupKindTopRead), @(WMFContentGroupKindOnThisDay), @(WMFContentGroupKindLocation), @(WMFContentGroupKindLocationPlaceholder), @(WMFContentGroupKindRandom), @(WMFContentGroupKindNotification)]];
+        customizableContentGroupKindNumbers = [NSSet setWithArray:@[@(WMFContentGroupKindFeaturedArticle), @(WMFContentGroupKindNews), @(WMFContentGroupKindTopRead), @(WMFContentGroupKindOnThisDay), @(WMFContentGroupKindLocation), @(WMFContentGroupKindLocationPlaceholder), @(WMFContentGroupKindRandom)]];
     });
     return customizableContentGroupKindNumbers;
 }
@@ -719,11 +719,6 @@ - (void)applyExploreFeedPreferencesToObjects:(NSArray<WMFContentGroup *>*)object
             continue;
         }
 
-        // Do not let preferences affect the notifications card
-        if (contentGroup.contentGroupKind == WMFContentGroupKindNotification) {
-            continue;
-        }
-        
         BOOL isVisible;
         if ([self isGlobal:contentGroup.contentGroupKind]) {
             NSDictionary *globalCardPreferences = [exploreFeedPreferences objectForKey:WMFExploreFeedPreferencesGlobalCardsKey];

WMFComponents/Sources/WMFComponents/Components/Settings/WMFSettingsView.swift

@@ -43,6 +43,7 @@ struct SettingsRow: View {
         case .toggle(let binding):
             Toggle("", isOn: binding)
                 .labelsHidden()
+                .toggleStyle(SwitchToggleStyle(tint: Color(uiColor: theme.accent)))
         case .icon(let image):
             if let image {
                 Image(uiImage: image)

WMFComponents/Sources/WMFComponents/Components/Settings/WMFSettingsViewModel.swift

@@ -227,7 +227,7 @@ final public class WMFSettingsViewModel: ObservableObject {
         self.username = username
         self.tempUsername = tempUsername
         self.isTempAccount = isTempAccount
-        await buildSections()
+        await refreshSections()
     }
 
     /// Updates the language, explore feed status and reading theme synchronously

WMFComponents/Sources/WMFComponents/Components/Shared/Buttons/CloseButtons.swift

@@ -60,16 +60,14 @@ import SwiftUI
 
         switch config.imageType {
         case .plainX:
-            let image = WMFSFSymbolIcon.for(symbol: .close, font: WMFFont.navigationBarCloseButtonFont)
-            item = UIBarButtonItem(image: image, style: .plain, target: config.target, action: config.action)
-            item.tintColor = theme.text
+            item = UIBarButtonItem(barButtonSystemItem: .cancel, target: config.target, action: config.action)
 
         case .prominentCheck:
             let image = WMFSFSymbolIcon.for(symbol: .checkmark, font: WMFFont.navigationBarCloseButtonFont)
             if #available(iOS 26.0, *) {
                 item = UIBarButtonItem(image: image, style: .prominent, target: config.target, action: config.action)
             } else {
-                item = UIBarButtonItem(image: image, style: .done, target: config.target, action: config.action)
+                item = UIBarButtonItem(barButtonSystemItem: .done, target: config.target, action: config.action)
             }
             item.tintColor = theme.link
         }

WMFComponents/Sources/WMFComponents/Extensions/Navigation Bar/WMFNavigationBarConfiguring.swift

@@ -141,10 +141,7 @@ public extension WMFNavigationBarConfiguring where Self: UIViewController {
             navigationController?.navigationBar.prefersLargeTitles = false
             navigationItem.largeTitleDisplayMode = .never
 
-            // will see double-titles on iPhones without this
-            if traitCollection.horizontalSizeClass == .compact {
-                navigationItem.titleView = UIView()
-            }
+            navigationItem.titleView = UIView()
 
             if let customTitleView = titleConfig.customView {
                 let button = UIBarButtonItem(customView: customTitleView)

WMFData/Sources/WMFData/Data Controllers/Settings/WMFSettingsDataController.swift

@@ -80,6 +80,18 @@ public actor WMFSettingsDataController: ObservableObject {
         try? userDefaultsStore?.save(key: WMFUserDefaultsKey.autoSignTalkPageDiscussions.rawValue, value: newValue)
     }
 
+    public nonisolated func didMigrateAutoSignTalkPageDiscussions() -> Bool {
+        return (try? userDefaultsStore?.load(key: WMFUserDefaultsKey.didMigrateAutoSignTalkPageDiscussions.rawValue)) ?? false
+    }
+
+    public nonisolated func setDidMigrateAutoSignTalkPageDiscussions(_ newValue: Bool) {
+        try? userDefaultsStore?.save(key: WMFUserDefaultsKey.didMigrateAutoSignTalkPageDiscussions.rawValue, value: newValue)
+    }
+
+    public nonisolated func hasStoredAutoSignTalkPageDiscussions() -> Bool {
+        return UserDefaults.standard.object(forKey: WMFUserDefaultsKey.autoSignTalkPageDiscussions.rawValue) != nil
+    }
+
     // MARK: - Search Settings
 
     public nonisolated func showSearchLanguageBar() -> Bool {

WMFData/Sources/WMFData/Store/WMFUserDefaultsKey.swift

@@ -35,6 +35,7 @@ public enum WMFUserDefaultsKey: String {
     case activityTabIsEditingInsightsOn = "activity-tab-editing-insights"
     case activityTabIsTimelineOfBehaviorOn = "activity-tab-timeline-of-behavior"
     case autoSignTalkPageDiscussions = "auto-sign-talk-page-discussions"
+    case didMigrateAutoSignTalkPageDiscussions = "did-migrate-auto-sign-talk-page-discussions"
     case showSearchLanguageBar = "show-search-language-bar"
     case openAppOnSearchTab = "open-app-on-search-tab"
     case isSubscribedToEchoNotifications = "is-subscribed-to-echo-notifications"