vyn/mirai
1
Fork 0
mirror of https://codeberg.org/vyn/mirai.git synced 2025-07-02 01:13:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add create/modify button when creating/editing a task

Browse source
This commit is contained in:
Vyn 2024-10-17 14:38:55 +02:00
parent e2b0c1ac74
commit 3650ddaccc
6 changed files with 69 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

1
external/mirai-core/include/mirai-core/Task.h vendored
View file

@ -32,6 +32,7 @@ class Task
void setDate(const Date &date);
void setEvent(const Event &event);
void setChecked(bool checked);
void unschedule();
int id() const;
int sourceId() const;

6
external/mirai-core/src/Task.cpp vendored
View file

@ -70,6 +70,12 @@ void Task::setDate(const Date &date)
data_->updateTask(id(), {.dayId = day.value().id, .eventId = emptyEventId});
}
void Task::unschedule()
{
auto emptyId = std::optional<std::optional<int>>(std::optional<int>(std::nullopt));
data_->updateTask(id(), {.dayId = emptyId, .eventId = emptyId});
}
void Task::setEvent(const Event &event)
{
auto emptyDayId = std::optional<std::optional<int>>(std::optional<int>(std::nullopt));

2
external/selenite vendored

@ -1 +1 @@
Subproject commit 1774720377afc932cb92303516e049f66d8bf7a0
Subproject commit 65e2a75a09df205a86a09d9dd4f1ca916bb115a3

6
src/UiState.cpp
View file

@ -154,14 +154,16 @@ void UiState::setupCallbacks()
task->setDate(date);
}
if (!task.value().hasEvent() && date.year == 0) {
task->unschedule();
}
miraiInstance_->save();
view_.update();
reloadTasks();
});
mainWindow_->global<ui::Backend>().on_create_task([&](ui::NewTaskData newTaskData) {
std::cout << "Task date: " << newTaskData.date.year << " " << newTaskData.date.day
<< std::endl;
std::optional<mirai::Date> date = std::nullopt;
if (newTaskData.date.year != 0) {
date = SlintDateToMiraiDate(newTaskData.date);

61
ui/components/CreateTaskOrEvent.slint
View file

@ -1,30 +1,12 @@
import { Backend, TaskData } from "../Backend.slint";
import { Button, VerticalBox, CheckBox, ScrollView, ComboBox } from "std-widgets.slint";
import { VPopupIconMenu, VDatePicker, VTimePicker, VCheckBox, VButton, VTag, VText, VTextInput, Palette } from "@selenite";
import { VPopupIconMenu, VDatePicker, VTimePicker, VCheckBox, VButton, VActionButton, VTag, VText, Svg, VTextInput, Palette } from "@selenite";
import { NewTaskData, SaveTaskData } from "../Backend.slint";
export component CreateTaskOrEvent inherits Rectangle {
Rectangle {
border-color: newTaskTitleInput.text != "" ? Palette.card-background : transparent;
border-width: newTaskTitleInput.text != "" ? 4px : 0px;
border-radius: newTaskTitleInput.text != "" ? 8px : 0px;
animate border-color, border-width {
duration: 250ms;
}
VerticalLayout {
in-out property <int> task-or-event: 1;
spacing: 8px;
padding: newTaskTitleInput.text != "" ? 16px : 0px;
animate padding {
duration: 250ms;
}
newTaskTitleInput := VTextInput {
placeholder: "Add new Task / Event";
started-writting() => {
sourceInput.current-index = Backend.default-source-index;
}
accepted => {
private property <int> task-or-event: 1;
function create-task() {
if (task-or-event == 1) {
Backend.create-task({
sourceId: sourceInput.current-index,
@ -44,6 +26,26 @@ export component CreateTaskOrEvent inherits Rectangle {
}
newTaskTitleInput.edit-text("");
}
Rectangle {
border-color: newTaskTitleInput.text != "" ? Palette.card-background : transparent;
border-width: newTaskTitleInput.text != "" ? 4px : 0px;
border-radius: newTaskTitleInput.text != "" ? 8px : 0px;
animate border-color, border-width {
duration: 250ms;
}
VerticalLayout {
spacing: 8px;
padding: newTaskTitleInput.text != "" ? 16px : 0px;
animate padding {
duration: 250ms;
}
newTaskTitleInput := VTextInput {
placeholder: "Add new Task / Event";
started-writting() => {
sourceInput.current-index = Backend.default-source-index;
}
accepted => { create-task() }
}
Rectangle {
min-height: 0px;
@ -76,8 +78,14 @@ export component CreateTaskOrEvent inherits Rectangle {
taskDateInput := VDatePicker {
enabled: true;
}
HorizontalLayout {
visible: task-or-event == 0;
Rectangle {
min-width: 0;
max-width: task-or-event == 0 ? 9999px : 0px;
opacity: task-or-event == 0 ? 1 : 0;
clip: true;
animate max-width, opacity {
duration: 250ms;
}
HorizontalLayout {
spacing: 4px;
VText { text: "between"; vertical-alignment: bottom; }
@ -86,7 +94,12 @@ export component CreateTaskOrEvent inherits Rectangle {
eventEndTimeInput := VTimePicker { }
}
}
VButton {
text: "Create";
icon-svg: Svg.correct;
icon-colorize: greenyellow;
clicked => { create-task() }
}
}
}
}

30
ui/components/TaskEdit.slint
View file

@ -1,6 +1,6 @@
import { Backend, TaskData } from "../Backend.slint";
import { Button, VerticalBox, CheckBox, ScrollView, ComboBox } from "std-widgets.slint";
import { VPopupIconMenu, VDatePicker, VTimePicker, VCheckBox, VButton, VTag, VText, VTextInput, Palette } from "@selenite";
import { VPopupIconMenu, VDatePicker, VTimePicker, VCheckBox, VButton, VTag, VText, VTextInput, Svg, Palette } from "@selenite";
import { NewTaskData, SaveTaskData } from "../Backend.slint";
export component TaskEdit inherits VerticalLayout {
@ -16,9 +16,20 @@ export component TaskEdit inherits VerticalLayout {
}
callback accepted(SaveTaskData);
if !should-show : Rectangle {}
if should-show : Rectangle {
function modify() {
root.accepted({
id: task.id,
sourceId: task.sourceId,
title: newTaskTitleInput.text,
scheduled: taskDateInput.date.year != 0,
date: taskDateInput.date
});
}
background: Palette.background;
border-radius: 8px;
VerticalLayout {
@ -27,16 +38,7 @@ export component TaskEdit inherits VerticalLayout {
newTaskTitleInput := VTextInput {
text: root.task.title;
accepted => {
root.accepted({
id: task.id,
sourceId: task.sourceId,
title: newTaskTitleInput.text,
scheduled: taskDateInput.date.year != 0,
date: taskDateInput.date
});
}
accepted => { modify() }
}
HorizontalLayout {
alignment: start;
@ -45,6 +47,12 @@ export component TaskEdit inherits VerticalLayout {
date: task.date;
enabled: true;
}
VButton {
text: "Modify";
icon-svg: Svg.correct;
icon-colorize: greenyellow;
clicked => { modify() }
}
}
}
}