Merge pull request #762 from bcc-code/feature/755-car-play-adjustments

CarPlay adjustments + opening app from push notification fix

Author: akrol95

BMM.Core/Constants/ImageResourceNames.cs

@@ -45,5 +45,6 @@ public class ImageResourceNames
         public const string SkipForwardIcon = "Skip_Forward_Icon";
         public const string SkipBackIcon = "Skip_Back_Icon";
         public const string ShuffleIcon = "Shuffle_Icon";
+        public const string IconShuffleCarplay = "Icon_Shuffle_Carplay";
     }
 }

BMM.Core/GuardedActions/Contributors/Interfaces/IShuffleContributorAction.cs

@@ -1,9 +1,11 @@
+using BMM.Api.Abstraction;
 using BMM.Core.GuardedActions.Base.Interfaces;
 using BMM.Core.Models.Contributors.Interfaces;
 
 namespace BMM.Core.GuardedActions.Contributors.Interfaces
 {
-    public interface IShuffleContributorAction : IGuardedActionWithParameter<IShuffleActionParameter>
+    public interface IShuffleContributorAction
+        : IGuardedActionWithParameterAndResult<IShuffleActionParameter, IMediaTrack>
     {
     }
 }

BMM.Core/GuardedActions/Contributors/Interfaces/IShufflePodcastAction.cs

@@ -1,9 +1,10 @@
+using BMM.Api.Abstraction;
 using BMM.Core.GuardedActions.Base.Interfaces;
 using BMM.Core.Models.Contributors.Interfaces;
 
 namespace BMM.Core.GuardedActions.Contributors.Interfaces
 {
-    public interface IShufflePodcastAction : IGuardedActionWithParameter<IShuffleActionParameter>
+    public interface IShufflePodcastAction : IGuardedActionWithParameterAndResult<IShuffleActionParameter, IMediaTrack>
     {
     }
 }

BMM.Core/GuardedActions/Contributors/ShuffleContributorAction.cs

@@ -10,7 +10,7 @@
 namespace BMM.Core.GuardedActions.Contributors
 {
     public class ShuffleContributorAction
-        : GuardedActionWithParameter<IShuffleActionParameter>,
+        : GuardedActionWithParameterAndResult<IShuffleActionParameter, IMediaTrack>,
           IShuffleContributorAction
     {
         private readonly IContributorClient _contributorClient;
@@ -24,13 +24,16 @@ public ShuffleContributorAction(
             _mediaPlayer = mediaPlayer;
         }
 
-        protected override async Task Execute(IShuffleActionParameter parameter)
+        protected override async Task<IMediaTrack> Execute(IShuffleActionParameter parameter)
         {
             var randomTracks = await _contributorClient.GetRandomTracks(parameter.Id);
             var tracksToPlay = randomTracks
                 .OfType<IMediaTrack>()
                 .ToList();
-            await _mediaPlayer.Play(tracksToPlay, tracksToPlay.First(), parameter.PlaybackOrigin);
+            
+            var trackToPlay = tracksToPlay.First();
+            await _mediaPlayer.Play(tracksToPlay, trackToPlay, parameter.PlaybackOrigin);
+            return trackToPlay;
         }
     }
 }

BMM.Core/GuardedActions/Contributors/ShufflePodcastAction.cs

@@ -10,7 +10,7 @@
 namespace BMM.Core.GuardedActions.Contributors
 {
     public class ShufflePodcastAction
-        : GuardedActionWithParameter<IShuffleActionParameter>,
+        : GuardedActionWithParameterAndResult<IShuffleActionParameter, IMediaTrack>,
           IShufflePodcastAction
     {
         private readonly IPodcastClient _podcastClient;
@@ -24,13 +24,15 @@ public ShufflePodcastAction(
             _podcastClient = podcastClient;
         }
 
-        protected override async Task Execute(IShuffleActionParameter parameter)
+        protected override async Task<IMediaTrack> Execute(IShuffleActionParameter parameter)
         {
             var podcastTracks = await _podcastClient.GetShuffle(parameter.Id);
             var tracksToPlay = podcastTracks
                 .OfType<IMediaTrack>()
                 .ToList();
-            await _mediaPlayer.Play(tracksToPlay, tracksToPlay.First(), parameter.PlaybackOrigin);
+            var trackToPlay = tracksToPlay.First();
+            await _mediaPlayer.Play(tracksToPlay, trackToPlay, parameter.PlaybackOrigin);
+            return trackToPlay;
         }
     }
 }

BMM.Core/GuardedActions/Tracklist/LikeOrUnlikeTrackAction.cs

@@ -6,6 +6,7 @@
 using BMM.Core.Implementations.Player.Interfaces;
 using BMM.Core.Messages;
 using BMM.Core.Models.TrackCollections.Interfaces;
+using BMM.Core.NewMediaPlayer.Abstractions;
 using MvvmCross.Plugin.Messenger;
 
 namespace BMM.Core.GuardedActions.Tracklist;
@@ -18,17 +19,20 @@ public class LikeOrUnlikeTrackAction
     private readonly IPlaybackHistoryService _playbackHistoryService;
     private readonly IRememberedQueueService _rememberedQueueService;
     private readonly IMvxMessenger _messenger;
+    private readonly IMediaPlayer _mediaPlayer;
 
     public LikeOrUnlikeTrackAction(
         ITrackCollectionClient trackCollectionClient,
         IPlaybackHistoryService playbackHistoryService,
         IRememberedQueueService rememberedQueueService,
-        IMvxMessenger messenger)
+        IMvxMessenger messenger,
+        IMediaPlayer mediaPlayer)
     {
         _trackCollectionClient = trackCollectionClient;
         _playbackHistoryService = playbackHistoryService;
         _rememberedQueueService = rememberedQueueService;
         _messenger = messenger;
+        _mediaPlayer = mediaPlayer;
     }
 
     protected override async Task<bool> Execute(ILikeOrUnlikeTrackActionParameter parameter)
@@ -46,6 +50,10 @@ protected override async Task<bool> Execute(ILikeOrUnlikeTrackActionParameter pa
         await _playbackHistoryService.SetTrackLikedOrUnliked(parameter.TrackId, !parameter.IsLiked);
         await _rememberedQueueService.SetTrackLikedOrUnliked(parameter.TrackId, !parameter.IsLiked);
         _messenger.Publish(new TrackLikedChangedMessage(this, !parameter.IsLiked, parameter.TrackId));
+        
+        if (_mediaPlayer.CurrentTrack?.Id == parameter.TrackId)
+            _mediaPlayer.CurrentTrack.IsLiked = !parameter.IsLiked;
+        
         return true;
     }
 

BMM.Core/Implementations/DeepLinking/DeepLinkHandler.cs

@@ -63,7 +63,7 @@ public class DeepLinkHandler : IDeepLinkHandler
 
         private readonly IList<IDeepLinkParser> _links;
         private bool _readyToHandleDeepLink;
-        private Uri _pendingDeepLink;
+        private PendingDeepLink _pendingDeepLink;
 
         public DeepLinkHandler(
             IBMMClient client,
@@ -230,17 +230,28 @@ private async Task PlayTrackById(TrackLinkParameters trackLinkParameters)
             await PlayTracks(new[] { requestedTrack }, PlaybackOriginName, trackLinkParameters.StartTimeInMs);
         }
 
-        public bool OpenFromInsideOfApp(Uri uri, string origin) => Open(uri, "internal link opened", origin);
+        public bool OpenFromInsideOfApp(Uri uri, string origin)
+        {
+            if (_readyToHandleDeepLink)
+                return Open(uri, "internal link opened", origin);
+
+            return CheckIfCanOpenDeepLinkAndSetPendingIfNeeded(new PendingDeepLink(uri, DeepLinkSource.InsideApp));
+        }
 
         public bool OpenFromOutsideOfApp(Uri uri)
         {
             if (_readyToHandleDeepLink)
                 return Open(uri, "deep link opened");
 
-            if (!_links.Any(l => l.PerformCanNavigateTo(uri, out _)))
+            return CheckIfCanOpenDeepLinkAndSetPendingIfNeeded(new PendingDeepLink(uri, DeepLinkSource.OutsideOfApp));
+        }
+        
+        private bool CheckIfCanOpenDeepLinkAndSetPendingIfNeeded(PendingDeepLink pendingDeepLink)
+        {
+            if (!_links.Any(l => l.PerformCanNavigateTo(pendingDeepLink.Uri, out _)))
                 return false;
 
-            _pendingDeepLink = uri;
+            _pendingDeepLink = pendingDeepLink;
             return true;
         }
 
@@ -251,7 +262,11 @@ public void SetReadyToOpenDeepLinkAndHandlePending()
             if (_pendingDeepLink == null)
                 return;
 
-            OpenFromOutsideOfApp(_pendingDeepLink);
+            if (_pendingDeepLink.Source == DeepLinkSource.OutsideOfApp)
+                OpenFromOutsideOfApp(_pendingDeepLink.Uri);
+            else
+                OpenFromInsideOfApp(_pendingDeepLink.Uri, string.Empty);
+            
             _pendingDeepLink = null;
         }
 

BMM.Core/Implementations/DeepLinking/PendingDeepLink.cs

@@ -0,0 +1,19 @@
+namespace BMM.Core.Implementations.DeepLinking;
+
+public class PendingDeepLink
+{
+    public PendingDeepLink(Uri uri, DeepLinkSource source)
+    {
+        Uri = uri;
+        Source = source;
+    }
+    
+    public Uri Uri { get; }
+    public DeepLinkSource Source { get; }
+}
+
+public enum DeepLinkSource
+{
+    OutsideOfApp,
+    InsideApp
+}

BMM.Core/Translation/en/Translations.designer.cs

@@ -251,7 +251,8 @@
     "AslaksenTheme1": "Believe in the God of miracles",
     "AslaksenTheme2": "I have been crucified with Christ",
     "AslaksenTheme3": "To fear and love God",
-    "AslaksenTheme4": "Humility is everything"
+    "AslaksenTheme4": "Humility is everything",
+    "AllEpisodes": "All episodes"
   },
   "CuratedPlaylistViewModel": {
     "Title": "Playlist"