fixed resolver error

TinyStuff · Dec 28, 2020 · b738822 · b738822
1 parent 0323e3e
commit b738822
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/src/TinyMvvm.Forms/ViewBase.cs b/src/TinyMvvm.Forms/ViewBase.cs
@@ -168,8 +168,6 @@ internal virtual void CreateViewModel()
         }
     }
 
-
-
     public abstract class ViewBase<T> : ViewBase where T:IViewModelBase?
     {
         public T? ViewModel
@@ -183,21 +181,18 @@ public T? ViewModel
 
                 return default(T);
             }
-        }
-
-
+        }        
 
         internal override void CreateViewModel()
         {
             if (Resolver.IsEnabled)
             {
-                BindingContext = Resolver.Resolve<T>();
+                BindingContext = Resolver.Resolve(typeof(T));
             }
             else
             {
                 BindingContext = Activator.CreateInstance(typeof(T));
-            }        
-
+            }     
         }
 
         public ViewBase(bool isShellView)
@@ -221,18 +216,14 @@ public ViewBase()
             }            
         }
 
-
         protected override void OnAppearing()
         {
-
-
             if(ViewModel == null && !CreatedByTinyMvvm)
             {
                 CreateViewModel();
             }
 
             base.OnAppearing();
-
         }
 
         protected override void OnDisappearing()

diff --git a/src/TinyMvvm/IoC/Resolver.cs b/src/TinyMvvm/IoC/Resolver.cs
@@ -21,7 +21,7 @@ public static bool IsEnabled
             }
         }
 
-        public static T Resolve<T>()
+        public static T Resolve<T>() where T:class
         {
             if(_resolver is null)
             {
@@ -31,7 +31,7 @@ public static T Resolve<T>()
             return _resolver.Resolve<T>();
         }
 
-        public static T Resolve<T>(string key)
+        public static T Resolve<T>(string key) where T : class
         {
             if (_resolver is null)
             {