Add FXIOS-9636 [Native Error Page] UI for No internet connection (#2…

…1629) * Add FXIOS-9636 [Native Error Page] No Internet Connection UI * Add FXIOS-9636 [Native Error Page] Test cases for native error page view controllers. --------- Co-authored-by: cyndichin <[email protected]>
mozilla-mobile · Aug 30, 2024 · 01b23e1 · 01b23e1
1 parent e31e169
commit 01b23e1
Show file tree

Hide file tree

Showing 14 changed files with 384 additions and 5 deletions.
diff --git a/firefox-ios/Client.xcodeproj/project.pbxproj b/firefox-ios/Client.xcodeproj/project.pbxproj
@@ -544,7 +544,11 @@
 		602B3D6729B0E1DB0066DEF8 /* ConversionValueUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 602B3D6629B0E1DB0066DEF8 /* ConversionValueUtil.swift */; };
 		60CE80C12667780D004026C7 /* CredentialListPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60CE80C02667780C004026C7 /* CredentialListPresenter.swift */; };
 		60D71AEC26AAF45E00355588 /* UIColorExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60D71AEB26AAF45E00355588 /* UIColorExtension.swift */; };
+		630FE1342C7FB42500D9D6B2 /* NativeErrorPageMockModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 630FE1302C7FB42500D9D6B2 /* NativeErrorPageMockModel.swift */; };
+		630FE1352C7FB42500D9D6B2 /* NativeErrorPageViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 630FE1322C7FB42500D9D6B2 /* NativeErrorPageViewControllerTests.swift */; };
 		63306D3921103EAE00F25400 /* LegacySavedTab.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63306D3821103EAE00F25400 /* LegacySavedTab.swift */; };
+		63F7A9AA2C7529ED005846F5 /* NativeErrorPageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63F7A9A92C7529ED005846F5 /* NativeErrorPageModel.swift */; };
+		63F7A9AC2C752BB0005846F5 /* NativeErrorPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63F7A9AB2C752BB0005846F5 /* NativeErrorPageViewController.swift */; };
 		6669B5E2211418A200CA117B /* WebsiteDataSearchResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6669B5E1211418A200CA117B /* WebsiteDataSearchResultsViewController.swift */; };
 		66CE54A820FCF6CF00CC310B /* WebsiteDataManagementViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66CE54A720FCF6CF00CC310B /* WebsiteDataManagementViewController.swift */; };
 		6A3E5D8A283831D1001E706E /* DownloadQueueTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A3E5D89283831D0001E706E /* DownloadQueueTests.swift */; };
@@ -6098,9 +6102,13 @@
 		62C1428C920701180BCD4C47 /* anp */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = anp; path = anp.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		62DF49B9976D5863CADF6EAA /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Menu.strings; sourceTree = "<group>"; };
 		63094229AA6EC744599B77A4 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/ClearPrivateData.strings; sourceTree = "<group>"; };
+		630FE1302C7FB42500D9D6B2 /* NativeErrorPageMockModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NativeErrorPageMockModel.swift; sourceTree = "<group>"; };
+		630FE1322C7FB42500D9D6B2 /* NativeErrorPageViewControllerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NativeErrorPageViewControllerTests.swift; sourceTree = "<group>"; };
 		63306D3821103EAE00F25400 /* LegacySavedTab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LegacySavedTab.swift; sourceTree = "<group>"; };
 		634148899F41CAA3BCF71E8B /* or */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = or; path = or.lproj/Localizable.strings; sourceTree = "<group>"; };
 		63B04BE882C41584580E0E59 /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fa; path = "fa.lproj/Default Browser.strings"; sourceTree = "<group>"; };
+		63F7A9A92C7529ED005846F5 /* NativeErrorPageModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NativeErrorPageModel.swift; sourceTree = "<group>"; };
+		63F7A9AB2C752BB0005846F5 /* NativeErrorPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NativeErrorPageViewController.swift; sourceTree = "<group>"; };
 		63FE433D87018CDDFCF592E3 /* sk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sk; path = sk.lproj/ErrorPages.strings; sourceTree = "<group>"; };
 		644B4A02BCAF40DE5B7B9EBB /* lv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = lv; path = lv.lproj/FindInPage.strings; sourceTree = "<group>"; };
 		646F49B3BD7C595E05EEA7C5 /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "en-GB.lproj/Today.strings"; sourceTree = "<group>"; };
@@ -9934,6 +9942,32 @@
 			path = Generated;
 			sourceTree = "<group>";
 		};
+		630FE1312C7FB42500D9D6B2 /* Mock */ = {
+			isa = PBXGroup;
+			children = (
+				630FE1302C7FB42500D9D6B2 /* NativeErrorPageMockModel.swift */,
+			);
+			path = Mock;
+			sourceTree = "<group>";
+		};
+		630FE1332C7FB42500D9D6B2 /* NativeErrorPage */ = {
+			isa = PBXGroup;
+			children = (
+				630FE1312C7FB42500D9D6B2 /* Mock */,
+				630FE1322C7FB42500D9D6B2 /* NativeErrorPageViewControllerTests.swift */,
+			);
+			path = NativeErrorPage;
+			sourceTree = "<group>";
+		};
+		63F7A9A82C752999005846F5 /* NativeErrorPage */ = {
+			isa = PBXGroup;
+			children = (
+				63F7A9A92C7529ED005846F5 /* NativeErrorPageModel.swift */,
+				63F7A9AB2C752BB0005846F5 /* NativeErrorPageViewController.swift */,
+			);
+			path = NativeErrorPage;
+			sourceTree = "<group>";
+		};
 		7A352B722C4F190F00359D51 /* Tabs */ = {
 			isa = PBXGroup;
 			children = (
@@ -12837,6 +12871,7 @@
 				C83DE54529DF3579006E1B69 /* Messaging */,
 				8A8482ED2BE15FEF00F9007B /* Microsurvey */,
 				C889D7D22858C85200121E1D /* Mocks */,
+				630FE1332C7FB42500D9D6B2 /* NativeErrorPage */,
 				C8B41E0B29F034D500FE218A /* Nimbus */,
 				E1312FCF29D23775008DDA85 /* NotificationSurface */,
 				C8B41E0C29F034E400FE218A /* OnboardingTests */,
@@ -12972,6 +13007,7 @@
 				EBC486972195F46A00CDA48D /* InternalSchemeHandler */,
 				D05434F3225FDA3400FDE4EF /* Library */,
 				8A6A3D452BD038EF00BFDB64 /* Microsurvey */,
+				63F7A9A82C752999005846F5 /* NativeErrorPage */,
 				E1FE132D29C0B334002A65FF /* NotificationSurface */,
 				C8BD875D2A0C23F500CD803A /* Onboarding */,
 				E63ED8DF1BFD254E0097D08E /* PasswordManagement */,
@@ -15102,6 +15138,8 @@
 				8A01891C275E9C2A00923EFE /* ClearHistorySheetProvider.swift in Sources */,
 				8A4EA0DD2C0117F200E4E4F1 /* MicrosurveyModel.swift in Sources */,
 				8C44A9D22A6A99FE009A1AA7 /* ShoppingProduct.swift in Sources */,
+				63F7A9AA2C7529ED005846F5 /* NativeErrorPageModel.swift in Sources */,
+				63F7A9AC2C752BB0005846F5 /* NativeErrorPageViewController.swift in Sources */,
 				C88E7A572A0553360072E638 /* OnboardingButtonInfoModel.swift in Sources */,
 				AB9A0C012C6CBC9100BFA22A /* TrackingProtectionDetailsViewController.swift in Sources */,
 				21B548952B1E5F1400DC1DF8 /* InactiveTabsManager.swift in Sources */,
@@ -15763,6 +15801,7 @@
 				8A5604F829DF0D2600035CA3 /* BrowserCoordinatorTests.swift in Sources */,
 				C787D8C32C1CB77900940123 /* FirefoxAccountSignInViewControllerTests.swift in Sources */,
 				39236E721FCC600200A38F1B /* TabEventHandlerTests.swift in Sources */,
+				630FE1352C7FB42500D9D6B2 /* NativeErrorPageViewControllerTests.swift in Sources */,
 				8AAEB9FE2BF50718000C02B5 /* MicrosurveyViewControllerTests.swift in Sources */,
 				C8E531CC29E72A2F00E03FEF /* ShortcutRouteTests.swift in Sources */,
 				C83B7DD629BBB49D005565C2 /* SurveySurfaceManagerTests.swift in Sources */,
@@ -15822,6 +15861,7 @@
 				C869915428917803007ACC5C /* WallpaperTestDataProvider.swift in Sources */,
 				0AC659292BF493CE005C614A /* MockFxAWebViewModel.swift in Sources */,
 				8A5604F629DF09FA00035CA3 /* MockLaunchCoordinatorDelegate.swift in Sources */,
+				630FE1342C7FB42500D9D6B2 /* NativeErrorPageMockModel.swift in Sources */,
 				C807CCCC28367446008E6A5A /* FeatureFlagManagerTests.swift in Sources */,
 				8A5C3BC5282ABF8E003A8CCF /* LegacyRemoteTabsPanelTests.swift in Sources */,
 				8AABBD032A001CBC0089941E /* MockApplicationHelper.swift in Sources */,

diff --git a/firefox-ios/Client/Application/ImageIdentifiers.swift b/firefox-ios/Client/Application/ImageIdentifiers.swift
@@ -71,4 +71,8 @@ public struct ImageIdentifiers {
         public static let fingerprintersTrackers = "fingerprintersTrackersImage"
         public static let crossSiteTrackers = "crossSiteTrackersImage"
     }
+
+    public struct NativeErrorPage {
+        public static let noInternetConnection = "noInternetConnection"
+    }
 }
diff --git a/firefox-ios/Client/Assets/Images.xcassets/NativeErrorPage/Contents.json b/firefox-ios/Client/Assets/Images.xcassets/NativeErrorPage/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...Client/Assets/Images.xcassets/NativeErrorPage/noInternetConnection.imageset/Contents.json b/...Client/Assets/Images.xcassets/NativeErrorPage/noInternetConnection.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "noInternetConnection.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...ts/Images.xcassets/NativeErrorPage/noInternetConnection.imageset/noInternetConnection.pdf b/...ts/Images.xcassets/NativeErrorPage/noInternetConnection.imageset/noInternetConnection.pdf
diff --git a/firefox-ios/Client/Coordinators/Browser/BrowserCoordinator.swift b/firefox-ios/Client/Coordinators/Browser/BrowserCoordinator.swift
@@ -30,6 +30,7 @@ class BrowserCoordinator: BaseCoordinator,
     var webviewController: WebviewViewController?
     var homepageViewController: HomepageViewController?
     var privateViewController: PrivateHomepageViewController?
+    var errorViewController: NativeErrorPageViewController?
 
     private var profile: Profile
     private let tabManager: TabManager
@@ -715,6 +716,19 @@ class BrowserCoordinator: BaseCoordinator,
         present(navigationController)
     }
 
+    func showNativeErrorPage(overlayManager: OverlayModeManager) {
+        // TODO: FXIOS-9641 #21239 Integration with Redux - presenting view
+        let errorPageModel = ErrorPageModel(errorTitle: "", errorDecription: "", errorCode: "")
+        let errorpageController = NativeErrorPageViewController(model: errorPageModel,
+                                                                windowUUID: windowUUID,
+                                                                overlayManager: overlayManager)
+        guard browserViewController.embedContent(errorpageController) else {
+            logger.log("Unable to embed private homepage", level: .debug, category: .coordinator)
+            return
+        }
+        self.errorViewController = errorpageController
+    }
+
     private func setiPadLayoutDetents(for controller: UIViewController) {
         guard controller.shouldUseiPadSetup() else { return }
         controller.sheetPresentationController?.selectedDetentIdentifier = .large

diff --git a/firefox-ios/Client/Coordinators/Browser/BrowserDelegate.swift b/firefox-ios/Client/Coordinators/Browser/BrowserDelegate.swift
@@ -31,4 +31,7 @@ protocol BrowserDelegate: AnyObject {
     /// This is called the browser is ready to start navigating,
     /// ensuring we are in the required state to perform deeplinks
     func browserHasLoaded()
+
+    /// Show the Error page to the user
+    func showNativeErrorPage(overlayManager: OverlayModeManager)
 }
diff --git a/firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift b/firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift
@@ -1389,8 +1389,13 @@ class BrowserViewController: UIViewController,
 
     // MARK: - Native Error Page
 
-    private func setupNativeErrorPage() {
-        guard featureFlags.isFeatureEnabled(.nativeErrorPage, checking: .buildOnly) else { return }
+    private func isNativeErrorPage() -> Bool {
+        featureFlags.isFeatureEnabled(.nativeErrorPage, checking: .buildOnly)
+    }
+
+    func showEmbeddedNativeErrorPage() {
+    // TODO: FXIOS-9641 #21239 Implement Redux for Native Error Pages
+        browserDelegate?.showNativeErrorPage(overlayManager: overlayManager)
     }
 
     // MARK: - Update content
@@ -1420,6 +1425,9 @@ class BrowserViewController: UIViewController,
 
     func updateInContentHomePanel(_ url: URL?, focusUrlBar: Bool = false) {
         let isAboutHomeURL = url.flatMap { InternalURL($0)?.isAboutHomeURL } ?? false
+
+        let isErrorURL = url.flatMap { InternalURL($0)?.isErrorPage } ?? false
+
         guard url != nil else {
             showEmbeddedWebview()
             if !isToolbarRefactorEnabled {
@@ -1430,6 +1438,8 @@ class BrowserViewController: UIViewController,
 
         if isAboutHomeURL {
             showEmbeddedHomepage(inline: true, isPrivate: tabManager.selectedTab?.isPrivate ?? false)
+        } else if isErrorURL && isNativeErrorPage() {
+            showEmbeddedNativeErrorPage()
         } else {
             showEmbeddedWebview()
             if !isToolbarRefactorEnabled {

diff --git a/firefox-ios/Client/Frontend/Components/ContentContainer.swift b/firefox-ios/Client/Frontend/Components/ContentContainer.swift
@@ -8,6 +8,7 @@ enum ContentType {
     case webview
     case homepage
     case privateHomepage
+    case nativeErrorPage
 }
 
 protocol ContentContainable: UIViewController {
@@ -43,6 +44,8 @@ class ContentContainer: UIView {
         switch type {
         case .homepage:
             return !(content is HomepageViewController)
+        case .nativeErrorPage:
+            return !(content is NativeErrorPageViewController)
         case .privateHomepage:
             return !(content is PrivateHomepageViewController)
         case .webview:

diff --git a/firefox-ios/Client/Frontend/NativeErrorPage/NativeErrorPageModel.swift b/firefox-ios/Client/Frontend/NativeErrorPage/NativeErrorPageModel.swift
@@ -0,0 +1,11 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/
+
+import Foundation
+
+struct ErrorPageModel {
+    let errorTitle: String
+    let errorDecription: String
+    let errorCode: String
+}