Views Never Did Unload, so use Disappear instead

anaisbetts · anaisbetts · commit 3dcd1083332b · 2014-01-29T20:19:23.000-08:00
diff --git a/ReactiveUI.Platforms/Cocoa/ReactiveCollectionViewController.cs b/ReactiveUI.Platforms/Cocoa/ReactiveCollectionViewController.cs
@@ -20,7 +20,8 @@
 
 namespace ReactiveUI.Cocoa
 {
-    public abstract class ReactiveCollectionViewController : UICollectionViewController, IReactiveNotifyPropertyChanged, IHandleObservableErrors, IReactiveObjectExtension, ICanActivate
+    public abstract class ReactiveCollectionViewController : UICollectionViewController, 
+	IReactiveNotifyPropertyChanged, IHandleObservableErrors, IReactiveObjectExtension, ICanActivate
     {
         protected ReactiveCollectionViewController(UICollectionViewLayout withLayout) : base(withLayout) { setupRxObj(); }
         protected ReactiveCollectionViewController(string nibName, NSBundle bundle) : base(nibName, bundle) { setupRxObj(); }
@@ -88,15 +89,15 @@ public IDisposable SuppressChangeNotifications()
         Subject<Unit> deactivated = new Subject<Unit>();
         public IObservable<Unit> Deactivated { get { return deactivated; } }
 
-        public override void ViewDidLoad()
+        public override void ViewDidAppear(bool animated)
         {
-            base.ViewDidLoad();
+            base.ViewDidAppear(animated);
             activated.OnNext(Unit.Default);
         }
 
-        public override void ViewDidUnload()
+        public override void ViewDidDisappear(bool animated)
         {
-            base.ViewDidUnload();
+            base.ViewDidDisappear(animated);
             deactivated.OnNext(Unit.Default);
         }
     }
diff --git a/ReactiveUI.Platforms/Cocoa/ReactiveImageView.cs b/ReactiveUI.Platforms/Cocoa/ReactiveImageView.cs
@@ -93,7 +93,11 @@ public override void WillMoveToSuperview(NSView newsuper)
         public override void ViewWillMoveToSuperview(NSView newsuper)
 #endif
         {
+#if UIKIT
             base.WillMoveToSuperview(newsuper);
+#else
+            base.ViewWillMoveToSuperview(newsuper);
+#endif
             RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));
         }
     }
diff --git a/ReactiveUI.Platforms/Cocoa/ReactiveNSView.cs b/ReactiveUI.Platforms/Cocoa/ReactiveNSView.cs
@@ -116,7 +116,11 @@ public override void WillMoveToSuperview(NSView newsuper)
         public override void ViewWillMoveToSuperview(NSView newsuper)
 #endif
         {
+#if UIKIT
             base.WillMoveToSuperview(newsuper);
+#else
+            base.ViewWillMoveToSuperview(newsuper);
+#endif
             RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));
         }
     }
diff --git a/ReactiveUI.Platforms/Cocoa/ReactiveNSViewController.cs b/ReactiveUI.Platforms/Cocoa/ReactiveNSViewController.cs
@@ -29,7 +29,11 @@ namespace ReactiveUI.Cocoa
     /// This is an View that is both an NSViewController and has ReactiveObject powers 
     /// (i.e. you can call RaiseAndSetIfChanged)
     /// </summary>
-    public class ReactiveViewController : NSViewController, IReactiveNotifyPropertyChanged, IHandleObservableErrors, IReactiveObjectExtension
+    public class ReactiveViewController : NSViewController, 
+	    IReactiveNotifyPropertyChanged, IHandleObservableErrors, IReactiveObjectExtension
+#if UIKIT
+        , ICanActivate
+#endif
     {
         protected ReactiveViewController() : base()
         {
@@ -105,21 +109,23 @@ public IDisposable SuppressChangeNotifications()
             return this.suppressChangeNotifications();
         }
                 
+#if UIKIT
         Subject<Unit> activated = new Subject<Unit>();
         public IObservable<Unit> Activated { get { return activated; } }
         Subject<Unit> deactivated = new Subject<Unit>();
         public IObservable<Unit> Deactivated { get { return deactivated; } }
 
-        public override void ViewDidLoad()
+        public override void ViewDidAppear(bool animated)
         {
-            base.ViewDidLoad();
+            base.ViewDidAppear(animated);
             activated.OnNext(Unit.Default);
         }
 
-        public override void ViewDidUnload()
+        public override void ViewDidDisappear(bool animated)
         {
-            base.ViewDidUnload();
+            base.ViewDidDisappear(animated);
             deactivated.OnNext(Unit.Default);
         }
+#endif
     }
 }
diff --git a/ReactiveUI.Platforms/Cocoa/ReactiveTableViewController.cs b/ReactiveUI.Platforms/Cocoa/ReactiveTableViewController.cs
@@ -22,7 +22,8 @@
 
 namespace ReactiveUI.Cocoa
 {
-    public abstract class ReactiveTableViewController : NSTableViewController, IReactiveNotifyPropertyChanged, IHandleObservableErrors, IReactiveObjectExtension, ICanActivate
+    public abstract class ReactiveTableViewController : NSTableViewController, 
+	IReactiveNotifyPropertyChanged, IHandleObservableErrors, IReactiveObjectExtension, ICanActivate
     {
         protected ReactiveTableViewController(NSTableViewStyle withStyle) : base(withStyle) { setupRxObj(); }
         protected ReactiveTableViewController(string nibName, NSBundle bundle) : base(nibName, bundle) { setupRxObj(); }
@@ -90,15 +91,15 @@ public IDisposable SuppressChangeNotifications()
         Subject<Unit> deactivated = new Subject<Unit>();
         public IObservable<Unit> Deactivated { get { return deactivated; } }
 
-        public override void ViewDidLoad()
+        public override void ViewDidAppear(bool animated)
         {
-            base.ViewDidLoad();
+            base.ViewDidAppear(animated);
             activated.OnNext(Unit.Default);
         }
 
-        public override void ViewDidUnload()
+        public override void ViewDidDisappear(bool animated)
         {
-            base.ViewDidUnload();
+            base.ViewDidDisappear(animated);
             deactivated.OnNext(Unit.Default);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,8 @@`
`20`	`20`
`21`	`21`	`namespace ReactiveUI.Cocoa`
`22`	`22`	`{`
`23`		`- public abstract class ReactiveCollectionViewController : UICollectionViewController, IReactiveNotifyPropertyChanged, IHandleObservableErrors, IReactiveObjectExtension, ICanActivate`
	`23`	`+ public abstract class ReactiveCollectionViewController : UICollectionViewController,`
	`24`	`+ IReactiveNotifyPropertyChanged, IHandleObservableErrors, IReactiveObjectExtension, ICanActivate`
`24`	`25`	`{`
`25`	`26`	`protected ReactiveCollectionViewController(UICollectionViewLayout withLayout) : base(withLayout) { setupRxObj(); }`
`26`	`27`	`protected ReactiveCollectionViewController(string nibName, NSBundle bundle) : base(nibName, bundle) { setupRxObj(); }`
`@@ -88,15 +89,15 @@ public IDisposable SuppressChangeNotifications()`
`88`	`89`	`Subject<Unit> deactivated = new Subject<Unit>();`
`89`	`90`	`public IObservable<Unit> Deactivated { get { return deactivated; } }`
`90`	`91`
`91`		`- public override void ViewDidLoad()`
	`92`	`+ public override void ViewDidAppear(bool animated)`
`92`	`93`	`{`
`93`		`- base.ViewDidLoad();`
	`94`	`+ base.ViewDidAppear(animated);`
`94`	`95`	`activated.OnNext(Unit.Default);`
`95`	`96`	`}`
`96`	`97`
`97`		`- public override void ViewDidUnload()`
	`98`	`+ public override void ViewDidDisappear(bool animated)`
`98`	`99`	`{`
`99`		`- base.ViewDidUnload();`
	`100`	`+ base.ViewDidDisappear(animated);`
`100`	`101`	`deactivated.OnNext(Unit.Default);`
`101`	`102`	`}`
`102`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,11 @@ public override void WillMoveToSuperview(NSView newsuper)`
`93`	`93`	`public override void ViewWillMoveToSuperview(NSView newsuper)`
`94`	`94`	`#endif`
`95`	`95`	`{`
	`96`	`+#if UIKIT`
`96`	`97`	`base.WillMoveToSuperview(newsuper);`
	`98`	`+#else`
	`99`	`+ base.ViewWillMoveToSuperview(newsuper);`
	`100`	`+#endif`
`97`	`101`	`RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));`
`98`	`102`	`}`
`99`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,11 @@ public override void WillMoveToSuperview(NSView newsuper)`
`116`	`116`	`public override void ViewWillMoveToSuperview(NSView newsuper)`
`117`	`117`	`#endif`
`118`	`118`	`{`
	`119`	`+#if UIKIT`
`119`	`120`	`base.WillMoveToSuperview(newsuper);`
	`121`	`+#else`
	`122`	`+ base.ViewWillMoveToSuperview(newsuper);`
	`123`	`+#endif`
`120`	`124`	`RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));`
`121`	`125`	`}`
`122`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,11 @@ namespace ReactiveUI.Cocoa`
`29`	`29`	`/// This is an View that is both an NSViewController and has ReactiveObject powers`
`30`	`30`	`/// (i.e. you can call RaiseAndSetIfChanged)`
`31`	`31`	`/// </summary>`
`32`		`- public class ReactiveViewController : NSViewController, IReactiveNotifyPropertyChanged, IHandleObservableErrors, IReactiveObjectExtension`
	`32`	`+ public class ReactiveViewController : NSViewController,`
	`33`	`+ IReactiveNotifyPropertyChanged, IHandleObservableErrors, IReactiveObjectExtension`
	`34`	`+#if UIKIT`
	`35`	`+ , ICanActivate`
	`36`	`+#endif`
`33`	`37`	`{`
`34`	`38`	`protected ReactiveViewController() : base()`
`35`	`39`	`{`
`@@ -105,21 +109,23 @@ public IDisposable SuppressChangeNotifications()`
`105`	`109`	`return this.suppressChangeNotifications();`
`106`	`110`	`}`
`107`	`111`
	`112`	`+#if UIKIT`
`108`	`113`	`Subject<Unit> activated = new Subject<Unit>();`
`109`	`114`	`public IObservable<Unit> Activated { get { return activated; } }`
`110`	`115`	`Subject<Unit> deactivated = new Subject<Unit>();`
`111`	`116`	`public IObservable<Unit> Deactivated { get { return deactivated; } }`
`112`	`117`
`113`		`- public override void ViewDidLoad()`
	`118`	`+ public override void ViewDidAppear(bool animated)`
`114`	`119`	`{`
`115`		`- base.ViewDidLoad();`
	`120`	`+ base.ViewDidAppear(animated);`
`116`	`121`	`activated.OnNext(Unit.Default);`
`117`	`122`	`}`
`118`	`123`
`119`		`- public override void ViewDidUnload()`
	`124`	`+ public override void ViewDidDisappear(bool animated)`
`120`	`125`	`{`
`121`		`- base.ViewDidUnload();`
	`126`	`+ base.ViewDidDisappear(animated);`
`122`	`127`	`deactivated.OnNext(Unit.Default);`
`123`	`128`	`}`
	`129`	`+#endif`
`124`	`130`	`}`
`125`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@`
`22`	`22`
`23`	`23`	`namespace ReactiveUI.Cocoa`
`24`	`24`	`{`
`25`		`- public abstract class ReactiveTableViewController : NSTableViewController, IReactiveNotifyPropertyChanged, IHandleObservableErrors, IReactiveObjectExtension, ICanActivate`
	`25`	`+ public abstract class ReactiveTableViewController : NSTableViewController,`
	`26`	`+ IReactiveNotifyPropertyChanged, IHandleObservableErrors, IReactiveObjectExtension, ICanActivate`
`26`	`27`	`{`
`27`	`28`	`protected ReactiveTableViewController(NSTableViewStyle withStyle) : base(withStyle) { setupRxObj(); }`
`28`	`29`	`protected ReactiveTableViewController(string nibName, NSBundle bundle) : base(nibName, bundle) { setupRxObj(); }`
`@@ -90,15 +91,15 @@ public IDisposable SuppressChangeNotifications()`
`90`	`91`	`Subject<Unit> deactivated = new Subject<Unit>();`
`91`	`92`	`public IObservable<Unit> Deactivated { get { return deactivated; } }`
`92`	`93`
`93`		`- public override void ViewDidLoad()`
	`94`	`+ public override void ViewDidAppear(bool animated)`
`94`	`95`	`{`
`95`		`- base.ViewDidLoad();`
	`96`	`+ base.ViewDidAppear(animated);`
`96`	`97`	`activated.OnNext(Unit.Default);`
`97`	`98`	`}`
`98`	`99`
`99`		`- public override void ViewDidUnload()`
	`100`	`+ public override void ViewDidDisappear(bool animated)`
`100`	`101`	`{`
`101`		`- base.ViewDidUnload();`
	`102`	`+ base.ViewDidDisappear(animated);`
`102`	`103`	`deactivated.OnNext(Unit.Default);`
`103`	`104`	`}`
`104`	`105`	`}`