Rename clock example to events

This commit is contained in:
Héctor Ramón Jiménez 2019-12-09 22:39:28 +01:00
parent 98160406f7
commit e189c22bb0

View file

@ -6,42 +6,40 @@ use iced::{
pub fn main() { pub fn main() {
env_logger::init(); env_logger::init();
Clock::run(Settings::default()) Events::run(Settings::default())
} }
#[derive(Debug)] #[derive(Debug, Default)]
struct Clock { struct Events {
time: chrono::DateTime<chrono::Local>, last: Vec<iced_native::Event>,
enabled: bool, enabled: bool,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
enum Message { enum Message {
Ticked(chrono::DateTime<chrono::Local>), EventOccurred(iced_native::Event),
Toggled(bool), Toggled(bool),
} }
impl Application for Clock { impl Application for Events {
type Message = Message; type Message = Message;
fn new() -> (Clock, Command<Message>) { fn new() -> (Events, Command<Message>) {
( (Events::default(), Command::none())
Clock {
time: chrono::Local::now(),
enabled: false,
},
Command::none(),
)
} }
fn title(&self) -> String { fn title(&self) -> String {
String::from("Clock - Iced") String::from("Events - Iced")
} }
fn update(&mut self, message: Message) -> Command<Message> { fn update(&mut self, message: Message) -> Command<Message> {
match message { match message {
Message::Ticked(time) => { Message::EventOccurred(event) => {
self.time = time; self.last.push(event);
if self.last.len() > 5 {
let _ = self.last.remove(0);
}
} }
Message::Toggled(enabled) => { Message::Toggled(enabled) => {
self.enabled = enabled; self.enabled = enabled;
@ -53,16 +51,23 @@ impl Application for Clock {
fn subscriptions(&self) -> Subscription<Message> { fn subscriptions(&self) -> Subscription<Message> {
if self.enabled { if self.enabled {
time::every(std::time::Duration::from_millis(500), Message::Ticked) events::all(Message::EventOccurred)
} else { } else {
Subscription::none() Subscription::none()
} }
} }
fn view(&mut self) -> Element<Message> { fn view(&mut self) -> Element<Message> {
let clock = Text::new(format!("{}", self.time.format("%H:%M:%S"))) let events = self.last.iter().fold(
.size(40) Column::new().width(Length::Shrink).spacing(10),
.width(Length::Shrink); |column, event| {
column.push(
Text::new(format!("{:?}", event))
.size(40)
.width(Length::Shrink),
)
},
);
let toggle = Checkbox::new(self.enabled, "Enabled", Message::Toggled) let toggle = Checkbox::new(self.enabled, "Enabled", Message::Toggled)
.width(Length::Shrink); .width(Length::Shrink);
@ -71,7 +76,7 @@ impl Application for Clock {
.width(Length::Shrink) .width(Length::Shrink)
.align_items(Align::Center) .align_items(Align::Center)
.spacing(20) .spacing(20)
.push(clock) .push(events)
.push(toggle); .push(toggle);
Container::new(content) Container::new(content)
@ -83,34 +88,23 @@ impl Application for Clock {
} }
} }
mod time { mod events {
use std::sync::Arc; use std::sync::Arc;
pub fn every<Message>( pub fn all<Message>(
duration: std::time::Duration, f: impl Fn(iced_native::Event) -> Message + 'static + Send + Sync,
f: impl Fn(chrono::DateTime<chrono::Local>) -> Message
+ 'static
+ Send
+ Sync,
) -> iced::Subscription<Message> ) -> iced::Subscription<Message>
where where
Message: Send + 'static, Message: Send + 'static,
{ {
Tick { All(Arc::new(f)).into()
duration,
message: Arc::new(f),
}
.into()
} }
struct Tick<Message> { struct All<Message>(
duration: std::time::Duration, Arc<dyn Fn(iced_native::Event) -> Message + Send + Sync>,
message: Arc< );
dyn Fn(chrono::DateTime<chrono::Local>) -> Message + Send + Sync,
>,
}
impl<Message> iced_native::subscription::Connection for Tick<Message> impl<Message> iced_native::subscription::Connection for All<Message>
where where
Message: 'static, Message: 'static,
{ {
@ -127,9 +121,9 @@ mod time {
) -> futures::stream::BoxStream<'static, Message> { ) -> futures::stream::BoxStream<'static, Message> {
use futures::StreamExt; use futures::StreamExt;
let function = self.message.clone(); let function = self.0.clone();
input.map(move |_| function(chrono::Local::now())).boxed() input.map(move |event| function(event)).boxed()
} }
} }
} }