feat: add timer and update button to podcasts (#846)

Feichtmeier · web-flow · commit 93fd7abe8d48 · 2024-08-14T19:46:52.000Z
diff --git a/lib/common/view/icons.dart b/lib/common/view/icons.dart
@@ -202,7 +202,7 @@ class Iconz {
   IconData get replay => yaruStyled
       ? YaruIcons.history
       : appleStyled
-          ? CupertinoIcons.restart
+          ? CupertinoIcons.clock
           : Icons.history;
   IconData get speakerLowFilled => yaruStyled
       ? YaruIcons.speaker_low_filled
@@ -425,6 +425,11 @@ class Iconz {
       : appleStyled
           ? CupertinoIcons.plus_app
           : Icons.queue;
+  IconData get sleep => yaruStyled
+      ? YaruIcons.clear_night
+      : appleStyled
+          ? CupertinoIcons.moon
+          : Icons.mode_night;
 
   Widget getAnimatedStar(bool isStarred, [Color? color]) {
     if (yaruStyled) {
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
@@ -327,5 +327,7 @@
     "radioTagDisclaimerSubTitle": "Manchmal senden Stationen Tags, die keinem Musikgenre entsprechen. MusicPod ist nicht für den Inhalt verantwortlich!",
     "podcastFeedLoadingTimeout": "Das Laden des Podcast-Feeds dauert länger als gewöhnlich....",
     "restartEpisode": "Episode von Anfang spielen",
-    "restartAllEpisodes": "Alle Episoden von Anfang spielen"
+    "restartAllEpisodes": "Alle Episoden von Anfang spielen",
+    "checkForUpdates": "Auf Aktualisierung überprüfen",
+    "playbackWillStopIn": "Wiedergabe wird gestoppt in: "
 }
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -328,5 +328,7 @@
     "podcastFeedLoadingTimeout": "Loading the podcast feed takes longer than usual...",
     "gitHubClientConnectError": "Could not load online version from GitHub.",
     "replayEpisode": "Replay episode",
-    "replayAllEpisodes": "Replay all episodes"
+    "replayAllEpisodes": "Replay all episodes",
+    "checkForUpdates": "Check for updates",
+    "playbackWillStopIn": "Playback will stop in: "
 }
diff --git a/lib/main.dart b/lib/main.dart
@@ -101,6 +101,7 @@ Future<void> main(List<String> args) async {
     PodcastService(
       notificationsService: notificationsService,
       settingsService: settingsService,
+      libraryService: libraryService,
     ),
   );
 
@@ -170,10 +171,7 @@ Future<void> main(List<String> args) async {
     dispose: (s) => s.dispose(),
   );
   di.registerSingleton<PodcastModel>(
-    PodcastModel(
-      libraryService: libraryService,
-      podcastService: di.get<PodcastService>(),
-    ),
+    PodcastModel(podcastService: di.get<PodcastService>()),
     dispose: (s) => s.dispose(),
   );
   di.registerSingleton<RadioModel>(
diff --git a/lib/player/player_model.dart b/lib/player/player_model.dart
@@ -184,6 +184,8 @@ class PlayerModel extends SafeChangeNotifier {
         .replaceAll(')', '');
   }
 
+  void setTimer(Duration duration) => _service.setTimer(duration);
+
   @override
   Future<void> dispose() async {
     await _queueNameChangedSub?.cancel();
diff --git a/lib/player/player_service.dart b/lib/player/player_service.dart
@@ -765,6 +765,11 @@ class PlayerService {
     _radioHistoryController.add(true);
   }
 
+  Timer? _timer;
+  void setTimer(Duration duration) {
+    _timer = Timer(duration, () => pause());
+  }
+
   Future<void> dispose() async {
     await _writePlayerState();
     await _smtcSub?.cancel();
@@ -791,7 +796,7 @@ class PlayerService {
     await _rateController.close();
     await _radioHistoryController.close();
     await _bufferSub?.cancel();
-
+    _timer?.cancel();
     await _player.dispose();
   }
 
diff --git a/lib/podcasts/podcast_model.dart b/lib/podcasts/podcast_model.dart
@@ -2,18 +2,15 @@ import 'dart:async';
 
 import 'package:safe_change_notifier/safe_change_notifier.dart';
 
-import '../library/library_service.dart';
+import '../common/data/audio.dart';
 import 'podcast_service.dart';
 
 class PodcastModel extends SafeChangeNotifier {
   PodcastModel({
     required PodcastService podcastService,
-    required LibraryService libraryService,
-  })  : _podcastService = podcastService,
-        _libraryService = libraryService;
+  }) : _podcastService = podcastService;
 
   final PodcastService _podcastService;
-  final LibraryService _libraryService;
 
   bool _loadingFeed = false;
   bool get loadingFeed => _loadingFeed;
@@ -27,24 +24,29 @@ class PodcastModel extends SafeChangeNotifier {
   Future<void> init({
     required String updateMessage,
     bool forceInit = false,
+    Function({required String message})? notify,
   }) async {
     await _podcastService.init(forceInit: forceInit);
 
     if (_firstUpdateChecked == false) {
-      update(updateMessage);
+      update(updateMessage: updateMessage);
     }
     _firstUpdateChecked = true;
 
     notifyListeners();
   }
 
-  void update(String updateMessage) {
+  void update({
+    required String updateMessage,
+    Map<String, List<Audio>>? oldPodcasts,
+    Function({required String message})? notify,
+  }) {
     _setCheckingForUpdates(true);
     _podcastService
         .updatePodcasts(
-          oldPodcasts: _libraryService.podcasts,
-          updatePodcast: _libraryService.updatePodcast,
+          oldPodcasts: oldPodcasts,
           updateMessage: updateMessage,
+          notify: notify,
         )
         .then((_) => _setCheckingForUpdates(false));
   }
diff --git a/lib/podcasts/podcast_service.dart b/lib/podcasts/podcast_service.dart
@@ -6,18 +6,22 @@ import '../common/data/audio.dart';
 import '../common/data/podcast_genre.dart';
 import '../common/view/audio_filter.dart';
 import '../common/view/languages.dart';
+import '../library/library_service.dart';
 import '../notifications/notifications_service.dart';
 import '../settings/settings_service.dart';
 import 'podcast_utils.dart';
 
 class PodcastService {
   final NotificationsService _notificationsService;
   final SettingsService _settingsService;
+  final LibraryService _libraryService;
   PodcastService({
     required NotificationsService notificationsService,
     required SettingsService settingsService,
+    required LibraryService libraryService,
   })  : _notificationsService = notificationsService,
-        _settingsService = settingsService;
+        _settingsService = settingsService,
+        _libraryService = libraryService;
 
   SearchResult? _searchResult;
   Search? _search;
@@ -80,11 +84,11 @@ class PodcastService {
   }
 
   Future<void> updatePodcasts({
-    required Map<String, List<Audio>> oldPodcasts,
-    required void Function(String name, List<Audio> audios) updatePodcast,
+    Map<String, List<Audio>>? oldPodcasts,
     required String updateMessage,
+    Function({required String message})? notify,
   }) async {
-    for (final old in oldPodcasts.entries) {
+    for (final old in (oldPodcasts ?? _libraryService.podcasts).entries) {
       if (old.value.isNotEmpty) {
         final list = old.value;
         sortListByAudioFilter(
@@ -102,10 +106,14 @@ class PodcastService {
                     audios.firstOrNull?.year == firstOld.year ||
                 audios.isEmpty) return;
 
-            updatePodcast(old.key, audios);
-            _notificationsService.notify(
-              message: '$updateMessage ${firstOld.album ?? old.value}',
-            );
+            _libraryService.updatePodcast(old.key, audios);
+            if (notify != null) {
+              notify(message: '$updateMessage ${firstOld.album ?? old.value}');
+            } else {
+              _notificationsService.notify(
+                message: '$updateMessage ${firstOld.album ?? old.value}',
+              );
+            }
           });
         }
       }
diff --git a/lib/podcasts/view/podcast_collection_control_panel.dart b/lib/podcasts/view/podcast_collection_control_panel.dart
@@ -0,0 +1,82 @@
+import '../../app/connectivity_model.dart';
+import '../../common/view/offline_page.dart';
+import '../../common/view/snackbars.dart';
+import '../../common/view/theme.dart';
+import '../../extensions/build_context_x.dart';
+import '../../l10n/l10n.dart';
+import '../podcast_model.dart';
+import 'dart:io';
+import 'package:flutter/material.dart';
+import 'package:watch_it/watch_it.dart';
+import 'package:yaru/yaru.dart';
+
+class PodcastCollectionControlPanel extends StatelessWidget with WatchItMixin {
+  const PodcastCollectionControlPanel({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = context.t;
+    final model = di<PodcastModel>();
+
+    final isOnline = watchPropertyValue((ConnectivityModel m) => m.isOnline);
+    if (!isOnline) return const OfflineBody();
+
+    final loading =
+        watchPropertyValue((PodcastModel m) => m.checkingForUpdates);
+    final updatesOnly = watchPropertyValue((PodcastModel m) => m.updatesOnly);
+    final downloadsOnly =
+        watchPropertyValue((PodcastModel m) => m.downloadsOnly);
+
+    return YaruChoiceChipBar(
+      chipBackgroundColor: chipColor(theme),
+      selectedChipBackgroundColor: chipSelectionColor(theme, loading),
+      borderColor: chipBorder(theme, loading),
+      yaruChoiceChipBarStyle: YaruChoiceChipBarStyle.wrap,
+      clearOnSelect: false,
+      selectedFirst: false,
+      labels: [
+        Text(context.l10n.newEpisodes),
+        Text(
+          context.l10n.downloadsOnly,
+        ),
+      ],
+      isSelected: [
+        updatesOnly,
+        downloadsOnly,
+      ],
+      onSelected: loading
+          ? null
+          : (index) {
+              if (index == 0) {
+                if (updatesOnly) {
+                  model.setUpdatesOnly(false);
+                } else {
+                  model.update(
+                    updateMessage: context.l10n.newEpisodeAvailable,
+                    notify: Platform.isLinux
+                        ? null
+                        : ({required message}) {
+                            if (context.mounted) {
+                              showSnackBar(
+                                context: context,
+                                content: Text(message),
+                              );
+                            }
+                          },
+                  );
+
+                  model.setUpdatesOnly(true);
+                  model.setDownloadsOnly(false);
+                }
+              } else {
+                if (downloadsOnly) {
+                  model.setDownloadsOnly(false);
+                } else {
+                  model.setDownloadsOnly(true);
+                  model.setUpdatesOnly(false);
+                }
+              }
+            },
+    );
+  }
+}
diff --git a/lib/podcasts/view/podcast_page.dart b/lib/podcasts/view/podcast_page.dart
@@ -25,9 +25,11 @@ import '../../search/search_model.dart';
 import '../../search/search_type.dart';
 import '../../settings/settings_model.dart';
 import '../podcast_model.dart';
+import 'podcast_refresh_button.dart';
 import 'podcast_reorder_button.dart';
 import 'podcast_replay_button.dart';
 import 'podcast_sub_button.dart';
+import 'podcast_timer_button.dart';
 import 'sliver_podcast_page_list.dart';
 
 class PodcastPage extends StatelessWidget with WatchItMixin {
@@ -121,6 +123,7 @@ class PodcastPage extends StatelessWidget with WatchItMixin {
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
                     PodcastReplayButton(audios: audiosWithDownloads),
+                    const PodcastTimerButton(),
                     PodcastSubButton(
                       audios: audiosWithDownloads,
                       pageId: pageId,
@@ -129,6 +132,7 @@ class PodcastPage extends StatelessWidget with WatchItMixin {
                       audios: audiosWithDownloads,
                       pageId: pageId,
                     ),
+                    PodcastRefreshButton(pageId: pageId),
                     PodcastReorderButton(feedUrl: pageId),
                     ExploreOnlinePopup(text: title),
                   ],
diff --git a/lib/podcasts/view/podcast_refresh_button.dart b/lib/podcasts/view/podcast_refresh_button.dart
@@ -0,0 +1,36 @@
+import '../../common/view/icons.dart';
+import '../../common/view/snackbars.dart';
+import '../../l10n/l10n.dart';
+import '../../library/library_model.dart';
+import '../podcast_model.dart';
+import 'package:flutter/material.dart';
+import 'package:watch_it/watch_it.dart';
+
+class PodcastRefreshButton extends StatelessWidget {
+  const PodcastRefreshButton({
+    super.key,
+    required this.pageId,
+  });
+
+  final String pageId;
+
+  @override
+  Widget build(BuildContext context) {
+    var podcast = di<LibraryModel>().podcasts[pageId];
+
+    return IconButton(
+      tooltip: context.l10n.checkForUpdates,
+      onPressed: podcast == null
+          ? null
+          : () => di<PodcastModel>().update(
+                oldPodcasts: {
+                  pageId: podcast,
+                },
+                updateMessage: context.l10n.updateAvailable,
+                notify: ({required message}) =>
+                    showSnackBar(context: context, content: Text(message)),
+              ),
+      icon: Icon(Iconz().refresh),
+    );
+  }
+}
diff --git a/lib/podcasts/view/podcast_timer_button.dart b/lib/podcasts/view/podcast_timer_button.dart
diff --git a/lib/podcasts/view/podcasts_collection_body.dart b/lib/podcasts/view/podcasts_collection_body.dart
diff --git a/needs_translation.json b/needs_translation.json
diff --git a/test/podcast_service_test.dart b/test/podcast_service_test.dart
diff --git a/test/podcast_service_test.mocks.dart b/test/podcast_service_test.mocks.dart

Original file line number	Diff line number	Diff line change
`@@ -327,5 +327,7 @@`
`327`	`327`	`"radioTagDisclaimerSubTitle": "Manchmal senden Stationen Tags, die keinem Musikgenre entsprechen. MusicPod ist nicht für den Inhalt verantwortlich!",`
`328`	`328`	`"podcastFeedLoadingTimeout": "Das Laden des Podcast-Feeds dauert länger als gewöhnlich....",`
`329`	`329`	`"restartEpisode": "Episode von Anfang spielen",`
`330`		`- "restartAllEpisodes": "Alle Episoden von Anfang spielen"`
	`330`	`+ "restartAllEpisodes": "Alle Episoden von Anfang spielen",`
	`331`	`+ "checkForUpdates": "Auf Aktualisierung überprüfen",`
	`332`	`+ "playbackWillStopIn": "Wiedergabe wird gestoppt in: "`
`331`	`333`	`}`
Original file line number	Diff line number	Diff line change
`@@ -328,5 +328,7 @@`
`328`	`328`	`"podcastFeedLoadingTimeout": "Loading the podcast feed takes longer than usual...",`
`329`	`329`	`"gitHubClientConnectError": "Could not load online version from GitHub.",`
`330`	`330`	`"replayEpisode": "Replay episode",`
`331`		`- "replayAllEpisodes": "Replay all episodes"`
	`331`	`+ "replayAllEpisodes": "Replay all episodes",`
	`332`	`+ "checkForUpdates": "Check for updates",`
	`333`	`+ "playbackWillStopIn": "Playback will stop in: "`
`332`	`334`	`}`
Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,8 @@ class PlayerModel extends SafeChangeNotifier {`
`184`	`184`	`.replaceAll(')', '');`
`185`	`185`	`}`
`186`	`186`
	`187`	`+ void setTimer(Duration duration) => _service.setTimer(duration);`
	`188`	`+`
`187`	`189`	`@override`
`188`	`190`	`Future<void> dispose() async {`
`189`	`191`	`await _queueNameChangedSub?.cancel();`