iOS: Now loading PlayerViewController right after splash when local r…

…esume playback information is available. The playback now resumes, but there are still a few things to fix.
ycastonguay · Oct 29, 2013 · 5486964 · 5486964
1 parent 9da8034
commit 5486964
Show file tree

Hide file tree

Showing 10 changed files with 317 additions and 266 deletions.
diff --git a/MPfm/MPfm.MVP/Config/Models/ResumePlaybackAppConfig.cs b/MPfm/MPfm.MVP/Config/Models/ResumePlaybackAppConfig.cs
@@ -30,8 +30,8 @@ public class ResumePlaybackAppConfig : IAppConfig
 
         public ResumePlaybackAppConfig()
         {
-            CurrentAudioFileId = Guid.Empty.ToString();
-            CurrentPlaylistId = Guid.Empty.ToString();
+            //CurrentAudioFileId = Guid.Empty.ToString();
+            //CurrentPlaylistId = Guid.Empty.ToString();
         }        
     }
 }
diff --git a/MPfm/MPfm.MVP/Navigation/MobileNavigationManager.cs b/MPfm/MPfm.MVP/Navigation/MobileNavigationManager.cs
@@ -28,6 +28,10 @@
 using MPfm.Player.Objects;
 using MPfm.Library.Objects;
 using MPfm.Sound.AudioFiles;
+using MPfm.MVP.Config;
+using MPfm.MVP.Services.Interfaces;
+using MPfm.Library.Services.Interfaces;
+using System.Linq;
 
 namespace MPfm.MVP.Navigation
 {
@@ -153,6 +157,47 @@ public virtual void Start()
 #endif
 
                 // Finally hide the splash screen, our UI is ready
+                //HideSplash();
+                
+                AppConfigManager.Instance.Load();
+                Console.WriteLine("LaunchActivity - OnCreate - isFirstRun: {0} resumePlayback.currentAudioFileId: {1} resumePlayback.currentPlaylistId: {2}", AppConfigManager.Instance.Root.IsFirstRun, AppConfigManager.Instance.Root.ResumePlayback.CurrentAudioFileId, AppConfigManager.Instance.Root.ResumePlayback.CurrentPlaylistId);
+                if (AppConfigManager.Instance.Root.IsFirstRun)
+                //if(true == true)
+                {
+                    Tracing.Log("LaunchActivity - First run of the application; launching FirstRun activity...");
+
+                    CreateFirstRunView();
+
+
+//                    var intent = new Intent(this, typeof(FirstRunActivity));
+//                    StartActivity(intent);
+//                    Finish();
+                }
+                else if (!string.IsNullOrEmpty(AppConfigManager.Instance.Root.ResumePlayback.CurrentAudioFileId))
+                {
+                    var playerService = Bootstrapper.GetContainer().Resolve<IPlayerService>();
+                    var messengerHub = Bootstrapper.GetContainer().Resolve<ITinyMessengerHub>();
+                    var audioFileCacheService = Bootstrapper.GetContainer().Resolve<IAudioFileCacheService>();
+                    var audioFile = audioFileCacheService.AudioFiles.FirstOrDefault(x => x.Id == new Guid(AppConfigManager.Instance.Root.ResumePlayback.CurrentAudioFileId));
+
+                    if(audioFile != null)
+                    {
+                        Tracing.Log("LaunchActivity - Resume playback is available; launching Player activity...");
+                        var audioFiles = audioFileCacheService.AudioFiles.Where(x => x.ArtistName == audioFile.ArtistName && x.AlbumTitle == audioFile.AlbumTitle).ToList();
+                        playerService.Play(audioFiles, audioFile.FilePath);
+
+                        Action<IBaseView> onViewBindedToPresenter = (theView) => messengerHub.PublishAsync<MobileLibraryBrowserItemClickedMessage>(new MobileLibraryBrowserItemClickedMessage(this) 
+                                                                                                                                                    {
+                            Query = new LibraryQuery() {
+                                ArtistName = audioFile.ArtistName,
+                                AlbumTitle = audioFile.AlbumTitle
+                            }, 
+                            FilePath = audioFile != null ? audioFile.FilePath : string.Empty
+                        });
+                        CreatePlayerView(MobileNavigationTabType.Playlists, onViewBindedToPresenter);
+                    }
+                }
+
                 HideSplash();
             };            
             ShowSplash(CreateSplashView(onInitDone));
@@ -934,7 +979,7 @@ protected virtual void CreateFirstRunViewInternal(Action<IBaseView> onViewReady)
                 _firstRunView = Bootstrapper.GetContainer().Resolve<IFirstRunView>(new NamedParameterOverloads() { { "onViewReady", onViewReady } });
 
 #if !ANDROID
-            PushTabView(MobileNavigationTabType.More, _resumePlaybackView);
+            PushDialogView(MobileDialogPresentationType.Overlay, "First Run", null, _firstRunView);
 #endif
         }
 

diff --git a/MPfm/MPfm.MVP/Services/PlayerService.cs b/MPfm/MPfm.MVP/Services/PlayerService.cs
@@ -105,6 +105,7 @@ void HandleOnPlaylistIndexChanged(PlayerPlaylistIndexChangedData data)
                     // Store player status locally for resuming playback later
                     AppConfigManager.Instance.Root.ResumePlayback.CurrentAudioFileId = data.AudioFileStarted.Id.ToString();
                     AppConfigManager.Instance.Root.ResumePlayback.CurrentPlaylistId = _player.Playlist.PlaylistId.ToString();
+                    AppConfigManager.Instance.Root.PositionUpdateFrequency = 777;
                     AppConfigManager.Instance.Save();
 
                     // Store player status on Cloud if enabled in preferences

diff --git a/MPfm/MPfm.iOS/Classes/Controllers/FirstRunViewController.cs b/MPfm/MPfm.iOS/Classes/Controllers/FirstRunViewController.cs
@@ -34,6 +34,19 @@ public FirstRunViewController(Action<IBaseView> onViewReady)
         public override void ViewDidLoad()
         {
             base.ViewDidLoad();
+
+            btnClose.SetImage(UIImage.FromBundle("Images/Buttons/select"));
+        }
+
+        partial void actionClose(NSObject sender)
+        {
+            WillMoveToParentViewController(null);
+            UIView.Animate(0.2f, () => {
+                this.View.Alpha = 0;
+            }, () => {
+                View.RemoveFromSuperview();
+                RemoveFromParentViewController();
+            });
         }
     }
 }
diff --git a/MPfm/MPfm.iOS/Classes/Controllers/FirstRunViewController.designer.cs b/MPfm/MPfm.iOS/Classes/Controllers/FirstRunViewController.designer.cs
diff --git a/MPfm/MPfm.iOS/Classes/Controllers/StartResumePlaybackViewController.cs b/MPfm/MPfm.iOS/Classes/Controllers/StartResumePlaybackViewController.cs
@@ -36,6 +36,19 @@ public StartResumePlaybackViewController(Action<IBaseView> onViewReady)
         public override void ViewDidLoad()
         {
             base.ViewDidLoad();
+
+            btnResume.SetImage(UIImage.FromBundle("Images/Buttons/select"));
+            btnCancel.SetImage(UIImage.FromBundle("Images/Buttons/cancel"));
+        }
+
+        partial void actionResume(NSObject sender)
+        {
+
+        }
+
+        partial void actionCancel(NSObject sender)
+        {
+
         }
 
         #region IStartResumePlaybackView implementation

diff --git a/MPfm/MPfm.iOS/Classes/Controllers/StartResumePlaybackViewController.designer.cs b/MPfm/MPfm.iOS/Classes/Controllers/StartResumePlaybackViewController.designer.cs
diff --git a/MPfm/MPfm.iOS/Classes/Providers/iOSAppConfigProvider.cs b/MPfm/MPfm.iOS/Classes/Providers/iOSAppConfigProvider.cs
@@ -29,9 +29,6 @@ public class iOSAppConfigProvider : IAppConfigProvider
         public RootAppConfig Load(string filePath)
         {
             var config = new RootAppConfig();
-            config.IsFirstRun = false;
-            SaveRecursive(config, "Root.");
-            config.IsFirstRun = true;
             LoadRecursive(config, "Root.");
             return config;
         }
@@ -50,8 +47,6 @@ private void LoadRecursive(IAppConfig config, string keyPreset)
             {
                 var propertyType = propertyInfo.PropertyType;
                 string fullName = keyPreset + propertyInfo.Name;
-                bool isAssignable = typeof(IAppConfig).GetTypeInfo().IsAssignableFrom(propertyType.GetTypeInfo());
-                //Debug.WriteLine("{0} - {1} - isAssignable: {2}", fullName, propertyInfo.PropertyType.Name, isAssignable);
 
                 if (propertyType == typeof(int))
                 {
@@ -91,8 +86,6 @@ private void SaveRecursive(IAppConfig config, string keyPreset)
                 var propertyType = propertyInfo.PropertyType;
                 string fullName = keyPreset + propertyInfo.Name;
                 object value = propertyInfo.GetValue(config);
-                bool isAssignable = typeof (IAppConfig).GetTypeInfo().IsAssignableFrom(propertyType.GetTypeInfo());
-                //Debug.WriteLine("{0} - {1} - isAssignable: {2}", fullName, propertyInfo.PropertyType.Name, isAssignable);
 
                 if (propertyType == typeof(int))
                 {