Browse Source

[iOS] Launch screen

master
Yana Stamcheva 8 years ago
parent
commit
10f3f01da8

+ 22
- 26
ios/app/Base.lproj/LaunchScreen.xib View File

1
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
3
+    <device id="retina4_7" orientation="portrait">
4
+        <adaptation id="fullscreen"/>
5
+    </device>
3
     <dependencies>
6
     <dependencies>
4
         <deployment identifier="iOS"/>
7
         <deployment identifier="iOS"/>
5
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
6
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
8
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
9
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
7
     </dependencies>
10
     </dependencies>
8
     <objects>
11
     <objects>
9
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
12
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
10
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
13
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
11
-        <view contentMode="scaleToFill" id="iN0-l3-epB">
14
+        <view userInteractionEnabled="NO" contentMode="scaleToFill" id="iN0-l3-epB">
12
             <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
15
             <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
13
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
16
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
14
             <subviews>
17
             <subviews>
15
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Powered by React Native" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
16
-                    <rect key="frame" x="20" y="439" width="441" height="21"/>
17
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
18
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
19
-                    <nil key="highlightedColor"/>
20
-                </label>
21
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Jitsi Meet" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
22
-                    <rect key="frame" x="20" y="140" width="441" height="43"/>
23
-                    <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
24
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
25
-                    <nil key="highlightedColor"/>
26
-                </label>
18
+                <imageView opaque="NO" userInteractionEnabled="NO" contentMode="center" fixedFrame="YES" image="LaunchScreen" translatesAutoresizingMaskIntoConstraints="NO" id="4B8-Xf-NDE">
19
+                    <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
20
+                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
21
+                    <accessibility key="accessibilityConfiguration">
22
+                        <accessibilityTraits key="traits" image="YES" notEnabled="YES"/>
23
+                    </accessibility>
24
+                </imageView>
27
             </subviews>
25
             </subviews>
28
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
29
-            <constraints>
30
-                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
31
-                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
32
-                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
33
-                <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
34
-                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
35
-                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
36
-            </constraints>
26
+            <color key="backgroundColor" red="0.090196078431372548" green="0.62745098039215685" blue="0.85882352941176465" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
27
+            <accessibility key="accessibilityConfiguration">
28
+                <accessibilityTraits key="traits" notEnabled="YES"/>
29
+            </accessibility>
37
             <nil key="simulatedStatusBarMetrics"/>
30
             <nil key="simulatedStatusBarMetrics"/>
38
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
31
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
39
             <point key="canvasLocation" x="548" y="455"/>
32
             <point key="canvasLocation" x="548" y="455"/>
40
         </view>
33
         </view>
41
     </objects>
34
     </objects>
35
+    <resources>
36
+        <image name="LaunchScreen" width="480" height="480"/>
37
+    </resources>
42
 </document>
38
 </document>

+ 6
- 0
ios/app/Images.xcassets/Contents.json View File

1
+{
2
+  "info" : {
3
+    "version" : 1,
4
+    "author" : "xcode"
5
+  }
6
+}

+ 22
- 0
ios/app/Images.xcassets/LaunchScreen.imageset/Contents.json View File

1
+{
2
+  "images" : [
3
+    {
4
+      "idiom" : "universal",
5
+      "filename" : "LaunchScreen-480@1x.png",
6
+      "scale" : "1x"
7
+    },
8
+    {
9
+      "idiom" : "universal",
10
+      "filename" : "LaunchScreen-480@2x.png",
11
+      "scale" : "2x"
12
+    },
13
+    {
14
+      "idiom" : "universal",
15
+      "scale" : "3x"
16
+    }
17
+  ],
18
+  "info" : {
19
+    "version" : 1,
20
+    "author" : "xcode"
21
+  }
22
+}

BIN
ios/app/Images.xcassets/LaunchScreen.imageset/LaunchScreen-480@1x.png View File


BIN
ios/app/Images.xcassets/LaunchScreen.imageset/LaunchScreen-480@2x.png View File


+ 1
- 1
react/features/base/styles/components/styles/ColorPalette.js View File

4
 export const ColorPalette = {
4
 export const ColorPalette = {
5
     appBackground: '#111111',
5
     appBackground: '#111111',
6
     buttonUnderlay: '#495258',
6
     buttonUnderlay: '#495258',
7
-    jitsiBlue: '#00ccff',
7
+    jitsiBlue: '#17A0DB',
8
     jitsiDarkGrey: '#555555',
8
     jitsiDarkGrey: '#555555',
9
     jitsiRed: '#D00000',
9
     jitsiRed: '#D00000',
10
     jitsiToggled: '#495258'
10
     jitsiToggled: '#495258'

+ 2
- 3
react/features/conference/components/styles.js View File

1
-import { createStyleSheet } from '../../base/styles';
1
+import { ColorPalette, createStyleSheet } from '../../base/styles';
2
 
2
 
3
 /**
3
 /**
4
  * The style of the conference UI (component).
4
  * The style of the conference UI (component).
5
- * TODO Make styles more generic and reusable. Use ColorPalette for all colors.
6
  */
5
  */
7
 export const styles = createStyleSheet({
6
 export const styles = createStyleSheet({
8
     /**
7
     /**
18
      */
17
      */
19
     conference: {
18
     conference: {
20
         alignSelf: 'stretch',
19
         alignSelf: 'stretch',
21
-        backgroundColor: '#111111',
20
+        backgroundColor: ColorPalette.appBackground,
22
         flex: 1
21
         flex: 1
23
     },
22
     },
24
 
23
 

+ 1
- 1
react/features/welcome/components/styles.js View File

63
      * Navigator container style.
63
      * Navigator container style.
64
      */
64
      */
65
     navContainer: {
65
     navContainer: {
66
-        backgroundColor: '#111111',
66
+        backgroundColor: ColorPalette.appBackground,
67
         flex: 1
67
         flex: 1
68
     },
68
     },
69
 
69
 

Loading…
Cancel
Save