diff --git a/Client/Application/LaunchScreen.xib b/Client/Application/LaunchScreen.xib index a0046647b631..c6403aaeb757 100644 --- a/Client/Application/LaunchScreen.xib +++ b/Client/Application/LaunchScreen.xib @@ -1,37 +1,39 @@ - - + + - + - + - - - - - - + + + - + + + + + - + - + + diff --git a/Client/Assets/Images.xcassets/splashHorizontal.imageset/Contents.json b/Client/Assets/Images.xcassets/splashHorizontal.imageset/Contents.json new file mode 100644 index 000000000000..2f451827bc4f --- /dev/null +++ b/Client/Assets/Images.xcassets/splashHorizontal.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "backgroundHorizontal.jpg", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "backgroundHorizontal@2x.jpg", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "backgroundHorizontal@3x.jpg", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Client/Assets/Images.xcassets/splashHorizontal.imageset/backgroundHorizontal.jpg b/Client/Assets/Images.xcassets/splashHorizontal.imageset/backgroundHorizontal.jpg new file mode 100644 index 000000000000..dcd68a893c53 Binary files /dev/null and b/Client/Assets/Images.xcassets/splashHorizontal.imageset/backgroundHorizontal.jpg differ diff --git a/Client/Assets/Images.xcassets/splashHorizontal.imageset/backgroundHorizontal@2x.jpg b/Client/Assets/Images.xcassets/splashHorizontal.imageset/backgroundHorizontal@2x.jpg new file mode 100644 index 000000000000..939b5fdff615 Binary files /dev/null and b/Client/Assets/Images.xcassets/splashHorizontal.imageset/backgroundHorizontal@2x.jpg differ diff --git a/Client/Assets/Images.xcassets/splashHorizontal.imageset/backgroundHorizontal@3x.jpg b/Client/Assets/Images.xcassets/splashHorizontal.imageset/backgroundHorizontal@3x.jpg new file mode 100644 index 000000000000..78627bc57d95 Binary files /dev/null and b/Client/Assets/Images.xcassets/splashHorizontal.imageset/backgroundHorizontal@3x.jpg differ diff --git a/Client/Assets/Images.xcassets/splashVertical.imageset/Contents.json b/Client/Assets/Images.xcassets/splashVertical.imageset/Contents.json new file mode 100644 index 000000000000..79faaa928452 --- /dev/null +++ b/Client/Assets/Images.xcassets/splashVertical.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "background.jpg", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "background@2x.jpg", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "background@3x.jpg", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Client/Assets/Images.xcassets/splashVertical.imageset/background.jpg b/Client/Assets/Images.xcassets/splashVertical.imageset/background.jpg new file mode 100644 index 000000000000..be80fefc899d Binary files /dev/null and b/Client/Assets/Images.xcassets/splashVertical.imageset/background.jpg differ diff --git a/Client/Assets/Images.xcassets/splashVertical.imageset/background@2x.jpg b/Client/Assets/Images.xcassets/splashVertical.imageset/background@2x.jpg new file mode 100644 index 000000000000..afd611e3b55e Binary files /dev/null and b/Client/Assets/Images.xcassets/splashVertical.imageset/background@2x.jpg differ diff --git a/Client/Assets/Images.xcassets/splashVertical.imageset/background@3x.jpg b/Client/Assets/Images.xcassets/splashVertical.imageset/background@3x.jpg new file mode 100644 index 000000000000..4f0e246d93ce Binary files /dev/null and b/Client/Assets/Images.xcassets/splashVertical.imageset/background@3x.jpg differ diff --git a/Client/Frontend/Browser/BrowserViewController.swift b/Client/Frontend/Browser/BrowserViewController.swift index 82e33c187fcc..12b39308184e 100644 --- a/Client/Frontend/Browser/BrowserViewController.swift +++ b/Client/Frontend/Browser/BrowserViewController.swift @@ -534,6 +534,9 @@ class BrowserViewController: UIViewController { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) + // Set IntroSeen to 1 until IntroViewController is adapted for WebXR Viewer + profile.prefs.setInt(1, forKey: PrefsKeys.IntroSeen) + // On iPhone, if we are about to show the On-Boarding, blank out the tab so that it does // not flash before we present. This change of alpha also participates in the animation when // the intro view is dismissed.