Merge pull request #5604 from wikimedia/T411060_design

tonisevener · web-flow · commit 828e8a22a15a · 2025-12-17T17:15:24.000-06:00
Reordered buttons, lowercased title
diff --git a/WMFComponents/Sources/WMFComponents/Components/Article Tabs/WMFArticleTabsHostingController.swift b/WMFComponents/Sources/WMFComponents/Components/Article Tabs/WMFArticleTabsHostingController.swift
@@ -31,7 +31,7 @@ public class WMFArticleTabsHostingController<HostedView: View>: WMFComponentHost
         format = viewModel.localizedStrings.navBarTitleFormat
         viewModel.updateNavigationBarTitleAction = { [weak self] numTabs in
             let newNavigationBarTitle = String.localizedStringWithFormat(self?.format ?? "", numTabs)
-            self?.configureNavigationBar(newNavigationBarTitle)
+            self?.configureNavigationBar(newNavigationBarTitle.lowercased())
         }
     }
     
@@ -45,7 +45,7 @@ public class WMFArticleTabsHostingController<HostedView: View>: WMFComponentHost
         configureNavigationBar()
         
         if dataController.shouldShowMoreDynamicTabsV2 {
-            navigationItem.rightBarButtonItems = [overflowButton, addTabButton]
+            navigationItem.rightBarButtonItems = [addTabButton, overflowButton]
         } else {
             navigationItem.rightBarButtonItem = addTabButton
         }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public class WMFArticleTabsHostingController<HostedView: View>: WMFComponentHost`
`31`	`31`	`format = viewModel.localizedStrings.navBarTitleFormat`
`32`	`32`	`viewModel.updateNavigationBarTitleAction = { [weak self] numTabs in`
`33`	`33`	`let newNavigationBarTitle = String.localizedStringWithFormat(self?.format ?? "", numTabs)`
`34`		`- self?.configureNavigationBar(newNavigationBarTitle)`
	`34`	`+ self?.configureNavigationBar(newNavigationBarTitle.lowercased())`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`@@ -45,7 +45,7 @@ public class WMFArticleTabsHostingController<HostedView: View>: WMFComponentHost`
`45`	`45`	`configureNavigationBar()`
`46`	`46`
`47`	`47`	`if dataController.shouldShowMoreDynamicTabsV2 {`
`48`		`- navigationItem.rightBarButtonItems = [overflowButton, addTabButton]`
	`48`	`+ navigationItem.rightBarButtonItems = [addTabButton, overflowButton]`
`49`	`49`	`} else {`
`50`	`50`	`navigationItem.rightBarButtonItem = addTabButton`
`51`	`51`	`}`