ViewModelLocator is now responsible for connecting view models to views.

Uses an auto-wiring convention-based approach.

Author: David Britch

src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml.cs

@@ -1,6 +1,6 @@
 using eShopOnContainers.Core.Helpers;
 using eShopOnContainers.Services;
-using eShopOnContainers.ViewModels.Base;
+using eShopOnContainers.Core.ViewModels.Base;
 using System.Threading.Tasks;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
@@ -27,13 +27,13 @@ public App()
         private void InitApp()
         {
             UseMockServices = Settings.UseMocks;
-
-            ViewModelLocator.Instance.UpdateDependencies(UseMockServices);
+			ViewModelLocator.Initialize();
+            ViewModelLocator.UpdateDependencies(UseMockServices);
         }
 
         private Task InitNavigation()
         {
-            var navigationService = ViewModelLocator.Instance.Resolve<INavigationService>();
+            var navigationService = ViewModelLocator.Resolve<INavigationService>();
             return navigationService.InitializeAsync();
         }
 

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/ServicesHelper.cs

@@ -1,6 +1,6 @@
 using eShopOnContainers.Core.Models.Basket;
 using eShopOnContainers.Core.Models.Catalog;
-using eShopOnContainers.ViewModels.Base;
+using eShopOnContainers.Core.ViewModels.Base;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -21,7 +21,7 @@ public static void FixCatalogItemPictureUri(IEnumerable<CatalogItem> catalogItem
 
             try
             {
-                if (!ViewModelLocator.Instance.UseMockService
+                if (!ViewModelLocator.UseMockService
                     && Settings.UrlBase != GlobalSetting.DefaultEndpoint)
                 {
                     foreach (var catalogItem in catalogItems)
@@ -54,7 +54,7 @@ public static void FixBasketItemPictureUri(IEnumerable<BasketItem> basketItems)
 
             try
             {
-                if (!ViewModelLocator.Instance.UseMockService
+                if (!ViewModelLocator.UseMockService
                     && Settings.UrlBase != GlobalSetting.DefaultEndpoint)
                 {
                     foreach (var basketItem in basketItems)

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/Settings.cs

@@ -1,4 +1,4 @@
-using eShopOnContainers.ViewModels.Base;
+using eShopOnContainers.Core.ViewModels.Base;
 using Plugin.Settings;
 using Plugin.Settings.Abstractions;
 
@@ -27,7 +27,7 @@ private static ISettings AppSettings
         private const string IdUrlBase = "url_base";
         private static readonly string AccessTokenDefault = string.Empty;
         private static readonly string IdTokenDefault = string.Empty;
-        private static readonly bool UseMocksDefault = ViewModelLocator.Instance.UseMockService;
+        private static readonly bool UseMocksDefault = ViewModelLocator.UseMockService;
         private static readonly string UrlBaseDefault = GlobalSetting.Instance.BaseEndpoint;
 
         #endregion

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Navigation/INavigationService.cs

@@ -1,4 +1,4 @@
-using eShopOnContainers.ViewModels.Base;
+using eShopOnContainers.Core.ViewModels.Base;
 using System;
 using System.Threading.Tasks;
 

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Navigation/NavigationService.cs

@@ -1,18 +1,17 @@
 using eShopOnContainers.Core.Helpers;
 using eShopOnContainers.Core.ViewModels;
 using eShopOnContainers.Core.Views;
-using eShopOnContainers.ViewModels.Base;
+using eShopOnContainers.Core.ViewModels.Base;
 using System;
-using System.Collections.Generic;
+using System.Globalization;
+using System.Reflection;
 using System.Threading.Tasks;
 using Xamarin.Forms;
 
 namespace eShopOnContainers.Services
 {
     public class NavigationService : INavigationService
     {
-        protected readonly Dictionary<Type, Type> _mappings;
-
         protected Application CurrentApplication
         {
             get
@@ -21,13 +20,6 @@ protected Application CurrentApplication
             }
         }
 
-        public NavigationService()
-        {
-            _mappings = new Dictionary<Type, Type>();
-
-            CreatePageViewModelMappings();
-        }
-
         public Task InitializeAsync()
         {
             if(string.IsNullOrEmpty(Settings.AuthAccessToken))
@@ -100,7 +92,7 @@ public virtual Task RemoveBackStackAsync()
 
         protected virtual async Task InternalNavigateToAsync(Type viewModelType, object parameter)
         {
-            Page page = CreateAndBindPage(viewModelType, parameter);
+            Page page = CreatePage(viewModelType, parameter);
 
             if (page is LoginView)
             {
@@ -109,7 +101,6 @@ protected virtual async Task InternalNavigateToAsync(Type viewModelType, object
             else
             {
                 var navigationPage = CurrentApplication.MainPage as CustomNavigationView;
-
                 if (navigationPage != null)
                 {
                     await navigationPage.PushAsync(page);
@@ -123,42 +114,25 @@ protected virtual async Task InternalNavigateToAsync(Type viewModelType, object
             await (page.BindingContext as ViewModelBase).InitializeAsync(parameter);
         }
 
-        protected Type GetPageTypeForViewModel(Type viewModelType)
-        {
-            if (!_mappings.ContainsKey(viewModelType))
-            {
-                throw new KeyNotFoundException($"No map for ${viewModelType} was found on navigation mappings");
-            }
-
-            return _mappings[viewModelType];
-        }
-
-        protected Page CreateAndBindPage(Type viewModelType, object parameter)
-        {
-            Type pageType = GetPageTypeForViewModel(viewModelType);
-
-            if (pageType == null)
-            {
-                throw new Exception($"Mapping type for {viewModelType} is not a page");
-            }
-
-            Page page = Activator.CreateInstance(pageType) as Page;
-            ViewModelBase viewModel = ViewModelLocator.Instance.Resolve(viewModelType) as ViewModelBase;
-            page.BindingContext = viewModel;
-
-            return page;
-        }
-
-        private void CreatePageViewModelMappings()
-        {
-            _mappings.Add(typeof(BasketViewModel), typeof(BasketView));
-            _mappings.Add(typeof(CatalogViewModel), typeof(CatalogView));
-            _mappings.Add(typeof(CheckoutViewModel), typeof(CheckoutView));
-            _mappings.Add(typeof(LoginViewModel), typeof(LoginView));
-            _mappings.Add(typeof(MainViewModel), typeof(MainView));
-            _mappings.Add(typeof(OrderDetailViewModel), typeof(OrderDetailView));
-            _mappings.Add(typeof(ProfileViewModel), typeof(ProfileView));
-            _mappings.Add(typeof(SettingsViewModel), typeof(SettingsView));
-        }
+		protected Type GetPageTypeForViewModel(Type viewModelType)
+		{
+			var viewName = viewModelType.FullName.Replace("Model", string.Empty);
+			var viewModelAssemblyName = viewModelType.GetTypeInfo().Assembly.FullName;
+			var viewAssemblyName = string.Format(CultureInfo.InvariantCulture, "{0}, {1}", viewName, viewModelAssemblyName);
+			var viewType = Type.GetType(viewAssemblyName);
+			return viewType;
+		}
+
+		protected Page CreatePage(Type viewModelType, object parameter)
+		{
+			Type pageType = GetPageTypeForViewModel(viewModelType);
+			if (pageType == null)
+			{
+				throw new Exception($"Cannot locate page type for {viewModelType}");
+			}
+
+			Page page = Activator.CreateInstance(pageType) as Page;
+			return page;
+		}
     }
 }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Validations/ValidatableObject.cs

@@ -1,4 +1,4 @@
-using eShopOnContainers.ViewModels.Base;
+using eShopOnContainers.Core.ViewModels.Base;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;

src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ExtendedBindableObject.cs

@@ -3,7 +3,7 @@
 using System.Reflection;
 using Xamarin.Forms;
 
-namespace eShopOnContainers.ViewModels.Base
+namespace eShopOnContainers.Core.ViewModels.Base
 {
     public abstract class ExtendedBindableObject : BindableObject
     {

src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelBase.cs

@@ -1,9 +1,8 @@
-using eShopOnContainers.Core;
-using eShopOnContainers.Core.Helpers;
+using eShopOnContainers.Core.Helpers;
 using eShopOnContainers.Services;
 using System.Threading.Tasks;
 
-namespace eShopOnContainers.ViewModels.Base
+namespace eShopOnContainers.Core.ViewModels.Base
 {
     public abstract class ViewModelBase : ExtendedBindableObject
     {
@@ -28,8 +27,8 @@ public bool IsBusy
 
         public ViewModelBase()
         {
-            DialogService = ViewModelLocator.Instance.Resolve<IDialogService>();
-            NavigationService = ViewModelLocator.Instance.Resolve<INavigationService>();
+            DialogService = ViewModelLocator.Resolve<IDialogService>();
+            NavigationService = ViewModelLocator.Resolve<INavigationService>();
             GlobalSetting.Instance.BaseEndpoint = Settings.UrlBase;
         }