Преглед изворни кода

Merge branch 'dev' of http://git.wmzhubo.com/guadoutech/YYHome into dev

glglove пре 2 месеци
родитељ
комит
6f59cbea26

BIN
app/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png


BIN
app/ios/Runner/Assets.xcassets/AppIcon.appiconset/32C047592C8D514741501471B52D6D07.png


+ 1 - 1
app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "1024.png",
+      "filename" : "32C047592C8D514741501471B52D6D07.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

BIN
app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png


BIN
app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png


+ 5 - 20
app/ios/Runner/Base.lproj/LaunchScreen.storyboard

@@ -5,7 +5,6 @@
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -17,23 +16,13 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LaunchBG.png" translatesAutoresizingMaskIntoConstraints="NO" id="tNR-J0-C2x">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                            </imageView>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="Pu5-Up-dfw">
-                                <rect key="frame" x="104.5" y="299.5" width="166" height="68"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="Pu5-Up-dfw">
+                                <rect key="frame" x="123" y="202.5" width="129" height="56.5"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="UaE-PJ-QZk"/>
-                        <color key="backgroundColor" systemColor="tertiaryLabelColor"/>
-                        <constraints>
-                            <constraint firstAttribute="bottom" secondItem="tNR-J0-C2x" secondAttribute="bottom" id="1Lq-rq-g1S"/>
-                            <constraint firstItem="Pu5-Up-dfw" firstAttribute="centerX" secondItem="tNR-J0-C2x" secondAttribute="centerX" id="5UC-LA-jKf"/>
-                            <constraint firstItem="tNR-J0-C2x" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="DWN-Tu-Vde"/>
-                            <constraint firstItem="Pu5-Up-dfw" firstAttribute="centerY" secondItem="tNR-J0-C2x" secondAttribute="centerY" id="ewy-U3-5wj"/>
-                            <constraint firstAttribute="trailing" secondItem="tNR-J0-C2x" secondAttribute="trailing" id="fWW-7q-1ZL"/>
-                            <constraint firstItem="tNR-J0-C2x" firstAttribute="leading" secondItem="UaE-PJ-QZk" secondAttribute="leading" id="mD2-Fb-bwB"/>
-                        </constraints>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -42,10 +31,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="LaunchBG.png" width="375" height="667"/>
-        <image name="LaunchImage" width="166" height="67.5"/>
-        <systemColor name="tertiaryLabelColor">
-            <color red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.29803921570000003" colorSpace="custom" customColorSpace="sRGB"/>
-        </systemColor>
+        <image name="LaunchImage" width="129" height="56.5"/>
     </resources>
 </document>