Updated for 0.3.2 release

nicklockwood · Jun 20, 2017 · 14d9ff5 · 14d9ff5
1 parent 2acf5d0
commit 14d9ff5
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# Change Log
+
+## [0.3.2](https://github.schibsted.io/Rocket/layout/releases/tag/0.3.2) (2017-06-20)
+
+- Reloading a nested LayoutViewController now reloads just the current controller, not the parent
+- Fixed potential AutoLayout crash
+
 ## [0.3.1](https://github.schibsted.io/Rocket/layout/releases/tag/0.3.1) (2017-06-13)
 
 - You can now reference nested state or constants dictionary keys using keypaths in expressions

diff --git a/Layout.podspec b/Layout.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Layout"
-  s.version      = "0.3.1"
+  s.version      = "0.3.2"
   s.summary      = "XML templates + expression-based layout system"
 
   s.homepage     = "https://github.schibsted.io/Rocket/layout/"

diff --git a/Layout/Layout/LayoutViewController.swift b/Layout/Layout/LayoutViewController.swift
@@ -125,8 +125,8 @@ open class LayoutViewController: UIViewController {
         return childViewControllers.isEmpty
     }
 
-    open override func viewWillLayoutSubviews() {
-        super.viewWillLayoutSubviews()
+    open override func viewDidLayoutSubviews() {
+        super.viewDidLayoutSubviews()
         do {
             if let errorNode = _errorNode {
                 try errorNode.update()

diff --git a/Layout/Podfile.lock b/Layout/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
   - Expression (0.7.0)
-  - Layout (0.3.1):
+  - Layout (0.3.2):
     - Expression (~> 0.7.0)
 
 DEPENDENCIES:
@@ -12,7 +12,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Expression: 58438d38e484a565be5ebc34e76f12f629132989
-  Layout: b5ab1da6e004e7536fdd077def9c9327dfd6a761
+  Layout: 3368b9651423273a7c18ebcdeec45f5e08ef9dde
 
 PODFILE CHECKSUM: 7bc9b0e5723b353706f18c4f2e1588b9a49483d1
 

diff --git a/Layout/Pods/Local Podspecs/Layout.podspec.json b/Layout/Pods/Local Podspecs/Layout.podspec.json
diff --git a/Layout/Pods/Manifest.lock b/Layout/Pods/Manifest.lock
diff --git a/Layout/Pods/Target Support Files/Layout/Info.plist b/Layout/Pods/Target Support Files/Layout/Info.plist
diff --git a/SampleApp/Podfile.lock b/SampleApp/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
   - Expression (0.7.0)
-  - Layout (0.3.1):
+  - Layout (0.3.2):
     - Expression (~> 0.7.0)
   - Northstar (0.0.1):
     - Layout
@@ -17,7 +17,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Expression: 58438d38e484a565be5ebc34e76f12f629132989
-  Layout: b5ab1da6e004e7536fdd077def9c9327dfd6a761
+  Layout: 3368b9651423273a7c18ebcdeec45f5e08ef9dde
   Northstar: eb1f7e140d4d5f4efcd6c8d6c7fc73a445fffb99
 
 PODFILE CHECKSUM: f8215283a456a0d52cd21807f2f4678a24b1b693

diff --git a/SampleApp/Pods/Local Podspecs/Layout.podspec.json b/SampleApp/Pods/Local Podspecs/Layout.podspec.json
diff --git a/SampleApp/Pods/Manifest.lock b/SampleApp/Pods/Manifest.lock
diff --git a/SampleApp/Pods/Target Support Files/Layout/Info.plist b/SampleApp/Pods/Target Support Files/Layout/Info.plist
diff --git a/SampleApp/SampleApp/Text.xml b/SampleApp/SampleApp/Text.xml
@@ -3,11 +3,11 @@
 
     <UIScrollView
         contentSize.height="auto + 20"
+        contentInset.top="max(topLayoutGuide.length + 10, 20)"
         contentInset.bottom="bottomLayoutGuide.length"
         scrollIndicatorInsets.bottom="bottomLayoutGuide.length">
 
         <UILabel
-            top="max(topLayoutGuide.length + 10, 20)"
             left="20"
             text="Left-aligned bold text"
             font="bold"

diff --git a/UIDesigner/Podfile.lock b/UIDesigner/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
   - Expression (0.7.0)
-  - Layout (0.3.1):
+  - Layout (0.3.2):
     - Expression (~> 0.7.0)
 
 DEPENDENCIES:
@@ -12,7 +12,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Expression: 58438d38e484a565be5ebc34e76f12f629132989
-  Layout: b5ab1da6e004e7536fdd077def9c9327dfd6a761
+  Layout: 3368b9651423273a7c18ebcdeec45f5e08ef9dde
 
 PODFILE CHECKSUM: de763472315fa391cbc8751113c14e4ffd2dd3fe
 

diff --git a/UIDesigner/Pods/Local Podspecs/Layout.podspec.json b/UIDesigner/Pods/Local Podspecs/Layout.podspec.json
diff --git a/UIDesigner/Pods/Manifest.lock b/UIDesigner/Pods/Manifest.lock
diff --git a/UIDesigner/Pods/Target Support Files/Layout/Info.plist b/UIDesigner/Pods/Target Support Files/Layout/Info.plist