tzemanovic/inflorescence - Change D7A7MSIHJS3IAOLEPK52M4CZLDPLO7JB3Y62XACT2AM6UUCPQ6BAC

allow to defer or abandon record, add buttons

Created by Tomáš Zemanovič on March 1, 2025

D7A7MSIHJS3IAOLEPK52M4CZLDPLO7JB3Y62XACT2AM6UUCPQ6BAC

Dependencies

In channels

main

Change contents

Replacement in crates/flowers_ui/src/main.rs at line 85 [2.2763]

B:BD[4.652] → [8.131:177]

    record_msg: Option<text_editor::Content>,

[4.652]

[3.1403]

    record_msg: Option<RecordMsg>,
}
#[derive(Debug)]
enum RecordMsg {
    Typing(text_editor::Content),
    Canceled { old_msg: String },

Replacement in crates/flowers_ui/src/main.rs at line 111 [2.2763]
B:BD[8.230] → [8.230:240]
```
    Save,
```
[8.230]
[4.735]
```
    DeferRecord,
    SaveRecord,
    AbandonRecord,
```

Insertion in crates/flowers_ui/src/main.rs at line 130 [2.2763]

[10.6718]

        Message::LoadedId(id) => {
            state.id = Some(*id);
            Task::none()
        }

Replacement in crates/flowers_ui/src/main.rs at line 336 [2.2763]

∅:D[11.951] → [10.14006:14054]

B:BD[10.14006] → [10.14006:14054]

                if state.record_msg.is_some() {

[11.951]

[10.14054]

                if repo.changed_files.is_empty() {
                    info!("Trying to record with no changed files");
                } else if let Some(RecordMsg::Typing(_)) =
                    state.record_msg.as_ref()
                {

Replacement in crates/flowers_ui/src/main.rs at line 342 [2.2763]

B:BD[10.14127] → [10.14127:14254]

                } else if repo.changed_files.is_empty() {
                    info!("Trying to record with no changed files");

[10.14127]

[10.14254]

                    return Task::none();

Replacement in crates/flowers_ui/src/main.rs at line 344 [2.2763]

B:BD[10.14279] → [10.14279:14353]

                    state.record_msg = Some(text_editor::Content::new());

[10.14279]

[13.114]

                    let content = match state.record_msg.take() {
                        Some(RecordMsg::Canceled { old_msg }) => {
                            text_editor::Content::with_text(&old_msg)
                        }
                        None | Some(RecordMsg::Typing(_)) => {
                            text_editor::Content::new()
                        }
                    };
                    state.record_msg = Some(RecordMsg::Typing(content));

Replacement in crates/flowers_ui/src/main.rs at line 360 [2.2763]

B:BD[8.648] → [8.648:714]

            if let Some(record_msg) = state.record_msg.as_mut() {

[8.648]

[8.714]

            if let Some(RecordMsg::Typing(record_msg)) =
                state.record_msg.as_mut()
            {

Replacement in crates/flowers_ui/src/main.rs at line 367 [2.2763]

B:BD[8.782] → [10.14372:14465]

        Message::Save => {
            if let Some(record_msg) = state.record_msg.as_ref() {

[8.782]

[9.1710]

        Message::SaveRecord => {
            if let Some(RecordMsg::Typing(record_msg)) =
                state.record_msg.as_ref()
            {

Replacement in crates/flowers_ui/src/main.rs at line 372 [2.2763]

B:BD[9.1755] → [9.1755:1815]

                if msg.chars().all(|c| c.is_whitespace()) {

[9.1755]

[10.14466]

                if msg.trim().is_empty() {

Replacement in crates/flowers_ui/src/main.rs at line 395 [2.2763]

B:BD[10.14755] → [11.952:987]

B:BD[11.987] → [12.5534:5568]

        Message::LoadedId(id) => {
            state.id = Some(*id);

[10.14755]

[11.1020]

        Message::DeferRecord => {
            if let Some(RecordMsg::Typing(record_msg)) =
                state.record_msg.as_ref()
            {
                let old_msg = record_msg.text();
                state.record_msg = if !old_msg.trim().is_empty() {
                    Some(RecordMsg::Canceled { old_msg })
                } else {
                    None
                };
            }
            Task::none()
        }
        Message::AbandonRecord => {
            if let Some(RecordMsg::Typing(_)) = state.record_msg.as_ref() {
                state.record_msg = None;
            }

Insertion in crates/flowers_ui/src/main.rs at line 501 [2.2763]

[4.2903]

                    "a" => Some(Message::AddUntrackedFile),

Replacement in crates/flowers_ui/src/main.rs at line 504 [2.2763]

B:BD[4.3009] → [6.7538:7598]

                    "a" => Some(Message::AddUntrackedFile),

[4.3009]

[7.2052]

                    "r" => Some(Message::Record),

Deletion in crates/flowers_ui/src/main.rs at line 506 [2.2763]
B:BD[7.2107] → [8.1348:1398]
```
                    "r" => Some(Message::Record),
```

Replacement in crates/flowers_ui/src/main.rs at line 513 [2.2763]

B:BD[8.1479] → [8.1479:1554]

                    "s" if mods == Modifiers::CTRL => Some(Message::Save),

[8.1479]

[8.1554]

                    "a" if mods == Modifiers::CTRL => {
                        Some(Message::AbandonRecord)
                    }
                    "d" if mods == Modifiers::CTRL => {
                        Some(Message::DeferRecord)
                    }
                    "s" if mods == Modifiers::CTRL => Some(Message::SaveRecord),

Replacement in crates/flowers_ui/src/main.rs at line 530 [2.2763]

B:BD[10.16523] → [10.16523:16682]

        let repo_info = Element::from(row([
            Element::from(text(&repo.dir_name)),
            Element::from(text(": ")),
            Element::from(

[10.16523]

[10.16682]

        let repo_info = el(row([
            el(text(&repo.dir_name)),
            el(text(": ")),
            el(

Replacement in crates/flowers_ui/src/main.rs at line 540 [2.2763]

B:BD[10.16864] → [10.16864:16938]

        Element::from(column(repo.untracked_files.iter().enumerate().map(

[10.16864]

[5.7755]

        el(column(repo.untracked_files.iter().enumerate().map(

Replacement in crates/flowers_ui/src/main.rs at line 545 [2.2763]
B:BD[5.7984] → [5.7984:8015]
```
                Element::from(
```
[5.7984]
[5.8015]
```
                el(
```

Replacement in crates/flowers_ui/src/main.rs at line 556 [2.2763]

B:BD[10.16967] → [10.16967:17039]

        Element::from(column(repo.changed_files.iter().enumerate().map(

[10.16967]

[6.7599]

        el(column(repo.changed_files.iter().enumerate().map(

Replacement in crates/flowers_ui/src/main.rs at line 561 [2.2763]
B:BD[4.3841] → [4.3841:3872]
```
                Element::from(
```
[4.3841]
[6.7627]
```
                el(
```

Replacement in crates/flowers_ui/src/main.rs at line 571 [2.2763]

B:BD[4.4169] → [10.17040:17203]

        let log = Element::from(column(
            ["todo: commits"]
                .iter()
                .map(|hash| Element::from(text(*hash))),
        ));

[4.4169]

[10.17203]

        let log =
            el(column(["todo: commits"].iter().map(|hash| el(text(*hash)))));

Replacement in crates/flowers_ui/src/main.rs at line 574 [2.2763]

B:BD[10.17204] → [10.17204:17593]

        let record_msg_editor =
            if let Some(record_msg) = state.record_msg.as_ref() {
                Element::from(
                    text_editor(record_msg)
                        .placeholder("Type something here...")
                        .on_action(Message::EditRecordMsg),
                )
            } else {
                Element::from(row([]))
            };

[10.17204]

[4.4170]

        let record_msg_editor = if let Some(RecordMsg::Typing(msg_content)) =
            state.record_msg.as_ref()
        {
            el(column([
                el(text_editor(msg_content)
                    .placeholder("Type something here...")
                    .on_action(Message::EditRecordMsg)),
                el(row([
                    el(button(text("Save")).on_press(Message::SaveRecord)),
                    el(button(text("Defer")).on_press(Message::DeferRecord)),
                    el(button(text("Abandon"))
                        .on_press(Message::AbandonRecord)),
                ])),
            ]))
        } else {
            el(row([]))
        };

Replacement in crates/flowers_ui/src/main.rs at line 592 [2.2763]

B:BD[4.4171] → [10.17594:18274]

        Element::from(row([
            Element::from(
                column([
                    repo_info,
                    Element::from(horizontal_rule(1)),
                    Element::from(text("Untracked:")),
                    untracked_files,
                    Element::from(horizontal_rule(1)),
                    Element::from(text("Changed:")),
                    changed_files,
                    Element::from(horizontal_rule(1)),
                    log,
                ])
                .width(Length::FillPortion(1)),
            ),
            Element::from(
                column([record_msg_editor]).width(Length::FillPortion(1)),
            ),

[4.4171]

[10.18274]

        el(row([
            el(column([
                repo_info,
                el(horizontal_rule(1)),
                el(text("Untracked:")),
                untracked_files,
                el(horizontal_rule(1)),
                el(text("Changed:")),
                changed_files,
                el(horizontal_rule(1)),
                log,
            ])
            .width(Length::FillPortion(1))),
            el(column([record_msg_editor]).width(Length::FillPortion(1))),

Replacement in crates/flowers_ui/src/main.rs at line 608 [2.2763]
B:BD[8.1953] → [10.18287:18334]
```
        Element::from(text("Loading repo..."))
```
[8.1953]
[10.18334]
```
        el(text("Loading repo..."))
```

Insertion in crates/flowers_ui/src/main.rs at line 633 [2.2763]

[4.4777]

[2.3333]

}
fn el<'a, E, M>(e: E) -> Element<'a, M>
where
    E: Into<Element<'a, M>>,
{
    e.into()