kill sidebar

src/ui/play_queue.blp

@@ -1,36 +1,24 @@
 using Gtk 4.0;
-using Adw 1;
 
-template $UiPlayQueue: Adw.NavigationPage {
+template $UiPlayQueue: Box {
-  title: _("Play queue");
+  ScrolledWindow {
+    hexpand: true;
 
-  Adw.ToolbarView {
+    ListView view {
-    [top]
+      show-separators: true;
-    Adw.HeaderBar {
+      single-click-activate: true;
-      Button {
-        icon-name: "edit-clear-all";
-        clicked => $on_clear ();
-        sensitive: bind template.can_clear_all;
-      }
-    }
 
-    ScrolledWindow {
+      activate => $on_row_activated ();
-      ListView view {
-        show-separators: true;
-        single-click-activate: true;
 
-        activate => $on_row_activated ();
+      model: NoSelection {
+        model: bind template.playbin as <$Playbin>.play_queue;
+      };
 
-        model: NoSelection {
+      factory: SignalListItemFactory {
-          model: bind template.playbin as <$Playbin>.play_queue;
+        setup => $on_song_list_setup ();
-        };
+        bind => $on_song_list_bind ();
-
+        unbind => $on_song_list_unbind ();
-        factory: SignalListItemFactory {
+      };
-          setup => $on_song_list_setup ();
-          bind => $on_song_list_bind ();
-          unbind => $on_song_list_unbind ();
-        };
-      }
     }
   }
 }

src/ui/play_queue.vala

@@ -108,7 +108,7 @@ class Ui.PlayQueueSong : Gtk.ListBoxRow {
 }
 
 [GtkTemplate (ui = "/eu/callcc/audrey/ui/play_queue.ui")]
-public class Ui.PlayQueue : Adw.NavigationPage {
+public class Ui.PlayQueue : Gtk.Box {
     private Playbin _playbin;
     public Playbin playbin {
         get { return _playbin; }
@@ -118,17 +118,14 @@ public class Ui.PlayQueue : Adw.NavigationPage {
 
             _playbin.play_queue.items_changed.connect (this.on_store_items_changed);
             this.can_clear_all = _playbin.play_queue.get_n_items () > 0;
-
-            _playbin.notify["play-queue-position"].connect (() => {
-            });
         }
     }
 
     public bool can_clear_all { get; private set; }
 
-    [GtkCallback] private void on_clear () {
+    /*[GtkCallback] private void on_clear () {
         this.playbin.clear ();
-    }
+    }*/
 
     private void on_store_items_changed (GLib.ListModel store, uint position, uint removed, uint added) {
         this.can_clear_all = store.get_n_items () > 0;

src/ui/window.blp

@@ -10,87 +10,40 @@ template $UiWindow: Adw.ApplicationWindow {
     can-open: false; // broken in libadwaita
 
     [content]
-    Adw.OverlaySplitView {
+    Adw.ToolbarView {
       margin-bottom: bind bottom_sheet.bottom-bar-height;
 
-      vexpand: true;
+      [top]
+      Adw.HeaderBar {
+        [start]
+        Button {
+          icon-name: "media-playlist-shuffle";
+          sensitive: bind template.can_click_shuffle_all;
+          clicked => $shuffle_all ();
+        }
 
-      [sidebar]
+        title-widget: Adw.ViewSwitcher {
-      Adw.NavigationPage {
+          stack: stack;
-        width-request: 100;
+          policy: wide;
-        title: _("audrey");
+        };
 
-        Adw.ToolbarView {
+        [end]
-          [top]
+        Button {
-          Adw.HeaderBar {
+          icon-name: "applications-system";
-            show-title: false;
+          clicked => $show_setup_dialog ();
-
-            [end]
-            Button {
-              icon-name: "applications-system";
-              clicked => $show_setup_dialog ();
-            }
-          }
-
-          content: Box {
-            orientation: vertical;
-
-            ListBox sidebar {
-              styles [
-                "navigation-sidebar",
-              ]
-
-              row-activated => $on_sidebar_row_activated();
-
-              ListBoxRow sidebar_play_queue {
-                Label {
-                  xalign: 0;
-                  label: _("Play queue");
-                }
-              }
-            }
-
-            Separator {}
-
-            ListBox {
-              selection-mode: none;
-
-              styles [
-                "navigation-sidebar",
-              ]
-
-              Adw.ButtonRow shuffle_all_tracks {
-                title: _("Shuffle all tracks");
-                start-icon-name: "media-playlist-shuffle";
-                sensitive: false;
-              }
-            }
-
-            Separator {
-              styles [
-                "spacer",
-              ]
-              vexpand: true;
-            }
-
-            Picture {
-              paintable: bind template.playing_cover_art;
-            }
-          };
         }
       }
 
-      [content]
+      content: Adw.ViewStack stack {
-      Stack stack {
+        Adw.ViewStackPage {
-        StackPage {
-          name: "play_queue";
           title: _("Play queue");
+          icon-name: "media-playback-start";
 
           child: $UiPlayQueue play_queue {
             playbin: bind template.playbin;
           };
         }
-      }
+      };
     }
 
     [bottom-bar]

src/ui/window.vala

@@ -1,12 +1,8 @@
 [GtkTemplate (ui = "/eu/callcc/audrey/ui/window.ui")]
 class Ui.Window : Adw.ApplicationWindow {
-    [GtkChild] private unowned Gtk.ListBox sidebar;
-    [GtkChild] private unowned Gtk.ListBoxRow sidebar_play_queue;
-    [GtkChild] private unowned Gtk.Stack stack;
-
     [GtkChild] public unowned Ui.PlayQueue play_queue;
     [GtkChild] public unowned Ui.Playbar playbar;
-    [GtkChild] public unowned Adw.ButtonRow shuffle_all_tracks;
+    //[GtkChild] public unowned Adw.ButtonRow shuffle_all_tracks;
 
     private Setup setup;
 
@@ -79,11 +75,10 @@ class Ui.Window : Adw.ApplicationWindow {
         this.setup.connected.connect ((api) => {
             this.api = api;
             this.playbin.api = api;
+            this.can_click_shuffle_all = true;
         });
         this.setup.load ();
 
-        this.sidebar.select_row (this.sidebar.get_row_at_index (0));
-
         this.playbin.new_track.connect (() => {
             this.now_playing (this.playbin.play_queue.get_item (this.playbin.play_queue_position) as Subsonic.Song);
         });
@@ -92,33 +87,28 @@ class Ui.Window : Adw.ApplicationWindow {
             this.playing_cover_art = null;
             this.song = null;
         });
-
-        this.shuffle_all_tracks.sensitive = true;
-        this.shuffle_all_tracks.activated.connect (() => {
-            this.shuffle_all_tracks.sensitive = false;
-            this.playbin.clear ();
-            api.get_random_songs.begin (null, (song) => {
-                this.playbin.append_track (song);
-            }, (obj, res) => {
-                try {
-                    api.get_random_songs.end (res);
-                } catch (Error e) {
-                    error ("could not get random songs: %s", e.message);
-                }
-                this.shuffle_all_tracks.sensitive = true;
-
-                this.playbin.select_track (0);
-            });
-        });
-    }
-
-    [GtkCallback] private void on_sidebar_row_activated (Gtk.ListBoxRow row) {
-        if (row == this.sidebar_play_queue) {
-            this.stack.set_visible_child_name("play_queue");
-        }
     }
 
     [GtkCallback] private void show_setup_dialog () {
         this.setup.present (this);
     }
+
+    public bool can_click_shuffle_all { get; private set; default = false; }
+
+    [GtkCallback] private void shuffle_all () {
+        this.can_click_shuffle_all = false;
+        this.playbin.clear ();
+        api.get_random_songs.begin (null, (song) => {
+            this.playbin.append_track (song);
+        }, (obj, res) => {
+            try {
+                api.get_random_songs.end (res);
+            } catch (Error e) {
+                error ("could not get random songs: %s", e.message);
+            }
+            this.can_click_shuffle_all = true;
+
+            this.playbin.select_track (0);
+        });
+    }
 }