Moved Forms init for Android and UWP as well

KMY520 · Aug 17, 2017 · f49e455 · f49e455
1 parent 41206e1
commit f49e455
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/MvvmCross-Forms/MvvmCross.Forms.Droid/MvxFormsAndroidSetup.cs b/MvvmCross-Forms/MvvmCross.Forms.Droid/MvxFormsAndroidSetup.cs
@@ -42,6 +42,8 @@ public MvxFormsApplication FormsApplication
         {
             get
             {
+                if (!Xamarin.Forms.Forms.IsInitialized)
+                    Xamarin.Forms.Forms.Init(Mvx.Resolve<IMvxAndroidCurrentTopActivity>().Activity, null);
                 if (_formsApplication == null)
                     _formsApplication = CreateFormsApplication();
                 return _formsApplication;
@@ -52,7 +54,6 @@ public MvxFormsApplication FormsApplication
 
         protected override IMvxAndroidViewPresenter CreateViewPresenter()
         {
-            Xamarin.Forms.Forms.Init(Mvx.Resolve<IMvxAndroidCurrentTopActivity>().Activity, null);
             return new MvxFormsDroidPagePresenter(FormsApplication);
         }
 

diff --git a/MvvmCross-Forms/MvvmCross.Forms.Uwp/MvxFormsWindowsSetup.cs b/MvvmCross-Forms/MvvmCross.Forms.Uwp/MvxFormsWindowsSetup.cs
@@ -41,15 +41,20 @@ protected override void InitializeApp(IMvxPluginManager pluginManager, IMvxAppli
         }
 
         private MvxFormsApplication _formsApplication;
-        public MvxFormsApplication FormsApplication =>
-            _formsApplication = _formsApplication ?? CreateFormsApplication();
+        public MvxFormsApplication FormsApplication
+        {
+            get
+            {
+                if (!Xamarin.Forms.Forms.IsInitialized)
+                    Xamarin.Forms.Forms.Init(_launchActivatedEventArgs);
+                _formsApplication = _formsApplication ?? CreateFormsApplication();
+            }
+        }
 
         protected virtual MvxFormsApplication CreateFormsApplication() => new MvxFormsApplication();
 
         protected override IMvxWindowsViewPresenter CreateViewPresenter(IMvxWindowsFrame rootFrame)
         {
-            Xamarin.Forms.Forms.Init(_launchActivatedEventArgs);
-
             var presenter = new MvxFormsUwpPagePresenter(rootFrame, FormsApplication);
             Mvx.RegisterSingleton<IMvxViewPresenter>(presenter);