From 6207747473b852c25387c543fec38a8a78f1a184 Mon Sep 17 00:00:00 2001 From: Akshay Date: Thu, 27 Feb 2020 20:21:18 +0530 Subject: refactor into app.rs --- src/main.rs | 159 +----------------------------------------------------------- 1 file changed, 2 insertions(+), 157 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index 3d819d2..5115aab 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,14 +1,9 @@ #![allow(unused_must_use)] use chrono::NaiveDate; -use std::f64; -use cursive::direction::Direction; -use cursive::event::{Event, EventResult, Key}; -use cursive::view::{View, ViewWrapper}; //use cursive::views::{Dialog, EditView, LinearLayout, ListView, SelectView}; use cursive::Cursive; -use cursive::{Printer, Vec2}; mod habit; use crate::habit::{Habit, HabitTrait, HabitType}; @@ -16,159 +11,9 @@ use crate::habit::{Habit, HabitTrait, HabitType}; mod views; use crate::views::habitview::HabitView; +mod app; mod theme; - -#[derive(PartialEq)] -enum ViewMode { - Day, - Month, - Year, -} - -struct App { - habits: Vec, - view_mode: ViewMode, - focus: usize, - grid_width: usize, - - padding: usize, -} - -impl App { - fn new() -> Self { - return App { - habits: vec![], - view_mode: ViewMode::Day, - focus: 0, - grid_width: 3, - padding: 12, - }; - } - fn add_habit(mut self, h: HabitView) -> Self { - self.habits.push(h); - return self; - } - fn set_mode(mut self, set_mode: ViewMode) -> Self { - if set_mode != self.view_mode { - self.view_mode = set_mode - } - return self; - } - fn focus_right(&mut self) { - if self.focus != self.habits.len() - 1 { - self.focus += 1; - } - } - fn focus_left(&mut self) { - if self.focus != 0 { - self.focus -= 1; - } - } - fn focus_down(&mut self) { - if self.focus + self.grid_width < self.habits.len() - 1 { - self.focus += self.grid_width; - } else { - self.focus = self.habits.len() - 1; - } - } - fn focus_up(&mut self) { - if self.focus as isize - self.grid_width as isize >= 0 { - self.focus -= self.grid_width; - } else { - self.focus = 0; - } - } - fn status(&self) -> String { - return format!( - "{} total, {} remaining", - self.habits.iter().map(|h| h.total()).sum::(), - self.habits.iter().map(|h| h.remaining()).sum::() - ); - } - fn max_size(&self) -> Vec2 { - let grid_width = self.grid_width; - let width = { - if self.habits.len() > 0 { - grid_width * self.habits[0].get_size().x - } else { - 0 - } - }; - let height = { - if self.habits.len() > 0 { - (self.habits[0].get_size().y as f64 - * (self.habits.len() as f64 / grid_width as f64).ceil()) - as usize - } else { - 0 - } - }; - Vec2::new(width, height) - } -} - -impl cursive::view::View for App { - fn draw(&self, printer: &Printer) { - let grid_width = self.grid_width; - let mut offset = Vec2::zero(); - for (idx, i) in self.habits.iter().enumerate() { - if idx >= grid_width && idx % grid_width == 0 { - offset = offset.map_y(|y| y + i.get_size().y).map_x(|_| 0); - } - i.draw(&printer.offset(offset).focused(self.focus == idx)); - offset = offset.map_x(|x| x + i.get_size().x); - } - offset = offset.map_x(|_| 0).map_y(|_| self.max_size().y - 2); - printer.print(offset, &self.status()); - } - - fn required_size(&mut self, _: Vec2) -> Vec2 { - let grid_width = self.grid_width; - let width = { - if self.habits.len() > 0 { - grid_width * self.habits[0].get_size().x - } else { - 0 - } - }; - let height = { - if self.habits.len() > 0 { - (self.habits[0].get_size().y as f64 - * (self.habits.len() as f64 / grid_width as f64).ceil()) - as usize - } else { - 0 - } - }; - Vec2::new(width, height) - } - - fn take_focus(&mut self, _: Direction) -> bool { - false - } - - fn on_event(&mut self, e: Event) -> EventResult { - match e { - Event::Key(Key::Right) | Event::Key(Key::Tab) | Event::Char('l') => { - self.focus_right(); - return EventResult::Consumed(None); - } - Event::Key(Key::Left) | Event::Shift(Key::Tab) | Event::Char('h') => { - self.focus_left(); - return EventResult::Consumed(None); - } - Event::Key(Key::Up) | Event::Char('k') => { - self.focus_up(); - return EventResult::Consumed(None); - } - Event::Key(Key::Down) | Event::Char('j') => { - self.focus_down(); - return EventResult::Consumed(None); - } - _ => self.habits[self.focus].on_event(e), - } - } -} +use crate::app::{App, ViewMode}; fn main() { let mut s = Cursive::default(); -- cgit v1.2.3