flattened views module

3 files changed, 125 insertions, 141 deletions

diff --git a/src/views.rs b/src/views.rs
new file mode 100644
index 0000000..ebb83b8
--- /dev/null
+++ b/src/views.rs
@@ -0,0 +1,125 @@
+use cursive::direction::Direction;
+use cursive::event::{Event, EventResult, Key};
+use cursive::theme::Style;
+use cursive::view::View;
+use cursive::{Printer, Vec2};
+
+use chrono::prelude::*;
+use chrono::{Local, NaiveDate};
+
+use crate::habit::{Bit, Count, Habit, TrackEvent};
+use crate::CONFIGURATION;
+
+pub trait ShadowView {
+    fn draw(&self, printer: &Printer);
+    fn required_size(&mut self, _: Vec2) -> Vec2;
+    fn take_focus(&mut self, _: Direction) -> bool;
+    fn on_event(&mut self, e: Event) -> EventResult;
+}
+
+// the only way to not rewrite each View implementation for trait
+// objects of Habit is to rewrite the View trait itself.
+impl<T> ShadowView for T
+where
+    T: Habit,
+    T::HabitType: std::fmt::Display,
+{
+    fn draw(&self, printer: &Printer) {
+        let now = Local::now();
+        let year = now.year();
+        let month = now.month();
+
+        let goal_reached_style = Style::from(CONFIGURATION.reached_color);
+        let todo_style = Style::from(CONFIGURATION.todo_color);
+        let future_style = Style::from(CONFIGURATION.future_color);
+
+        printer.with_style(
+            if !printer.focused {
+                future_style
+            } else {
+                goal_reached_style
+            },
+            |p| {
+                p.print(
+                    (0, 0),
+                    &format!("{:width$}", self.name(), width = CONFIGURATION.view_width),
+                )
+            },
+        );
+
+        for i in 1..=31 {
+            let day = NaiveDate::from_ymd_opt(year, month, i);
+            let day_style;
+
+            if let Some(d) = day {
+                if self.reached_goal(d) {
+                    day_style = goal_reached_style;
+                } else {
+                    day_style = todo_style;
+                }
+                let coords: Vec2 = ((i % 7) * 3, i / 7 + 2).into();
+                if let Some(c) = self.get_by_date(d) {
+                    printer.with_style(day_style, |p| {
+                        p.print(coords, &format!("{:^3}", c));
+                    });
+                } else {
+                    printer.with_style(future_style, |p| {
+                        p.print(coords, &format!("{:^3}", CONFIGURATION.future_chr));
+                    });
+                }
+                //printer.with_style(day_style, |p| {
+                //        p.print(coords, &format!("{:^3}", c));
+                //    } else {
+                //        p.print(coords, &format!("{:^3}", CONFIGURATION.future_chr));
+                //    }
+                //});
+            }
+        }
+    }
+    fn required_size(&mut self, _: Vec2) -> Vec2 {
+        (25, 6).into()
+    }
+
+    fn take_focus(&mut self, _: Direction) -> bool {
+        true
+    }
+
+    fn on_event(&mut self, e: Event) -> EventResult {
+        let now = Local::now().naive_utc().date();
+        match e {
+            Event::Key(Key::Enter) | Event::Char('n') => {
+                self.modify(now, TrackEvent::Increment);
+                return EventResult::Consumed(None);
+            }
+            Event::Key(Key::Backspace) | Event::Char('p') => {
+                self.modify(now, TrackEvent::Decrement);
+                return EventResult::Consumed(None);
+            }
+            _ => return EventResult::Ignored,
+        }
+    }
+}
+
+macro_rules! auto_view_impl {
+    ($struct_name:ident) => {
+        impl View for $struct_name {
+            fn draw(&self, printer: &Printer) {
+                ShadowView::draw(self, printer);
+            }
+            fn required_size(&mut self, x: Vec2) -> Vec2 {
+                ShadowView::required_size(self, x)
+            }
+
+            fn take_focus(&mut self, d: Direction) -> bool {
+                ShadowView::take_focus(self, d)
+            }
+
+            fn on_event(&mut self, e: Event) -> EventResult {
+                ShadowView::on_event(self, e)
+            }
+        }
+    };
+}
+
+auto_view_impl!(Count);
+auto_view_impl!(Bit);
diff --git a/src/views/habitview.rs b/src/views/habitview.rs
deleted file mode 100644
index c9ca505..0000000
--- a/src/views/habitview.rs
+++ /dev/null
@@ -1,137 +0,0 @@
-use cursive::direction::Direction;
-use cursive::event::{Event, EventResult, Key};
-use cursive::theme::{BaseColor, Color, Style};
-use cursive::view::View;
-use cursive::{Printer, Vec2};
-
-use chrono::prelude::*;
-use chrono::{Local, NaiveDate};
-
-use crate::habit::{Habit, HabitTrait, HabitType, TrackEvent};
-
-use serde::Serialize;
-
-pub struct HabitView {
-    habit: Habit,
-    // characters to use
-    true_chr: char,
-    false_chr: char,
-    future_chr: char,
-    // view dimensions
-    view_width: u32,
-    view_height: u32,
-    // color config
-    reached_color: Color,
-    todo_color: Color,
-    future_color: Color,
-}
-
-impl HabitView {
-    pub fn new(habit: Habit) -> Self {
-        return HabitView {
-            habit,
-            true_chr: '·',
-            false_chr: '·',
-            future_chr: '·',
-            view_width: 25,
-            view_height: 8,
-            reached_color: Color::Dark(BaseColor::Cyan),
-            todo_color: Color::Dark(BaseColor::Magenta),
-            future_color: Color::Light(BaseColor::Black),
-        };
-    }
-    pub fn get_name(&self) -> String {
-        return self.habit.get_name().to_owned();
-    }
-    pub fn get_size(&self) -> Vec2 {
-        (self.view_width, self.view_height).into()
-    }
-    pub fn remaining(&self) -> u32 {
-        self.habit.remaining(Local::now().naive_utc().date())
-    }
-    pub fn total(&self) -> u32 {
-        self.habit.total()
-    }
-}
-
-impl View for HabitView {
-    fn draw(&self, printer: &Printer) {
-        let now = Local::now();
-        let year = now.year();
-        let month = now.month();
-
-        let goal_reached_style = Style::from(self.reached_color);
-        let todo_style = Style::from(self.todo_color);
-        let future_style = Style::from(self.future_color);
-
-        printer.with_style(
-            if !printer.focused {
-                future_style
-            } else {
-                goal_reached_style
-            },
-            |p| {
-                p.print(
-                    (0, 0),
-                    &format!("{:width$}", self.get_name(), width = self.get_size().x),
-                )
-            },
-        );
-
-        for i in 1..=31 {
-            let day = NaiveDate::from_ymd_opt(year, month, i);
-            let mut day_style;
-
-            if let Some(d) = day {
-                if self.habit.reached_goal(d) {
-                    day_style = goal_reached_style;
-                } else {
-                    day_style = todo_style;
-                }
-                let coords: Vec2 = ((i % 7) * 3, i / 7 + 2).into();
-                let day_chr: Box<dyn std::fmt::Display> = match self.habit.get_by_date(d) {
-                    Some(val) => match val {
-                        HabitType::Bit(b) => {
-                            if *b {
-                                Box::new(self.true_chr)
-                            } else {
-                                Box::new(self.false_chr)
-                            }
-                        }
-                        HabitType::Count(c) => Box::new(c.to_string()),
-                    },
-                    None => {
-                        day_style = future_style;
-                        Box::new(self.future_chr)
-                    }
-                };
-                printer.with_style(day_style, |p| {
-                    p.print(coords, &format!("{:^3}", day_chr));
-                });
-            }
-        }
-    }
-
-    fn required_size(&mut self, _: Vec2) -> Vec2 {
-        (self.view_width, self.view_height).into()
-    }
-
-    fn take_focus(&mut self, _: Direction) -> bool {
-        true
-    }
-
-    fn on_event(&mut self, e: Event) -> EventResult {
-        let now = Local::now().naive_utc().date();
-        match e {
-            Event::Key(Key::Enter) | Event::Char('n') => {
-                self.habit.modify(now, TrackEvent::Increment);
-                return EventResult::Consumed(None);
-            }
-            Event::Key(Key::Backspace) | Event::Char('p') => {
-                self.habit.modify(now, TrackEvent::Decrement);
-                return EventResult::Consumed(None);
-            }
-            _ => return EventResult::Ignored,
-        }
-    }
-}
diff --git a/src/views/mod.rs b/src/views/mod.rs
deleted file mode 100644
index 1e3732f..0000000
--- a/src/views/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-// pub mod bitview;
-// pub mod countview;
-
-pub mod habitview;