Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion crates/okena-ext-claude/src/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use okena_extensions::{ExtensionSettingsStore, ThemeColors};
use okena_ui::settings::{section_container, section_header, settings_row_with_desc};
use okena_ui::simple_input::{InputChangedEvent, SimpleInput, SimpleInputState};
use okena_ui::tokens::ui_text_md;
use okena_usage::WorkingDaysSetting;
use okena_usage::{BreaksSetting, WorkingDaysSetting};

fn theme(cx: &App) -> ThemeColors {
okena_extensions::theme(cx)
Expand All @@ -12,6 +12,7 @@ fn theme(cx: &App) -> ThemeColors {
pub struct ClaudeSettingsView {
config_dir_input: Entity<SimpleInputState>,
working_days: Entity<WorkingDaysSetting>,
breaks: Entity<BreaksSetting>,
}

impl ClaudeSettingsView {
Expand All @@ -29,6 +30,7 @@ impl ClaudeSettingsView {
});

let working_days = cx.new(WorkingDaysSetting::new);
let breaks = cx.new(BreaksSetting::new);

cx.observe_global::<ExtensionSettingsStore>(move |this, cx| {
let next_value = cx
Expand Down Expand Up @@ -62,6 +64,7 @@ impl ClaudeSettingsView {
Self {
config_dir_input,
working_days,
breaks,
}
}
}
Expand Down Expand Up @@ -97,5 +100,6 @@ impl Render for ClaudeSettingsView {
),
)
.child(self.working_days.clone())
.child(self.breaks.clone())
}
}
5 changes: 4 additions & 1 deletion crates/okena-ext-claude/src/usage.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::ui_helpers::capitalize_first;
use okena_extensions::{ExtensionSettingsStore, ThemeColors};
use okena_usage::{
effective_time_pct, read_working_days, render_simple_bar, render_usage_row,
effective_time_pct, read_breaks, read_working_days, render_simple_bar, render_usage_row,
usage_body_container, usage_divider, usage_kv_row, usage_popover_container,
usage_popover_header, usage_trigger_items, SegmentUnit, UsageRow,
};
Expand Down Expand Up @@ -766,6 +766,7 @@ impl Render for ClaudeUsage {
let t = theme(cx);

let working = read_working_days(cx);
let breaks = read_breaks(cx);
let data = self.data.read(cx).data.lock();
let mut items: Vec<(SharedString, f64, Option<f64>)> = Vec::new();
match data.as_ref() {
Expand All @@ -776,6 +777,7 @@ impl Render for ClaudeUsage {
tier.period_secs,
Some(SegmentUnit::Hour),
working,
&breaks,
tier.time_elapsed_pct,
);
items.push(("5h".into(), tier.utilization, et));
Expand All @@ -786,6 +788,7 @@ impl Render for ClaudeUsage {
tier.period_secs,
Some(SegmentUnit::Day),
working,
&breaks,
tier.time_elapsed_pct,
);
items.push(("7d".into(), tier.utilization, et));
Expand Down
5 changes: 4 additions & 1 deletion crates/okena-ext-codex/src/settings.rs
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
use gpui::*;
use okena_extensions::ThemeColors;
use okena_ui::settings::section_header;
use okena_usage::WorkingDaysSetting;
use okena_usage::{BreaksSetting, WorkingDaysSetting};

fn theme(cx: &App) -> ThemeColors {
okena_extensions::theme(cx)
}

pub struct CodexSettingsView {
working_days: Entity<WorkingDaysSetting>,
breaks: Entity<BreaksSetting>,
}

impl CodexSettingsView {
pub fn new(cx: &mut Context<Self>) -> Self {
Self {
working_days: cx.new(WorkingDaysSetting::new),
breaks: cx.new(BreaksSetting::new),
}
}
}
Expand All @@ -29,5 +31,6 @@ impl Render for CodexSettingsView {
.gap(px(8.0))
.child(section_header("Codex", &t, cx))
.child(self.working_days.clone())
.child(self.breaks.clone())
}
}
4 changes: 3 additions & 1 deletion crates/okena-ext-codex/src/usage.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use okena_extensions::ThemeColors;
use okena_usage::{
effective_time_pct, read_working_days, render_usage_row, usage_body_container, usage_divider,
effective_time_pct, read_breaks, read_working_days, render_usage_row, usage_body_container, usage_divider,
usage_kv_row, usage_popover_container, usage_popover_header, usage_trigger_items, SegmentUnit,
UsageRow,
};
Expand Down Expand Up @@ -686,6 +686,7 @@ impl Render for CodexUsage {
let t = theme(cx);

let working = read_working_days(cx);
let breaks = read_breaks(cx);
let data = self.data.read(cx).data.lock();
let mut items: Vec<(SharedString, f64, Option<f64>)> = Vec::new();
match data.as_ref() {
Expand All @@ -699,6 +700,7 @@ impl Render for CodexUsage {
w.window_seconds as f64,
segment_unit_for_window(w.window_seconds),
working,
&breaks,
w.time_elapsed_pct,
);
items.push((
Expand Down
6 changes: 6 additions & 0 deletions crates/okena-extensions/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,12 @@ impl ExtensionSettingsStore {
// before invoking the closure with `&mut App`.
let setter = cx.global::<Self>().setter.clone();
setter(extension_id, value, cx);
// The host setter mutates its own settings entity, not this store, so
// `observe_global::<ExtensionSettingsStore>` watchers (settings panels,
// usage widgets) wouldn't otherwise wake. Touch the global to fire them
// — without this a settings change only reaches the live widgets on the
// next poll tick.
let _ = cx.global_mut::<Self>();
}
}

Expand Down
Loading
Loading