Fix podcast/playlist search

ubuntu-flutter-community · May 9, 2024 · c0b1f5c · c0b1f5c
1 parent 80e4c7b
commit c0b1f5c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/lib/src/playlists/view/liked_audio_page.dart b/lib/src/playlists/view/liked_audio_page.dart
@@ -66,7 +66,6 @@ class LikedAudioPage extends StatelessWidget with WatchItMixin {
       audioPageType: AudioPageType.likedAudio,
       pageId: kLikedAudiosPageId,
       pageTitle: context.l10n.likedSongs,
-      // pageSubTitle: context.l10n.likedSongsSubtitle,
       pageLabel: context.l10n.likedSongsSubtitle,
       image: FallBackHeaderImage(
         child: Icon(

diff --git a/lib/src/playlists/view/playlist_page.dart b/lib/src/playlists/view/playlist_page.dart
@@ -354,6 +354,7 @@ class _PlaylistPageBody extends StatelessWidget with WatchItMixin {
               audios: audios,
               pageId: pageId,
               audioPageType: AudioPageType.playlist,
+              onSubTitleTab: onArtistTap,
             ),
         ],
       ),

diff --git a/lib/src/podcasts/podcast_model.dart b/lib/src/podcasts/podcast_model.dart
@@ -25,8 +25,8 @@ class PodcastModel extends SafeChangeNotifier {
 
   SearchResult? get searchResult => _podcastService.searchResult;
 
-  bool _searchActive = false;
-  bool get searchActive => _searchActive;
+  bool? _searchActive;
+  bool? get searchActive => _searchActive;
   void setSearchActive(bool value) {
     if (value == _searchActive) return;
     _searchActive = value;
@@ -107,7 +107,7 @@ class PodcastModel extends SafeChangeNotifier {
   }) async {
     await _podcastService.init(forceInit: forceInit);
 
-    _searchActive = _libraryService.podcasts.isEmpty;
+    _searchActive ??= _libraryService.podcasts.isEmpty;
 
     _country ??= Country.values.firstWhereOrNull(
       (c) => c.code == (_libraryService.lastCountryCode ?? countryCode),

diff --git a/lib/src/podcasts/view/podcast_page.dart b/lib/src/podcasts/view/podcast_page.dart
@@ -38,6 +38,8 @@ class PodcastPage extends StatelessWidget with WatchItMixin {
     void onTap(text) {
       final podcastModel = getIt<PodcastModel>();
       Navigator.of(context).maybePop();
+      getIt<LibraryModel>().setIndex(2);
+      podcastModel.setSearchActive(true);
       podcastModel.setSearchQuery(text);
       podcastModel.search(searchQuery: text);
     }

diff --git a/lib/src/podcasts/view/podcasts_page.dart b/lib/src/podcasts/view/podcasts_page.dart
@@ -43,7 +43,8 @@ class _PodcastsPageState extends State<PodcastsPage> {
 
     final model = getIt<PodcastModel>();
 
-    final searchActive = watchPropertyValue((PodcastModel m) => m.searchActive);
+    final searchActive =
+        watchPropertyValue((PodcastModel m) => m.searchActive ?? false);
     final setSearchActive = model.setSearchActive;
 
     final search = model.search;
@@ -81,7 +82,7 @@ class _PodcastsPageState extends State<PodcastsPage> {
               padding: appBarActionSpacing,
               child: SearchButton(
                 active: searchActive,
-                onPressed: () => setSearchActive(!searchActive),
+                onPressed: () => setSearchActive(!(searchActive)),
               ),
             ),
           ),

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: musicpod
 description: Ubuntu music, radio and podcast player.
-version: 1.3.8
+version: 1.3.9
 
 publish_to: "none"