reya/coop
1
0
Fork 0
Code Issues Pull Requests Releases Activity

feat: add bottom bar

Browse Source
This commit is contained in:
reya
2024-11-22 14:09:20 +07:00
parent 8bf497bdc7
commit f448508b31
11 changed files with 258 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
crates/ui/src/views/app.rs
View File

@@ -1,34 +1,23 @@
use components::theme::ActiveTheme;
use gpui::*;
use super::{chat_space::ChatSpace, onboarding::Onboarding};
use crate::state::AppState;
use super::{chatspace::ChatSpaceView, setup::SetupView};
pub struct AppView {
onboarding: Model<Option<AnyView>>, // TODO: create onboarding view
setup: View<SetupView>,
chat_space: View<ChatSpaceView>,
onboarding: View<Onboarding>,
chat_space: View<ChatSpace>,
}
impl AppView {
pub fn new(cx: &mut ViewContext<'_, Self>) -> AppView {
// Onboarding model
let onboarding = cx.new_model(|_| None);
// Setup view
let setup = cx.new_view(SetupView::new);
let onboarding = cx.new_view(Onboarding::new);
// Chat Space view
let chat_space = cx.new_view(ChatSpaceView::new);
cx.foreground_executor()
.spawn(async move {
// TODO: create onboarding view for the first time open app
})
.detach();
let chat_space = cx.new_view(ChatSpace::new);
AppView {
onboarding,
setup,
chat_space,
}
}
@@ -39,18 +28,14 @@ impl Render for AppView {
let mut content = div().size_full().flex().items_center().justify_center();
if cx.global::<AppState>().accounts.is_empty() {
content = content.child(self.setup.clone())
content = content.child(self.onboarding.clone())
} else {
content = content.child(self.chat_space.clone())
}
if let Some(onboarding) = self.onboarding.read(cx).as_ref() {
content = content.child(onboarding.clone())
}
div()
.bg(cx.theme().background)
.text_color(rgb(0xFFFFFF))
.text_color(cx.theme().foreground)
.size_full()
.child(content)
}

113
crates/ui/src/views/chat_space/bottom_bar.rs Normal file
View File

@@ -0,0 +1,113 @@
use client::NostrClient;
use components::theme::ActiveTheme;
use gpui::*;
use nostr_sdk::prelude::*;
use prelude::FluentBuilder;
use std::time::Duration;
use crate::state::AppState;
#[derive(Clone, IntoElement)]
struct Account {
#[allow(dead_code)] // TODO: remove this
public_key: PublicKey,
metadata: Model<Option<Metadata>>,
}
impl Account {
pub fn new(public_key: PublicKey, cx: &mut WindowContext) -> Self {
let client = cx.global::<NostrClient>().client;
let metadata = cx.new_model(|_| None);
let async_metadata = metadata.clone();
let mut async_cx = cx.to_async();
cx.foreground_executor()
.spawn(async move {
match client
.fetch_metadata(public_key, Some(Duration::from_secs(2)))
.await
{
Ok(metadata) => {
async_metadata
.update(&mut async_cx, |a, b| {
*a = Some(metadata);
b.notify()
})
.unwrap();
}
Err(_) => todo!(),
}
})
.detach();
Self {
public_key,
metadata,
}
}
}
impl RenderOnce for Account {
fn render(self, cx: &mut WindowContext) -> impl IntoElement {
match self.metadata.read(cx) {
Some(metadata) => div()
.w_8()
.h_12()
.px_1()
.flex()
.items_center()
.justify_center()
.border_b_2()
.border_color(cx.theme().primary_active)
.when_some(metadata.picture.clone(), |parent, picture| {
parent.child(
img(picture)
.size_6()
.rounded_full()
.object_fit(ObjectFit::Cover),
)
}),
None => div(), // TODO: add fallback image
}
}
}
pub struct BottomBar {
accounts: Vec<Account>,
}
impl BottomBar {
pub fn new(cx: &mut ViewContext<'_, Self>) -> BottomBar {
let state: Vec<PublicKey> = cx
.global::<AppState>()
.accounts
.clone()
.into_iter()
.collect();
let win_cx = cx.window_context();
let accounts = state
.into_iter()
.map(|pk| Account::new(pk, win_cx))
.collect::<Vec<_>>();
BottomBar { accounts }
}
}
impl Render for BottomBar {
fn render(&mut self, _cx: &mut ViewContext<Self>) -> impl IntoElement {
div()
.h_12()
.px_3()
.flex_shrink_0()
.flex()
.items_center()
.justify_center()
.gap_1()
.children(self.accounts.clone())
}
}

56
crates/ui/src/views/chat_space/mod.rs Normal file
View File

@@ -0,0 +1,56 @@
use bottom_bar::BottomBar;
use components::{
resizable::{h_resizable, resizable_panel, ResizablePanelGroup},
theme::ActiveTheme,
};
use gpui::*;
pub mod bottom_bar;
pub struct ChatSpace {
layout: View<ResizablePanelGroup>,
}
impl ChatSpace {
pub fn new(cx: &mut ViewContext<'_, Self>) -> Self {
let bottom_bar = cx.new_view(BottomBar::new);
// TODO: add chat list view
let layout = cx.new_view(|cx| {
h_resizable(cx)
.child(
resizable_panel().size(px(260.)).content(move |cx| {
div()
.size_full()
.bg(cx.theme().secondary)
.flex()
.flex_col()
.child(
div()
.flex_1()
.flex()
.items_center()
.justify_center()
.w_full()
.child("Chat List"),
)
.child(bottom_bar.clone())
.into_any_element()
}),
cx,
)
.child(
resizable_panel().content(|_| div().child("Content").into_any_element()),
cx,
)
});
Self { layout }
}
}
impl Render for ChatSpace {
fn render(&mut self, _cx: &mut ViewContext<Self>) -> impl IntoElement {
div().relative().size_full().child(self.layout.clone())
}
}

24
crates/ui/src/views/chatspace.rs
View File

@@ -1,24 +0,0 @@
use gpui::*;
pub struct ChatSpaceView {
pub text: SharedString,
}
impl ChatSpaceView {
pub fn new(_cx: &mut ViewContext<'_, Self>) -> ChatSpaceView {
ChatSpaceView {
text: "chat".into(),
}
}
}
impl Render for ChatSpaceView {
fn render(&mut self, _cx: &mut ViewContext<Self>) -> impl IntoElement {
div()
.flex()
.size_full()
.justify_center()
.items_center()
.child(format!("Hello, {}!", &self.text))
}
}

4
crates/ui/src/views/mod.rs
View File

@@ -1,3 +1,3 @@
pub mod app;
pub mod chatspace;
pub mod setup;
pub mod chat_space;
pub mod onboarding;

10
crates/ui/src/views/setup.rs → crates/ui/src/views/onboarding.rs
View File

@@ -8,12 +8,12 @@ use nostr_sdk::prelude::*;
use crate::state::AppState;
pub struct SetupView {
pub struct Onboarding {
input: View<TextInput>,
}
impl SetupView {
pub fn new(cx: &mut ViewContext<'_, Self>) -> SetupView {
impl Onboarding {
pub fn new(cx: &mut ViewContext<'_, Self>) -> Self {
let input = cx.new_view(|cx| {
let mut input = TextInput::new(cx);
input.set_size(components::Size::Medium, cx);
@@ -36,11 +36,11 @@ impl SetupView {
})
.detach();
SetupView { input }
Self { input }
}
}
impl Render for SetupView {
impl Render for Onboarding {
fn render(&mut self, _cx: &mut ViewContext<Self>) -> impl IntoElement {
div()
.size_1_3()