stuff

src/bin/client/ui/main.rs

@@ -1,6 +1,6 @@
 use std::hash::Hash;
 
-use crate::Rsc;
+use crate::{Rsc, session::Session};
 
 use super::*;
 
@@ -9,24 +9,25 @@ pub const SIZE: u32 = 20;
 #[derive(PartialEq, Eq, Hash, Clone, Copy)]
 pub enum MainView {
     Channel,
+    Friends,
     Server,
 }
 
-pub fn main_view(rsc: &mut Rsc) -> WeakWidget {
+pub fn main_view(rsc: &mut Rsc, session: Session) -> WeakWidget {
     let mut view = WidgetSelector::new(MainView::Channel, channel::view(rsc));
-    view.set(MainView::Server, server::view(rsc));
+    view.set(MainView::Server, server::view(rsc, &session));
     let view = view.add(rsc);
-    (top_bar(rsc, view), view).span(Dir::DOWN).add(rsc)
-}
-
-pub fn top_bar(rsc: &mut Rsc, view: WeakWidget<WidgetSelector<MainView>>) -> WeakWidget {
-    let [channel, server] = tabs(
+    let [channel, friends, server] = tabs(
         rsc,
         view,
-        [("channel", MainView::Channel), ("server", MainView::Server)],
+        [
+            ("channel", MainView::Channel),
+            ("friends", MainView::Friends),
+            ("server", MainView::Server),
+        ],
     );
-    rect(Color::BLACK.alpha(150))
+    let top_bar = rect(Color::BLACK.alpha(150))
         .height(50)
-        .foreground((channel, server).span(Dir::RIGHT))
-        .add(rsc)
+        .foreground((channel, friends, server).span(Dir::RIGHT));
+    (top_bar, view).span(Dir::DOWN).add(rsc)
 }