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

use instant

Browse Source
This commit is contained in:
Ren Amamiya
2026-07-28 16:39:09 +07:00
parent 5ddae637f6
commit 0faa8694f8
38 changed files with 72 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/workspace/Cargo.toml
View File

@@ -17,6 +17,7 @@ person = { path = "../person" }
gpui.workspace = true
nostr-sdk.workspace = true
instant.workspace = true
nostr-connect.workspace = true
anyhow.workspace = true

2
crates/workspace/src/dialogs/import.rs
View File

@@ -1,4 +1,4 @@
use std::time::Duration;
use instant::Duration;
use anyhow::{Error, anyhow};
use gpui::prelude::FluentBuilder;

2
crates/workspace/src/dialogs/restore.rs
View File

@@ -1,4 +1,4 @@
use std::time::Duration;
use instant::Duration;
use anyhow::Error;
use device::DeviceRegistry;

2
crates/workspace/src/dialogs/screening.rs
View File

@@ -1,5 +1,4 @@
use std::collections::HashMap;
use std::time::Duration;
use anyhow::Error;
use common::TimestampExt;
@@ -8,6 +7,7 @@ use gpui::{
App, AppContext, Context, Div, Entity, InteractiveElement, IntoElement, ParentElement, Render,
SharedString, Styled, Subscription, Task, Window, div, px, relative, uniform_list,
};
use instant::Duration;
use nostr_sdk::prelude::*;
use person::{Person, PersonRegistry, shorten_pubkey};
use smallvec::{SmallVec, smallvec};

59
crates/workspace/src/lib.rs
View File

@@ -79,20 +79,16 @@ impl Workspace {
let device = DeviceRegistry::global(cx);
let nostr = NostrRegistry::global(cx);
let dock = cx.new(|cx| DockArea::new(window, cx));
let dock = cx.new(|cx| {
let mut this = DockArea::new(window, cx);
let left = DockItem::panel(Arc::new(sidebar::init(window, cx)));
this.set_left_dock(left, Some(SIDEBAR_WIDTH), true, window, cx);
this
});
let image_cache = CoopImageCache::new(IMAGE_CACHE_SIZE, cx);
let mut subscriptions = smallvec![];
subscriptions.push(
// Observe sign in state changes
cx.observe_in(&nostr, window, move |this, nostr, window, cx| {
if nostr.read(cx).current_user().is_some() {
this.set_center_layout(window, cx);
}
}),
);
subscriptions.push(
// Observe system appearance and update theme
cx.observe_window_appearance(window, |_this, window, cx| {
@@ -105,11 +101,7 @@ impl Workspace {
cx.subscribe_in(&nostr, window, move |this, _state, event, window, cx| {
match event {
StateEvent::SignerChanged => {
this.set_center_layout(window, cx);
cx.defer_in(window, |_this, window, cx| {
window.close_all_modals(cx);
});
window.close_all_modals(cx);
}
StateEvent::NoSigner => {
this.import_identity(window, cx);
@@ -241,9 +233,15 @@ impl Workspace {
}),
);
// Set the layout at the end of cycle
cx.defer_in(window, |this, window, cx| {
this.set_layout(window, cx);
let dock = this.dock.downgrade();
let greeter = Arc::new(greeter::init(window, cx));
let tabs = DockItem::tabs(vec![greeter], None, &dock, window, cx);
let center = DockItem::split(Axis::Vertical, vec![tabs], &dock, window, cx);
this.dock.update(cx, |this, cx| {
this.set_center(center, window, cx);
});
});
Self {
@@ -281,29 +279,6 @@ impl Workspace {
.collect()
}
/// Set the dock layout
fn set_layout(&mut self, window: &mut Window, cx: &mut Context<Self>) {
let left = DockItem::panel(Arc::new(sidebar::init(window, cx)));
// Update the dock layout with sidebar on the left
self.dock.update(cx, |this, cx| {
this.set_left_dock(left, Some(SIDEBAR_WIDTH), true, window, cx);
});
}
/// Set the center dock layout
fn set_center_layout(&mut self, window: &mut Window, cx: &mut Context<Self>) {
let dock = self.dock.downgrade();
let greeter = Arc::new(greeter::init(window, cx));
let tabs = DockItem::tabs(vec![greeter], None, &dock, window, cx);
let center = DockItem::split(Axis::Vertical, vec![tabs], &dock, window, cx);
// Update the layout with center dock
self.dock.update(cx, |this, cx| {
this.set_center(center, window, cx);
});
}
/// Handle command events
fn on_command(&mut self, command: &Command, window: &mut Window, cx: &mut Context<Self>) {
match command {
@@ -834,7 +809,7 @@ impl Render for Workspace {
let notification_layer = Root::render_notification_layer(window, cx);
div()
.id(SharedString::from("workspace"))
.id("workspace")
.on_action(cx.listener(Self::on_command))
.relative()
.size_full()

2
crates/workspace/src/panels/backup.rs
View File

@@ -1,4 +1,4 @@
use std::time::Duration;
use instant::Duration;
use anyhow::Error;
use gpui::{

2
crates/workspace/src/panels/contact_list.rs
View File

@@ -1,5 +1,5 @@
use std::collections::HashSet;
use std::time::Duration;
use instant::Duration;
use anyhow::Error;
use gpui::prelude::FluentBuilder;

2
crates/workspace/src/panels/messaging_relays.rs
View File

@@ -1,5 +1,5 @@
use std::collections::HashSet;
use std::time::Duration;
use instant::Duration;
use anyhow::{Error, anyhow};
use gpui::prelude::FluentBuilder;

2
crates/workspace/src/panels/profile.rs
View File

@@ -1,5 +1,4 @@
use std::str::FromStr;
use std::time::Duration;
use anyhow::{Context as AnyhowContext, Error};
use gpui::{
@@ -7,6 +6,7 @@ use gpui::{
Focusable, IntoElement, ParentElement, PathPromptOptions, Render, SharedString, Styled, Task,
Window, div,
};
use instant::Duration;
use nostr_sdk::prelude::*;
use person::{Person, PersonRegistry, shorten_pubkey};
use settings::AppSettings;

2
crates/workspace/src/panels/relay_list.rs
View File

@@ -1,5 +1,5 @@
use std::collections::HashSet;
use std::time::Duration;
use instant::Duration;
use anyhow::{Error, anyhow};
use gpui::prelude::FluentBuilder;

2
crates/workspace/src/sidebar/mod.rs
View File

@@ -1,6 +1,6 @@
use std::collections::HashSet;
use std::ops::Range;
use std::time::Duration;
use instant::Duration;
use anyhow::Error;
use chat::{ChatEvent, ChatRegistry, Room, RoomKind};