From b70b275e4494b8ccaa5e834972da54df2b6e58b0 Mon Sep 17 00:00:00 2001
From: Frederik Feichtmeier <frederik.feichtmeier@gmail.com>
Date: Sun, 25 Aug 2024 13:22:32 +0200
Subject: [PATCH] fix: reduce radio history repaint and minimize streams (#892)

---
 lib/library/library_model.dart                |  50 +-------
 lib/library/library_service.dart              | 116 ++++++------------
 lib/player/player_model.dart                  |  69 ++---------
 lib/player/player_service.dart                |  86 ++++---------
 lib/player/view/bottom_player_image.dart      |   2 +-
 lib/player/view/full_height_player_image.dart |   4 +-
 lib/player/view/shuffle_button.dart           |   3 +-
 lib/radio/view/radio_history_list.dart        |  29 +++--
 .../view/radio_page_copy_histoy_button.dart   |   4 +-
 lib/settings/settings_model.dart              |  41 +------
 lib/settings/settings_service.dart            |  52 ++------
 11 files changed, 111 insertions(+), 345 deletions(-)

diff --git a/lib/library/library_model.dart b/lib/library/library_model.dart
index 9533b84dd..d7c9a1164 100644
--- a/lib/library/library_model.dart
+++ b/lib/library/library_model.dart
@@ -12,45 +12,14 @@ class LibraryModel extends SafeChangeNotifier {
   LibraryModel(this._service);
 
   final LibraryService _service;
-  StreamSubscription<bool>? _likedAudiosSub;
-  StreamSubscription<bool>? _playlistsSub;
-  StreamSubscription<bool>? _albumsSub;
-  StreamSubscription<bool>? _podcastsSub;
-  StreamSubscription<bool>? _stationsSub;
-  StreamSubscription<bool>? _updatesChangedSub;
-  StreamSubscription<bool>? _favTagsSub;
-  StreamSubscription<bool>? _favCountriesSub;
-  StreamSubscription<bool>? _favLanguageCodeFavsSub;
-  StreamSubscription<bool>? _lastCountryCodeSub;
-  StreamSubscription<bool>? _downloadsSub;
-  StreamSubscription<bool>? _ascendingPodcastsSub;
+  StreamSubscription<bool>? _propertiesChangedSub;
 
   Future<bool> init() async {
     await _service.init();
     _pageIdStack.add(_service.selectedPageId ?? kSearchPageId);
 
-    _likedAudiosSub ??=
-        _service.likedAudiosChanged.listen((event) => notifyListeners());
-    _playlistsSub ??=
-        _service.playlistsChanged.listen((event) => notifyListeners());
-    _albumsSub = _service.albumsChanged.listen((event) => notifyListeners());
-    _podcastsSub ??=
-        _service.podcastsChanged.listen((event) => notifyListeners());
-    _stationsSub ??=
-        _service.starredStationsChanged.listen((event) => notifyListeners());
-    _updatesChangedSub ??=
-        _service.updatesChanged.listen((_) => notifyListeners());
-    _favTagsSub ??= _service.favTagsChanged.listen((_) => notifyListeners());
-    _favCountriesSub ??=
-        _service.favCountriesChanged.listen((_) => notifyListeners());
-    _favLanguageCodeFavsSub ??=
-        _service.favLanguagesChanged.listen((_) => notifyListeners());
-    _downloadsSub ??=
-        _service.downloadsChanged.listen((_) => notifyListeners());
-    _lastCountryCodeSub ??=
-        _service.lastCountryCodeChanged.listen((_) => notifyListeners());
-    _ascendingPodcastsSub ??=
-        _service.ascendingPodcastsChanged.listen((_) => notifyListeners());
+    _propertiesChangedSub ??=
+        _service.propertiesChanged.listen((_) => notifyListeners());
 
     notifyListeners();
     return true;
@@ -58,18 +27,7 @@ class LibraryModel extends SafeChangeNotifier {
 
   @override
   Future<void> dispose() async {
-    await _likedAudiosSub?.cancel();
-    await _playlistsSub?.cancel();
-    await _albumsSub?.cancel();
-    await _podcastsSub?.cancel();
-    await _stationsSub?.cancel();
-    await _updatesChangedSub?.cancel();
-    await _favTagsSub?.cancel();
-    await _favCountriesSub?.cancel();
-    await _favLanguageCodeFavsSub?.cancel();
-    await _downloadsSub?.cancel();
-    await _lastCountryCodeSub?.cancel();
-    await _ascendingPodcastsSub?.cancel();
+    await _propertiesChangedSub?.cancel();
     super.dispose();
   }
 
diff --git a/lib/library/library_service.dart b/lib/library/library_service.dart
index bff12939d..e97795bf2 100644
--- a/lib/library/library_service.dart
+++ b/lib/library/library_service.dart
@@ -16,20 +16,21 @@ class LibraryService {
 
   final SharedPreferences _sharedPreferences;
 
+  final _propertiesChangedController = StreamController<bool>.broadcast();
+  Stream<bool> get propertiesChanged => _propertiesChangedController.stream;
+
   //
   // Liked Audios
   //
   List<Audio> _likedAudios = [];
   List<Audio> get likedAudios => _likedAudios;
-  final _likedAudiosController = StreamController<bool>.broadcast();
-  Stream<bool> get likedAudiosChanged => _likedAudiosController.stream;
 
   void addLikedAudio(Audio audio, [bool notify = true]) {
     if (_likedAudios.contains(audio)) return;
     _likedAudios.add(audio);
     if (notify) {
       writeAudioMap({kLikedAudiosPageId: _likedAudios}, kLikedAudiosFileName)
-          .then((value) => _likedAudiosController.add(true));
+          .then((value) => _propertiesChangedController.add(true));
     }
   }
 
@@ -38,7 +39,7 @@ class LibraryService {
       addLikedAudio(audio, false);
     }
     writeAudioMap({kLikedAudiosPageId: _likedAudios}, kLikedAudiosFileName)
-        .then((value) => _likedAudiosController.add(true));
+        .then((value) => _propertiesChangedController.add(true));
   }
 
   bool liked(Audio audio) {
@@ -49,7 +50,7 @@ class LibraryService {
     _likedAudios.remove(audio);
     if (notify) {
       writeAudioMap({kLikedAudiosPageId: _likedAudios}, kLikedAudiosFileName)
-          .then((value) => _likedAudiosController.add(true));
+          .then((value) => _propertiesChangedController.add(true));
     }
   }
 
@@ -58,7 +59,7 @@ class LibraryService {
       removeLikedAudio(audio, false);
     }
     writeAudioMap({kLikedAudiosPageId: _likedAudios}, kLikedAudiosFileName)
-        .then((value) => _likedAudiosController.add(true));
+        .then((value) => _propertiesChangedController.add(true));
   }
 
   //
@@ -68,19 +69,17 @@ class LibraryService {
   Map<String, List<Audio>> _starredStations = {};
   Map<String, List<Audio>> get starredStations => _starredStations;
   int get starredStationsLength => _starredStations.length;
-  final _starredStationsController = StreamController<bool>.broadcast();
-  Stream<bool> get starredStationsChanged => _starredStationsController.stream;
 
   void addStarredStation(String url, List<Audio> audios) {
     _starredStations.putIfAbsent(url, () => audios);
     writeAudioMap(_starredStations, kStarredStationsFileName)
-        .then((_) => _starredStationsController.add(true));
+        .then((_) => _propertiesChangedController.add(true));
   }
 
   void unStarStation(String name) {
     _starredStations.remove(name);
     writeAudioMap(_starredStations, kStarredStationsFileName)
-        .then((_) => _starredStationsController.add(true));
+        .then((_) => _propertiesChangedController.add(true));
   }
 
   bool isStarredStation(String? url) {
@@ -90,8 +89,6 @@ class LibraryService {
   Set<String> get favRadioTags =>
       _sharedPreferences.getStringList(kFavRadioTags)?.toSet() ?? {};
   bool isFavTag(String value) => favRadioTags.contains(value);
-  final _favTagsController = StreamController<bool>.broadcast();
-  Stream<bool> get favTagsChanged => _favTagsController.stream;
 
   void addFavRadioTag(String name) {
     if (favRadioTags.contains(name)) return;
@@ -99,7 +96,7 @@ class LibraryService {
     tags.add(name);
     _sharedPreferences.setStringList(kFavRadioTags, tags.toList()).then(
       (saved) {
-        if (saved) _favTagsController.add(true);
+        if (saved) _propertiesChangedController.add(true);
       },
     );
   }
@@ -110,7 +107,7 @@ class LibraryService {
     tags.remove(name);
     _sharedPreferences.setStringList(kFavRadioTags, tags.toList()).then(
       (saved) {
-        if (saved) _favTagsController.add(true);
+        if (saved) _propertiesChangedController.add(true);
       },
     );
   }
@@ -119,19 +116,14 @@ class LibraryService {
   void setLastCountryCode(String value) {
     _sharedPreferences.setString(kLastCountryCode, value).then(
       (saved) {
-        if (saved) _lastCountryCodeController.add(true);
+        if (saved) _propertiesChangedController.add(true);
       },
     );
   }
 
-  final _lastCountryCodeController = StreamController<bool>.broadcast();
-  Stream<bool> get lastCountryCodeChanged => _lastCountryCodeController.stream;
-
   Set<String> get favCountryCodes =>
       _sharedPreferences.getStringList(kFavCountryCodes)?.toSet() ?? {};
   bool isFavCountry(String value) => favCountryCodes.contains(value);
-  final _favCountriesController = StreamController<bool>.broadcast();
-  Stream<bool> get favCountriesChanged => _favCountriesController.stream;
 
   void addFavCountryCode(String name) {
     if (favCountryCodes.contains(name)) return;
@@ -140,7 +132,7 @@ class LibraryService {
     _sharedPreferences
         .setStringList(kFavCountryCodes, favCodes.toList())
         .then((saved) {
-      if (saved) _favCountriesController.add(true);
+      if (saved) _propertiesChangedController.add(true);
     });
   }
 
@@ -151,7 +143,7 @@ class LibraryService {
     _sharedPreferences
         .setStringList(kFavCountryCodes, favCodes.toList())
         .then((saved) {
-      if (saved) _favCountriesController.add(true);
+      if (saved) _propertiesChangedController.add(true);
     });
   }
 
@@ -159,19 +151,13 @@ class LibraryService {
       _sharedPreferences.getString(kLastLanguageCode);
   void setLastLanguageCode(String value) {
     _sharedPreferences.setString(kLastLanguageCode, value).then((saved) {
-      if (saved) _lastLanguageCodeController.add(true);
+      if (saved) _propertiesChangedController.add(true);
     });
   }
 
-  final _lastLanguageCodeController = StreamController<bool>.broadcast();
-  Stream<bool> get lastLanguageCodeChanged =>
-      _lastLanguageCodeController.stream;
-
   Set<String> get favLanguageCodes =>
       _sharedPreferences.getStringList(kFavLanguageCodes)?.toSet() ?? {};
   bool isFavLanguage(String value) => favLanguageCodes.contains(value);
-  final _favLanguagesController = StreamController<bool>.broadcast();
-  Stream<bool> get favLanguagesChanged => _favLanguagesController.stream;
 
   void addFavLanguageCode(String name) {
     if (favLanguageCodes.contains(name)) return;
@@ -179,7 +165,7 @@ class LibraryService {
     favLangs.add(name);
     _sharedPreferences.setStringList(kFavLanguageCodes, favLangs.toList()).then(
       (saved) {
-        if (saved) _favLanguagesController.add(true);
+        if (saved) _propertiesChangedController.add(true);
       },
     );
   }
@@ -190,7 +176,7 @@ class LibraryService {
     favLangs.remove(name);
     _sharedPreferences.setStringList(kFavLanguageCodes, favLangs.toList()).then(
       (saved) {
-        if (saved) _favLanguagesController.add(true);
+        if (saved) _propertiesChangedController.add(true);
       },
     );
   }
@@ -201,14 +187,12 @@ class LibraryService {
 
   Map<String, List<Audio>> _playlists = {};
   Map<String, List<Audio>> get playlists => _playlists;
-  final _playlistsController = StreamController<bool>.broadcast();
-  Stream<bool> get playlistsChanged => _playlistsController.stream;
 
   Future<void> addPlaylist(String id, List<Audio> audios) async {
     if (!_playlists.containsKey(id)) {
       _playlists.putIfAbsent(id, () => audios);
       await writeAudioMap(_playlists, kPlaylistsFileName)
-          .then((_) => _playlistsController.add(true));
+          .then((_) => _propertiesChangedController.add(true));
     }
   }
 
@@ -219,7 +203,7 @@ class LibraryService {
           id,
           (value) => audios,
         );
-        _playlistsController.add(true);
+        _propertiesChangedController.add(true);
       });
     }
   }
@@ -228,7 +212,7 @@ class LibraryService {
     if (_playlists.containsKey(id)) {
       _playlists.remove(id);
       writeAudioMap(_playlists, kPlaylistsFileName)
-          .then((_) => _playlistsController.add(true));
+          .then((_) => _propertiesChangedController.add(true));
     }
   }
 
@@ -239,7 +223,7 @@ class LibraryService {
       _playlists.remove(oldName);
       _playlists.putIfAbsent(newName, () => oldList);
       writeAudioMap(_playlists, kPlaylistsFileName)
-          .then((_) => _playlistsController.add(true));
+          .then((_) => _propertiesChangedController.add(true));
     }
   }
 
@@ -270,12 +254,12 @@ class LibraryService {
           .then((value) {
         likedAudios.clear();
         likedAudios.addAll(audios);
-        _likedAudiosController.add(true);
+        _propertiesChangedController.add(true);
       });
     } else {
       writeAudioMap(_playlists, kPlaylistsFileName).then((_) {
         _playlists.update(id, (value) => audios);
-        _playlistsController.add(true);
+        _propertiesChangedController.add(true);
       });
     }
   }
@@ -285,7 +269,7 @@ class LibraryService {
     if (playlist == null || playlist.contains(audio)) return;
     playlist.add(audio);
     writeAudioMap(_playlists, kPlaylistsFileName)
-        .then((_) => _playlistsController.add(true));
+        .then((_) => _propertiesChangedController.add(true));
   }
 
   void removeAudioFromPlaylist(String id, Audio audio) {
@@ -293,7 +277,7 @@ class LibraryService {
     if (playlist != null && playlist.contains(audio)) {
       playlist.remove(audio);
       writeAudioMap(_playlists, kPlaylistsFileName)
-          .then((_) => _playlistsController.add(true));
+          .then((_) => _propertiesChangedController.add(true));
     }
   }
 
@@ -302,7 +286,7 @@ class LibraryService {
     if (playlist != null) {
       playlist.clear();
       writeAudioMap(_playlists, kPlaylistsFileName)
-          .then((_) => _playlistsController.add(true));
+          .then((_) => _propertiesChangedController.add(true));
     }
   }
 
@@ -319,8 +303,6 @@ class LibraryService {
       _feedsWithDownloads.contains(feedUrl);
   int get feedsWithDownloadsLength => _feedsWithDownloads.length;
 
-  final _downloadsController = StreamController<bool>.broadcast();
-  Stream<bool> get downloadsChanged => _downloadsController.stream;
   void addDownload({
     required String url,
     required String path,
@@ -336,7 +318,7 @@ class LibraryService {
             filename: kFeedsWithDownloads,
           ),
         )
-        .then((_) => _downloadsController.add(true));
+        .then((_) => _propertiesChangedController.add(true));
   }
 
   void removeDownload({required String url, required String feedUrl}) {
@@ -360,7 +342,7 @@ class LibraryService {
               filename: kFeedsWithDownloads,
             ),
           )
-          .then((_) => _downloadsController.add(true));
+          .then((_) => _propertiesChangedController.add(true));
     }
   }
 
@@ -370,7 +352,7 @@ class LibraryService {
     writeStringIterable(
       iterable: _feedsWithDownloads,
       filename: kFeedsWithDownloads,
-    ).then((_) => _downloadsController.add(true));
+    ).then((_) => _propertiesChangedController.add(true));
   }
 
   String? _downloadsDir;
@@ -378,14 +360,12 @@ class LibraryService {
   Map<String, List<Audio>> _podcasts = {};
   Map<String, List<Audio>> get podcasts => _podcasts;
   int get podcastsLength => _podcasts.length;
-  final _podcastsController = StreamController<bool>.broadcast();
-  Stream<bool> get podcastsChanged => _podcastsController.stream;
 
   void addPodcast(String feedUrl, List<Audio> audios) {
     if (_podcasts.containsKey(feedUrl)) return;
     _podcasts.putIfAbsent(feedUrl, () => audios);
     writeAudioMap(_podcasts, kPodcastsFileName)
-        .then((_) => _podcastsController.add(true));
+        .then((_) => _propertiesChangedController.add(true));
   }
 
   Future<void> updatePodcast(String feedUrl, List<Audio> audios) async {
@@ -393,31 +373,28 @@ class LibraryService {
     _addPodcastUpdate(feedUrl);
     _podcasts.update(feedUrl, (value) => audios);
     return writeAudioMap(_podcasts, kPodcastsFileName)
-        .then((_) => _podcastsController.add(true));
+        .then((_) => _propertiesChangedController.add(true));
   }
 
   void _addPodcastUpdate(String feedUrl) {
     if (_podcastUpdates?.contains(feedUrl) == true) return;
     _podcastUpdates?.add(feedUrl);
     writeStringIterable(iterable: _podcastUpdates!, filename: kPodcastsUpdates)
-        .then((_) => _updateController.add(true));
+        .then((_) => _propertiesChangedController.add(true));
   }
 
-  final _ascendingPodcastsController = StreamController<bool>.broadcast();
-  Stream<bool> get ascendingPodcastsChanged =>
-      _ascendingPodcastsController.stream;
   bool showPodcastAscending(String feedUrl) =>
       _sharedPreferences.getBool(kAscendingFeeds + feedUrl) ?? false;
 
   Future<void> _addAscendingPodcast(String feedUrl) async {
     await _sharedPreferences.setBool(kAscendingFeeds + feedUrl, true).then(
-          (_) => _ascendingPodcastsController.add(true),
+          (_) => _propertiesChangedController.add(true),
         );
   }
 
   Future<void> _removeAscendingPodcast(String feedUrl) async =>
       _sharedPreferences.remove(kAscendingFeeds + feedUrl).then(
-            (_) => _ascendingPodcastsController.add(true),
+            (_) => _propertiesChangedController.add(true),
           );
 
   Future<void> reorderPodcast({
@@ -449,17 +426,14 @@ class LibraryService {
     if (_podcastUpdates?.isNotEmpty == false) return;
     _podcastUpdates?.remove(feedUrl);
     writeStringIterable(iterable: _podcastUpdates!, filename: kPodcastsUpdates)
-        .then((_) => _updateController.add(true));
+        .then((_) => _propertiesChangedController.add(true));
   }
 
-  final _updateController = StreamController<bool>.broadcast();
-  Stream<bool> get updatesChanged => _updateController.stream;
-
   void removePodcast(String name) {
     if (!_podcasts.containsKey(name)) return;
     _podcasts.remove(name);
     writeAudioMap(_podcasts, kPodcastsFileName)
-        .then((_) => _podcastsController.add(true))
+        .then((_) => _propertiesChangedController.add(true))
         .then((_) => removePodcastUpdate(name))
         .then((_) => _removeFeedWithDownload(name));
   }
@@ -471,8 +445,6 @@ class LibraryService {
   Map<String, List<Audio>> _pinnedAlbums = {};
   Map<String, List<Audio>> get pinnedAlbums => _pinnedAlbums;
   int get pinnedAlbumsLength => _pinnedAlbums.length;
-  final _albumsController = StreamController<bool>.broadcast();
-  Stream<bool> get albumsChanged => _albumsController.stream;
 
   List<Audio> getAlbumAt(int index) =>
       _pinnedAlbums.entries.elementAt(index).value.toList();
@@ -482,13 +454,13 @@ class LibraryService {
   void addPinnedAlbum(String name, List<Audio> audios) {
     _pinnedAlbums.putIfAbsent(name, () => audios);
     writeAudioMap(_pinnedAlbums, kPinnedAlbumsFileName)
-        .then((_) => _albumsController.add(true));
+        .then((_) => _propertiesChangedController.add(true));
   }
 
   void removePinnedAlbum(String name) {
     _pinnedAlbums.remove(name);
     writeAudioMap(_pinnedAlbums, kPinnedAlbumsFileName)
-        .then((_) => _albumsController.add(true));
+        .then((_) => _propertiesChangedController.add(true));
   }
 
   bool? _libraryInitialized;
@@ -525,16 +497,6 @@ class LibraryService {
 
   Future<void> dispose() async {
     dio.close();
-    await _albumsController.close();
-    await _podcastsController.close();
-    await _likedAudiosController.close();
-    await _playlistsController.close();
-    await _starredStationsController.close();
-    await _favTagsController.close();
-    await _favCountriesController.close();
-    await _favLanguagesController.close();
-    await _updateController.close();
-    await _downloadsController.close();
-    await _ascendingPodcastsController.close();
+    await _propertiesChangedController.close();
   }
 }
diff --git a/lib/player/player_model.dart b/lib/player/player_model.dart
index 4471b7174..25741402e 100644
--- a/lib/player/player_model.dart
+++ b/lib/player/player_model.dart
@@ -20,21 +20,7 @@ class PlayerModel extends SafeChangeNotifier {
 
   VideoController get controller => _service.controller;
 
-  StreamSubscription<bool>? _queueNameChangedSub;
-  StreamSubscription<bool>? _queueChangedSub;
-  StreamSubscription<bool>? _mpvMetaDataChangedSub;
-  StreamSubscription<bool>? _audioChangedSub;
-  StreamSubscription<bool>? _isVideoChangedSub;
-  StreamSubscription<bool>? _nextAudioChangedSub;
-  StreamSubscription<bool>? _shuffleChangedSub;
-  StreamSubscription<bool>? _repeatSingleChangedSub;
-  StreamSubscription<bool>? _volumeChangedSub;
-  StreamSubscription<bool>? _isPlayingChangedSub;
-  StreamSubscription<bool>? _durationChangedSub;
-  StreamSubscription<bool>? _positionChangedSub;
-  StreamSubscription<bool>? _rateChanged;
-  StreamSubscription<bool>? _radioHistoryChangedSub;
-  StreamSubscription<bool>? _lastPositionsSub;
+  StreamSubscription<bool>? _propertiesChangedSub;
   StreamSubscription<List<ConnectivityResult>>? _connectivitySubscription;
 
   String? get queueName => _service.queue.name;
@@ -88,35 +74,8 @@ class PlayerModel extends SafeChangeNotifier {
 
   Future<void> resume() async => _service.resume();
 
-  void init() {
-    _queueNameChangedSub ??=
-        _service.queueChanged.listen((_) => notifyListeners());
-    _queueChangedSub ??= _service.queueChanged.listen((_) => notifyListeners());
-    _mpvMetaDataChangedSub ??=
-        _service.mpvMetaDataChanged.listen((_) => notifyListeners());
-    _audioChangedSub = _service.audioChanged.listen((_) => notifyListeners());
-    _isVideoChangedSub ??=
-        _service.isVideoChanged.listen((_) => notifyListeners());
-    _nextAudioChangedSub ??=
-        _service.nextAudioChanged.listen((_) => notifyListeners());
-    _shuffleChangedSub ??=
-        _service.shuffleChanged.listen((_) => notifyListeners());
-    _repeatSingleChangedSub ??=
-        _service.repeatSingleChanged.listen((_) => notifyListeners());
-    _volumeChangedSub ??=
-        _service.volumeChanged.listen((_) => notifyListeners());
-    _rateChanged ??= _service.rateChanged.listen((_) => notifyListeners());
-    _isPlayingChangedSub ??=
-        _service.isPlayingChanged.listen((_) => notifyListeners());
-    _durationChangedSub ??=
-        _service.durationChanged.listen((_) => notifyListeners());
-    _positionChangedSub ??=
-        _service.positionChanged.listen((_) => notifyListeners());
-    _radioHistoryChangedSub ??=
-        _service.radioHistoryChanged.listen((_) => notifyListeners());
-    _lastPositionsSub ??=
-        _service.lastPositionsChanged.listen((_) => notifyListeners());
-  }
+  void init() => _propertiesChangedSub ??=
+      _service.propertiesChanged.listen((_) => notifyListeners());
 
   Future<void> playNext() async => _service.playNext();
 
@@ -158,12 +117,12 @@ class PlayerModel extends SafeChangeNotifier {
   Future<void> removeLastPositions(List<Audio> audios) =>
       _service.removeLastPositions(audios);
 
-  Map<String, MpvMetaData> get radioHistory => _service.radioHistory;
-
+  int getRadioHistoryLength({String? filter}) =>
+      filteredRadioHistory(filter: filter).length;
   Iterable<MapEntry<String, MpvMetaData>> filteredRadioHistory({
     required String? filter,
   }) {
-    return radioHistory.entries.where(
+    return _service.radioHistory.entries.where(
       (e) => filter == null
           ? true
           : e.value.icyName.contains(filter) ||
@@ -188,22 +147,8 @@ class PlayerModel extends SafeChangeNotifier {
 
   @override
   Future<void> dispose() async {
-    await _queueNameChangedSub?.cancel();
-    await _queueChangedSub?.cancel();
-    await _mpvMetaDataChangedSub?.cancel();
-    await _audioChangedSub?.cancel();
-    await _isVideoChangedSub?.cancel();
-    await _nextAudioChangedSub?.cancel();
-    await _shuffleChangedSub?.cancel();
-    await _repeatSingleChangedSub?.cancel();
-    await _volumeChangedSub?.cancel();
-    await _isPlayingChangedSub?.cancel();
-    await _durationChangedSub?.cancel();
-    await _positionChangedSub?.cancel();
-    await _rateChanged?.cancel();
-    await _radioHistoryChangedSub?.cancel();
+    await _propertiesChangedSub?.cancel();
     await _connectivitySubscription?.cancel();
-    await _lastPositionsSub?.cancel();
     super.dispose();
   }
 }
diff --git a/lib/player/player_service.dart b/lib/player/player_service.dart
index 6ed3821f2..622f4aeb2 100644
--- a/lib/player/player_service.dart
+++ b/lib/player/player_service.dart
@@ -46,18 +46,17 @@ class PlayerService {
 
   Player get _player => _controller.player;
 
-  final _queueController = StreamController<bool>.broadcast();
-  Stream<bool> get queueChanged => _queueController.stream;
+  final _propertiesChangedController = StreamController<bool>.broadcast();
+  Stream<bool> get propertiesChanged => _propertiesChangedController.stream;
+
   Queue _queue = (name: '', audios: []);
   Queue get queue => _queue;
   void setQueue(Queue value) {
     if (value == _queue || value.audios.isEmpty) return;
     _queue = value;
-    _queueController.add(true);
+    _propertiesChangedController.add(true);
   }
 
-  final _mpvMetaDataController = StreamController<bool>.broadcast();
-  Stream<bool> get mpvMetaDataChanged => _mpvMetaDataController.stream;
   MpvMetaData? _mpvMetaData;
   MpvMetaData? get mpvMetaData => _mpvMetaData;
   void setMpvMetaData(MpvMetaData? value) {
@@ -83,11 +82,9 @@ class PlayerService {
         ),
       );
     }
-    _mpvMetaDataController.add(true);
+    _propertiesChangedController.add(true);
   }
 
-  final _audioController = StreamController<bool>.broadcast();
-  Stream<bool> get audioChanged => _audioController.stream;
   Audio? _audio;
   Audio? get audio => _audio;
   void _setAudio(Audio value) async {
@@ -97,62 +94,51 @@ class PlayerService {
       setRate(1);
     }
     _audio = value;
-    _audioController.add(true);
+    _propertiesChangedController.add(true);
     setMpvMetaData(null);
   }
 
-  final _isVideoController = StreamController<bool>.broadcast();
-  Stream<bool> get isVideoChanged => _isVideoController.stream;
-
   bool? _isVideo;
   bool? get isVideo => _isVideo;
   void _setIsVideo(bool? value) {
     _isVideo = value;
-    _isVideoController.add(true);
+    _propertiesChangedController.add(true);
   }
 
-  final _nextAudioController = StreamController<bool>.broadcast();
-  Stream<bool> get nextAudioChanged => _nextAudioController.stream;
   Audio? _nextAudio;
   Audio? get nextAudio => _nextAudio;
   set nextAudio(Audio? value) {
     if (value == null || value == _nextAudio) return;
     _nextAudio = value;
-    _nextAudioController.add(true);
+    _propertiesChangedController.add(true);
   }
 
-  final _isPlayingController = StreamController<bool>.broadcast();
-  Stream<bool> get isPlayingChanged => _isPlayingController.stream;
   bool _isPlaying = false;
   bool get isPlaying => _isPlaying;
   void setIsPlaying(bool value) {
     if (value == _isPlaying) return;
     _isPlaying = value;
-    _isPlayingController.add(true);
+    _propertiesChangedController.add(true);
     _setMediaControlsIsPlaying(value);
   }
 
-  final _durationController = StreamController<bool>.broadcast();
-  Stream<bool> get durationChanged => _durationController.stream;
   Duration? _duration;
   Duration? get duration => _duration;
   void setDuration(Duration? value) {
     if (value?.inSeconds == _duration?.inSeconds) return;
     _duration = value;
-    _durationController.add(true);
+    _propertiesChangedController.add(true);
     _setMediaControlDuration(value);
   }
 
   int _playerStateTicker = 0;
-  final _positionController = StreamController<bool>.broadcast();
-  Stream<bool> get positionChanged => _positionController.stream;
   Duration? _position = Duration.zero;
   Duration? get position => _position;
   void setPosition(Duration? value) {
     if (position?.inSeconds == value?.inSeconds) return;
     _position = value;
     _playerStateTicker = value?.inSeconds ?? 0;
-    _positionController.add(true);
+    _propertiesChangedController.add(true);
     _setMediaControlPosition(value);
     if (_playerStateTicker >= 5) {
       _playerStateTicker = 0;
@@ -160,29 +146,23 @@ class PlayerService {
     }
   }
 
-  final _bufferController = StreamController<bool>.broadcast();
-  Stream<bool> get bufferChanged => _bufferController.stream;
   Duration? _buffer = Duration.zero;
   Duration? get buffer => _buffer;
   void setBuffer(Duration? value) {
     if (buffer?.inSeconds == value?.inSeconds) return;
     _buffer = value;
-    _bufferController.add(true);
+    _propertiesChangedController.add(true);
   }
 
-  final _repeatSingleController = StreamController<bool>.broadcast();
-  Stream<bool> get repeatSingleChanged => _repeatSingleController.stream;
   bool _repeatSingle = false;
   bool get repeatSingle => _repeatSingle;
   void setRepeatSingle(bool value) {
     if (value == _repeatSingle) return;
     _repeatSingle = value;
     _estimateNext();
-    _repeatSingleController.add(true);
+    _propertiesChangedController.add(true);
   }
 
-  final _shuffleController = StreamController<bool>.broadcast();
-  Stream<bool> get shuffleChanged => _shuffleController.stream;
   bool _shuffle = false;
   bool get shuffle => _shuffle;
   void setShuffle(bool value) {
@@ -191,11 +171,9 @@ class PlayerService {
     if (value && queue.audios.length > 1) {
       _randomNext();
     }
-    _shuffleController.add(true);
+    _propertiesChangedController.add(true);
   }
 
-  final _volumeController = StreamController<bool>.broadcast();
-  Stream<bool> get volumeChanged => _volumeController.stream;
   double? _volume;
   double? get volume => _volume;
   Future<void> setVolume(double value) async {
@@ -203,8 +181,6 @@ class PlayerService {
     await _player.setVolume(value);
   }
 
-  final _rateController = StreamController<bool>.broadcast();
-  Stream<bool> get rateChanged => _rateController.stream;
   double _rate = 1.0;
   double get rate => _rate;
   Future<void> setRate(double value) async {
@@ -323,12 +299,12 @@ class PlayerService {
 
     _volumeSub ??= _player.stream.volume.listen((value) {
       _volume = value;
-      _volumeController.add(true);
+      _propertiesChangedController.add(true);
     });
 
     _rateSub ??= _player.stream.rate.listen((value) {
       _rate = value;
-      _rateController.add(true);
+      _propertiesChangedController.add(true);
     });
 
     _tracksSub ??= _player.stream.tracks.listen((tracks) {
@@ -374,14 +350,14 @@ class PlayerService {
 
       _estimateNext();
 
-      _queueController.add(true);
+      _propertiesChangedController.add(true);
     }
   }
 
   void remove(Audio deleteMe) {
     _queue.audios.remove(deleteMe);
     _estimateNext();
-    _queueController.add(true);
+    _propertiesChangedController.add(true);
   }
 
   void _estimateNext() {
@@ -523,8 +499,6 @@ class PlayerService {
   // lose their progress
   Map<String, Duration> _lastPositions = {};
   Map<String, Duration> get lastPositions => _lastPositions;
-  final _lastPositionsController = StreamController<bool>.broadcast();
-  Stream<bool> get lastPositionsChanged => _lastPositionsController.stream;
   Future<void> addLastPosition(String key, Duration lastPosition) async {
     await writeCustomSetting(
       key,
@@ -536,13 +510,13 @@ class PlayerService {
     } else {
       _lastPositions.putIfAbsent(key, () => lastPosition);
     }
-    _lastPositionsController.add(true);
+    _propertiesChangedController.add(true);
   }
 
   Future<void> removeLastPosition(String key) async {
     await removeCustomSetting(key, kLastPositionsFileName);
     _lastPositions.remove(key);
-    _lastPositionsController.add(true);
+    _propertiesChangedController.add(true);
   }
 
   Future<void> removeLastPositions(List<Audio> audios) async {
@@ -550,7 +524,7 @@ class PlayerService {
       if (e.url != null) {
         await removeCustomSetting(e.url!, kLastPositionsFileName);
         _lastPositions.remove(e.url!);
-        _lastPositionsController.add(true);
+        _propertiesChangedController.add(true);
       }
     }
   }
@@ -767,8 +741,6 @@ class PlayerService {
 
   final Map<String, MpvMetaData> _radioHistory = {};
   Map<String, MpvMetaData> get radioHistory => _radioHistory;
-  final _radioHistoryController = StreamController<bool>.broadcast();
-  Stream<bool> get radioHistoryChanged => _radioHistoryController.stream;
   void _addRadioHistoryElement({
     required String icyTitle,
     required MpvMetaData mpvMetaData,
@@ -777,7 +749,6 @@ class PlayerService {
       icyTitle,
       () => mpvMetaData,
     );
-    _radioHistoryController.add(true);
   }
 
   Timer? _timer;
@@ -786,21 +757,10 @@ class PlayerService {
   }
 
   Future<void> dispose() async {
-    await _writePlayerState();
+    await _propertiesChangedController.close();
     await _smtcSub?.cancel();
     await _smtc?.disableSmtc();
     await _smtc?.dispose();
-    await _queueController.close();
-    await _mpvMetaDataController.close();
-    await _audioController.close();
-    await _nextAudioController.close();
-    await _volumeController.close();
-    await _shuffleController.close();
-    await _durationController.close();
-    await _isVideoController.close();
-    await _positionController.close();
-    await _isPlayingController.close();
-    await _repeatSingleController.close();
     await _isPlayingSub?.cancel();
     await _positionSub?.cancel();
     await _durationSub?.cancel();
@@ -808,8 +768,6 @@ class PlayerService {
     await _volumeSub?.cancel();
     await _tracksSub?.cancel();
     await _rateSub?.cancel();
-    await _rateController.close();
-    await _radioHistoryController.close();
     await _bufferSub?.cancel();
     _timer?.cancel();
     await _player.dispose();
diff --git a/lib/player/view/bottom_player_image.dart b/lib/player/view/bottom_player_image.dart
index 0f1fbcf09..2e34be3e7 100644
--- a/lib/player/view/bottom_player_image.dart
+++ b/lib/player/view/bottom_player_image.dart
@@ -71,7 +71,7 @@ class BottomPlayerImage extends StatelessWidget with WatchItMixin {
         audio?.imageUrl != null) {
       child = PlayerRemoteSourceImage(
         key: ValueKey(
-          mpvMetaData?.icyTitle ?? audio?.albumArtUrl ?? audio?.imageUrl,
+          '${mpvMetaData?.icyTitle ?? ''}${audio?.albumArtUrl ?? ''}${audio?.imageUrl ?? ''}',
         ),
         mpvMetaData: mpvMetaData,
         height: size,
diff --git a/lib/player/view/full_height_player_image.dart b/lib/player/view/full_height_player_image.dart
index f8cf79d45..c8721cd23 100644
--- a/lib/player/view/full_height_player_image.dart
+++ b/lib/player/view/full_height_player_image.dart
@@ -51,9 +51,7 @@ class FullHeightPlayerImage extends StatelessWidget with WatchItMixin {
         image = PlayerRemoteSourceImage(
           mpvMetaData: mpvMetaData,
           key: ValueKey(
-            (mpvMetaData?.icyTitle ?? '') +
-                (audio?.imageUrl ?? '') +
-                (audio?.albumArtUrl ?? ''),
+            '${mpvMetaData?.icyTitle ?? ''}${audio?.albumArtUrl ?? ''}${audio?.imageUrl ?? ''}',
           ),
           height: height ?? fullHeightPlayerImageSize,
           width: width ?? fullHeightPlayerImageSize,
diff --git a/lib/player/view/shuffle_button.dart b/lib/player/view/shuffle_button.dart
index 8678307fd..5bef8171e 100644
--- a/lib/player/view/shuffle_button.dart
+++ b/lib/player/view/shuffle_button.dart
@@ -18,7 +18,6 @@ class ShuffleButton extends StatelessWidget with WatchItMixin {
   Widget build(BuildContext context) {
     final theme = context.t;
     final shuffle = watchPropertyValue((PlayerModel m) => m.shuffle);
-    final setShuffle = di<PlayerModel>().setShuffle;
 
     return IconButton(
       tooltip: context.l10n.shuffle,
@@ -30,7 +29,7 @@ class ShuffleButton extends StatelessWidget with WatchItMixin {
                 ? theme.colorScheme.primary
                 : theme.colorScheme.onSurface),
       ),
-      onPressed: !active ? null : () => setShuffle(!shuffle),
+      onPressed: !active ? null : () => di<PlayerModel>().setShuffle(!shuffle),
     );
   }
 }
diff --git a/lib/radio/view/radio_history_list.dart b/lib/radio/view/radio_history_list.dart
index 5f9bcd737..e3a3e5800 100644
--- a/lib/radio/view/radio_history_list.dart
+++ b/lib/radio/view/radio_history_list.dart
@@ -27,12 +27,13 @@ class RadioHistoryList extends StatelessWidget with WatchItMixin, PlayerMixin {
 
   @override
   Widget build(BuildContext context) {
-    final radioHistory = watchPropertyValue(
-      (PlayerModel m) => m.filteredRadioHistory(filter: filter),
+    final length = watchPropertyValue(
+      (PlayerModel m) => m.getRadioHistoryLength(filter: filter),
     );
+
     final current = watchPropertyValue((PlayerModel m) => m.mpvMetaData);
 
-    if (radioHistory.isEmpty) {
+    if (length == 0) {
       return NoSearchResultPage(
         icon: emptyIcon ?? const AnimatedEmoji(AnimatedEmojis.crystalBall),
         message: emptyMessage ?? Text(context.l10n.emptyHearingHistory),
@@ -45,10 +46,12 @@ class RadioHistoryList extends StatelessWidget with WatchItMixin, PlayerMixin {
         builder: (context, constraints) {
           return ListView.builder(
             padding: getAdaptiveHorizontalPadding(constraints: constraints),
-            itemCount: radioHistory.length,
+            itemCount: length,
             itemBuilder: (context, index) {
-              final reversedIndex = radioHistory.length - index - 1;
-              final e = radioHistory.elementAt(reversedIndex);
+              final reversedIndex = length - index - 1;
+              final e = di<PlayerModel>()
+                  .filteredRadioHistory(filter: filter)
+                  .elementAt(reversedIndex);
               return RadioHistoryTile(
                 simpleTile: simpleList,
                 entry: e,
@@ -80,12 +83,12 @@ class SliverRadioHistoryList extends StatelessWidget
 
   @override
   Widget build(BuildContext context) {
-    final radioHistory = watchPropertyValue(
-      (PlayerModel m) => m.filteredRadioHistory(filter: filter),
+    final length = watchPropertyValue(
+      (PlayerModel m) => m.getRadioHistoryLength(filter: filter),
     );
     final current = watchPropertyValue((PlayerModel m) => m.mpvMetaData);
 
-    if (radioHistory.isEmpty) {
+    if (length == 0) {
       return SliverToBoxAdapter(
         child: NoSearchResultPage(
           icon: emptyIcon ?? const AnimatedEmoji(AnimatedEmojis.crystalBall),
@@ -97,15 +100,17 @@ class SliverRadioHistoryList extends StatelessWidget
     return SliverList(
       delegate: SliverChildBuilderDelegate(
         (context, index) {
-          final reversedIndex = radioHistory.length - index - 1;
-          final e = radioHistory.elementAt(reversedIndex);
+          final reversedIndex = length - index - 1;
+          final e = di<PlayerModel>()
+              .filteredRadioHistory(filter: filter)
+              .elementAt(reversedIndex);
           return RadioHistoryTile(
             entry: e,
             selected: current?.icyTitle != null &&
                 current?.icyTitle == e.value.icyTitle,
           );
         },
-        childCount: radioHistory.length,
+        childCount: length,
       ),
     );
   }
diff --git a/lib/radio/view/radio_page_copy_histoy_button.dart b/lib/radio/view/radio_page_copy_histoy_button.dart
index bf7330d02..e4d13d683 100644
--- a/lib/radio/view/radio_page_copy_histoy_button.dart
+++ b/lib/radio/view/radio_page_copy_histoy_button.dart
@@ -16,7 +16,9 @@ class RadioPageCopyHistoryButton extends StatelessWidget with WatchItMixin {
   @override
   Widget build(BuildContext context) {
     watchPropertyValue(
-      (PlayerModel m) => m.filteredRadioHistory(filter: station.title),
+      (PlayerModel m) => m.getRadioHistoryLength(
+        filter: station.title,
+      ),
     );
     final text = di<PlayerModel>().getRadioHistoryList(filter: station.title);
     return IconButton(
diff --git a/lib/settings/settings_model.dart b/lib/settings/settings_model.dart
index 89ebe66e9..0cab52b60 100644
--- a/lib/settings/settings_model.dart
+++ b/lib/settings/settings_model.dart
@@ -18,15 +18,7 @@ class SettingsModel extends SafeChangeNotifier {
   final SettingsService _service;
   final ExternalPathService _externalPathService;
 
-  StreamSubscription<bool>? _usePodcastIndexChangedSub;
-  StreamSubscription<bool>? _podcastIndexApiKeyChangedSub;
-  StreamSubscription<bool>? _podcastIndexApiSecretChangedSub;
-  StreamSubscription<bool>? _neverShowFailedImportsSub;
-  StreamSubscription<bool>? _directoryChangedSub;
-  StreamSubscription<bool>? _themeIndexChangedSub;
-  StreamSubscription<bool>? _recentPatchNotesDisposedChangedSub;
-  StreamSubscription<bool>? _useArtistGridViewChangedSub;
-  StreamSubscription<bool>? _closeBtnActionIndexChangedSub;
+  StreamSubscription<bool>? _propertiesChangedSub;
 
   String? get directory => _service.directory;
   Future<void> setDirectory(String value) async => _service.setDirectory(value);
@@ -59,37 +51,12 @@ class SettingsModel extends SafeChangeNotifier {
   void setCloseBtnActionIndex(CloseBtnAction value) =>
       _service.setCloseBtnActionIndex(value);
 
-  void init() {
-    _themeIndexChangedSub ??=
-        _service.themeIndexChanged.listen((_) => notifyListeners());
-    _usePodcastIndexChangedSub ??=
-        _service.usePodcastIndexChanged.listen((_) => notifyListeners());
-    _podcastIndexApiKeyChangedSub ??=
-        _service.podcastIndexApiKeyChanged.listen((_) => notifyListeners());
-    _podcastIndexApiSecretChangedSub ??=
-        _service.podcastIndexApiSecretChanged.listen((_) => notifyListeners());
-    _neverShowFailedImportsSub ??=
-        _service.neverShowFailedImportsChanged.listen((_) => notifyListeners());
-    _directoryChangedSub ??=
-        _service.directoryChanged.listen((_) => notifyListeners());
-    _recentPatchNotesDisposedChangedSub ??= _service
-        .recentPatchNotesDisposedChanged
-        .listen((_) => notifyListeners());
-    _closeBtnActionIndexChangedSub ??=
-        _service.closeBtnActionChanged.listen((_) => notifyListeners());
-  }
+  void init() => _propertiesChangedSub ??=
+      _service.propertiesChanged.listen((_) => notifyListeners());
 
   @override
   Future<void> dispose() async {
-    await _themeIndexChangedSub?.cancel();
-    await _usePodcastIndexChangedSub?.cancel();
-    await _podcastIndexApiKeyChangedSub?.cancel();
-    await _podcastIndexApiSecretChangedSub?.cancel();
-    await _neverShowFailedImportsSub?.cancel();
-    await _directoryChangedSub?.cancel();
-    await _recentPatchNotesDisposedChangedSub?.cancel();
-    await _useArtistGridViewChangedSub?.cancel();
-    await _closeBtnActionIndexChangedSub?.cancel();
+    await _propertiesChangedSub?.cancel();
     super.dispose();
   }
 }
diff --git a/lib/settings/settings_service.dart b/lib/settings/settings_service.dart
index a1096095b..eed4b0627 100644
--- a/lib/settings/settings_service.dart
+++ b/lib/settings/settings_service.dart
@@ -11,86 +11,67 @@ class SettingsService {
 
   final SharedPreferences _preferences;
 
-  final _themeIndexController = StreamController<bool>.broadcast();
-  Stream<bool> get themeIndexChanged => _themeIndexController.stream;
+  final _propertiesChangedController = StreamController<bool>.broadcast();
+  Stream<bool> get propertiesChanged => _propertiesChangedController.stream;
   int get themeIndex => _preferences.getInt(kThemeIndex) ?? 0;
   void setThemeIndex(int value) {
     _preferences.setInt(kThemeIndex, value).then(
       (saved) {
-        if (saved) _themeIndexController.add(true);
+        if (saved) _propertiesChangedController.add(true);
       },
     );
   }
 
   bool get neverShowFailedImports =>
       _preferences.getBool(kNeverShowImportFails) ?? false;
-  final _neverShowFailedImportsController = StreamController<bool>.broadcast();
-  Stream<bool> get neverShowFailedImportsChanged =>
-      _neverShowFailedImportsController.stream;
+
   void setNeverShowFailedImports(bool value) {
     _preferences.setBool(kNeverShowImportFails, value).then(
       (saved) {
-        if (saved) _neverShowFailedImportsController.add(true);
+        if (saved) _propertiesChangedController.add(true);
       },
     );
   }
 
-  final _recentPatchNotesDisposedController =
-      StreamController<bool>.broadcast();
-  Stream<bool> get recentPatchNotesDisposedChanged =>
-      _recentPatchNotesDisposedController.stream;
   bool recentPatchNotesDisposed(String version) =>
       _preferences.getString(kPatchNotesDisposed) == version;
 
   Future<void> disposePatchNotes(String version) async =>
       _preferences.setString(kPatchNotesDisposed, version).then(
         (saved) {
-          if (saved) _recentPatchNotesDisposedController.add(true);
+          if (saved) _propertiesChangedController.add(true);
         },
       );
 
-  final _usePodcastIndexController = StreamController<bool>.broadcast();
-  Stream<bool> get usePodcastIndexChanged => _usePodcastIndexController.stream;
   bool get usePodcastIndex => _preferences.getBool(kUsePodcastIndex) ?? false;
   Future<void> setUsePodcastIndex(bool value) async {
     return _preferences.setBool(kUsePodcastIndex, value).then((value) {
-      if (value) _usePodcastIndexController.add(true);
+      if (value) _propertiesChangedController.add(true);
     });
   }
 
-  final _podcastIndexApiKeyController = StreamController<bool>.broadcast();
-  Stream<bool> get podcastIndexApiKeyChanged =>
-      _podcastIndexApiKeyController.stream;
   String? get podcastIndexApiKey => _preferences.getString(kPodcastIndexApiKey);
   void setPodcastIndexApiKey(String value) {
     _preferences.setString(kPodcastIndexApiKey, value).then((saved) {
-      if (saved) _podcastIndexApiKeyController.add(true);
+      if (saved) _propertiesChangedController.add(true);
     });
   }
 
-  final _podcastIndexApiSecretController = StreamController<bool>.broadcast();
-  Stream<bool> get podcastIndexApiSecretChanged =>
-      _podcastIndexApiSecretController.stream;
   String? get podcastIndexApiSecret =>
       _preferences.getString(kPodcastIndexApiSecret);
   void setPodcastIndexApiSecret(String value) {
     _preferences.setString(kPodcastIndexApiSecret, value).then((saved) {
-      if (saved) _podcastIndexApiSecretController.add(true);
+      if (saved) _propertiesChangedController.add(true);
     });
   }
 
-  final _directoryController = StreamController<bool>.broadcast();
-  Stream<bool> get directoryChanged => _directoryController.stream;
   String? get directory => _preferences.getString(kDirectoryProperty);
   Future<void> setDirectory(String directory) async {
     await _preferences.setString(kDirectoryProperty, directory).then((saved) {
-      if (saved) _directoryController.add(true);
+      if (saved) _propertiesChangedController.add(true);
     });
   }
 
-  final _closeBtnActionIndexController = StreamController<bool>.broadcast();
-  Stream<bool> get closeBtnActionChanged =>
-      _closeBtnActionIndexController.stream;
   CloseBtnAction get closeBtnActionIndex =>
       _preferences.getString(kCloseBtnAction) == null
           ? CloseBtnAction.alwaysAsk
@@ -102,19 +83,10 @@ class SettingsService {
   void setCloseBtnActionIndex(CloseBtnAction value) {
     _preferences.setString(kCloseBtnAction, value.toString()).then(
       (saved) {
-        if (saved) _closeBtnActionIndexController.add(true);
+        if (saved) _propertiesChangedController.add(true);
       },
     );
   }
 
-  Future<void> dispose() async {
-    await _themeIndexController.close();
-    await _recentPatchNotesDisposedController.close();
-    await _neverShowFailedImportsController.close();
-    await _directoryController.close();
-    await _podcastIndexApiSecretController.close();
-    await _usePodcastIndexController.close();
-    await _podcastIndexApiKeyController.close();
-    await _closeBtnActionIndexController.close();
-  }
+  Future<void> dispose() async => _propertiesChangedController.close();
 }