Edited MvxAndroidViewPresenter and AppCompat version: If the request …

…is a plain MvxViewModelRequest, then load the ViewModel respecting its life cycle
KMY520 · Aug 20, 2017 · cf9f6b0 · cf9f6b0
1 parent cc27a8e
commit cf9f6b0
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 15 deletions.
diff --git a/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V7.AppCompat/MvxAppCompatViewPresenter.cs b/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V7.AppCompat/MvxAppCompatViewPresenter.cs
@@ -280,18 +280,21 @@ protected override void ShowDialogFragment(Type view,
             var fragmentName = FragmentJavaName(attribute.ViewType);
             var dialog = (DialogFragment)CreateFragment(attribute, fragmentName);
 
-            //TODO: Find a better way to set the ViewModel at the Fragment
-            IMvxViewModel viewModel;
+            var mvxFragmentView = (IMvxFragmentView)dialog;
+            // MvxNavigationService provides an already instantiated ViewModel here,
+            // therefore just assign it
             if (request is MvxViewModelInstanceRequest instanceRequest)
-                viewModel = instanceRequest.ViewModelInstance;
+            {
+                mvxFragmentView.ViewModel = instanceRequest.ViewModelInstance;
+            }
             else
             {
-                viewModel = (IMvxViewModel)Mvx.IocConstruct(request.ViewModelType);
+                mvxFragmentView.LoadViewModelFrom(request, null);
             }
-            ((IMvxFragmentView)dialog).ViewModel = viewModel;
+
             dialog.Cancelable = attribute.Cancelable;
 
-            Dialogs.Add(viewModel, dialog);
+            Dialogs.Add(mvxFragmentView.ViewModel, dialog);
 
             var ft = CurrentFragmentManager.BeginTransaction();
             if (attribute.SharedElements != null)

diff --git a/MvvmCross/Droid/Droid/Views/MvxAndroidViewPresenter.cs b/MvvmCross/Droid/Droid/Views/MvxAndroidViewPresenter.cs
@@ -456,18 +456,21 @@ protected virtual void ShowDialogFragment(
             var fragmentName = FragmentJavaName(attribute.ViewType);
             var dialog = (DialogFragment)CreateFragment(attribute, fragmentName);
 
-            //TODO: Find a better way to set the ViewModel at the Fragment
-            IMvxViewModel viewModel;
+            var mvxFragmentView = (IMvxFragmentView)dialog;
+            // MvxNavigationService provides an already instantiated ViewModel here,
+            // therefore just assign it
             if (request is MvxViewModelInstanceRequest instanceRequest)
-                viewModel = instanceRequest.ViewModelInstance;
+            {
+                mvxFragmentView.ViewModel = instanceRequest.ViewModelInstance;
+            }
             else
             {
-                viewModel = (IMvxViewModel)Mvx.IocConstruct(request.ViewModelType);
+                mvxFragmentView.LoadViewModelFrom(request, null);
             }
-            ((IMvxFragmentView)dialog).ViewModel = viewModel;
+
             dialog.Cancelable = attribute.Cancelable;
 
-            Dialogs.Add(viewModel, dialog);
+            Dialogs.Add(mvxFragmentView.ViewModel, dialog);
 
             var ft = CurrentFragmentManager.BeginTransaction();
             if (attribute.SharedElements != null)

diff --git a/TestProjects/Playground/Playground.Core/ViewModels/ModalViewModel.cs b/TestProjects/Playground/Playground.Core/ViewModels/ModalViewModel.cs
@@ -19,6 +19,21 @@ public ModalViewModel(IMvxNavigationService navigationService)
             ShowNestedModalCommand = new MvxAsyncCommand(async () => await _navigationService.Navigate<NestedModalViewModel>());
         }
 
+        public override System.Threading.Tasks.Task Initialize()
+        {
+            return base.Initialize();
+        }
+
+        public void Init()
+        {
+
+        }
+
+        public override void Start()
+        {
+            base.Start();
+        }
+
         public IMvxAsyncCommand ShowTabsCommand { get; private set; }
 
         public IMvxAsyncCommand CloseCommand { get; private set; }

diff --git a/TestProjects/Playground/Playground.Core/ViewModels/RootViewModel.cs b/TestProjects/Playground/Playground.Core/ViewModels/RootViewModel.cs
@@ -15,11 +15,9 @@ public RootViewModel(IMvxNavigationService navigationService)
         {
             _navigationService = navigationService;
 
-            //ShowChildCommand = new MvxAsyncCommand(async () => await _navigationService.Navigate<ChildViewModel>());
-
             ShowChildCommand = new MvxAsyncCommand(async () => ShowViewModel<ChildViewModel>());
 
-            ShowModalCommand = new MvxAsyncCommand(async () => await _navigationService.Navigate<ModalViewModel>());
+            ShowModalCommand = new MvxAsyncCommand(async () => ShowViewModel<ModalViewModel>());
 
             ShowModalNavCommand = new MvxAsyncCommand(async () => await _navigationService.Navigate<ModalNavViewModel>());