Merge branch 'master' of https://github.com/reactiveui/reactiveui

Author: anaisbetts

ReactiveUI.Testing/TestUtils.cs

@@ -12,7 +12,7 @@ namespace ReactiveUI.Testing
 {
     public static class TestUtils
     {
-        static readonly object schedGate = 42;
+        static readonly AutoResetEvent schedGate = new AutoResetEvent(true);
         static readonly object mbGate = 42;
 
         /// <summary>
@@ -26,7 +26,7 @@ public static class TestUtils
         /// schedulers.</returns>
         public static IDisposable WithScheduler(IScheduler sched)
         {
-            Monitor.Enter(schedGate);
+            schedGate.WaitOne();
             var prevDef = RxApp.MainThreadScheduler;
             var prevTask = RxApp.TaskpoolScheduler;
 
@@ -36,7 +36,7 @@ public static IDisposable WithScheduler(IScheduler sched)
             return Disposable.Create(() => {
                 RxApp.MainThreadScheduler = prevDef;
                 RxApp.TaskpoolScheduler = prevTask;
-                Monitor.Exit(schedGate);
+                schedGate.Set();
             });
         }
 

ReactiveUI.Tests/ReactiveUI.Tests_Net45.csproj

@@ -103,6 +103,7 @@
     <Compile Include="AwaiterTest.cs" />
     <Compile Include="BindingTypeConvertersTest.cs" />
     <Compile Include="CommandBindingTests.cs" />
+    <Compile Include="TestUtilsTest.cs" />
     <Compile Include="WeakEventManagerTest.cs" />
     <Compile Include="Winforms\ActivationTests.cs" />
     <Compile Include="Winforms\CommandBindingTests.cs">

ReactiveUI.Tests/TestUtilsTest.cs

@@ -0,0 +1,16 @@
+using System.Threading.Tasks;
+using Microsoft.Reactive.Testing;
+using ReactiveUI.Testing;
+using Xunit;
+
+namespace ReactiveUI.Tests
+{
+    public class TestUtilsTest
+    {
+        [Fact]
+        public async Task WithAsyncScheduler()
+        {
+            await new TestScheduler().WithAsync(_ => Task.Run(() => { }));
+        }
+    }
+}

ReactiveUI/Cocoa/ReactiveNavigationController.cs

@@ -0,0 +1,112 @@
+using System;
+using ReactiveUI;
+using System.Runtime.Serialization;
+using System.ComponentModel;
+using System.Reflection;
+using System.Reactive;
+using System.Reactive.Subjects;
+using System.Reactive.Concurrency;
+using System.Linq;
+using System.Threading;
+using System.Reactive.Disposables;
+using System.Diagnostics.Contracts;
+using System.Runtime.CompilerServices;
+using System.Collections.Generic;
+using System.Drawing;
+using Splat;
+
+#if UNIFIED
+using Foundation;
+using UIKit;
+#else
+using MonoTouch.Foundation;
+using MonoTouch.UIKit;
+#endif
+
+namespace ReactiveUI
+{
+    public abstract class ReactiveNavigationController : UINavigationController,
+    IReactiveNotifyPropertyChanged<ReactiveNavigationController>, IHandleObservableErrors, IReactiveObject, ICanActivate
+    {
+        protected ReactiveNavigationController(UIViewController rootViewController) : base(rootViewController) { setupRxObj(); }
+        protected ReactiveNavigationController(Type navigationBarType, Type toolbarType) : base(navigationBarType, toolbarType) { setupRxObj(); }
+        protected ReactiveNavigationController(string nibName, NSBundle bundle) : base(nibName, bundle) { setupRxObj(); }
+        protected ReactiveNavigationController(IntPtr handle) : base(handle) { setupRxObj(); }
+        protected ReactiveNavigationController(NSObjectFlag t) : base(t) { setupRxObj(); }
+        protected ReactiveNavigationController(NSCoder coder) : base(coder) { setupRxObj(); }
+        protected ReactiveNavigationController() { setupRxObj(); }
+
+        public event PropertyChangingEventHandler PropertyChanging {
+            add { PropertyChangingEventManager.AddHandler(this, value); }
+            remove { PropertyChangingEventManager.RemoveHandler(this, value); }
+        }
+
+        void IReactiveObject.RaisePropertyChanging(PropertyChangingEventArgs args)
+        {
+            PropertyChangingEventManager.DeliverEvent(this, args);
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged {
+            add { PropertyChangedEventManager.AddHandler(this, value); }
+            remove { PropertyChangedEventManager.RemoveHandler(this, value); }
+        }
+
+        void IReactiveObject.RaisePropertyChanged(PropertyChangedEventArgs args)
+        {
+            PropertyChangedEventManager.DeliverEvent(this, args);
+        }
+
+        /// <summary>
+        /// Represents an Observable that fires *before* a property is about to
+        /// be changed.         
+        /// </summary>
+        public IObservable<IReactivePropertyChangedEventArgs<ReactiveNavigationController>> Changing {
+            get { return this.getChangingObservable(); }
+        }
+
+        /// <summary>
+        /// Represents an Observable that fires *after* a property has changed.
+        /// </summary>
+        public IObservable<IReactivePropertyChangedEventArgs<ReactiveNavigationController>> Changed {
+            get { return this.getChangedObservable(); }
+        }
+
+        public IObservable<Exception> ThrownExceptions { get { return this.getThrownExceptionsObservable(); } }
+
+        void setupRxObj()
+        {
+        }
+
+        /// <summary>
+        /// When this method is called, an object will not fire change
+        /// notifications (neither traditional nor Observable notifications)
+        /// until the return value is disposed.
+        /// </summary>
+        /// <returns>An object that, when disposed, reenables change
+        /// notifications.</returns>
+        public IDisposable SuppressChangeNotifications()
+        {
+            return this.suppressChangeNotifications();
+        }
+
+        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 ViewWillAppear(bool animated)
+        {
+            base.ViewWillAppear(animated);
+            activated.OnNext(Unit.Default);
+            this.ActivateSubviews(true);
+        }
+
+        public override void ViewDidDisappear(bool animated)
+        {
+            base.ViewDidDisappear(animated);
+            deactivated.OnNext(Unit.Default);
+            this.ActivateSubviews(false);
+        }
+    }
+}
+

ReactiveUI/ReactiveUI_iOS.csproj

@@ -159,6 +159,7 @@
     <Compile Include="Cocoa\AutoSuspendHelper.cs" />
     <Compile Include="Legacy\ReactiveCommand.cs" />
     <Compile Include="Cocoa\ReactiveTabBarController.cs" />
+    <Compile Include="Cocoa\ReactiveNavigationController.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.ReactiveUI_iOS.config" />