Skip to content

Commit 9214568

Browse files
author
Giorgio Ruscigno
committed
Migration screens: some minor refactor
1 parent 7e148ee commit 9214568

File tree

4 files changed

+42
-95
lines changed

4 files changed

+42
-95
lines changed

‎WordPress/Jetpack/Classes/ViewRelated/WordPress-to-Jetpack Migration/All done/MigrationDoneViewController.swift‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,23 @@ class MigrationDoneViewController: UIViewController {
1414
}
1515

1616
override func loadView() {
17-
// TODO: replace this blank center view with the actual content
18-
let centerView = UIView()
19-
centerView.translatesAutoresizingMaskIntoConstraints = false
20-
centerView.setContentHuggingPriority(UILayoutPriority.defaultLow, for: .vertical)
17+
let centerContentView = MigrationDoneCenterView()
18+
let centerView = MigrationCenterView(contentView: centerContentView,
19+
descriptionText: TextContent.description,
20+
highlightedDescriptionText: TextContent.highlightedDescription)
2121

2222
view = MigrationStepView(headerView: MigrationHeaderView(configuration: viewModel.configuration.headerConfiguration),
2323
actionsView: MigrationActionsView(configuration: viewModel.configuration.actionsConfiguration),
24-
centerView: MigrationCenterView(contentView: MigrationDoneCenterView()))
24+
centerView: centerView)
25+
}
26+
27+
enum TextContent {
28+
29+
static let description = NSLocalizedString("migration.done.footer",
30+
value: "Please delete the WordPress app to avoid data conflicts.",
31+
comment: "Footer for the migration done screen.")
32+
static let highlightedDescription = NSLocalizedString("migration.done.footer.highlighted",
33+
value: "delete the WordPress app",
34+
comment: "Highlighted text in the footer of the migration done screen.")
2535
}
2636
}

‎WordPress/Jetpack/Classes/ViewRelated/WordPress-to-Jetpack Migration/Common/Views/Configuration/MigrationCenterView.swift‎

Lines changed: 0 additions & 85 deletions
This file was deleted.

‎WordPress/Jetpack/Classes/ViewRelated/WordPress-to-Jetpack Migration/Notifications Permission/MigrationNotificationsViewController.swift‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,23 @@ class MigrationNotificationsViewController: UIViewController {
1414
}
1515

1616
override func loadView() {
17+
let centerContentView = MigrationNotificationsCenterView()
18+
let centerView = MigrationCenterView(contentView: centerContentView,
19+
descriptionText: TextContent.description,
20+
highlightedDescriptionText: TextContent.highlightedDescription)
1721

1822
view = MigrationStepView(headerView: MigrationHeaderView(configuration: viewModel.configuration.headerConfiguration),
1923
actionsView: MigrationActionsView(configuration: viewModel.configuration.actionsConfiguration),
20-
centerView: MigrationCenterView(contentView: MigrationNotificationsCenterView()))
24+
centerView: centerView)
25+
}
26+
27+
enum TextContent {
28+
29+
static let description = NSLocalizedString("migration.notifications.footer",
30+
value: "When the alert apears tap Allow to continue receiving all your WordPress notifications.",
31+
comment: "Footer for the migration notifications screen.")
32+
static let highlightedDescription = NSLocalizedString("migration.notifications.footer.highlighted",
33+
value: "Allow",
34+
comment: "Highlighted text in the footer of the migration notifications screen.")
2135
}
2236
}

‎WordPress/WordPress.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,9 @@
831831
3FE3D1FF26A6F56700F3CD10 /* Comment+Interface.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE02F95E269DC14A00752A44 /* Comment+Interface.swift */; };
832832
3FE77C8325B0CA89007DE9E5 /* LocalizableStrings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FE77C8225B0CA89007DE9E5 /* LocalizableStrings.swift */; };
833833
3FEC241525D73E8B007AFE63 /* ConfettiView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FEC241425D73E8B007AFE63 /* ConfettiView.swift */; };
834-
3FF15A56291B4EEA00E1B4E5 /* MigrationNotificationsCenterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FF15A55291B4EEA00E1B4E5 /* MigrationNotificationsCenterView.swift */; };
834+
3FF15A56291B4EEA00E1B4E5 /* MigrationCenterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FF15A55291B4EEA00E1B4E5 /* MigrationCenterView.swift */; };
835+
3FF15A5A291EC56700E1B4E5 /* MigrationDoneCenterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FF15A59291EC56700E1B4E5 /* MigrationDoneCenterView.swift */; };
836+
3FF15A5C291ED21100E1B4E5 /* MigrationNotificationsCenterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FF15A5B291ED21100E1B4E5 /* MigrationNotificationsCenterView.swift */; };
835837
3FF1A853242D5FCB00373F5D /* WPTabBarController+ReaderTabNavigation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FF1A852242D5FCB00373F5D /* WPTabBarController+ReaderTabNavigation.swift */; };
836838
3FFA5ED22876152E00830E28 /* JetpackButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FFA5ED12876152E00830E28 /* JetpackButton.swift */; };
837839
3FFDEF7829177D7500B625CE /* MigrationNotificationsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FFDEF7729177D7500B625CE /* MigrationNotificationsViewModel.swift */; };
@@ -6092,7 +6094,9 @@
60926094
3FE20C3625CF211F00A15525 /* ListViewData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListViewData.swift; sourceTree = "<group>"; };
60936095
3FE77C8225B0CA89007DE9E5 /* LocalizableStrings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizableStrings.swift; sourceTree = "<group>"; };
60946096
3FEC241425D73E8B007AFE63 /* ConfettiView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfettiView.swift; sourceTree = "<group>"; };
6095-
3FF15A55291B4EEA00E1B4E5 /* MigrationNotificationsCenterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrationNotificationsCenterView.swift; sourceTree = "<group>"; };
6097+
3FF15A55291B4EEA00E1B4E5 /* MigrationCenterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrationCenterView.swift; sourceTree = "<group>"; };
6098+
3FF15A59291EC56700E1B4E5 /* MigrationDoneCenterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrationDoneCenterView.swift; sourceTree = "<group>"; };
6099+
3FF15A5B291ED21100E1B4E5 /* MigrationNotificationsCenterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrationNotificationsCenterView.swift; sourceTree = "<group>"; };
60966100
3FF1A852242D5FCB00373F5D /* WPTabBarController+ReaderTabNavigation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WPTabBarController+ReaderTabNavigation.swift"; sourceTree = "<group>"; };
60976101
3FFA5ED12876152E00830E28 /* JetpackButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JetpackButton.swift; sourceTree = "<group>"; };
60986102
3FFDEF7729177D7500B625CE /* MigrationNotificationsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrationNotificationsViewModel.swift; sourceTree = "<group>"; };
@@ -10172,7 +10176,7 @@
1017210176
3F00739D2915BAA100A37FD1 /* Notifications Permission */ = {
1017310177
isa = PBXGroup;
1017410178
children = (
10175-
3FF15A55291B4EEA00E1B4E5 /* MigrationNotificationsCenterView.swift */,
10179+
3FF15A5B291ED21100E1B4E5 /* MigrationNotificationsCenterView.swift */,
1017610180
3FFDEF7929177D8C00B625CE /* MigrationNotificationsViewController.swift */,
1017710181
3FFDEF7729177D7500B625CE /* MigrationNotificationsViewModel.swift */,
1017810182
);
@@ -10904,6 +10908,7 @@
1090410908
3FFDEF862918595200B625CE /* All done */ = {
1090510909
isa = PBXGroup;
1090610910
children = (
10911+
3FF15A59291EC56700E1B4E5 /* MigrationDoneCenterView.swift */,
1090710912
3FFDEF892918597700B625CE /* MigrationDoneViewController.swift */,
1090810913
3FFDEF872918596B00B625CE /* MigrationDoneViewModel.swift */,
1090910914
);
@@ -16415,6 +16420,7 @@
1641516420
F41BDD72290BBDCA00B7F2B0 /* MigrationActionsView.swift */,
1641616421
F4F9D5EB29096CF500502576 /* MigrationHeaderView.swift */,
1641716422
3FFDEF842918215700B625CE /* MigrationStepView.swift */,
16423+
3FF15A55291B4EEA00E1B4E5 /* MigrationCenterView.swift */,
1641816424
3FFDEF8D2918625600B625CE /* Configuration */,
1641916425
);
1642016426
path = Views;
@@ -22420,6 +22426,7 @@
2242022426
FABB216F2602FC2C00C8785C /* UIView+ContentLayout.swift in Sources */,
2242122427
FABB21702602FC2C00C8785C /* PeopleCell.swift in Sources */,
2242222428
FABB21712602FC2C00C8785C /* AbstractPost+Local.swift in Sources */,
22429+
3FF15A5A291EC56700E1B4E5 /* MigrationDoneCenterView.swift in Sources */,
2242322430
FABB21722602FC2C00C8785C /* MeScenePresenter.swift in Sources */,
2242422431
FABB21732602FC2C00C8785C /* JetpackScanStatusViewModel.swift in Sources */,
2242522432
F195C42C26DFBE21000EC884 /* WeeklyRoundupBackgroundTask.swift in Sources */,
@@ -23442,7 +23449,7 @@
2344223449
C3643AD028AC049D00FC5FD3 /* SharingViewController.swift in Sources */,
2344323450
FABB24A42602FC2C00C8785C /* NotificationContentFactory.swift in Sources */,
2344423451
FABB24A52602FC2C00C8785C /* SiteIconView.swift in Sources */,
23445-
3FF15A56291B4EEA00E1B4E5 /* MigrationNotificationsCenterView.swift in Sources */,
23452+
3FF15A56291B4EEA00E1B4E5 /* MigrationCenterView.swift in Sources */,
2344623453
FABB24A62602FC2C00C8785C /* JetpackRestoreCompleteViewController.swift in Sources */,
2344723454
FABB24A72602FC2C00C8785C /* FormattableNoticonRange.swift in Sources */,
2344823455
FABB24A82602FC2C00C8785C /* PromptViewController.swift in Sources */,
@@ -23779,6 +23786,7 @@
2377923786
FABB25B12602FC2C00C8785C /* NSAttributedStringKey+Conversion.swift in Sources */,
2378023787
FABB25B22602FC2C00C8785C /* SelectPostViewController.swift in Sources */,
2378123788
8BE6F92D27EE27DB0008BDC7 /* BlogDashboardPostCardGhostCell.swift in Sources */,
23789+
3FF15A5C291ED21100E1B4E5 /* MigrationNotificationsCenterView.swift in Sources */,
2378223790
FABB25B32602FC2C00C8785C /* ReaderVisitSiteAction.swift in Sources */,
2378323791
FABB25B42602FC2C00C8785C /* ReaderCard+CoreDataProperties.swift in Sources */,
2378423792
FABB25B52602FC2C00C8785C /* GutenbergViewController+MoreActions.swift in Sources */,

0 commit comments

Comments
 (0)