From 45325e082fcfd8f26b5ca750a9cb4022a949af61 Mon Sep 17 00:00:00 2001
From: Daniel Dahan <daniel@cosmicmind.com>
Date: Sun, 7 Jan 2018 16:17:40 -0600
Subject: [PATCH] Fixed regression where view lifecycle functions were not
 being called.

---
 CHANGELOG.md                                 |  4 +++
 Material.podspec                             |  2 +-
 Sources/Frameworks/Motion                    |  2 +-
 Sources/Info.plist                           |  2 +-
 Sources/iOS/NavigationDrawerController.swift | 26 +++++++++++++++++++-
 Sources/iOS/TransitionController.swift       | 20 +++++++++++++++
 6 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77619868f..966f7fc28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.13.3
+
+* [issue-1015](https://github.com/CosmicMind/Material/issues/1015): Fixed regression where view lifecycle functions were not being called.
+
 ## 2.13.2
 
 * Updated to [Motion 1.3.2](https://github.com/CosmicMind/Motion/releases/tag/1.3.2).
diff --git a/Material.podspec b/Material.podspec
index 3f7dd953b..98745718f 100755
--- a/Material.podspec
+++ b/Material.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 	s.name = 'Material'
-	s.version = '2.13.2'
+	s.version = '2.13.3'
 	s.license = 'BSD-3-Clause'
 	s.summary = 'A UI/UX framework for creating beautiful applications.'
 	s.homepage = 'http://cosmicmind.com'
diff --git a/Sources/Frameworks/Motion b/Sources/Frameworks/Motion
index 6b95e4828..0c04b36fd 160000
--- a/Sources/Frameworks/Motion
+++ b/Sources/Frameworks/Motion
@@ -1 +1 @@
-Subproject commit 6b95e482892f73c52644c95d84c54a82587032bc
+Subproject commit 0c04b36fd1da09d085c624163fd8c7d6a23f6dca
diff --git a/Sources/Info.plist b/Sources/Info.plist
index 622269b0f..c614e72b0 100644
--- a/Sources/Info.plist
+++ b/Sources/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.13.2</string>
+	<string>2.13.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Sources/iOS/NavigationDrawerController.swift b/Sources/iOS/NavigationDrawerController.swift
index 6d3015975..7b98e33be 100644
--- a/Sources/iOS/NavigationDrawerController.swift
+++ b/Sources/iOS/NavigationDrawerController.swift
@@ -453,7 +453,31 @@ open class NavigationDrawerController: TransitionController {
         
         rootViewController.view.frame = container.bounds
 	}
-	
+    
+    open override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        leftViewController?.beginAppearanceTransition(true, animated: animated)
+        rightViewController?.beginAppearanceTransition(true, animated: animated)
+    }
+    
+    open override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        leftViewController?.endAppearanceTransition()
+        rightViewController?.endAppearanceTransition()
+    }
+    
+    open override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        leftViewController?.beginAppearanceTransition(false, animated: animated)
+        rightViewController?.beginAppearanceTransition(false, animated: animated)
+    }
+    
+    open override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        leftViewController?.endAppearanceTransition()
+        rightViewController?.endAppearanceTransition()
+    }
+    
     open override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
         super.viewWillTransition(to: size, with: coordinator)
 		// Ensures the view is isHidden.
diff --git a/Sources/iOS/TransitionController.swift b/Sources/iOS/TransitionController.swift
index f736989b8..44929a27d 100644
--- a/Sources/iOS/TransitionController.swift
+++ b/Sources/iOS/TransitionController.swift
@@ -112,6 +112,26 @@ open class TransitionController: UIViewController {
         prepare()
     }
     
+    open override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        rootViewController.beginAppearanceTransition(true, animated: animated)
+    }
+    
+    open override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        rootViewController.endAppearanceTransition()
+    }
+    
+    open override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        rootViewController.beginAppearanceTransition(false, animated: animated)
+    }
+    
+    open override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        rootViewController.endAppearanceTransition()
+    }
+    
     open override func viewWillLayoutSubviews() {
         super.viewWillLayoutSubviews()
         layoutSubviews()