Merge pull request #335 from reactiveui/view-locator-fallback

Fall back to non orientation-specific views

Author: Paul Betts

ReactiveUI.Platforms/Cocoa/RoutedViewHost.cs

@@ -67,7 +67,7 @@ public RoutedViewHost(NSView targetView)
                 }
 
                 var viewLocator = ViewLocator ?? ReactiveUI.ViewLocator.Current;
-                var view = viewLocator.ResolveView(x.ViewModel, x.Contract);
+                var view = viewLocator.ResolveView(x.ViewModel, x.Contract) ?? viewLocator.ResolveView(x.ViewModel, null);
                 view.ViewModel = x.ViewModel;
 
                 if (view is NSViewController) {

ReactiveUI.Platforms/Xaml/RoutedViewHost.cs

@@ -89,7 +89,8 @@ public RoutedViewHost()
                 }
 
                 var viewLocator = ViewLocator ?? ReactiveUI.ViewLocator.Current;
-                var view = viewLocator.ResolveView(x.Item1, x.Item2);
+                var view = viewLocator.ResolveView(x.Item1, x.Item2) ?? viewLocator.ResolveView(x.Item1, null);
+
                 view.ViewModel = x.Item1;
                 Content = view;
             }, ex => RxApp.DefaultExceptionHandler.OnNext(ex));

ReactiveUI/ViewLocator.cs

@@ -21,7 +21,7 @@ public static IViewLocator Current {
         }
     }
 
-    class DefaultViewLocator : IViewLocator
+    class DefaultViewLocator : IViewLocator, IEnableLogger
     {
         public Func<string, string> ViewModelToViewFunc { get; set; }
 
@@ -56,21 +56,29 @@ public IViewFor ResolveView<T>(T viewModel, string contract = null)
 
             // IFooBarView that implements IViewFor (or custom ViewModelToViewFunc)
             var typeToFind = ViewModelToViewFunc(viewModel.GetType().AssemblyQualifiedName);
-            try {
-                var type = Reflection.ReallyFindType(typeToFind, false);
+                
+            var ret = attemptToResolveView(Reflection.ReallyFindType(typeToFind, false), contract);
+            if (ret != null) return ret;
 
-                if (type != null) {
-                    var ret = RxApp.DependencyResolver.GetService(type, contract) as IViewFor;
-                    if (ret != null) return ret;
-                }
+            // IViewFor<FooBarViewModel> (the original behavior in RxUI 3.1)
+            var viewType = typeof (IViewFor<>);
+            return attemptToResolveView(viewType.MakeGenericType(viewModel.GetType()), contract);
+        }
+
+        IViewFor attemptToResolveView(Type type, string contract)
+        {
+            if (type == null) return null;
+
+            var ret = default(IViewFor);
+
+            try {
+                ret = (IViewFor)RxApp.DependencyResolver.GetService(type, contract);
             } catch (Exception ex) {
-                LogHost.Default.DebugException("Couldn't instantiate " + typeToFind, ex);
+                this.Log().ErrorException("Failed to instantiate view: " + type.FullName, ex);
+                throw;
             }
 
-            var viewType = typeof (IViewFor<>);
-
-            // IViewFor<FooBarViewModel> (the original behavior in RxUI 3.1)
-            return (IViewFor) RxApp.DependencyResolver.GetService(viewType.MakeGenericType(viewModel.GetType()), contract);
+            return ret;
         }
 
         static string interfaceifyTypeName(string typeName)