Rename core to done_core.

edfloreshz · Mar 11, 2024 · c72182f · c72182f
1 parent 648b424
commit c72182f
Show file tree

Hide file tree

Showing 19 changed files with 88 additions and 80 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -68,7 +68,7 @@ features = [
     "size-vertically",
 ]
 
-[dependencies.core_done]
+[dependencies.done_core]
 path = "core"
 
 [dependencies.chrono]

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "core_done"
+name = "done_core"
 version = "0.1.0"
 edition = "2021"
 

diff --git a/core/src/models/list.rs b/core/src/models/list.rs
@@ -6,15 +6,7 @@ use crate::service::Service;
 use crate::services::microsoft::models::list::TodoTaskList;
 
 #[derive(
-	Clone,
-	Default,
-	Debug,
-	PartialEq,
-	Eq,
-	PartialOrd,
-	Ord,
-	Serialize,
-	Deserialize,
+	Clone, Default, Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize,
 )]
 pub struct List {
 	pub id: String,

diff --git a/core/src/models/recurrence.rs b/core/src/models/recurrence.rs
@@ -1,7 +1,7 @@
-use std::fmt::Display;
 use crate::services::microsoft::models::recurrence::DayOfWeek;
 use crate::services::microsoft::models::recurrence::TaskRecurrence;
 use serde::{Deserialize, Serialize};
+use std::fmt::Display;
 
 #[derive(
 	Clone,

diff --git a/src/app.rs b/src/app.rs
@@ -1,10 +1,6 @@
-pub mod components;
-pub mod factories;
-pub mod models;
 use std::str::FromStr;
 
 use adw::glib::Propagation;
-use core_done::service::Service;
 use relm4::{
 	actions::{ActionGroupName, RelmAction, RelmActionGroup},
 	adw,
@@ -27,6 +23,8 @@ use relm4::{
 };
 use relm4_icons::icon_name;
 
+use done_core::service::Service;
+
 use crate::{
 	app::{
 		components::{
@@ -48,7 +46,10 @@ use self::{
 	models::sidebar_list::SidebarList,
 };
 
+pub mod components;
 pub mod config;
+pub mod factories;
+pub mod models;
 
 new_action_group!(pub(super) WindowActionGroup, "win");
 new_stateless_action!(pub(super) ShortcutsAction, WindowActionGroup, "show-help-overlay");

diff --git a/src/app/components/content.rs b/src/app/components/content.rs
@@ -1,12 +1,4 @@
-use crate::app::components::task_input::TaskInputOutput;
-use crate::app::factories::task::{TaskInit, TaskInput, TaskModel, TaskOutput};
-use crate::app::models::sidebar_list::SidebarList;
-use crate::fl;
-
 use chrono::{DateTime, Utc};
-use core_done::models::status::Status;
-use core_done::models::task::Task;
-use core_done::service::Service;
 use futures::StreamExt;
 use relm4::component::{
 	AsyncComponent, AsyncComponentParts, AsyncComponentSender,
@@ -25,6 +17,15 @@ use relm4::{
 };
 use relm4_icons::icon_name;
 
+use done_core::models::status::Status;
+use done_core::models::task::Task;
+use done_core::service::Service;
+
+use crate::app::components::task_input::TaskInputOutput;
+use crate::app::factories::task::{TaskInit, TaskInput, TaskModel, TaskOutput};
+use crate::app::models::sidebar_list::SidebarList;
+use crate::fl;
+
 use super::task_input::{TaskInputInput, TaskInputModel};
 use super::welcome::WelcomeComponent;
 

diff --git a/src/app/components/list_sidebar.rs b/src/app/components/list_sidebar.rs
@@ -1,4 +1,3 @@
-use core_done::{models::list::List, service::Service};
 use futures::StreamExt;
 use relm4::{
 	adw,
@@ -18,6 +17,8 @@ use relm4::{
 };
 use relm4_icons::icon_name;
 
+use done_core::{models::list::List, service::Service};
+
 use crate::{
 	app::{
 		components::{list_dialog::ListDialogOutput, services::ServicesOutput},

diff --git a/src/app/components/preferences.rs b/src/app/components/preferences.rs
@@ -1,5 +1,4 @@
 use anyhow::Result;
-use core_done::service::Service;
 use libset::Config;
 use relm4::{
 	adw,
@@ -13,6 +12,8 @@ use relm4::{
 };
 use relm4_icons::icon_name;
 
+use done_core::service::Service;
+
 use crate::app::config::preferences::Preferences;
 use crate::app::config::{appearance::ColorScheme, info::APP_ID};
 use crate::fl;

diff --git a/src/app/components/services.rs b/src/app/components/services.rs
@@ -1,4 +1,3 @@
-use core_done::service::Service;
 use glib::Cast;
 use libadwaita::prelude::{FlowBoxChildExt, ToggleButtonExt};
 use relm4::{
@@ -8,6 +7,8 @@ use relm4::{
 	AsyncComponentSender, RelmIterChildrenExt, RelmWidgetExt,
 };
 
+use done_core::service::Service;
+
 use crate::{
 	app::factories::service::{ServiceFactoryModel, ServiceFactoryOutput},
 	fl,

diff --git a/src/app/components/task_input.rs b/src/app/components/task_input.rs
@@ -1,12 +1,14 @@
-use crate::{app::models::sidebar_list::SidebarList, fl};
 use adw::traits::{EntryRowExt, PreferencesRowExt};
-use core_done::models::task::Task;
 use gtk::traits::{EditableExt, ListBoxRowExt};
 use relm4::{
 	adw, gtk, gtk::prelude::WidgetExt, Component, ComponentParts,
 	ComponentSender, RelmWidgetExt,
 };
 
+use done_core::models::task::Task;
+
+use crate::{app::models::sidebar_list::SidebarList, fl};
+
 #[derive(Debug)]
 pub struct TaskInputModel {
 	pub task: Task,

diff --git a/src/app/config/settings.rs b/src/app/config/settings.rs
@@ -1,7 +1,8 @@
 use anyhow::Result;
-use core_done::services::local::database::{Database, DATABASE_NAME};
 use libset::{Config, FileType};
 
+use done_core::services::local::database::{Database, DATABASE_NAME};
+
 use super::{info::APP_ID, preferences::Preferences};
 
 pub(crate) fn init() -> Result<()> {

diff --git a/src/app/factories/service.rs b/src/app/factories/service.rs
@@ -1,4 +1,3 @@
-use core_done::service::Service;
 use libadwaita::prelude::{BoxExt, ButtonExt, OrientableExt, WidgetExt};
 use relm4::{
 	factory::{AsyncFactoryComponent, FactoryView},
@@ -8,6 +7,8 @@ use relm4::{
 	AsyncFactorySender, RelmWidgetExt,
 };
 
+use done_core::service::Service;
+
 pub struct ServiceFactoryModel {
 	service: Service,
 }

diff --git a/src/app/factories/sub_tasks/factory.rs b/src/app/factories/sub_tasks/factory.rs
@@ -1,5 +1,4 @@
 use adw::traits::{EntryRowExt, PreferencesRowExt};
-use core_done::models::status::Status;
 use gtk::traits::{ButtonExt, CheckButtonExt, ListBoxRowExt, WidgetExt};
 use relm4::gtk::traits::EditableExt;
 use relm4::RelmWidgetExt;
@@ -12,6 +11,8 @@ use relm4::{
 };
 use relm4_icons::icon_name;
 
+use done_core::models::status::Status;
+
 use crate::fl;
 
 use super::{

diff --git a/src/app/factories/sub_tasks/messages.rs b/src/app/factories/sub_tasks/messages.rs
@@ -1,6 +1,7 @@
-use core_done::models::task::Task;
 use relm4::prelude::DynamicIndex;
 
+use done_core::models::task::Task;
+
 #[derive(Debug)]
 pub enum SubTaskInput {
 	SetStatus(DynamicIndex, bool),

diff --git a/src/app/factories/sub_tasks/model.rs b/src/app/factories/sub_tasks/model.rs
@@ -1,6 +1,7 @@
-use core_done::models::task::Task;
 use relm4::prelude::DynamicIndex;
 
+use done_core::models::task::Task;
+
 #[derive(Debug)]
 pub struct SubTaskModel {
 	pub sub_task: Task,

diff --git a/src/app/factories/task.rs b/src/app/factories/task.rs
@@ -1,31 +1,33 @@
 use std::str::FromStr;
 
-use crate::app::config::info::APP_ID;
-use crate::app::config::preferences::Preferences;
-use crate::fl;
 use adw::prelude::{
 	ActionRowExt, BoxExt, ExpanderRowExt, OrientableExt, PreferencesGroupExt,
 	TextBufferExt, TextViewExt, ToggleButtonExt,
 };
 use adw::traits::{EntryRowExt, PreferencesRowExt};
-use chrono::{DateTime, Datelike, Duration, Timelike, Utc};
-use core_done::models::list::List;
-use core_done::models::priority::Priority;
-use core_done::models::recurrence::Day;
-use core_done::models::status::Status;
-use core_done::models::task::Task;
+use chrono::{Datelike, DateTime, Duration, Timelike, Utc};
 use libset::Config;
-use relm4::factory::{AsyncFactoryComponent, FactoryVecDeque};
-use relm4::factory::{AsyncFactorySender, DynamicIndex, FactoryView};
 use relm4::{
 	adw, gtk,
 	gtk::prelude::{
 		ButtonExt, CheckButtonExt, EditableExt, ListBoxRowExt, WidgetExt,
 	},
 	RelmWidgetExt,
 };
+use relm4::factory::{AsyncFactoryComponent, FactoryVecDeque};
+use relm4::factory::{AsyncFactorySender, DynamicIndex, FactoryView};
 use relm4_icons::icon_name;
 
+use done_core::models::list::List;
+use done_core::models::priority::Priority;
+use done_core::models::recurrence::Day;
+use done_core::models::status::Status;
+use done_core::models::task::Task;
+
+use crate::app::config::info::APP_ID;
+use crate::app::config::preferences::Preferences;
+use crate::fl;
+
 use super::sub_tasks::messages::SubTaskOutput;
 use super::sub_tasks::model::{SubTaskInit, SubTaskModel};
 
@@ -475,7 +477,7 @@ impl AsyncFactoryComponent for TaskModel {
 							set_activatable: false,
 							set_margin_top: 10,
 							adw::PreferencesGroup {
-								set_description: Some(&fl!("notes")),
+								set_description: Some(fl!("notes")),
 								add = &gtk::TextView {
 									set_css_classes: &["card"],
 									set_top_margin: 10,
@@ -516,7 +518,7 @@ impl AsyncFactoryComponent for TaskModel {
 		let mut task = init.task.clone();
 		let notes_buffer = gtk::TextBuffer::default();
 		if let Some(ref note) = task.notes {
-			notes_buffer.set_text(&note);
+			notes_buffer.set_text(note);
 		}
 		task.parent = init.parent_list.id.clone();
 		let mut model = Self {

diff --git a/src/app/factories/task_list.rs b/src/app/factories/task_list.rs
@@ -1,4 +1,3 @@
-use core_done::service::Service;
 use relm4::actions::{ActionGroupName, RelmAction, RelmActionGroup};
 use relm4::factory::AsyncFactoryComponent;
 use relm4::factory::{DynamicIndex, FactoryView};
@@ -9,6 +8,8 @@ use relm4::{
 	RelmWidgetExt,
 };
 
+use done_core::service::Service;
+
 use crate::app::components::delete::{
 	DeleteComponent, DeleteInit, DeleteOutput,
 };

diff --git a/src/app/models/sidebar_list.rs b/src/app/models/sidebar_list.rs
@@ -1,8 +1,9 @@
-use core_done::models::list::List;
 use relm4_icons::icon_name;
 use strum::IntoEnumIterator;
 use strum_macros::EnumIter;
 
+use done_core::models::list::List;
+
 use crate::fl;
 
 #[derive(Debug, Clone, EnumIter, PartialEq)]