Pārlūkot izejas kodu

fix initial wrong position of Loginbutton and Logo in CloudScreen

Carola Nitz 8 gadi atpakaļ
vecāks
revīzija
4b762586f8

+ 31 - 44
Resources/VLCCloudStorageTableViewController.xib

@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13168.3" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
     <dependencies>
         <deployment identifier="iOS"/>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13147.4"/>
+        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     </dependencies>
     <objects>
     <objects>
@@ -17,11 +21,11 @@
         </placeholder>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" restorationIdentifier="CloudStorageTableViewController" id="28">
         <view contentMode="scaleToFill" restorationIdentifier="CloudStorageTableViewController" id="28">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
             <subviews>
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="29">
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="29">
-                    <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <connections>
                     <connections>
                         <outlet property="dataSource" destination="-1" id="32"/>
                         <outlet property="dataSource" destination="-1" id="32"/>
@@ -40,56 +44,39 @@
             <point key="canvasLocation" x="13" y="-85"/>
             <point key="canvasLocation" x="13" y="-85"/>
         </view>
         </view>
         <view contentMode="scaleToFill" id="8">
         <view contentMode="scaleToFill" id="8">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
             <subviews>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FhN-yS-GbO">
-                    <rect key="frame" x="77.5" y="102.5" width="165" height="275"/>
-                    <subviews>
-                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="dropbox-white.png" translatesAutoresizingMaskIntoConstraints="NO" id="9">
-                            <rect key="frame" x="20" y="20" width="125" height="42"/>
-                        </imageView>
-                        <button opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="751" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="20" customClass="VLCMenuButton">
-                            <rect key="frame" x="61" y="215" width="41" height="40"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                            <state key="normal" title="Login">
-                                <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            </state>
-                            <state key="highlighted">
-                                <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            </state>
-                            <connections>
-                                <action selector="loginAction:" destination="-1" eventType="touchUpInside" id="Ny5-mX-HmE"/>
-                            </connections>
-                        </button>
-                    </subviews>
-                    <color key="backgroundColor" red="0.1215686275" green="0.1215686275" blue="0.1215686275" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    <constraints>
-                        <constraint firstItem="9" firstAttribute="top" secondItem="FhN-yS-GbO" secondAttribute="top" constant="20" id="3AC-5Z-mit"/>
-                        <constraint firstAttribute="width" constant="165" id="3oj-db-nBo"/>
-                        <constraint firstAttribute="height" constant="275" id="d2r-lP-rPN"/>
-                        <constraint firstItem="9" firstAttribute="leading" secondItem="FhN-yS-GbO" secondAttribute="leading" constant="20" id="eak-Y3-9Vx"/>
-                        <constraint firstAttribute="trailing" secondItem="9" secondAttribute="trailing" constant="20" id="wZ3-RN-6rz"/>
-                    </constraints>
-                </view>
+                <button opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="20" customClass="VLCMenuButton">
+                    <rect key="frame" x="167" y="385" width="41" height="30"/>
+                    <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                    <state key="normal" title="Login">
+                        <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </state>
+                    <state key="highlighted">
+                        <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </state>
+                    <connections>
+                        <action selector="loginAction:" destination="-1" eventType="touchUpInside" id="Ny5-mX-HmE"/>
+                    </connections>
+                </button>
+                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="dropbox-white.png" translatesAutoresizingMaskIntoConstraints="NO" id="9">
+                    <rect key="frame" x="125" y="179" width="125" height="42"/>
+                </imageView>
             </subviews>
             </subviews>
             <color key="backgroundColor" red="0.12156862745098039" green="0.12156862745098039" blue="0.12156862745098039" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <color key="backgroundColor" red="0.12156862745098039" green="0.12156862745098039" blue="0.12156862745098039" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
             <constraints>
-                <constraint firstItem="FhN-yS-GbO" firstAttribute="centerX" secondItem="8" secondAttribute="centerX" id="Y9W-vp-U2a"/>
-                <constraint firstItem="FhN-yS-GbO" firstAttribute="centerY" secondItem="8" secondAttribute="centerY" id="hpO-eO-ELD"/>
+                <constraint firstItem="20" firstAttribute="centerY" secondItem="8" secondAttribute="centerY" multiplier="1.2" id="0UY-nU-pho"/>
+                <constraint firstItem="9" firstAttribute="centerX" secondItem="8" secondAttribute="centerX" id="CRh-Jr-qOQ"/>
+                <constraint firstItem="20" firstAttribute="centerX" secondItem="8" secondAttribute="centerX" id="Hky-JS-uMT"/>
+                <constraint firstItem="9" firstAttribute="centerY" secondItem="8" secondAttribute="centerY" multiplier="0.6" id="Xlv-wc-yx9"/>
             </constraints>
             </constraints>
             <nil key="simulatedStatusBarMetrics"/>
             <nil key="simulatedStatusBarMetrics"/>
-            <point key="canvasLocation" x="13.5" y="-687.5"/>
+            <point key="canvasLocation" x="13" y="-688"/>
         </view>
         </view>
     </objects>
     </objects>
     <resources>
     <resources>
         <image name="dropbox-white.png" width="125" height="42"/>
         <image name="dropbox-white.png" width="125" height="42"/>
     </resources>
     </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination"/>
-    </simulatedMetricsContainer>
 </document>
 </document>

+ 1 - 1
Sources/VLCCloudStorageTableViewController.m

@@ -184,7 +184,7 @@
 {
 {
     self.loginToCloudStorageView.frame = self.tableView.frame;
     self.loginToCloudStorageView.frame = self.tableView.frame;
     self.navigationItem.rightBarButtonItem = nil;
     self.navigationItem.rightBarButtonItem = nil;
-    [self.view addSubview:self.loginToCloudStorageView];
+    [self.tableView addSubview:self.loginToCloudStorageView];
 }
 }
 
 
 - (void)updateViewAfterSessionChange
 - (void)updateViewAfterSessionChange