Louis 7 лет назад
Родитель
Сommit
aaa1206887
30 измененных файлов с 59 добавлено и 41 удалено
  1. 14 26
      Resources/Launch Screen.xib
  2. 0 2
      Sources/VLC for iOS-Info.plist
  3. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/4\"@1x-1.png
  4. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/4\"@1x.png
  5. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/4.7\"@1x.png
  6. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/5.5\"-landscape@1x.png
  7. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/5.5\"@1x.png
  8. 45 13
      vlc-ios/Images.xcassets/LaunchImage.launchimage/Contents.json
  9. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png
  10. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/Default-ipad-Landscape.png
  11. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/Default-ipad-Landscape@2x.png
  12. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/Default-ipad-Portrait.png
  13. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/Default-ipad-Portrait@2x.png
  14. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/Default.png
  15. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/Default@2x-1.png
  16. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/Default@2x.png
  17. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad-1.png
  18. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad-ExcludeStatusBar-Landscape.png
  19. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad-ExcludeStatusBar-Landscape@2x.png
  20. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad-ExcludeStatusBar.png
  21. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad-ExcludeStatusBar@2x.png
  22. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad-Landscape-1.png
  23. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad-Landscape.png
  24. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad-Landscape@2x-1.png
  25. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad-Landscape@2x.png
  26. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad.png
  27. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad@2x-1.png
  28. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad@2x.png
  29. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/iphonex-landscape.png
  30. BIN
      vlc-ios/Images.xcassets/LaunchImage.launchimage/iphonex.png

+ 14 - 26
Resources/Launch Screen.xib

@@ -1,42 +1,30 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7531" systemVersion="14D131" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7520"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <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="600" height="600"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view alpha="0.94999999999999996" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="08f-KG-S7V">
-                    <rect key="frame" x="0.0" y="0.0" width="600" height="65"/>
-                    <subviews>
-                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="1000" verticalHuggingPriority="1000" image="title.png" translatesAutoresizingMaskIntoConstraints="NO" id="6ra-lX-N7Q">
-                            <rect key="frame" x="281" y="30" width="39" height="19"/>
-                        </imageView>
-                    </subviews>
-                    <color key="backgroundColor" red="1" green="0.51764705879999995" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="65" id="Nv3-Z9-t13"/>
-                        <constraint firstAttribute="centerX" secondItem="6ra-lX-N7Q" secondAttribute="centerX" constant="-0.5" id="e1x-na-svf"/>
-                        <constraint firstAttribute="centerY" secondItem="6ra-lX-N7Q" secondAttribute="centerY" constant="-7" id="rfq-Oh-VgN"/>
-                    </constraints>
-                </view>
+                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="cGi-zi-WAb">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                </imageView>
             </subviews>
-            <color key="backgroundColor" white="0.12" alpha="1" colorSpace="calibratedWhite"/>
-            <constraints>
-                <constraint firstItem="08f-KG-S7V" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="8rT-by-3db"/>
-                <constraint firstAttribute="trailing" secondItem="08f-KG-S7V" secondAttribute="trailing" id="RBf-zK-fpO"/>
-                <constraint firstItem="08f-KG-S7V" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="wvd-SD-NaR"/>
-            </constraints>
             <nil key="simulatedStatusBarMetrics"/>
-            <point key="canvasLocation" x="404" y="445"/>
+            <point key="canvasLocation" x="403.5" y="444.5"/>
         </view>
     </objects>
     <resources>
-        <image name="title.png" width="39" height="19"/>
+        <image name="LaunchImage" width="16" height="16"/>
     </resources>
 </document>

+ 0 - 2
Sources/VLC for iOS-Info.plist

@@ -283,8 +283,6 @@
 	</array>
 	<key>UIFileSharingEnabled</key>
 	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>Launch Screen</string>
 	<key>UIPrerenderedIcon</key>
 	<true/>
 	<key>UIRequiredDeviceCapabilities</key>

BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/4\"@1x-1.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/4\"@1x.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/4.7\"@1x.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/5.5\"-landscape@1x.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/5.5\"@1x.png


+ 45 - 13
vlc-ios/Images.xcassets/LaunchImage.launchimage/Contents.json

@@ -1,42 +1,63 @@
 {
   "images" : [
     {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "2436h",
+      "filename" : "iphonex.png",
+      "minimum-system-version" : "11.0",
       "orientation" : "portrait",
+      "scale" : "3x"
+    },
+    {
+      "extent" : "full-screen",
       "idiom" : "iphone",
+      "subtype" : "2436h",
+      "filename" : "iphonex-landscape.png",
+      "minimum-system-version" : "11.0",
+      "orientation" : "landscape",
+      "scale" : "3x"
+    },
+    {
       "extent" : "full-screen",
-      "minimum-system-version" : "8.0",
+      "idiom" : "iphone",
       "subtype" : "736h",
+      "filename" : "5.5\"@1x.png",
+      "minimum-system-version" : "8.0",
+      "orientation" : "portrait",
       "scale" : "3x"
     },
     {
-      "orientation" : "landscape",
-      "idiom" : "iphone",
       "extent" : "full-screen",
-      "minimum-system-version" : "8.0",
+      "idiom" : "iphone",
       "subtype" : "736h",
+      "filename" : "5.5\"-landscape@1x.png",
+      "minimum-system-version" : "8.0",
+      "orientation" : "landscape",
       "scale" : "3x"
     },
     {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
       "extent" : "full-screen",
-      "minimum-system-version" : "8.0",
+      "idiom" : "iphone",
       "subtype" : "667h",
+      "filename" : "4.7\"@1x.png",
+      "minimum-system-version" : "8.0",
+      "orientation" : "portrait",
       "scale" : "2x"
     },
     {
       "orientation" : "portrait",
       "idiom" : "iphone",
+      "filename" : "Default@2x.png",
       "extent" : "full-screen",
       "minimum-system-version" : "7.0",
-      "filename" : "Default@2x.png",
       "scale" : "2x"
     },
     {
       "extent" : "full-screen",
       "idiom" : "iphone",
       "subtype" : "retina4",
-      "filename" : "Default-568h@2x.png",
+      "filename" : "4\"@1x.png",
       "minimum-system-version" : "7.0",
       "orientation" : "portrait",
       "scale" : "2x"
@@ -44,50 +65,53 @@
     {
       "orientation" : "portrait",
       "idiom" : "ipad",
+      "filename" : "iPad-1.png",
       "extent" : "full-screen",
       "minimum-system-version" : "7.0",
-      "filename" : "Default-ipad-Portrait.png",
       "scale" : "1x"
     },
     {
       "orientation" : "landscape",
       "idiom" : "ipad",
+      "filename" : "iPad-Landscape.png",
       "extent" : "full-screen",
       "minimum-system-version" : "7.0",
-      "filename" : "Default-ipad-Landscape.png",
       "scale" : "1x"
     },
     {
       "orientation" : "portrait",
       "idiom" : "ipad",
+      "filename" : "iPad@2x-1.png",
       "extent" : "full-screen",
       "minimum-system-version" : "7.0",
-      "filename" : "Default-ipad-Portrait@2x.png",
       "scale" : "2x"
     },
     {
       "orientation" : "landscape",
       "idiom" : "ipad",
+      "filename" : "iPad-Landscape@2x-1.png",
       "extent" : "full-screen",
       "minimum-system-version" : "7.0",
-      "filename" : "Default-ipad-Landscape@2x.png",
       "scale" : "2x"
     },
     {
       "orientation" : "portrait",
       "idiom" : "iphone",
+      "filename" : "Default.png",
       "extent" : "full-screen",
       "scale" : "1x"
     },
     {
       "orientation" : "portrait",
       "idiom" : "iphone",
+      "filename" : "Default@2x-1.png",
       "extent" : "full-screen",
       "scale" : "2x"
     },
     {
       "orientation" : "portrait",
       "idiom" : "iphone",
+      "filename" : "4\"@1x-1.png",
       "extent" : "full-screen",
       "subtype" : "retina4",
       "scale" : "2x"
@@ -95,48 +119,56 @@
     {
       "orientation" : "portrait",
       "idiom" : "ipad",
+      "filename" : "iPad-ExcludeStatusBar.png",
       "extent" : "to-status-bar",
       "scale" : "1x"
     },
     {
       "orientation" : "portrait",
       "idiom" : "ipad",
+      "filename" : "iPad.png",
       "extent" : "full-screen",
       "scale" : "1x"
     },
     {
       "orientation" : "landscape",
       "idiom" : "ipad",
+      "filename" : "iPad-ExcludeStatusBar-Landscape.png",
       "extent" : "to-status-bar",
       "scale" : "1x"
     },
     {
       "orientation" : "landscape",
       "idiom" : "ipad",
+      "filename" : "iPad-Landscape-1.png",
       "extent" : "full-screen",
       "scale" : "1x"
     },
     {
       "orientation" : "portrait",
       "idiom" : "ipad",
+      "filename" : "iPad-ExcludeStatusBar@2x.png",
       "extent" : "to-status-bar",
       "scale" : "2x"
     },
     {
       "orientation" : "portrait",
       "idiom" : "ipad",
+      "filename" : "iPad@2x.png",
       "extent" : "full-screen",
       "scale" : "2x"
     },
     {
       "orientation" : "landscape",
       "idiom" : "ipad",
+      "filename" : "iPad-ExcludeStatusBar-Landscape@2x.png",
       "extent" : "to-status-bar",
       "scale" : "2x"
     },
     {
       "orientation" : "landscape",
       "idiom" : "ipad",
+      "filename" : "iPad-Landscape@2x.png",
       "extent" : "full-screen",
       "scale" : "2x"
     }

BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/Default-ipad-Landscape.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/Default-ipad-Landscape@2x.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/Default-ipad-Portrait.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/Default-ipad-Portrait@2x.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/Default.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/Default@2x-1.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/Default@2x.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad-1.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad-ExcludeStatusBar-Landscape.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad-ExcludeStatusBar-Landscape@2x.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad-ExcludeStatusBar.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad-ExcludeStatusBar@2x.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad-Landscape-1.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad-Landscape.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad-Landscape@2x-1.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad-Landscape@2x.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad@2x-1.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/iPad@2x.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/iphonex-landscape.png


BIN
vlc-ios/Images.xcassets/LaunchImage.launchimage/iphonex.png