Fix updating of another android property

Baseflow · Jul 2, 2019 · 4602517 · 4602517
1 parent 95b20b0
commit 4602517
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/Directory.build.props b/Directory.build.props
@@ -14,7 +14,7 @@
     <RepositoryType>git</RepositoryType>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
     <NeutralLanguage>en</NeutralLanguage>
-    <Version>0.6.8</Version>
+    <Version>0.6.9</Version>
 
     <LangVersion>latest</LangVersion>
     <NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000;NU1603</NoWarn>

diff --git a/MediaManager/MediaManagerBase.cs b/MediaManager/MediaManagerBase.cs
@@ -24,7 +24,7 @@ public MediaManagerBase()
 
         public bool IsInitialized { get; protected set; }
 
-        public Timer Timer { get; } = new Timer(1000);
+        public Timer Timer { get; protected set; } = new Timer(1000);
 
         private TimeSpan _stepSize = TimeSpan.FromSeconds(10);
         public virtual TimeSpan StepSize
@@ -211,6 +211,10 @@ public virtual Task StepForward()
         internal void OnStateChanged(object sender, StateChangedEventArgs e)
         {
             StateChanged?.Invoke(sender, e);
+
+            //TODO: Find a better way to trigger some changes.
+            OnPropertyChanged(nameof(Duration));
+
             NotificationManager?.UpdateNotification();
         }
 
@@ -241,6 +245,7 @@ protected virtual void Timer_Elapsed(object sender, ElapsedEventArgs e)
             if (PreviousPosition != Position)
             {
                 PreviousPosition = Position;
+                //OnPropertyChanged(nameof(Position));
                 OnPositionChanged(this, new PositionChangedEventArgs(Position));
             }
         }

diff --git a/MediaManager/Platforms/Android/MediaManagerImplementation.cs b/MediaManager/Platforms/Android/MediaManagerImplementation.cs
@@ -44,7 +44,12 @@ public virtual Context Context
         public int NotificationIconResource
         {
             get => _notificationIconResource;
-            set => SetProperty(ref _notificationIconResource, value);
+            set
+            {
+                SetProperty(ref _notificationIconResource, value);
+                var playerNotificationManager = (NotificationManager as MediaManager.Platforms.Android.Notifications.NotificationManager)?.PlayerNotificationManager;
+                playerNotificationManager?.SetSmallIcon(_notificationIconResource);
+            }
         }
 
         private MediaSessionCompat _mediaSession;

diff --git a/MediaManager/Platforms/Android/MediaSession/MediaBrowserService.cs b/MediaManager/Platforms/Android/MediaSession/MediaBrowserService.cs
@@ -104,7 +104,7 @@ protected virtual void PrepareNotificationManager()
             PlayerNotificationManager.SetRewindIncrementMs((long)MediaManager.StepSize.TotalMilliseconds);
             PlayerNotificationManager.SetNotificationListener(NotificationListener);
             PlayerNotificationManager.SetMediaSessionToken(SessionToken);
-            PlayerNotificationManager.SetOngoing(false);
+            PlayerNotificationManager.SetOngoing(true);
             PlayerNotificationManager.SetUsePlayPauseActions(MediaManager.NotificationManager.ShowPlayPauseControls);
             PlayerNotificationManager.SetUseNavigationActions(MediaManager.NotificationManager.ShowNavigationControls);