Skip to content

Commit

Permalink
WebXR: Skip presentIntroViewController, replace splash screen (#5953)
Browse files Browse the repository at this point in the history
* 3 Dino WebXR Viewer splash screen

* Skip presentIntroViewController
  • Loading branch information
robomex authored and garvankeeley committed Dec 26, 2019
1 parent 93b9291 commit daf8c92
Show file tree
Hide file tree
Showing 10 changed files with 64 additions and 13 deletions.
28 changes: 15 additions & 13 deletions Client/Application/LaunchScreen.xib
Original file line number Diff line number Diff line change
@@ -1,37 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina5_9" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB">
<rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
<rect key="frame" x="0.0" y="0.0" width="287" height="480"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="splash" translatesAutoresizingMaskIntoConstraints="NO" id="8jg-1f-0sB">
<rect key="frame" x="175" y="175" width="130" height="130"/>
<constraints>
<constraint firstAttribute="width" constant="130" id="V8U-lj-86g"/>
<constraint firstAttribute="height" constant="130" id="eV3-E9-QZk"/>
</constraints>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="splashHorizontal" translatesAutoresizingMaskIntoConstraints="NO" id="8jg-1f-0sB">
<rect key="frame" x="0.0" y="0.0" width="287" height="480"/>
<variation key="heightClass=regular-widthClass=compact" image="splashVertical"/>
</imageView>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="8jg-1f-0sB" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="CWl-RQ-Zjn"/>
<constraint firstItem="8jg-1f-0sB" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="ITK-hU-DwR"/>
<constraint firstItem="8jg-1f-0sB" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="YPF-TK-qsg"/>
<constraint firstAttribute="trailing" secondItem="8jg-1f-0sB" secondAttribute="trailing" id="e6U-9J-NkT"/>
<constraint firstAttribute="bottom" secondItem="8jg-1f-0sB" secondAttribute="bottom" id="gNL-rF-1Is"/>
<constraint firstItem="8jg-1f-0sB" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="grm-jt-xY2"/>
</constraints>
<nil key="simulatedStatusBarMetrics"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="404" y="445"/>
<point key="canvasLocation" x="263.04347826086956" y="444.64285714285711"/>
</view>
</objects>
<resources>
<image name="splash" width="60" height="60"/>
<image name="splashHorizontal" width="1104" height="621"/>
<image name="splashVertical" width="621" height="1104"/>
</resources>
</document>
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "backgroundHorizontal.jpg",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "background.jpg",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Client/Frontend/Browser/BrowserViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit daf8c92

Please sign in to comment.