adapt to new Task struct instead of Command

src/app.rs

@@ -13,11 +13,11 @@ use crate::ui::{
 };
 #[cfg(feature = "tracing")]
 use crate::tracepoints;
-use chrono::{Datelike, NaiveDate, Months, Utc, Days};
+use chrono::{NaiveDate, Months, Utc, Days};
 use std::path;
 use iced::{
     Alignment,
-    Command,
+    Task,
     Element,
     Length,
     widget::{
@@ -72,7 +72,7 @@ impl CalendarApp {
         app
 	}
 
-    pub fn update(&mut self, message: Message) -> Command<Message> {
+    pub fn update(&mut self, message: Message) -> Task<Message> {
         match message {
             Message::PrevWeek => {
                 self.view_date = self.view_date - Days::new(7);
@@ -96,7 +96,7 @@ impl CalendarApp {
                 self.controls.mode = Some(mode);
             }
         }
-        Command::none()
+        Task::none()
     }
 
     pub fn view(&self) -> Element<Message> {
@@ -104,7 +104,7 @@ impl CalendarApp {
         tracepoints::calendar::view_entry();
         let content = Column::new()
             .align_items(Alignment::Center)
-            .push(self.controls.view(self.view_date, self.view_date.year()))
+            .push(self.controls.view(self.view_date))
             .push(CalendarView::new(self.controls.mode.unwrap_or(ViewMode::Year), &CalendarParams::new(), self.view_date, &self.events))
             ;
 

src/ui/controls.rs

@@ -3,6 +3,7 @@ use crate::{
 	ui::calendar::CalendarViewMode as ViewMode
 };
 use chrono::{
+	Datelike,
 	NaiveDate,
 	Locale,
 };
@@ -24,7 +25,7 @@ impl Default for Controls {
 }
 
 impl Controls {
-    pub fn view<'a>(&'a self, view_date: NaiveDate, year: i32) -> Element<Message> {
+    pub fn view<'a>(&'a self, view_date: NaiveDate) -> Element<Message> {
         let description = match self.mode {
             Some(ViewMode::Month) => view_date.format_localized("%B", self.locale).to_string(),
             Some(ViewMode::Week) => view_date.format_localized("%B", self.locale).to_string(),
@@ -51,7 +52,7 @@ impl Controls {
                     .size(24),
             )
             .push(
-                Text::new(year.to_string())
+                Text::new(view_date.year().to_string())
                     .width(Length::Fill)
                     .horizontal_alignment(alignment::Horizontal::Right)
                     .size(40),