workaround for xamarin bug on alpha - no idea why this cast throws a …

…null ref exception
MvvmCross · Sep 1, 2013 · 5786d49 · 5786d49
1 parent 8a6a378
commit 5786d49
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 8 deletions.
diff --git a/Cirrious/Cirrious.MvvmCross.AutoView.Touch/Views/Dialog/MvxAutoDialogTouchView.cs b/Cirrious/Cirrious.MvvmCross.AutoView.Touch/Views/Dialog/MvxAutoDialogTouchView.cs
@@ -32,7 +32,7 @@ public MvxAutoDialogTouchView()
 
         public new MvxViewModel ViewModel
         {
-            get { return (MvxViewModel) base.ViewModel; }
+			get { return base.ViewModel as MvxViewModel; }
             set { base.ViewModel = value; }
         }
 

diff --git a/Cirrious/Cirrious.MvvmCross.AutoView.Touch/Views/MvxMissingViewController.cs b/Cirrious/Cirrious.MvvmCross.AutoView.Touch/Views/MvxMissingViewController.cs
@@ -21,7 +21,7 @@ public class MvxMissingViewController
     {
         public new MvxViewModel ViewModel
         {
-            get { return (MvxViewModel) base.ViewModel; }
+			get { return base.ViewModel as MvxViewModel; }
             set { base.ViewModel = value; }
         }
 

diff --git a/Cirrious/Cirrious.MvvmCross.Dialog.Touch/MvxDialogViewController.cs b/Cirrious/Cirrious.MvvmCross.Dialog.Touch/MvxDialogViewController.cs
@@ -36,7 +36,7 @@ public object DataContext
 
         public IMvxViewModel ViewModel
         {
-            get { return (IMvxViewModel) DataContext; }
+            get { return DataContext as IMvxViewModel; }
             set { DataContext = value; }
         }
 

diff --git a/Cirrious/Cirrious.MvvmCross.Touch/Views/MvxCollectionViewController.cs b/Cirrious/Cirrious.MvvmCross.Touch/Views/MvxCollectionViewController.cs
@@ -44,7 +44,7 @@ public object DataContext
 
         public IMvxViewModel ViewModel
         {
-            get { return (IMvxViewModel) DataContext; }
+			get { return DataContext as IMvxViewModel; }
             set { DataContext = value; }
         }
 

diff --git a/Cirrious/Cirrious.MvvmCross.Touch/Views/MvxTabBarViewController.cs b/Cirrious/Cirrious.MvvmCross.Touch/Views/MvxTabBarViewController.cs
@@ -40,7 +40,7 @@ public object DataContext
 
         public IMvxViewModel ViewModel
         {
-            get { return (IMvxViewModel) DataContext; }
+			get { return DataContext as IMvxViewModel; }
             set { DataContext = value; }
         }
 

diff --git a/Cirrious/Cirrious.MvvmCross.Touch/Views/MvxTableViewController.cs b/Cirrious/Cirrious.MvvmCross.Touch/Views/MvxTableViewController.cs
@@ -11,6 +11,7 @@
 using Cirrious.MvvmCross.ViewModels;
 using MonoTouch.Foundation;
 using MonoTouch.UIKit;
+using Cirrious.CrossCore;
 
 namespace Cirrious.MvvmCross.Touch.Views
 {
@@ -44,8 +45,32 @@ public object DataContext
 
         public IMvxViewModel ViewModel
         {
-            get { return (IMvxViewModel) DataContext; }
-            set { DataContext = value; }
+            get {
+				/*
+				Mvx.Trace ("I am in .ViewModel!");
+				if (BindingContext == null)
+					Mvx.Trace ("BindingContext is null!");
+				Mvx.Trace ("I am in .ViewModel 2!");
+				if (DataContext == null)
+					Mvx.Trace ("DataContext is null!");
+				Mvx.Trace ("I am in .ViewModel 3!");
+
+				var c = DataContext;
+				Mvx.Trace ("I am in .ViewModel 4!");
+				var d = c as IMvxViewModel;
+				Mvx.Trace ("I am in .ViewModel 5!");
+
+				var e = (IMvxViewModel)d;
+				Mvx.Trace ("I am in .ViewModel 6!");
+				if (d == null)
+					Mvx.Trace ("d was null!");
+
+				if (e == null)
+					Mvx.Trace ("e was null!");
+				*/
+				return DataContext as IMvxViewModel;
+			}
+			set { DataContext = value; }
         }
 
         public MvxViewModelRequest Request { get; set; }

diff --git a/Cirrious/Cirrious.MvvmCross.Touch/Views/MvxViewController.cs b/Cirrious/Cirrious.MvvmCross.Touch/Views/MvxViewController.cs
@@ -42,7 +42,7 @@ public object DataContext
 
         public IMvxViewModel ViewModel
         {
-            get { return (IMvxViewModel) DataContext; }
+			get { return DataContext as IMvxViewModel; }
             set { DataContext = value; }
         }