Skip to content

Commit 69cc567

Browse files
committed
Move RecentActivity widget to RecentActivity package
1 parent 08358ef commit 69cc567

File tree

6 files changed

+24
-55
lines changed

6 files changed

+24
-55
lines changed

GovUK.xcodeproj/project.pbxproj

-8
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@
134134
5D9E67CA2C5A3BA600DB7877 /* UITabBarController+GOVUK.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D9E67C92C5A3BA600DB7877 /* UITabBarController+GOVUK.swift */; };
135135
5DA4FB072CCBAF2100804C8A /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DA4FB062CCBAF2100804C8A /* SettingsView.swift */; };
136136
5DA6E5332C47BD2700D41263 /* DeeplinkRouteProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DA6E5322C47BD2700D41263 /* DeeplinkRouteProvider.swift */; };
137-
5DABE8CF2CA41AD4003AB312 /* RecentActivityWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DABE8CE2CA41AD4003AB312 /* RecentActivityWidget.swift */; };
138137
5DAD71782BD250DB0075F648 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DAD71772BD250DB0075F648 /* AppDelegate.swift */; };
139138
5DAD717A2BD250DB0075F648 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DAD71792BD250DB0075F648 /* SceneDelegate.swift */; };
140139
5DAD71812BD250DE0075F648 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5DAD71802BD250DE0075F648 /* Assets.xcassets */; };
@@ -185,7 +184,6 @@
185184
D0568C502D521B45000F1110 /* WidgetCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0568C4E2D521B45000F1110 /* WidgetCoordinator.swift */; };
186185
D0568E442D53B370000F1110 /* UserFeedbackWidgetProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0568E432D53B370000F1110 /* UserFeedbackWidgetProvider.swift */; };
187186
D0568E462D54D462000F1110 /* SearchWidgetProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0568E452D54D462000F1110 /* SearchWidgetProvider.swift */; };
188-
D0568E482D550625000F1110 /* RecentActivityWidgetProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0568E472D550625000F1110 /* RecentActivityWidgetProvider.swift */; };
189187
D056CE762D3A848A005845E0 /* UserFeedbackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D056CE752D3A847F005845E0 /* UserFeedbackView.swift */; };
190188
D05AF4DA2CAD3C2900F86DD0 /* TopicDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D05AF4D92CAD3C2900F86DD0 /* TopicDetailView.swift */; };
191189
D05AF4DC2CAD3C4E00F86DD0 /* TopicsWidgetViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D05AF4DB2CAD3C4E00F86DD0 /* TopicsWidgetViewModel.swift */; };
@@ -394,7 +392,6 @@
394392
5D9E67C92C5A3BA600DB7877 /* UITabBarController+GOVUK.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITabBarController+GOVUK.swift"; sourceTree = "<group>"; };
395393
5DA4FB062CCBAF2100804C8A /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
396394
5DA6E5322C47BD2700D41263 /* DeeplinkRouteProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeeplinkRouteProvider.swift; sourceTree = "<group>"; };
397-
5DABE8CE2CA41AD4003AB312 /* RecentActivityWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecentActivityWidget.swift; sourceTree = "<group>"; };
398395
5DAD71742BD250DB0075F648 /* govuk_ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = govuk_ios.app; sourceTree = BUILT_PRODUCTS_DIR; };
399396
5DAD71772BD250DB0075F648 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
400397
5DAD71792BD250DB0075F648 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@@ -445,7 +442,6 @@
445442
D0568C4E2D521B45000F1110 /* WidgetCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetCoordinator.swift; sourceTree = "<group>"; };
446443
D0568E432D53B370000F1110 /* UserFeedbackWidgetProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserFeedbackWidgetProvider.swift; sourceTree = "<group>"; };
447444
D0568E452D54D462000F1110 /* SearchWidgetProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchWidgetProvider.swift; sourceTree = "<group>"; };
448-
D0568E472D550625000F1110 /* RecentActivityWidgetProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecentActivityWidgetProvider.swift; sourceTree = "<group>"; };
449445
D056CE752D3A847F005845E0 /* UserFeedbackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserFeedbackView.swift; sourceTree = "<group>"; };
450446
D05AF4D92CAD3C2900F86DD0 /* TopicDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TopicDetailView.swift; sourceTree = "<group>"; };
451447
D05AF4DB2CAD3C4E00F86DD0 /* TopicsWidgetViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TopicsWidgetViewModel.swift; sourceTree = "<group>"; };
@@ -633,12 +629,10 @@
633629
D056CE752D3A847F005845E0 /* UserFeedbackView.swift */,
634630
D06EB96A2CA6F6FA007EA081 /* Topics */,
635631
5DD036842C5A577C00EEF11E /* NavigationBar.swift */,
636-
5DABE8CE2CA41AD4003AB312 /* RecentActivityWidget.swift */,
637632
1666F49F2C86124900DBD064 /* SearchModalButton.swift */,
638633
16E5AD422C6D5719000B8B3A /* SearchWidgetStackView.swift */,
639634
D0568E432D53B370000F1110 /* UserFeedbackWidgetProvider.swift */,
640635
D0568E452D54D462000F1110 /* SearchWidgetProvider.swift */,
641-
D0568E472D550625000F1110 /* RecentActivityWidgetProvider.swift */,
642636
);
643637
path = Home;
644638
sourceTree = "<group>";
@@ -1678,7 +1672,6 @@
16781672
D0EB02812D37F02400B310D8 /* CoreDataRepository.swift in Sources */,
16791673
1631DE992C2B0D020050CB9D /* DeviceInformationProvider.swift in Sources */,
16801674
166BDDB62C330D1C00437AE0 /* HomeViewController.swift in Sources */,
1681-
5DABE8CF2CA41AD4003AB312 /* RecentActivityWidget.swift in Sources */,
16821675
5D66D1842CBFC12400006723 /* AppEvent+Function.swift in Sources */,
16831676
16D0D0432CC6819C00944D79 /* TopicTableViewCell.swift in Sources */,
16841677
D06EB96C2CA6F71E007EA081 /* TopicCard.swift in Sources */,
@@ -1692,7 +1685,6 @@
16921685
3D9C933C2CB0155300EFA337 /* Bundle+AppVersionProvider.swift in Sources */,
16931686
D0568E442D53B370000F1110 /* UserFeedbackWidgetProvider.swift in Sources */,
16941687
1687F3152CB40F8B005E1473 /* AllTopicsCoordinator.swift in Sources */,
1695-
D0568E482D550625000F1110 /* RecentActivityWidgetProvider.swift in Sources */,
16961688
4E00EEEF2CCB04B0007B61E8 /* TopicOnboardingViewModel.swift in Sources */,
16971689
);
16981690
runOnlyForDeploymentPostprocessing = 0;

Production/govuk_ios/Resources/Strings/Home.xcstrings

-22
Original file line numberDiff line numberDiff line change
@@ -45,28 +45,6 @@
4545
}
4646
}
4747
},
48-
"recentActivityWidgetAccessibilityLabel" : {
49-
"extractionState" : "manual",
50-
"localizations" : {
51-
"en-GB" : {
52-
"stringUnit" : {
53-
"state" : "translated",
54-
"value" : "Pages you've visited"
55-
}
56-
}
57-
}
58-
},
59-
"recentActivityWidgetTitle" : {
60-
"extractionState" : "manual",
61-
"localizations" : {
62-
"en-GB" : {
63-
"stringUnit" : {
64-
"state" : "translated",
65-
"value" : "Pages you've visited"
66-
}
67-
}
68-
}
69-
},
7048
"searchButtonTitle" : {
7149
"extractionState" : "manual",
7250
"localizations" : {

Production/govuk_ios/Resources/Widgets.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"enabled" : true
1717
},
1818
{
19-
"name" : "govuk_ios.RecentActivityWidgetProvider",
19+
"name" : "RecentActivity.RecentActivityWidgetProvider",
2020
"rank" : 2,
2121
"enabled" : true
2222
},

Production/govuk_ios/Views/Home/RecentActivityWidgetProvider.swift

-23
This file was deleted.

Production/govuk_ios/Views/Home/RecentActivityWidget.swift renamed to RecentActivity/Sources/RecentActivity/Model/RecentActivity/RecentActivityWidget.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class RecentActivityWidget: UIControl {
1616
}
1717

1818
private func configureAccessibility() {
19-
accessibilityLabel = String.home.localized(
19+
accessibilityLabel = String.recentActivity.localized(
2020
"recentActivityWidgetAccessibilityLabel"
2121
)
2222
accessibilityTraits = .button

RecentActivity/Sources/RecentActivity/Resources/Strings/RecentActivity.xcstrings

+22
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,28 @@
100100
}
101101
}
102102
},
103+
"recentActivityWidgetAccessibilityLabel" : {
104+
"extractionState" : "manual",
105+
"localizations" : {
106+
"en-GB" : {
107+
"stringUnit" : {
108+
"state" : "translated",
109+
"value" : "Pages you've visited"
110+
}
111+
}
112+
}
113+
},
114+
"recentActivityWidgetTitle" : {
115+
"extractionState" : "manual",
116+
"localizations" : {
117+
"en-GB" : {
118+
"stringUnit" : {
119+
"state" : "translated",
120+
"value" : "Pages you've visited"
121+
}
122+
}
123+
}
124+
},
103125
"removeActivitiesButtonTitle" : {
104126
"extractionState" : "manual",
105127
"localizations" : {

0 commit comments

Comments
 (0)