Merge branch 'main' into T409351

tonisevener · web-flow · commit 40a2242a252f · 2025-12-17T16:44:23.000-06:00
diff --git a/WMFComponents/Sources/WMFComponents/Components/Activity Tab/WMFActivityTabCustomizeView.swift b/WMFComponents/Sources/WMFComponents/Components/Activity Tab/WMFActivityTabCustomizeView.swift
@@ -68,6 +68,7 @@ public struct WMFActivityTabCustomizeView: View {
                 Text(viewModel.localizedStrings.footer)
                     .font(Font(WMFFont.for(.caption1)))
                     .foregroundStyle(Color(uiColor: theme.secondaryText))
+                    .padding(.top, 12)
             }
         }
         .listRowBackground(Color(theme.paperBackground).edgesIgnoringSafeArea([.all]))
diff --git a/WMFComponents/Sources/WMFComponents/Components/Activity Tab/WMFActivityTabView.swift b/WMFComponents/Sources/WMFComponents/Components/Activity Tab/WMFActivityTabView.swift
@@ -469,6 +469,7 @@ public struct WMFActivityTabView: View {
     
     private func customizedEmptyState() -> some View {
         WMFSimpleEmptyStateView(imageName: "empty_activity_tab", openCustomize: viewModel.openCustomize, title: viewModel.localizedStrings.customizeEmptyState)
+            .frame(maxWidth: .infinity)
     }
 }
 
diff --git a/WMFComponents/Sources/WMFComponents/Components/Activity Tab/WMFSimpleEmptyStateView.swift b/WMFComponents/Sources/WMFComponents/Components/Activity Tab/WMFSimpleEmptyStateView.swift
@@ -39,6 +39,7 @@ public struct WMFSimpleEmptyStateView: View {
                 )
             Spacer()
         }
+        .frame(maxWidth: .infinity)
         .padding(.horizontal, 16)
         .background(Color(uiColor: theme.paperBackground))
     }
diff --git a/WMFComponents/Sources/WMFComponents/Style/WMFIcon.swift b/WMFComponents/Sources/WMFComponents/Style/WMFIcon.swift
@@ -112,6 +112,7 @@ public enum WMFSFSymbolIcon {
     case textPage
     case leave
     case gear
+    case gearShape
     case calendar
     case share
     case infoCircleFill
@@ -284,6 +285,8 @@ public enum WMFSFSymbolIcon {
             image = UIImage(systemName: "rectangle.portrait.and.arrow.right", withConfiguration: configuration)
         case .gear:
             image = UIImage(systemName: "gear", withConfiguration: configuration)
+        case .gearShape:
+            image = UIImage(systemName: "gearshape", withConfiguration: configuration)
         case .heartFilled:
             image = UIImage(systemName: "heart.fill", withConfiguration: configuration)
         case .calendar:
diff --git a/Wikipedia/Code/ActivityTabViewController.swift b/Wikipedia/Code/ActivityTabViewController.swift
@@ -294,7 +294,7 @@ final class WMFActivityTabHostingController: WMFComponentHostingController<WMFAc
             ActivityTabFunnel.shared.logActivityTabOverflowMenuProblem()
         })
         
-        let customizeAction = UIAction(title: CommonStrings.customize, image: WMFSFSymbolIcon.for(symbol: .gear), handler: { _ in
+        let customizeAction = UIAction(title: CommonStrings.customize, image: WMFSFSymbolIcon.for(symbol: .gearShape), handler: { _ in
             self.userDidTapCustomize()
             // TODO: Log
         })

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ public struct WMFActivityTabCustomizeView: View {`
`68`	`68`	`Text(viewModel.localizedStrings.footer)`
`69`	`69`	`.font(Font(WMFFont.for(.caption1)))`
`70`	`70`	`.foregroundStyle(Color(uiColor: theme.secondaryText))`
	`71`	`+ .padding(.top, 12)`
`71`	`72`	`}`
`72`	`73`	`}`
`73`	`74`	`.listRowBackground(Color(theme.paperBackground).edgesIgnoringSafeArea([.all]))`
Original file line number	Diff line number	Diff line change
`@@ -469,6 +469,7 @@ public struct WMFActivityTabView: View {`
`469`	`469`
`470`	`470`	`private func customizedEmptyState() -> some View {`
`471`	`471`	`WMFSimpleEmptyStateView(imageName: "empty_activity_tab", openCustomize: viewModel.openCustomize, title: viewModel.localizedStrings.customizeEmptyState)`
	`472`	`+ .frame(maxWidth: .infinity)`
`472`	`473`	`}`
`473`	`474`	`}`
`474`	`475`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ public struct WMFSimpleEmptyStateView: View {`
`39`	`39`	`)`
`40`	`40`	`Spacer()`
`41`	`41`	`}`
	`42`	`+ .frame(maxWidth: .infinity)`
`42`	`43`	`.padding(.horizontal, 16)`
`43`	`44`	`.background(Color(uiColor: theme.paperBackground))`
`44`	`45`	`}`