chore: unobserve property on dispose in radioservice, watch podcast updates in podcast page (#1367)

Author: Feichtmeier

lib/player/observe_property.dart

@@ -0,0 +1,3 @@
+export 'observe_property_stub.dart'
+    if (dart.library.html) 'observe_property_web.dart'
+    if (dart.library.io) 'observe_property_io.dart';

lib/player/observe_property_io.dart

@@ -0,0 +1,28 @@
+import 'package:media_kit/media_kit.dart';
+
+import '../common/logging.dart';
+
+Future<void> observeProperty({
+  required String property,
+  required Player player,
+  Future<void> Function(String)? listener,
+}) async {
+  NativePlayer? nativePlayer;
+  try {
+    nativePlayer = player.platform as NativePlayer;
+  } on Exception catch (e) {
+    printMessageInDebugMode(e);
+  }
+
+  if (nativePlayer == null) {
+    return Future.value();
+  }
+
+  if (listener == null) {
+    if (nativePlayer.observed.containsKey(property)) {
+      return nativePlayer.unobserveProperty(property);
+    }
+  } else if (!nativePlayer.observed.containsKey(property)) {
+    return nativePlayer.observeProperty(property, listener);
+  }
+}

lib/player/observe_property_stub.dart

@@ -0,0 +1,7 @@
+import 'package:media_kit/media_kit.dart';
+
+Future<void> observeProperty({
+  required String property,
+  required Player player,
+  Future<void> Function(String)? listener,
+}) async => throw UnimplementedError();

lib/player/observe_property_web.dart

@@ -0,0 +1,7 @@
+import 'package:media_kit/media_kit.dart';
+
+Future<void> observeProperty({
+  required String property,
+  required Player player,
+  Future<void> Function(String)? listener,
+}) async {}

lib/player/player_service.dart

@@ -425,7 +425,7 @@ class PlayerService {
 
   String? _remoteImageUrl;
   String? get remoteImageUrl => _remoteImageUrl;
-  Future<void> setRemoteImageUrl(String? url) async {
+  void setRemoteImageUrl(String? url) {
     if (_color != null) {
       _setColor(null);
     }

lib/player/view/audio_visualizer.dart

@@ -63,22 +63,15 @@ class _AudioVisualizerState extends State<AudioVisualizer> {
 
   @override
   Widget build(BuildContext context) {
-    final color = watchPropertyValue(
-      (PlayerModel m) => m.color ?? context.colorScheme.primary,
-    );
-    return Center(
-      child: AnimatedOpacity(
-        opacity: color != context.colorScheme.primary ? 0.9 : 1,
-        duration: const Duration(milliseconds: 300),
-        child: WaveformWidget(
-          controller: _controller,
-          height: widget.height,
-          style: WaveformStyle(
-            waveColor: color,
-            backgroundColor: Colors.transparent,
-            waveformStyle: WaveformDrawStyle.bars,
-          ),
-        ),
+    final color = watchPropertyValue((PlayerModel m) => m.color);
+    return WaveformWidget(
+      controller: _controller,
+      height: widget.height,
+      style: WaveformStyle(
+        waveColor: color ?? context.colorScheme.primary,
+        barCount: 35,
+        backgroundColor: Colors.transparent,
+        waveformStyle: WaveformDrawStyle.bars,
       ),
     );
   }

lib/player/view/full_height_player_image.dart

@@ -30,13 +30,9 @@ class FullHeightPlayerImage extends StatelessWidget with WatchItMixin {
   @override
   Widget build(BuildContext context) {
     final audio = watchPropertyValue((PlayerModel m) => m.audio);
-    final showAudioVisualizer =
-        this.showAudioVisualizer &&
-        watchPropertyValue((PlayerModel m) => m.showAudioVisualizer);
-
-    if (showAudioVisualizer) {
-      return AudioVisualizer(height: height ?? 400);
-    }
+    final showAudioVisualizer = watchPropertyValue(
+      (PlayerModel m) => m.showAudioVisualizer && this.showAudioVisualizer,
+    );
 
     final size = context.isPortrait
         ? fullHeightPlayerImageSize
@@ -74,6 +70,10 @@ class FullHeightPlayerImage extends StatelessWidget with WatchItMixin {
       );
     }
 
+    if (showAudioVisualizer) {
+      return AudioVisualizer(height: height ?? 200);
+    }
+
     return SizedBox(
       height: theHeight,
       width: theWidth,

lib/player/view/player_color.dart

@@ -29,8 +29,11 @@ class PlayerColor extends StatelessWidget with WatchItMixin {
     final blurredPlayerBackground = watchPropertyValue(
       (SettingsModel m) => m.blurredPlayerBackground,
     );
+    final showAudioVisualizer = watchPropertyValue(
+      (PlayerModel m) => m.showAudioVisualizer,
+    );
 
-    if (blurredPlayerBackground) {
+    if (!showAudioVisualizer && blurredPlayerBackground) {
       return _BlurredPlayerColor(size: size);
     }
 
@@ -80,7 +83,6 @@ class _BlurredPlayerColor extends StatelessWidget {
               ? Colors.white
               : theme.scaffoldBackgroundColor,
           child: FullHeightPlayerImage(
-            showAudioVisualizer: false,
             emptyFallBack: true,
             borderRadius: BorderRadius.zero,
             fit: BoxFit.cover,

lib/podcasts/view/podcast_page.dart

@@ -43,6 +43,7 @@ class PodcastPage extends StatelessWidget with WatchItMixin {
     final showPodcastsAscending = watchPropertyValue(
       (LibraryModel m) => m.showPodcastAscending(feedUrl),
     );
+    watchPropertyValue((LibraryModel m) => m.podcastUpdatesLength);
 
     watchPropertyValue(
       (PodcastModel m) => m.getPodcastEpisodesFromCache(feedUrl)?.length,

lib/radio/radio_service.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:basic_utils/basic_utils.dart';
-import 'package:media_kit/media_kit.dart';
 import 'package:radio_browser_api/radio_browser_api.dart';
 
 import '../common/data/audio.dart';
@@ -10,6 +9,7 @@ import '../common/data/mpv_meta_data.dart';
 import '../common/logging.dart';
 import '../expose/expose_service.dart';
 import '../extensions/string_x.dart';
+import '../player/observe_property_io.dart';
 import '../player/player_service.dart';
 import 'online_art_service.dart';
 
@@ -35,9 +35,10 @@ class RadioService {
 
   Future<void> init({bool observePlayer = true}) async {
     if (observePlayer) {
-      await (_playerService.player.platform as NativePlayer).observeProperty(
-        'metadata',
-        _onMpvMetadata,
+      await observeProperty(
+        property: 'metadata',
+        player: _playerService.player,
+        listener: _onMpvMetadata,
       );
     }
 
@@ -262,9 +263,8 @@ class RadioService {
 
   Future<void> dispose() async {
     await _propertiesChangedController.close();
-    await (_playerService.player.platform as NativePlayer).unobserveProperty(
-      'metadata',
-    );
+
+    await observeProperty(property: 'metadata', player: _playerService.player);
   }
 
   //
@@ -279,8 +279,7 @@ class RadioService {
   }
 
   Future<void> _onMpvMetadata(data) async {
-    if (_playerService.audio?.audioType != AudioType.radio ||
-        !data.contains('icy-title')) {
+    if (!data.contains('icy-title')) {
       return;
     }
     final newData = MpvMetaData.fromJson(data);