Skip to content

Commit 4bfcb0b

Browse files
authored
Merge pull request #5674 from wikimedia/history-title
Add History title to view
2 parents 178c097 + e18f9db commit 4bfcb0b

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

WMFComponents/Sources/WMFComponents/Components/History/WMFHistoryView.swift

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,16 @@ public struct WMFHistoryView: View {
160160
ZStack {
161161
Color(theme.paperBackground)
162162
.ignoresSafeArea()
163+
163164
if !viewModel.isEmpty {
164-
listView()
165+
VStack(alignment: .leading, spacing: 8) {
166+
Text(viewModel.localizedStrings.historyHeaderTitle)
167+
.font(Font(WMFFont.for(.boldTitle3)))
168+
.foregroundStyle(Color(uiColor: theme.text))
169+
.padding(.horizontal)
170+
171+
listView()
172+
}
165173
} else {
166174
emptyView()
167175
}

WMFComponents/Sources/WMFComponents/Components/History/WMFHistoryViewModel.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ public final class WMFHistoryViewModel: ObservableObject {
1515
let unsaveActionTitle: String
1616
let shareActionTitle: String
1717
let deleteSwipeActionLabel: String
18+
let historyHeaderTitle: String
1819

19-
public init(emptyViewTitle: String, emptyViewSubtitle: String, todayTitle: String, yesterdayTitle: String, openArticleActionTitle: String, saveForLaterActionTitle: String, unsaveActionTitle: String, shareActionTitle: String, deleteSwipeActionLabel: String) {
20+
public init(emptyViewTitle: String, emptyViewSubtitle: String, todayTitle: String, yesterdayTitle: String, openArticleActionTitle: String, saveForLaterActionTitle: String, unsaveActionTitle: String, shareActionTitle: String, deleteSwipeActionLabel: String, historyHeaderTitle: String) {
2021
self.emptyViewTitle = emptyViewTitle
2122
self.emptyViewSubtitle = emptyViewSubtitle
2223
self.todayTitle = todayTitle
@@ -26,6 +27,7 @@ public final class WMFHistoryViewModel: ObservableObject {
2627
self.unsaveActionTitle = unsaveActionTitle
2728
self.shareActionTitle = shareActionTitle
2829
self.deleteSwipeActionLabel = deleteSwipeActionLabel
30+
self.historyHeaderTitle = historyHeaderTitle
2931
}
3032
}
3133

WMFComponents/Tests/WMFComponentsTests/WMFHistoryViewModelTests.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ final class WMFHistoryViewModelTests: XCTestCase {
4848
saveForLaterActionTitle: "Save for Later",
4949
unsaveActionTitle: "Unsave",
5050
shareActionTitle: "Share",
51-
deleteSwipeActionLabel: "Delete"
51+
deleteSwipeActionLabel: "Delete",
52+
historyHeaderTitle: "History"
5253
)
5354

5455
func createViewModel(with controller: WMFHistoryDataControllerProtocol) -> WMFHistoryViewModel {

Wikipedia/Code/SearchViewController.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -833,8 +833,7 @@ class SearchViewController: ThemeableViewController, WMFNavigationBarConfiguring
833833
let todayTitle = CommonStrings.todayTitle
834834
let yesterdayTitle = CommonStrings.yesterdayTitle
835835

836-
let localizedStrings = WMFHistoryViewModel.LocalizedStrings(emptyViewTitle: CommonStrings.emptyNoHistoryTitle, emptyViewSubtitle: CommonStrings.emptyNoHistorySubtitle, todayTitle: todayTitle, yesterdayTitle: yesterdayTitle, openArticleActionTitle: "Open article",saveForLaterActionTitle: CommonStrings.saveTitle, unsaveActionTitle: CommonStrings.unsaveTitle, shareActionTitle: CommonStrings.shareMenuTitle, deleteSwipeActionLabel: CommonStrings.deleteActionTitle)
837-
836+
let localizedStrings = WMFHistoryViewModel.LocalizedStrings(emptyViewTitle: CommonStrings.emptyNoHistoryTitle, emptyViewSubtitle: CommonStrings.emptyNoHistorySubtitle, todayTitle: todayTitle, yesterdayTitle: yesterdayTitle, openArticleActionTitle: "Open article",saveForLaterActionTitle: CommonStrings.saveTitle, unsaveActionTitle: CommonStrings.unsaveTitle, shareActionTitle: CommonStrings.shareMenuTitle, deleteSwipeActionLabel: CommonStrings.deleteActionTitle, historyHeaderTitle: CommonStrings.historyTabTitle)
838837

839838
let viewModel = WMFHistoryViewModel(emptyViewImage: UIImage(named: "history-blank"), localizedStrings: localizedStrings, historyDataController: historyDataController)
840839

0 commit comments

Comments
 (0)