[YogaKit] support auto apply layout.

- support auto apply layout - build Yoga & YogaKit framework as staticlib; - update YogaKitSample.
2020-08-13 13:24:14 +08:00
parent e1c9d8800e
commit 14f7e8bb2c
13 changed files with 200 additions and 76 deletions
--- a/YogaKit/YogaKitSample/Podfile
+++ b/YogaKit/YogaKitSample/Podfile
@@ -1,6 +1,8 @@
+platform :ios, '9.0'
 use_frameworks!

 target 'YogaKitSample' do
+  pod 'Yoga', :path => '../../Yoga.podspec'
  pod 'YogaKit', :path => '../../YogaKit.podspec'
-  pod 'IGListKit', '~> 2.1.0'
+  pod 'IGListKit', '~> 4.0.0'
 end
--- a/YogaKit/YogaKitSample/Podfile.lock
+++ b/YogaKit/YogaKitSample/Podfile.lock
@@ -1,26 +1,33 @@
 PODS:
-  - IGListKit (2.1.0):
-    - IGListKit/Default (= 2.1.0)
-  - IGListKit/Default (2.1.0):
-    - IGListKit/Diffing
-  - IGListKit/Diffing (2.1.0)
-  - Yoga (1.7.0)
-  - YogaKit (1.7.0):
-    - Yoga (~> 1.7)
+  - IGListDiffKit (4.0.0)
+  - IGListKit (4.0.0):
+    - IGListDiffKit (= 4.0.0)
+  - Yoga (1.14.1)
+  - YogaKit (1.18.1):
+    - Yoga (~> 1.14.1)

 DEPENDENCIES:
-  - IGListKit (~> 2.1.0)
+  - IGListKit (~> 4.0.0)
+  - Yoga (from `../../Yoga.podspec`)
  - YogaKit (from `../../YogaKit.podspec`)

+SPEC REPOS:
+  trunk:
+    - IGListDiffKit
+    - IGListKit
+
 EXTERNAL SOURCES:
+  Yoga:
+    :path: "../../Yoga.podspec"
  YogaKit:
-    :path: ../../YogaKit.podspec
+    :path: "../../YogaKit.podspec"

 SPEC CHECKSUMS:
-  IGListKit: b826c68ef7a4ae1626c09d4d3e1ea7a169e6c36e
-  Yoga: 2ed1d7accfef3610a67f58c0cf101a0662137f2c
-  YogaKit: 31576530e8fcae3175469719ec3212397403330b
+  IGListDiffKit: 665d6cf43ce726e676013db9c7d6c4294259b6b2
+  IGListKit: fd5a5d21935298f5849fa49d426843cff97b77c7
+  Yoga: 1b62f19e549f5e174fc935ba76a47a8d9b60211e
+  YogaKit: befe87ed72becf4125f290a33af021e9992712c7

-PODFILE CHECKSUM: 216f8e7127767709e0e43f3711208d238fa5c404
+PODFILE CHECKSUM: 31f0f3ccdee77adc2f4b58b4772186c206fd1446

-COCOAPODS: 1.1.1
+COCOAPODS: 1.9.1
--- a/YogaKit/YogaKitSample/YogaKitSample.xcodeproj/project.pbxproj
+++ b/YogaKit/YogaKitSample/YogaKitSample.xcodeproj/project.pbxproj
@@ -1,10 +1,3 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
 // !$*UTF8*$!
 {
 	archiveVersion = 1;
@@ -178,7 +171,6 @@
 				13687D401DF8748300E7C260 /* Frameworks */,
 				13687D411DF8748300E7C260 /* Resources */,
 				FA2FB9DD6471BDD3FBCE503B /* [CP] Embed Pods Frameworks */,
-				6E01EB987F1564F3D71EBE5A /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -233,6 +225,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -272,28 +265,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-YogaKitSample-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
-			showEnvVarsInLog = 0;
-		};
-		6E01EB987F1564F3D71EBE5A /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YogaKitSample/Pods-YogaKitSample-resources.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		FA2FB9DD6471BDD3FBCE503B /* [CP] Embed Pods Frameworks */ = {
@@ -302,13 +283,18 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-YogaKitSample/Pods-YogaKitSample-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/IGListDiffKit/IGListDiffKit.framework",
+				"${BUILT_PRODUCTS_DIR}/IGListKit/IGListKit.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IGListDiffKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IGListKit.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YogaKitSample/Pods-YogaKitSample-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-YogaKitSample/Pods-YogaKitSample-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -446,7 +432,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -461,7 +447,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.YogaKitSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_INSTALL_OBJC_HEADER = NO;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
--- a/YogaKit/YogaKitSample/YogaKitSample/ExamplesViewController.swift
+++ b/YogaKit/YogaKitSample/YogaKitSample/ExamplesViewController.swift
@@ -18,12 +18,12 @@ private final class ExampleModel {
    }
 }

-extension ExampleModel: IGListDiffable {
+extension ExampleModel: ListDiffable {
    fileprivate func diffIdentifier() -> NSObjectProtocol {
        return title as NSString
    }

-    fileprivate func isEqual(toDiffableObject object: IGListDiffable?) -> Bool {
+    fileprivate func isEqual(toDiffableObject object: ListDiffable?) -> Bool {
        guard let otherObj = object as? ExampleModel else { return false }

        return (title == otherObj.title) &&
@@ -31,11 +31,11 @@ extension ExampleModel: IGListDiffable {
    }
 }

-final class ExamplesViewController: UIViewController, IGListAdapterDataSource, IGListSingleSectionControllerDelegate {
-    private lazy var adapter: IGListAdapter = {
-        return IGListAdapter(updater: IGListAdapterUpdater(), viewController: self, workingRangeSize: 0)
+final class ExamplesViewController: UIViewController, ListAdapterDataSource, ListSingleSectionControllerDelegate {
+    private lazy var adapter: ListAdapter = {
+        return ListAdapter(updater: ListAdapterUpdater(), viewController: self, workingRangeSize: 0)
    }()
-    private let collectionView = IGListCollectionView(frame: .zero, collectionViewLayout: UICollectionViewFlowLayout())
+    private let collectionView = ListCollectionView(frame: .zero)


    // Update this to array to create more examples.
@@ -47,6 +47,7 @@ final class ExamplesViewController: UIViewController, IGListAdapterDataSource, I
    override func viewDidLoad() {
        super.viewDidLoad()
        title = "Examples"
+        collectionView.backgroundColor = .clear
        view.addSubview(collectionView)
        adapter.collectionView = collectionView
        adapter.dataSource = self
@@ -59,16 +60,16 @@ final class ExamplesViewController: UIViewController, IGListAdapterDataSource, I

    //MARK: IGListAdapterDataSource

-    func objects(for listAdapter: IGListAdapter) -> [IGListDiffable] {
-        return models as [IGListDiffable]
+    func objects(for listAdapter: ListAdapter) -> [ListDiffable] {
+        return models as [ListDiffable]
    }

-    func listAdapter(_ listAdapter: IGListAdapter, sectionControllerFor object: Any) -> IGListSectionController {
-        let sizeBlock: IGListSingleSectionCellSizeBlock = { (model, context) in
+    func listAdapter(_ listAdapter: ListAdapter, sectionControllerFor object: Any) -> ListSectionController {
+        let sizeBlock: ListSingleSectionCellSizeBlock = { (model, context) in
            return CGSize(width: (context?.containerSize.width)!, height: 75.0)
        }

-        let configureBlock: IGListSingleSectionCellConfigureBlock = { (model, cell) in
+        let configureBlock: ListSingleSectionCellConfigureBlock = { (model, cell) in
            guard let m = model as? ExampleModel, let c = cell as? SingleLabelCollectionCell else {
                return
            }
@@ -76,18 +77,18 @@ final class ExamplesViewController: UIViewController, IGListAdapterDataSource, I
            c.label.text = m.title
        }

-        let sectionController = IGListSingleSectionController(cellClass: SingleLabelCollectionCell.self,
+        let sectionController = ListSingleSectionController(cellClass: SingleLabelCollectionCell.self,
                                                              configureBlock: configureBlock,
                                                              sizeBlock: sizeBlock)
        sectionController.selectionDelegate = self
        return sectionController
    }

-    func emptyView(for listAdapter: IGListAdapter) -> UIView? { return nil }
+    func emptyView(for listAdapter: ListAdapter) -> UIView? { return nil }

    //MARK: IGListSingleSectionControllerDelegate

-    func didSelect(_ sectionController: IGListSingleSectionController) {
+    func didSelect(_ sectionController: ListSingleSectionController, with object: Any) {
        let section = adapter.section(for: sectionController)
        let model = models[section]

--- a/YogaKit/YogaKitSample/YogaKitSample/Info.plist
+++ b/YogaKit/YogaKitSample/YogaKitSample/Info.plist
@@ -32,5 +32,7 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UIUserInterfaceStyle</key>
+	<string>Light</string>
 </dict>
 </plist>
--- a/YogaKit/YogaKitSample/YogaKitSample/ViewControllers/BasicViewController.swift
+++ b/YogaKit/YogaKitSample/YogaKitSample/ViewControllers/BasicViewController.swift
@@ -32,22 +32,24 @@ final class BasicViewController: UIViewController {
        }
        root.addSubview(child1)

-        let child2 = UIView(frame: CGRect(x: 0, y: 0, width: 200, height: 200))
+        let child2 = UIView()
        child2.backgroundColor = .green
        child2.configureLayout { (layout) in
            layout.isEnabled = true
            layout.alignSelf = .flexEnd
+            layout.width = 200
+            layout.height = 200
        }
        root.addSubview(child2)

-        let child3 = UIView(frame: CGRect(x: 0, y: 0, width: 100, height: 100))
+        let child3 = UIView()
        child3.backgroundColor = .yellow
        child3.configureLayout { (layout) in
            layout.isEnabled = true
            layout.alignSelf = .flexStart
+            layout.width = 100
+            layout.height = 100
        }
        root.addSubview(child3)
-
-        root.yoga.applyLayout(preservingOrigin: true)
    }
 }
--- a/YogaKit/YogaKitSample/YogaKitSample/ViewControllers/LayoutInclusionViewController.swift
+++ b/YogaKit/YogaKitSample/YogaKitSample/ViewControllers/LayoutInclusionViewController.swift
@@ -51,9 +51,9 @@ final class LayoutInclusionViewController: UIViewController {
        }
        contentView.addSubview(disappearingView)

-        button.setTitle("Add Blue View", for: UIControlState.selected)
-        button.setTitle("Remove Blue View", for: UIControlState.normal)
-        button.addTarget(self, action: #selector(buttonWasTapped), for: UIControlEvents.touchUpInside)
+        button.setTitle("Add Blue View", for: .selected)
+        button.setTitle("Remove Blue View", for: .normal)
+        button.addTarget(self, action: #selector(buttonWasTapped), for: UIControl.Event.touchUpInside)
        button.configureLayout { (layout) in
            layout.isEnabled = true
            layout.height = 300
@@ -61,12 +61,10 @@ final class LayoutInclusionViewController: UIViewController {
            layout.alignSelf = .center
        }
        root.addSubview(button)
-
-        root.yoga.applyLayout(preservingOrigin: false)
    }

    // MARK - UIButton Action
-    func buttonWasTapped() {
+    @objc func buttonWasTapped() {
        button.isSelected = !button.isSelected

        button.isUserInteractionEnabled = false
--- a/YogaKit/YogaKitSample/YogaKitSample/Views/SingleLabelCollectionCell.swift
+++ b/YogaKit/YogaKitSample/YogaKitSample/Views/SingleLabelCollectionCell.swift
@@ -42,7 +42,6 @@ final class SingleLabelCollectionCell: UICollectionViewCell {
    override func layoutSubviews() {
        super.layoutSubviews()

-        contentView.yoga.applyLayout(preservingOrigin: false)
        label.frame = contentView.bounds
    }
 }