refactor: improve file structure

Author: edfloreshz

src/app.rs

@@ -1,3 +1,12 @@
+pub mod actions;
+pub mod context;
+pub mod dialog;
+pub mod error;
+mod flags;
+pub mod markdown;
+pub mod menu;
+
+pub use flags::*;
 use std::{
     any::TypeId,
     collections::{HashMap, VecDeque},
@@ -23,25 +32,24 @@ use cosmic::{
 };
 
 use crate::{
-    actions::{Action, ApplicationAction, NavMenuAction, TasksAction},
-    app::{config::CONFIG_VERSION, key_bind::key_binds},
-    content::{self, Content},
-    context::ContextPage,
-    core::{models::List, storage::LocalStorage},
-    details::{self, Details},
-    dialog::{DialogAction, DialogPage},
+    app::{
+        actions::{Action, ApplicationAction, NavMenuAction, TasksAction},
+        context::ContextPage,
+        dialog::{DialogAction, DialogPage},
+    },
+    core::{
+        config::{self, CONFIG_VERSION},
+        icons,
+        key_bind::key_binds,
+    },
     fl,
+    pages::{
+        content::{self, Content},
+        details::{self, Details},
+    },
+    storage::{models::List, LocalStorage},
 };
 
-pub mod config;
-pub mod icons;
-mod key_bind;
-pub mod localize;
-pub mod markdown;
-pub mod menu;
-pub mod settings;
-pub mod style;
-
 pub struct Tasks {
     core: Core,
     about: widget::about::About,
@@ -454,7 +462,7 @@ impl Tasks {
 
 impl Application for Tasks {
     type Executor = cosmic::executor::Default;
-    type Flags = crate::settings::app::Flags;
+    type Flags = crate::app::Flags;
     type Message = Message;
     const APP_ID: &'static str = "dev.edfloreshz.Tasks";
 

src/actions.rs renamed to src/app/actions.rs

@@ -1,8 +1,10 @@
 use crate::{
-    app::Message,
-    context::ContextPage,
-    core::models::List,
-    dialog::{DialogAction, DialogPage},
+    app::{
+        context::ContextPage,
+        dialog::{DialogAction, DialogPage},
+        Message,
+    },
+    storage::models::List,
 };
 use cosmic::{
     iced::keyboard::{Key, Modifiers},

src/context.rs renamed to src/app/context.rs

@@ -6,7 +6,7 @@ use cosmic::{
     widget::{self, calendar::CalendarModel, segmented_button},
 };
 
-use crate::{actions::ApplicationAction, app::Message, fl};
+use crate::{app::actions::ApplicationAction, app::Message, fl};
 
 #[derive(Debug, Clone)]
 pub enum DialogAction {
@@ -20,7 +20,7 @@ pub enum DialogAction {
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub enum DialogPage {
     New(String),
-    Icon(Option<segmented_button::Entity>, String, String), // Added search string
+    Icon(Option<segmented_button::Entity>, String, String),
     Rename(Option<segmented_button::Entity>, String),
     Delete(Option<segmented_button::Entity>),
     Calendar(CalendarModel),
@@ -97,7 +97,7 @@ impl DialogPage {
                 )),
             DialogPage::Icon(entity, icon, search) => {
                 let search_lower = search.to_lowercase();
-                let icon_buttons = crate::app::icons::get_all_icon_handles(20)
+                let icon_buttons = crate::core::icons::get_all_icon_handles(20)
                     .iter()
                     .filter(|(name, _)| name.to_lowercase().contains(&search_lower))
                     .map(|(name, icon)| {
@@ -128,7 +128,7 @@ impl DialogPage {
 
                 let dialog = widget::dialog()
                     .title(fl!("icon-select"))
-                    .icon(crate::app::icons::get_icon(icon, 32))
+                    .icon(crate::core::icons::get_icon(icon, 32))
                     .primary_action(widget::button::suggested(fl!("ok")).on_press_maybe(Some(
                         Message::Application(ApplicationAction::Dialog(DialogAction::Complete)),
                     )))

src/dialog.rs renamed to src/app/dialog.rs

@@ -0,0 +1,23 @@
+use cosmic::cosmic_config;
+
+use crate::{
+    core::config::{self, TasksConfig},
+    storage::LocalStorage,
+};
+
+#[derive(Clone, Debug)]
+pub struct Flags {
+    pub config_handler: Option<cosmic_config::Config>,
+    pub config: config::TasksConfig,
+    pub storage: LocalStorage,
+}
+
+pub fn flags(storage: LocalStorage) -> Flags {
+    let (config_handler, config) = (TasksConfig::config_handler(), TasksConfig::config());
+
+    Flags {
+        config_handler,
+        config,
+        storage,
+    }
+}

src/error.rs renamed to src/app/error.rs

@@ -1,4 +1,4 @@
-use crate::core::models::{List, Status, Task};
+use crate::storage::models::{List, Status, Task};
 
 pub trait Markdown {
     fn markdown(&self) -> String;

src/app/flags.rs

@@ -8,12 +8,12 @@ use cosmic::{
 };
 
 use crate::{
-    app::icons,
     app::{Action, Message},
+    core::icons,
     fl,
 };
 
-use super::config::TasksConfig;
+use crate::core::config::TasksConfig;
 
 pub fn menu_bar<'a>(
     key_binds: &HashMap<KeyBind, Action>,