refactor(calendar): add setters for managing selected date logic

examples/calendar/src/main.rs

@@ -3,7 +3,7 @@
 
 //! Calendar widget example
 
-use chrono::{Datelike, Days, Local, Months, NaiveDate};
+use chrono::{Local, NaiveDate};
 use cosmic::app::{Command, Core, Settings};
 use cosmic::{executor, iced, ApplicationExt, Element};
 
@@ -69,33 +69,13 @@ impl cosmic::Application for App {
     fn update(&mut self, message: Self::Message) -> Command<Self::Message> {
         match message {
             Message::DaySelected(day) => {
-                let current = self.date_selected.day();
+                cosmic::widget::calendar::set_day(&mut self.date_selected, day);
-
-                let new_date = if current < day {
-                    self.date_selected
-                        .checked_add_days(Days::new((day - current) as u64))
-                } else if current > day {
-                    self.date_selected
-                        .checked_sub_days(Days::new((current - day) as u64))
-                } else {
-                    None
-                };
-
-                if let Some(new) = new_date {
-                    self.date_selected = new;
-                }
             }
             Message::PrevMonth => {
-                self.date_selected = self
+                cosmic::widget::calendar::set_prev_month(&mut self.date_selected);
-                    .date_selected
-                    .checked_sub_months(Months::new(1))
-                    .expect("valid naivedate");
             }
             Message::NextMonth => {
-                self.date_selected = self
+                cosmic::widget::calendar::set_next_month(&mut self.date_selected);
-                    .date_selected
-                    .checked_add_months(Months::new(1))
-                    .expect("valid naivedate");
             }
         }
 
@@ -113,7 +93,7 @@ impl cosmic::Application for App {
             |day| Message::DaySelected(day),
         );
 
-        content = content.push(cosmic::widget::container(calendar).width(350));
+        content = content.push(calendar);
 
         let centered = cosmic::widget::container(content)
             .width(iced::Length::Fill)

src/widget/calendar.rs

@@ -1,9 +1,11 @@
 // Copyright 2024 System76 <info@system76.com>
 // SPDX-License-Identifier: MPL-2.0
 
+use std::cmp;
+
 use crate::iced_core::{Length, Padding};
 use crate::widget::{button, column, grid, icon, row, text, Grid};
-use chrono::{Datelike, Days, NaiveDate, Weekday};
+use chrono::{Datelike, Days, Months, NaiveDate, Weekday};
 use iced::alignment::{Horizontal, Vertical};
 
 pub fn calendar<M>(
@@ -20,6 +22,34 @@ pub fn calendar<M>(
     }
 }
 
+pub fn set_day(date_selected: &mut NaiveDate, day: u32) {
+    let current = date_selected.day();
+
+    let new_date = match current.cmp(&day) {
+        cmp::Ordering::Less => date_selected.checked_add_days(Days::new((day - current) as u64)),
+
+        cmp::Ordering::Greater => date_selected.checked_sub_days(Days::new((current - day) as u64)),
+
+        _ => None,
+    };
+
+    if let Some(new) = new_date {
+        *date_selected = new;
+    }
+}
+
+pub fn set_prev_month(date_selected: &mut NaiveDate) {
+    *date_selected = date_selected
+        .checked_sub_months(Months::new(1))
+        .expect("valid naivedate");
+}
+
+pub fn set_next_month(date_selected: &mut NaiveDate) {
+    *date_selected = date_selected
+        .checked_add_months(Months::new(1))
+        .expect("valid naivedate");
+}
+
 pub struct Calendar<'a, M> {
     selected: &'a NaiveDate,
     on_prev_month: M,
@@ -95,6 +125,7 @@ where
             calendar_grid.into(),
             padded_control(crate::widget::divider::horizontal::default()).into(),
         ])
+        .width(315)
         .padding([8, 0]);
 
         Self::new(content_list)