Android SplashScreens: Remove TriggerFirstNavigate and use RunAppStart instead

Author: nmilcoff

MvvmCross.Android.Support/V7.AppCompat/MvxSplashScreenAppCompatActivity.cs

@@ -7,7 +7,6 @@
 using Android.Views;
 using MvvmCross.Core;
 using MvvmCross.Platforms.Android.Core;
-using MvvmCross.Platforms.Android.Views;
 using MvvmCross.ViewModels;
 
 namespace MvvmCross.Droid.Support.V7.AppCompat
@@ -20,6 +19,8 @@ public abstract class MvxSplashScreenAppCompatActivity
 
         private readonly int _resourceId;
 
+        private Bundle _bundle;
+
         public new MvxNullViewModel ViewModel
         {
             get { return base.ViewModel as MvxNullViewModel; }
@@ -40,6 +41,8 @@ protected override void OnCreate(Bundle bundle)
         {
             RequestWindowFeatures();
 
+            _bundle = bundle;
+
             var setup = MvxAndroidSetupSingleton.EnsureSingletonAvailable(ApplicationContext);
             setup.InitializeAndMonitor(this);
 
@@ -77,14 +80,7 @@ public virtual void InitializationComplete()
             if (!_isResumed)
                 return;
 
-            TriggerFirstNavigate();
-        }
-
-        protected virtual void TriggerFirstNavigate()
-        {
-            var startup = Mvx.Resolve<IMvxAppStart>();
-            if (!startup.IsStarted)
-                startup.Start();
+            RunAppStart(_bundle);
         }
     }
 }

MvvmCross/Platforms/Android/Views/MvxSplashScreenActivity.cs

@@ -19,6 +19,8 @@ public abstract class MvxSplashScreenActivity
 
         private readonly int _resourceId;
 
+        private Bundle _bundle;
+
         public new MvxNullViewModel ViewModel
         {
             get { return base.ViewModel as MvxNullViewModel; }
@@ -39,6 +41,8 @@ protected override void OnCreate(Bundle bundle)
         {
             RequestWindowFeatures();
 
+            _bundle = bundle;
+
             var setup = MvxAndroidSetupSingleton.EnsureSingletonAvailable(ApplicationContext);
             setup.InitializeAndMonitor(this);
 
@@ -76,14 +80,7 @@ public virtual void InitializationComplete()
             if (!_isResumed)
                 return;
 
-            TriggerFirstNavigate();
-        }
-
-        protected virtual void TriggerFirstNavigate()
-        {
-            var startup = Mvx.Resolve<IMvxAppStart>();
-            if (!startup.IsStarted)
-                startup.Start();
+            RunAppStart(_bundle);
         }
     }
 }