Collapse break setting sections

This commit is contained in:
waozi committed 2026-10-30 00:39:33 -03:00
1 parent 6271db0d6f
commit dd02f7fd3c
3 files changed
+115 -2

No files matched your search

+1
View File
@@ -2,6 +2,7 @@
## [Unreleased]
- Collapse each break kind in settings and expand it on click.
- Keep Linux break reminder text and progress bars in separate rows.
- Catalog games can award their own achievements, with the usual top-right notification.
- Friends, Lists and requests show the profile picture each friend chose in any app, abstract pictures included.
+86 -1
View File
@@ -26,6 +26,8 @@
using TextAlign;
using ButtonTone;
using ButtonEmphasis;
using ContentAlignment;
using ArrowDirection;
settings_breaks_slider_height :: () -> s32 {
return AppScale(66)
@@ -47,6 +49,25 @@ settings_breaks_week_row_height :: () -> s32 {
return AppScale(28)
}
SETTINGS_BREAKS_TIMER_ROW :: 64
settings_breaks_expanded: u32 = 0;
settings_breaks_timer_expanded :: (index: s32) -> bool {
if index < 0 || index >= BREAK_TYPE_COUNT {
return false
}
return (settings_breaks_expanded & (cast(u32)1 << cast(u32)index)) != 0
}
#program_export
settings_breaks_expanded_toggle :: (expanded: u32, index: s32) -> u32 {
if index < 0 || index >= BREAK_TYPE_COUNT {
return expanded
}
return expanded ^ (cast(u32)1 << cast(u32)index)
}
settings_breaks_timer_header :: (index: s32) -> string {
if index == BREAK_REST {
return LocaleText("settings_breaks_rest_header")
@@ -70,7 +91,7 @@ settings_breaks_general_body :: (width: s32) -> s32 {
toggle_row_height(LocaleText("settings_breaks_micro_counts"), width)
}
settings_breaks_timer_body :: (index: s32, width: s32) -> s32 {
settings_breaks_timer_options_body :: (index: s32, width: s32) -> s32 {
sliders: s32 = 4
if index == BREAK_DAILY {
sliders = 3
@@ -81,6 +102,14 @@ settings_breaks_timer_body :: (index: s32, width: s32) -> s32 {
toggle_row_height(LocaleText("settings_breaks_show_postpone"), width)
}
settings_breaks_timer_body :: (index: s32, width: s32) -> s32 {
body := AppScale(SETTINGS_BREAKS_TIMER_ROW)
if settings_breaks_timer_expanded(index) {
body += settings_breaks_timer_options_body(index, width)
}
return body
}
settings_breaks_week_body :: (has_data: bool) -> s32 {
if !has_data {
return settings_breaks_week_row_height() + AppScale(12)
@@ -197,6 +226,55 @@ settings_breaks_slider :: (app: *InnerBreeze, id: s32, x: s32, width: s32,
"", 0) != 0
}
settings_breaks_timer_summary :: (app: *InnerBreeze, index: s32,
output: []u8) -> string {
timer := *app.breaks.timers[index]
state := LocaleText(ifx timer.enabled != 0 then "toggle_on" else "toggle_off")
interval := BreakFormatDuration(timer.limit_s)
interval_text := AppTextFromCString(*interval.bytes[0], 16)
if index == BREAK_DAILY {
args: [2]FormatArg = .[
FormatArg.{.text = state, .is_text = true},
FormatArg.{.text = interval_text, .is_text = true}
]
unused FormatTemplate("%s · %s", args[:], output[:])
} else {
duration := BreakFormatDuration(timer.duration_s)
duration_text := AppTextFromCString(*duration.bytes[0], 16)
args: [3]FormatArg = .[
FormatArg.{.text = state, .is_text = true},
FormatArg.{.text = interval_text, .is_text = true},
FormatArg.{.text = duration_text, .is_text = true}
]
unused FormatTemplate("%s · %s · %s", args[:], output[:])
}
return FrameTextHold(*app.ui.frame_text,
AppTextFromCString(*output[0], cast(s32)output.count))
}
settings_breaks_draw_timer_row :: (app: *InnerBreeze, index: s32,
x: s32, width: s32, y: *s32) {
summary: [96]u8
expanded := settings_breaks_timer_expanded(index)
row: ButtonProps
row.id = 546 + index
row.key = cast(u64)(546 + index)
row.bounds = Rectangle.{cast(float32)x, cast(float32)y.*,
cast(float32)width, cast(float32)AppScale(SETTINGS_BREAKS_TIMER_ROW)}
row.label = settings_breaks_timer_header(index)
row.detail = settings_breaks_timer_summary(app, index, summary[:])
row.content_alignment = cast(ContentAlignment)ContentAlignmentStart
row.tone = cast(ButtonTone)ButtonToneNeutral
row.emphasis = cast(ButtonEmphasis)ButtonEmphasisGhost
row.arrow = true
row.direction = cast(ArrowDirection)ifx expanded then ArrowDown else ArrowRight
if Button(app.ui.session, row) != 0 {
settings_breaks_expanded = settings_breaks_expanded_toggle(
settings_breaks_expanded, index)
}
y.* += AppScale(SETTINGS_BREAKS_TIMER_ROW)
}
settings_breaks_draw_timer :: (app: *InnerBreeze, index: s32,
x: s32, width: s32, y: *s32) {
timer := *app.breaks.timers[index]
@@ -215,6 +293,13 @@ settings_breaks_draw_timer :: (app: *InnerBreeze, index: s32,
ix := section.inner_x
iw := section.inner_width
settings_breaks_draw_timer_row(app, index, ix, iw, y)
if !settings_breaks_timer_expanded(index) {
settings_section_end(y)
return
}
settings_row_divider(app, section, y.*)
if commit_toggle_row(app, ix, iw, y,
LocaleText("settings_breaks_timer_enabled"), *enabled, 0) != 0 {
changed = true
+28 -1
View File
@@ -223,6 +223,18 @@ ControlSelected :: (key: u64) -> bool {
return false
}
ControlPresent :: (key: u64) -> bool {
index: s32 = 1
while index < TreeCount(test_app.ui.session) {
node := TreeNodeAt(test_app.ui.session, index)
if node.key == key {
return true
}
index += 1
}
return false
}
ClickControl :: (key: u64, parent_key: u64, fraction: float32) {
found: bool = false
bounds: Rectangle
@@ -280,6 +292,14 @@ main :: () -> s32 {
test_app.reminders[1].last_day == 0, 6)
test_mode = 1
expanded := settings_breaks_expanded_toggle(0, BREAK_MICRO)
Require(expanded == 1 && settings_breaks_expanded == 0, 10)
expanded = settings_breaks_expanded_toggle(expanded, BREAK_MICRO)
Require(expanded == 0, 11)
expanded = settings_breaks_expanded_toggle(expanded, BREAK_REST)
Require(expanded == 2, 12)
expanded = settings_breaks_expanded_toggle(expanded, -1)
Require(expanded == 2, 13)
test_app.breaks.timers[BREAK_MICRO].enabled = 1
test_app.breaks.timers[BREAK_MICRO].limit_s = 180
test_app.breaks.timers[BREAK_MICRO].active_s = 5000
@@ -287,11 +307,18 @@ main :: () -> s32 {
test_app.breaks.timers[BREAK_MICRO].postpone_s = 150
test_app.settings_dirty = 0
DrawSettings()
ClickControl(cast(u64)62044, cast(u64)0, 0.5)
timer_toggle_key := cast(u64)62108
Require(!ControlPresent(timer_toggle_key), 14)
ClickControl(cast(u64)546, cast(u64)0, 0.5)
Require(ControlPresent(timer_toggle_key), 15)
ClickControl(timer_toggle_key, cast(u64)0, 0.5)
Require(test_app.breaks.timers[BREAK_MICRO].enabled == 0 && test_app.settings_dirty == 1, 7)
ClickControl(cast(u64)500, cast(u64)0, 0.99)
Require(test_app.breaks.timers[BREAK_MICRO].limit_s > 180 &&
test_app.breaks.timers[BREAK_MICRO].active_s <= test_app.breaks.timers[BREAK_MICRO].limit_s, 8)
ClickControl(cast(u64)546, cast(u64)0, 0.5)
DrawSettings()
Require(!ControlPresent(timer_toggle_key), 16)
Require(SessionClose(test_app.ui.session), 9)
return 0
}