deprecate view_month_offset in favor of cursor

1 files changed, 8 insertions, 29 deletions

diff --git a/src/habit/bit.rs b/src/habit/bit.rs
index 7fe6fd9..da64ece 100644
--- a/src/habit/bit.rs
+++ b/src/habit/bit.rs
@@ -1,13 +1,12 @@
 use std::collections::HashMap;
+use std::default::Default;
 
 use chrono::NaiveDate;
-use cursive::direction::Absolute;
 use serde::{Deserialize, Serialize};
 
-use crate::app::Cursor;
 use crate::habit::prelude::default_auto;
 use crate::habit::traits::Habit;
-use crate::habit::{TrackEvent, ViewMode};
+use crate::habit::{InnerData, TrackEvent};
 use crate::CONFIGURATION;
 
 #[derive(Copy, Clone, Debug, Serialize, Deserialize)]
@@ -44,13 +43,7 @@ pub struct Bit {
     auto: bool,
 
     #[serde(skip)]
-    view_month_offset: u32,
-
-    #[serde(skip)]
-    cursor: Cursor,
-
-    #[serde(skip)]
-    view_mode: ViewMode,
+    inner_data: InnerData,
 }
 
 impl Bit {
@@ -60,9 +53,7 @@ impl Bit {
             stats: HashMap::new(),
             goal: CustomBool(true),
             auto,
-            view_month_offset: 0,
-            cursor: Cursor::new(),
-            view_mode: ViewMode::Day,
+            inner_data: Default::default(),
         };
     }
 }
@@ -124,23 +115,11 @@ impl Habit for Bit {
             }
         }
     }
-    fn set_view_month_offset(&mut self, offset: u32) {
-        self.view_month_offset = offset;
-    }
-    fn view_month_offset(&self) -> u32 {
-        self.view_month_offset
-    }
-    fn move_cursor(&mut self, d: Absolute) {
-        self.cursor.do_move(d);
-    }
-    fn cursor(&self) -> Cursor {
-        self.cursor
-    }
-    fn set_view_mode(&mut self, mode: ViewMode) {
-        self.view_mode = mode;
+    fn inner_data_ref(&self) -> &InnerData {
+        &self.inner_data
     }
-    fn view_mode(&self) -> ViewMode {
-        self.view_mode
+    fn inner_data_mut_ref(&mut self) -> &mut InnerData {
+        &mut self.inner_data
     }
     fn is_auto(&self) -> bool {
         self.auto