Show badge in sidebar for updates (#148)

ubuntu-flutter-community · Aug 13, 2023 · 50712a0 · 50712a0
1 parent 1407ff4
commit 50712a0
Show file tree

Hide file tree

Showing 14 changed files with 120 additions and 63 deletions.
diff --git a/lib/app/app.dart b/lib/app/app.dart
@@ -183,6 +183,7 @@ class _AppState extends State<App> {
     context.select((LibraryModel m) => m.pinnedAlbums.length);
     context.select((LibraryModel m) => m.starredStations.length);
     context.select((LibraryModel m) => m.playlists.length);
+    context.select<LibraryModel, int>((m) => m.podcastUpdates.length);
 
     if (!ready) {
       return SplashScreen(
@@ -244,6 +245,8 @@ class _AppState extends State<App> {
       unStarStation: libraryModel.unStarStation,
       play: play,
       countryCode: _countryCode,
+      podcastUpdateAvailable: libraryModel.podcastUpdateAvailable,
+      removePodcastUpdate: libraryModel.removePodcastUpdate,
     );
 
     final yaruMasterDetailPage = MasterDetailPage(

diff --git a/lib/app/common/audio_page.dart b/lib/app/common/audio_page.dart
@@ -38,6 +38,7 @@ class AudioPage extends StatelessWidget {
     this.albumFlex = 4,
     this.showAudioTileHeader = true,
     this.countryCode,
+    this.removeUpdate,
   });
 
   final Set<Audio>? audios;
@@ -63,6 +64,7 @@ class AudioPage extends StatelessWidget {
   final String? titleLabel, artistLabel, albumLabel;
   final int titleFlex, artistFlex, albumFlex;
   final String? countryCode;
+  final void Function(String id)? removeUpdate;
 
   final void Function({
     required String text,
@@ -102,6 +104,7 @@ class AudioPage extends StatelessWidget {
       pageTitleWidget: pageTitleWidget,
       showAudioPageHeader: showAudioPageHeader,
       showAudioTileHeader: showAudioTileHeader,
+      removeUpdate: () => removeUpdate?.call(pageId),
     );
 
     return YaruDetailPage(

diff --git a/lib/app/common/audio_page_body.dart b/lib/app/common/audio_page_body.dart
@@ -44,6 +44,7 @@ class AudioPageBody extends StatefulWidget {
     this.albumFlex = 4,
     this.showAudioTileHeader = true,
     this.countryCode,
+    this.removeUpdate,
   });
 
   final Set<Audio>? audios;
@@ -67,6 +68,7 @@ class AudioPageBody extends StatefulWidget {
   final String? titleLabel, artistLabel, albumLabel;
   final int titleFlex, artistFlex, albumFlex;
   final String? countryCode;
+  final void Function()? removeUpdate;
 
   final void Function({
     required String text,
@@ -233,23 +235,9 @@ class _AudioPageBodyState extends State<AudioPageBody> {
                 final audio = sortedAudios.elementAt(index);
                 final audioSelected = currentAudio == audio;
 
-                final likeButton = LikeButton(
-                  key: ObjectKey(audio),
-                  pageId: widget.pageId,
-                  audio: audio,
-                  audioSelected: audioSelected,
-                  audioPageType: widget.audioPageType,
-                  isLiked: liked,
-                  removeLikedAudio: removeLikedAudio,
-                  addLikedAudio: addLikedAudio,
-                  removeAudioFromPlaylist: removeAudioFromPlaylist,
-                  getTopFivePlaylistNames: getTopFivePlaylistNames,
-                  addAudioToPlaylist: addAudioToPlaylist,
-                  addPlaylist: addPlaylist,
-                );
-
                 if (audio.audioType == AudioType.podcast) {
                   return PodcastAudioTile(
+                    removeUpdate: () => widget.removeUpdate?.call(),
                     isExpanded: audioSelected,
                     audio: audio,
                     isPlayerPlaying: isPlaying,
@@ -265,16 +253,29 @@ class _AudioPageBodyState extends State<AudioPageBody> {
                   );
                 }
 
+                final likeButton = LikeButton(
+                  key: ObjectKey(audio),
+                  pageId: widget.pageId,
+                  audio: audio,
+                  audioSelected: audioSelected,
+                  audioPageType: widget.audioPageType,
+                  isLiked: liked,
+                  removeLikedAudio: removeLikedAudio,
+                  addLikedAudio: addLikedAudio,
+                  removeAudioFromPlaylist: removeAudioFromPlaylist,
+                  getTopFivePlaylistNames: getTopFivePlaylistNames,
+                  addAudioToPlaylist: addAudioToPlaylist,
+                  addPlaylist: addPlaylist,
+                );
+
                 return AudioTile(
                   titleFlex: widget.titleFlex,
                   artistFlex: widget.artistFlex,
                   albumFlex: widget.albumFlex,
                   onTextTap: widget.onTextTap,
                   isPlayerPlaying: isPlaying,
                   pause: pause,
-                  play: () async {
-                    await play(newAudio: audio);
-                  },
+                  play: play,
                   startPlaylist: widget.audios == null
                       ? null
                       : () => startPlaylist(

diff --git a/lib/app/common/audio_tile.dart b/lib/app/common/audio_tile.dart
@@ -27,7 +27,7 @@ class AudioTile extends StatelessWidget {
   final void Function()? onLike;
   final Widget? likeIcon;
   final bool isPlayerPlaying;
-  final Future<void> Function() play;
+  final Future<void> Function({bool bigPlay, Audio? newAudio}) play;
   final Future<void> Function() resume;
   final void Function()? startPlaylist;
   final void Function() pause;
@@ -53,17 +53,17 @@ class AudioTile extends StatelessWidget {
         borderRadius: BorderRadius.circular(kYaruButtonRadius),
       ),
       onTap: () {
-        if (isPlayerPlaying && selected) {
-          pause();
-        } else {
-          if (selected) {
+        if (selected) {
+          if (isPlayerPlaying) {
+            pause();
+          } else {
             resume();
+          }
+        } else {
+          if (startPlaylist != null) {
+            startPlaylist!();
           } else {
-            if (startPlaylist != null) {
-              startPlaylist!();
-            } else {
-              play();
-            }
+            play(newAudio: audio);
           }
         }
       },

diff --git a/lib/app/library_model.dart b/lib/app/library_model.dart
@@ -16,6 +16,7 @@ class LibraryModel extends SafeChangeNotifier {
   StreamSubscription<bool>? _stationsSub;
   StreamSubscription<int?>? _localAudioIndexSub;
   StreamSubscription<bool>? _lastPositionsSub;
+  StreamSubscription<bool>? _updatesChangedSub;
 
   bool ready = false;
 
@@ -37,6 +38,8 @@ class LibraryModel extends SafeChangeNotifier {
         _service.starredStationsChanged.listen((event) => notifyListeners());
     _lastPositionsSub =
         _service.lastPositionsChanged.listen((_) => notifyListeners());
+    _updatesChangedSub =
+        _service.updatesChanged.listen((_) => notifyListeners());
 
     ready = true;
     notifyListeners();
@@ -51,6 +54,7 @@ class LibraryModel extends SafeChangeNotifier {
     _podcastsSub?.cancel();
     _stationsSub?.cancel();
     _lastPositionsSub?.cancel();
+    _updatesChangedSub?.cancel();
 
     super.dispose();
   }
@@ -145,15 +149,15 @@ class LibraryModel extends SafeChangeNotifier {
 
   Map<String, Set<Audio>> get podcasts => _service.podcasts;
   int get podcastsLength => podcasts.length;
-  void addPodcast(String name, Set<Audio> audios) =>
-      _service.addPodcast(name, audios);
-  void updatePodcast(String name, Set<Audio> audios) =>
-      _service.updatePodcast(name, audios);
+  void addPodcast(String feedUrl, Set<Audio> audios) =>
+      _service.addPodcast(feedUrl, audios);
+  void updatePodcast(String feedUrl, Set<Audio> audios) =>
+      _service.updatePodcast(feedUrl, audios);
 
-  void removePodcast(String name) => _service.removePodcast(name);
+  void removePodcast(String feedUrl) => _service.removePodcast(feedUrl);
 
-  bool podcastSubscribed(String? name) =>
-      name == null ? false : podcasts.containsKey(name);
+  bool podcastSubscribed(String? feedUrl) =>
+      feedUrl == null ? false : podcasts.containsKey(feedUrl);
 
   Map<String, String> get podcastsToFeedUrls => _service.podcastsToFeedUrls;
   void addPlaylistFeed(String playlist, String feedUrl) =>
@@ -162,6 +166,13 @@ class LibraryModel extends SafeChangeNotifier {
   bool get showSubbedPodcasts =>
       audioPageType == null || audioPageType == AudioPageType.podcast;
 
+  bool podcastUpdateAvailable(String feedUrl) =>
+      _service.updateAvailable(feedUrl);
+
+  Set<String> get podcastUpdates => _service.podcastUpdates;
+
+  void removePodcastUpdate(String feedUrl) => _service.removeUpdate(feedUrl);
+
   //
   // Albums
   //

diff --git a/lib/app/local_audio/local_audio_search_page.dart b/lib/app/local_audio/local_audio_search_page.dart
@@ -199,9 +199,7 @@ class _Titles extends StatelessWidget {
                   showTrack: false,
                   isPlayerPlaying: isPlaying,
                   pause: pause,
-                  play: () async {
-                    await play(newAudio: audio);
-                  },
+                  play: play,
                   resume: resume,
                   key: ValueKey(audio),
                   selected: audioSelected,

diff --git a/lib/app/master_items.dart b/lib/app/master_items.dart
@@ -44,6 +44,8 @@ List<MasterItem> createMasterItems({
   required void Function(String name) unStarStation,
   required Future<void> Function({bool bigPlay, Audio? newAudio}) play,
   String? countryCode,
+  required bool Function(String feedUrl) podcastUpdateAvailable,
+  required void Function(String feedUrl) removePodcastUpdate,
 }) {
   return [
     MasterItem(
@@ -116,10 +118,12 @@ List<MasterItem> createMasterItems({
     for (final podcast in subbedPodcasts.entries)
       MasterItem(
         tileBuilder: (context) => PodcastPage.createTitle(
+          context: context,
           title: podcast.value.firstOrNull?.album ??
               podcast.value.firstOrNull?.title ??
               podcast.value.firstOrNull.toString(),
           enabled: showSubbedPodcasts,
+          update: podcastUpdateAvailable(podcast.key),
         ),
         builder: (context) => isOnline
             ? PodcastPage(
@@ -133,6 +137,7 @@ List<MasterItem> createMasterItems({
                 removePodcast: removePodcast,
                 imageUrl: podcast.value.firstOrNull?.albumArtUrl ??
                     podcast.value.firstOrNull?.imageUrl,
+                removePodcastUpdate: removePodcastUpdate,
               )
             : const OfflinePage(),
         iconBuilder: (context, selected) => PodcastPage.createIcon(

diff --git a/lib/app/player/player_model.dart b/lib/app/player/player_model.dart
@@ -216,7 +216,11 @@ class PlayerModel extends SafeChangeNotifier {
 
   Future<void> resume() async {
     if (audio == null) return;
-    await _player.playOrPause();
+    if (_firstPlay) {
+      play(bigPlay: true);
+    } else {
+      await _player.playOrPause();
+    }
   }
 
   Future<void> init() async {

diff --git a/lib/app/podcasts/podcast_audio_tile.dart b/lib/app/podcasts/podcast_audio_tile.dart
@@ -25,6 +25,7 @@ class PodcastAudioTile extends StatelessWidget {
     required this.lastPosition,
     this.isExpanded = false,
     this.countryCode,
+    this.removeUpdate,
   });
 
   final Audio audio;
@@ -33,7 +34,9 @@ class PodcastAudioTile extends StatelessWidget {
   final void Function() pause;
   final Future<void> Function() resume;
   final void Function()? startPlaylist;
-  final Future<void> Function() play;
+  final Future<void> Function({bool bigPlay, Audio? newAudio}) play;
+  final void Function()? removeUpdate;
+
   final Duration? lastPosition;
   final bool isExpanded;
   final String? countryCode;
@@ -78,18 +81,19 @@ class PodcastAudioTile extends StatelessWidget {
                         )
                       : const Icon(YaruIcons.media_play),
                   onPressed: () {
-                    if (isPlayerPlaying && selected) {
-                      pause();
-                    } else {
-                      if (selected) {
+                    if (selected) {
+                      if (isPlayerPlaying) {
+                        pause();
+                      } else {
                         resume();
+                      }
+                    } else {
+                      if (startPlaylist != null) {
+                        startPlaylist!();
                       } else {
-                        if (startPlaylist != null) {
-                          startPlaylist!();
-                        } else {
-                          play();
-                        }
+                        play(newAudio: audio);
                       }
+                      removeUpdate?.call();
                     }
                   },
                 ),

diff --git a/lib/app/podcasts/podcast_page.dart b/lib/app/podcasts/podcast_page.dart
@@ -1,8 +1,8 @@
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:musicpod/app/common/audio_page.dart';
-import 'package:musicpod/constants.dart';
 import 'package:musicpod/app/common/safe_network_image.dart';
+import 'package:musicpod/constants.dart';
 import 'package:musicpod/data/audio.dart';
 import 'package:musicpod/l10n/l10n.dart';
 import 'package:yaru_icons/yaru_icons.dart';
@@ -20,6 +20,7 @@ class PodcastPage extends StatelessWidget {
     required this.addPodcast,
     required this.title,
     this.countryCode,
+    required this.removePodcastUpdate,
   });
 
   static Widget createIcon({
@@ -63,17 +64,25 @@ class PodcastPage extends StatelessWidget {
   }
 
   static Widget createTitle({
+    required BuildContext context,
     required bool enabled,
     required String title,
+    required update,
   }) {
     return Opacity(
       opacity: enabled ? 1 : 0.5,
-      child: Text(title),
+      child: Badge(
+        alignment: Alignment.centerRight,
+        isLabelVisible: update,
+        label: Text(context.l10n.newEpisode),
+        child: Text(title),
+      ),
     );
   }
 
-  final void Function(String name) removePodcast;
-  final void Function(String name, Set<Audio> audios) addPodcast;
+  final void Function(String feedUrl) removePodcast;
+  final void Function(String feedUrl, Set<Audio> audios) addPodcast;
+  final void Function(String feedUrl) removePodcastUpdate;
   final void Function({
     required String text,
     required AudioType audioType,
@@ -90,6 +99,7 @@ class PodcastPage extends StatelessWidget {
     final theme = Theme.of(context);
     final genre = audios?.firstWhereOrNull((e) => e.genre != null)?.genre;
     return AudioPage(
+      removeUpdate: removePodcastUpdate,
       countryCode: countryCode,
       showAudioTileHeader: false,
       sort: false,