调整项目结构

Harley-xk · Apr 7, 2019 · a92c315 · a92c315
1 parent fa97f1a
commit a92c315
Show file tree

Hide file tree

Showing 101 changed files with 611 additions and 4,036 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.2
+5
diff --git a/Example/MaLiang.xcodeproj/project.pbxproj b/Example/MaLiang.xcodeproj/project.pbxproj
diff --git a/Example/MaLiang.xcodeproj/xcshareddata/xcschemes/MaLiang-Example.xcscheme b/Example/MaLiang.xcodeproj/xcshareddata/xcschemes/MaLiang-Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Example/MaLiang.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/Example/MaLiang.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
diff --git a/Example/MaLiang/AppDelegate.swift b/Example/MaLiang/AppDelegate.swift
@@ -2,8 +2,8 @@
 //  AppDelegate.swift
 //  MaLiang
 //
-//  Created by harley-xk on 11/06/2017.
-//  Copyright (c) 2017 harley-xk. All rights reserved.
+//  Created by Harley-xk on 04/07/2019.
+//  Copyright (c) 2019 Harley-xk. All rights reserved.
 //
 
 import UIKit

diff --git a/Example/MaLiang/Base.lproj/LaunchScreen.xib b/Example/MaLiang/Base.lproj/LaunchScreen.xib
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<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="14283.14"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -16,54 +16,31 @@
             <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2015 Harley-xk. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
-                    <rect key="frame" x="20" y="439" width="440" height="21"/>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2015 CocoaPods. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+                    <rect key="frame" x="20" y="439" width="441" height="21"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon" translatesAutoresizingMaskIntoConstraints="NO" id="A5u-Aa-LTr">
-                    <rect key="frame" x="200" y="160" width="80" height="80"/>
-                    <constraints>
-                        <constraint firstAttribute="width" secondItem="A5u-Aa-LTr" secondAttribute="height" id="Hhj-2u-dif"/>
-                        <constraint firstAttribute="width" constant="80" id="oT9-YK-jGI"/>
-                    </constraints>
-                </imageView>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wxf-0H-d0W">
-                    <rect key="frame" x="237.5" y="0.0" width="5" height="160"/>
-                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="5" id="UYe-cv-vyF"/>
-                    </constraints>
-                </view>
                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MaLiang" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
-                    <rect key="frame" x="20" y="388" width="440" height="36"/>
-                    <fontDescription key="fontDescription" type="boldSystem" pointSize="30"/>
+                    <rect key="frame" x="20" y="140" width="441" height="43"/>
+                    <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                     <nil key="highlightedColor"/>
                 </label>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstItem="wxf-0H-d0W" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="0K4-V8-gvF"/>
-                <constraint firstItem="A5u-Aa-LTr" firstAttribute="top" secondItem="wxf-0H-d0W" secondAttribute="bottom" id="EER-yn-LLE"/>
-                <constraint firstItem="A5u-Aa-LTr" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="IW0-9i-bpS"/>
-                <constraint firstItem="wxf-0H-d0W" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="K0j-Cz-6UW"/>
+                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
                 <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
-                <constraint firstItem="uan-4X-a34" firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
+                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
                 <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
                 <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
                 <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
-                <constraint firstItem="8ie-xW-0ye" firstAttribute="top" secondItem="kId-c2-rCX" secondAttribute="bottom" constant="15" id="nNg-tS-qkO"/>
-                <constraint firstItem="wxf-0H-d0W" firstAttribute="height" secondItem="iN0-l3-epB" secondAttribute="height" multiplier="1:3" id="yga-gp-taA"/>
             </constraints>
             <nil key="simulatedStatusBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <viewLayoutGuide key="safeArea" id="uan-4X-a34"/>
             <point key="canvasLocation" x="548" y="455"/>
         </view>
     </objects>
-    <resources>
-        <image name="icon" width="609" height="610"/>
-    </resources>
 </document>
diff --git a/Example/MaLiang/Deprecated/MLTexture.swift b/Example/MaLiang/Deprecated/MLTexture.swift