Refactor style files

syrtcevvi · Sep 7, 2024 · 535eeb6 · 535eeb6
1 parent 9daab71
commit 535eeb6
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 11 deletions.
diff --git a/crates/teloxide-inline-widgets/Cargo.toml b/crates/teloxide-inline-widgets/Cargo.toml
@@ -26,14 +26,15 @@ derive_more = { version = "0.99.18", default-features = false, features = ["disp
 serde = { version = "1.0.204", features = ["derive"] }
 teloxide = { version = "0.12.2", default-features = false }
 log = "0.4.22"
+chrono = "0.4.38"
 
 [dev-dependencies]
 derive_more = "0.99.18"
 log = "0.4.22"
 pretty_assertions = "1.4.0"
 pretty_env_logger = "0.5.0"
 rstest = "0.22.0"
-teloxide = "0.12.2"
+teloxide = { version = "0.12.2", features = ["macros"] }
 tokio = { version = "1.39.1", features = ["rt-multi-thread", "macros"] }
 
 [[example]]

diff --git a/crates/teloxide-inline-widgets/src/types.rs b/crates/teloxide-inline-widgets/src/types.rs
@@ -1,12 +1,5 @@
-mod calendar_style;
-mod checkbox_list_style;
-mod common_style;
-mod radio_list_style;
+mod callback_query_data;
 mod size;
-mod widget_styles;
+mod styles;
 
-pub use self::{
-    calendar_style::CalendarStyle, checkbox_list_style::CheckboxListStyle,
-    common_style::CommonStyle, radio_list_style::RadioListStyle, size::Size,
-    widget_styles::WidgetStyles,
-};
+pub use self::{callback_query_data::CallbackQueryData, size::Size, styles::*};
diff --git a/crates/teloxide-inline-widgets/src/types/styles.rs b/crates/teloxide-inline-widgets/src/types/styles.rs
@@ -0,0 +1,10 @@
+mod calendar_style;
+mod checkbox_list_style;
+mod common_style;
+mod radio_list_style;
+mod widget_styles;
+
+pub use self::{
+    calendar_style::*, checkbox_list_style::*, common_style::*, radio_list_style::*,
+    widget_styles::*,
+};
diff --git a/...nline-widgets/src/types/calendar_style.rs → ...idgets/src/types/styles/calendar_style.rs b/...nline-widgets/src/types/calendar_style.rs → ...idgets/src/types/styles/calendar_style.rs
diff --git a/...-widgets/src/types/checkbox_list_style.rs → ...s/src/types/styles/checkbox_list_style.rs b/...-widgets/src/types/checkbox_list_style.rs → ...s/src/types/styles/checkbox_list_style.rs
diff --git a/...-inline-widgets/src/types/common_style.rs → ...-widgets/src/types/styles/common_style.rs b/...-inline-widgets/src/types/common_style.rs → ...-widgets/src/types/styles/common_style.rs
diff --git a/...ine-widgets/src/types/radio_list_style.rs → ...gets/src/types/styles/radio_list_style.rs b/...ine-widgets/src/types/radio_list_style.rs → ...gets/src/types/styles/radio_list_style.rs
diff --git a/...inline-widgets/src/types/widget_styles.rs → ...widgets/src/types/styles/widget_styles.rs b/...inline-widgets/src/types/widget_styles.rs → ...widgets/src/types/styles/widget_styles.rs