Merge pull request #459 from reactiveui/always-initialize-rxui

Paul Betts · Paul Betts · commit 2cc1c4009614 · 2013-12-24T13:14:06.000-08:00
Always initialize ReactiveUI
diff --git a/ReactiveUI.Platforms/Android/ActivityRoutedViewHost.cs b/ReactiveUI.Platforms/Android/ActivityRoutedViewHost.cs
@@ -13,6 +13,7 @@
 using Android.Widget;
 using ActionbarSherlock.App;
 using Splat;
+using ReactiveUI;
 
 namespace ReactiveUI.Android
 {
@@ -23,6 +24,8 @@ public sealed class ActivityRoutedViewHost : IDisposable
 
         public ActivityRoutedViewHost(Activity hostActivity, IViewLocator viewLocator = null)
         {
+            RxApp.EnsureInitialized();
+
             viewLocator = viewLocator ?? ViewLocator.Current;
             var platform = Locator.Current.GetService<IPlatformOperations>();
 
diff --git a/ReactiveUI.Platforms/Cocoa/RoutedViewHost.cs b/ReactiveUI.Platforms/Cocoa/RoutedViewHost.cs
@@ -47,6 +47,7 @@ public NSViewController DefaultContent {
 
         public RoutedViewHost(NSView targetView)
         {
+            RxApp.EnsureInitialized();
             NSView viewLastAdded = null;
 
             ViewContractObservable = Observable.Return(default(string));
@@ -82,4 +83,4 @@ public RoutedViewHost(NSView targetView)
             }, RxApp.DefaultExceptionHandler.OnNext);
         }
     }
-}
+}
diff --git a/ReactiveUI.Platforms/Cocoa/RouterUINavigationController.cs b/ReactiveUI.Platforms/Cocoa/RouterUINavigationController.cs
@@ -10,6 +10,7 @@
 using MonoTouch.Foundation;
 using System.ComponentModel;
 using Splat;
+using ReactiveUI;
 
 namespace ReactiveUI.Cocoa
 {
@@ -20,6 +21,8 @@ public class RouterUINavigationController : UINavigationController
 
         public RouterUINavigationController(IRoutingState router, IViewLocator viewLocator = null)
         {
+            RxApp.EnsureInitialized();
+
             this.router = router;
             viewLocator = viewLocator ?? ViewLocator.Current;
 
diff --git a/ReactiveUI.Platforms/Cocoa/ViewModelViewHost.cs b/ReactiveUI.Platforms/Cocoa/ViewModelViewHost.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Reactive;
 using System.Reactive.Linq;
+using ReactiveUI;
 
 #if UIKIT
 using MonoTouch.UIKit;
@@ -26,6 +27,8 @@ public class ViewModelViewHost : ReactiveObject
     {
         public ViewModelViewHost(NSView targetView)
         {
+            RxApp.EnsureInitialized();
+
             NSView viewLastAdded = null;
 
             ViewContractObservable = Observable.Return(default(string));
diff --git a/ReactiveUI.Platforms/Winforms/RoutedViewHost.cs b/ReactiveUI.Platforms/Winforms/RoutedViewHost.cs
@@ -5,6 +5,7 @@
 using System.Reactive.Linq;
 using System.Runtime.CompilerServices;
 using System.Windows.Forms;
+using ReactiveUI;
 
 namespace ReactiveUI.Winforms
 {
@@ -20,6 +21,7 @@ public partial class RoutedViewHost : UserControl, INotifyPropertyChanged, INoti
 
         public RoutedViewHost()
         {
+            RxApp.EnsureInitialized();
             this.InitializeComponent();
 
             this.disposables.Add(this.WhenAny(x => x.DefaultContent, x => x.Value).Subscribe(x => {
diff --git a/ReactiveUI.Platforms/Winforms/ViewModelViewHost.cs b/ReactiveUI.Platforms/Winforms/ViewModelViewHost.cs
@@ -5,6 +5,7 @@
 using System.Reactive.Linq;
 using System.Runtime.CompilerServices;
 using System.Windows.Forms;
+using ReactiveUI;
 
 namespace ReactiveUI.Winforms
 {
@@ -20,6 +21,7 @@ public partial class ViewModelViewHost : UserControl, INotifyPropertyChanged, IN
 
         public ViewModelViewHost()
         {
+            RxApp.EnsureInitialized();
             this.InitializeComponent();
 
             this.disposables.Add(this.WhenAny(x => x.DefaultContent, x => x.Value).Subscribe(x => {
diff --git a/ReactiveUI.Platforms/Xaml/RoutedViewHost.cs b/ReactiveUI.Platforms/Xaml/RoutedViewHost.cs
@@ -59,6 +59,7 @@ public IObservable<string> ViewContractObservable {
 
         public RoutedViewHost()
         {
+            RxApp.EnsureInitialized();
             HorizontalContentAlignment = HorizontalAlignment.Stretch;
             VerticalContentAlignment = VerticalAlignment.Stretch;
 
diff --git a/ReactiveUI.Platforms/Xaml/ViewModelViewHost.cs b/ReactiveUI.Platforms/Xaml/ViewModelViewHost.cs
@@ -55,6 +55,8 @@ public IObservable<string> ViewContractObservable {
 
         public ViewModelViewHost()
         {
+            RxApp.EnsureInitialized();
+
             // NB: InUnitTestRunner also returns true in Design Mode
             if (ModeDetector.InUnitTestRunner()) {
                 ViewContractObservable = Observable.Never<string>();
diff --git a/ReactiveUI/CommandBinding.cs b/ReactiveUI/CommandBinding.cs
@@ -9,7 +9,7 @@
 using System.Text;
 using System.Windows.Input;
 using Splat;
-using Splat;
+using ReactiveUI;
 
 namespace ReactiveUI
 {
@@ -19,6 +19,8 @@ public static class CommandBinder
 
         static CommandBinder()
         {
+            RxApp.EnsureInitialized();
+
             binderImplementation = Locator.Current.GetService<ICommandBinderImplementation>() ?? 
                 new CommandBinderImplementation();
         }
diff --git a/ReactiveUI/DefaultPropertyBinding.cs b/ReactiveUI/DefaultPropertyBinding.cs
@@ -10,6 +10,8 @@ public class DefaultPropertyBinding
     {
         public static string GetPropertyForControl(object control)
         {
+            RxApp.EnsureInitialized();
+
             return Locator.Current.GetServices<IDefaultPropertyBindingProvider>()
                 .Select(x => x.GetPropertyForControl(control))
                 .Where(x => x != null)
diff --git a/ReactiveUI/PropertyBinding.cs b/ReactiveUI/PropertyBinding.cs
@@ -23,6 +23,7 @@ public static class BindingMixins
 
         static BindingMixins()
         {
+            RxApp.EnsureInitialized();
             binderImplementation = new PropertyBinderImplementation();
         }
 
diff --git a/ReactiveUI/ReactiveNotifyPropertyChangedMixin.cs b/ReactiveUI/ReactiveNotifyPropertyChangedMixin.cs
@@ -15,6 +15,11 @@ namespace ReactiveUI
 {
     public static class ReactiveNotifyPropertyChangedMixin
     {
+        static ReactiveNotifyPropertyChangedMixin()
+        {
+            RxApp.EnsureInitialized();
+        }
+
         /// <summary>
         /// ObservableForProperty returns an Observable representing the
         /// property change notifications for a specific property on a
diff --git a/ReactiveUI/RoutingState.cs b/ReactiveUI/RoutingState.cs
@@ -65,6 +65,8 @@ public RoutingState()
 
         void setupRx()
         {
+            RxApp.EnsureInitialized();
+
             NavigateBack = new ReactiveCommand(
                 NavigationStack.CountChanged.StartWith(_NavigationStack.Count).Select(x => x > 1));
             NavigateBack.Subscribe(_ =>
diff --git a/ReactiveUI/RxApp.cs b/ReactiveUI/RxApp.cs
@@ -162,6 +162,18 @@ public static void InitializeCustomResolver(Action<object, Type> registerMethod)
             fakeResolver.InitializeReactiveUI();
         }
 
+        /// <summary>
+        /// This method ensures that Splat's Default Locator is initialized
+        /// by ReactiveUI. This method is primarily used by ReactiveUI itself,
+        /// you can usually ignore it.
+        /// </summary>
+        public static void EnsureInitialized()
+        {
+            // NB: This doesn't actually do anything, it just makes sure we've
+            // called the static ctor.
+            MainThreadScheduler.GetType();
+        }
+
 #if ANDROID || SILVERLIGHT || IOS
         public const int SmallCacheLimit = 32;
         public const int BigCacheLimit = 64;
diff --git a/ReactiveUI/ViewLocator.cs b/ReactiveUI/ViewLocator.cs
@@ -14,6 +14,8 @@ public static class ViewLocator
     {
         public static IViewLocator Current {
             get {
+                RxApp.EnsureInitialized();
+
                 var ret = Locator.Current.GetService<IViewLocator>();
                 if (ret == null) {
                     throw new Exception("Could not find a default ViewLocator. This should never happen, your dependency resolver is broken");

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`using Android.Widget;`
`14`	`14`	`using ActionbarSherlock.App;`
`15`	`15`	`using Splat;`
	`16`	`+using ReactiveUI;`
`16`	`17`
`17`	`18`	`namespace ReactiveUI.Android`
`18`	`19`	`{`
`@@ -23,6 +24,8 @@ public sealed class ActivityRoutedViewHost : IDisposable`
`23`	`24`
`24`	`25`	`public ActivityRoutedViewHost(Activity hostActivity, IViewLocator viewLocator = null)`
`25`	`26`	`{`
	`27`	`+ RxApp.EnsureInitialized();`
	`28`	`+`
`26`	`29`	`viewLocator = viewLocator ?? ViewLocator.Current;`
`27`	`30`	`var platform = Locator.Current.GetService<IPlatformOperations>();`
`28`	`31`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ public NSViewController DefaultContent {`
`47`	`47`
`48`	`48`	`public RoutedViewHost(NSView targetView)`
`49`	`49`	`{`
	`50`	`+ RxApp.EnsureInitialized();`
`50`	`51`	`NSView viewLastAdded = null;`
`51`	`52`
`52`	`53`	`ViewContractObservable = Observable.Return(default(string));`
`@@ -82,4 +83,4 @@ public RoutedViewHost(NSView targetView)`
`82`	`83`	`}, RxApp.DefaultExceptionHandler.OnNext);`
`83`	`84`	`}`
`84`	`85`	`}`
`85`		`-}`
	`86`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`using MonoTouch.Foundation;`
`11`	`11`	`using System.ComponentModel;`
`12`	`12`	`using Splat;`
	`13`	`+using ReactiveUI;`
`13`	`14`
`14`	`15`	`namespace ReactiveUI.Cocoa`
`15`	`16`	`{`
`@@ -20,6 +21,8 @@ public class RouterUINavigationController : UINavigationController`
`20`	`21`
`21`	`22`	`public RouterUINavigationController(IRoutingState router, IViewLocator viewLocator = null)`
`22`	`23`	`{`
	`24`	`+ RxApp.EnsureInitialized();`
	`25`	`+`
`23`	`26`	`this.router = router;`
`24`	`27`	`viewLocator = viewLocator ?? ViewLocator.Current;`
`25`	`28`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Reactive;`
`3`	`3`	`using System.Reactive.Linq;`
	`4`	`+using ReactiveUI;`
`4`	`5`
`5`	`6`	`#if UIKIT`
`6`	`7`	`using MonoTouch.UIKit;`
`@@ -26,6 +27,8 @@ public class ViewModelViewHost : ReactiveObject`
`26`	`27`	`{`
`27`	`28`	`public ViewModelViewHost(NSView targetView)`
`28`	`29`	`{`
	`30`	`+ RxApp.EnsureInitialized();`
	`31`	`+`
`29`	`32`	`NSView viewLastAdded = null;`
`30`	`33`
`31`	`34`	`ViewContractObservable = Observable.Return(default(string));`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using System.Reactive.Linq;`
`6`	`6`	`using System.Runtime.CompilerServices;`
`7`	`7`	`using System.Windows.Forms;`
	`8`	`+using ReactiveUI;`
`8`	`9`
`9`	`10`	`namespace ReactiveUI.Winforms`
`10`	`11`	`{`
`@@ -20,6 +21,7 @@ public partial class RoutedViewHost : UserControl, INotifyPropertyChanged, INoti`
`20`	`21`
`21`	`22`	`public RoutedViewHost()`
`22`	`23`	`{`
	`24`	`+ RxApp.EnsureInitialized();`
`23`	`25`	`this.InitializeComponent();`
`24`	`26`
`25`	`27`	`this.disposables.Add(this.WhenAny(x => x.DefaultContent, x => x.Value).Subscribe(x => {`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ public IObservable<string> ViewContractObservable {`
`59`	`59`
`60`	`60`	`public RoutedViewHost()`
`61`	`61`	`{`
	`62`	`+ RxApp.EnsureInitialized();`
`62`	`63`	`HorizontalContentAlignment = HorizontalAlignment.Stretch;`
`63`	`64`	`VerticalContentAlignment = VerticalAlignment.Stretch;`
`64`	`65`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,8 @@ public IObservable<string> ViewContractObservable {`
`55`	`55`
`56`	`56`	`public ViewModelViewHost()`
`57`	`57`	`{`
	`58`	`+ RxApp.EnsureInitialized();`
	`59`	`+`
`58`	`60`	`// NB: InUnitTestRunner also returns true in Design Mode`
`59`	`61`	`if (ModeDetector.InUnitTestRunner()) {`
`60`	`62`	`ViewContractObservable = Observable.Never<string>();`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`using System.Text;`
`10`	`10`	`using System.Windows.Input;`
`11`	`11`	`using Splat;`
`12`		`-using Splat;`
	`12`	`+using ReactiveUI;`
`13`	`13`
`14`	`14`	`namespace ReactiveUI`
`15`	`15`	`{`
`@@ -19,6 +19,8 @@ public static class CommandBinder`
`19`	`19`
`20`	`20`	`static CommandBinder()`
`21`	`21`	`{`
	`22`	`+ RxApp.EnsureInitialized();`
	`23`	`+`
`22`	`24`	`binderImplementation = Locator.Current.GetService<ICommandBinderImplementation>() ??`
`23`	`25`	`new CommandBinderImplementation();`
`24`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ public class DefaultPropertyBinding`
`10`	`10`	`{`
`11`	`11`	`public static string GetPropertyForControl(object control)`
`12`	`12`	`{`
	`13`	`+ RxApp.EnsureInitialized();`
	`14`	`+`
`13`	`15`	`return Locator.Current.GetServices<IDefaultPropertyBindingProvider>()`
`14`	`16`	`.Select(x => x.GetPropertyForControl(control))`
`15`	`17`	`.Where(x => x != null)`