diff --git a/src/card/mod.rs b/src/card/mod.rs index 1b091fb..f26bb95 100644 --- a/src/card/mod.rs +++ b/src/card/mod.rs @@ -1,46 +1,36 @@ -use gtk::glib::Object; - pub struct Card { image_path: Option, hieroglyph: Option, reading: Option, translation: Option, + is_learning: Option } impl Card { - - pub fn new(image_path: Option, hieroglyph: Option, reading: Option, translation: Option) -> Card { + pub fn new(image_path: Option, hieroglyph: Option, reading: Option, translation: Option, is_learning: Option) -> Card { Card { - image_path, hieroglyph, reading, translation + image_path, hieroglyph, reading, translation, is_learning } } - pub fn image_path(&self) -> Option<&String> { - match &self.image_path { - Some(v) => Some(&v), - None => None, - } + pub fn image_path(&self) -> Option { + self.image_path.clone() } - pub fn hieroglyp(&self) -> Option<&String> { - match &self.image_path { - Some(v) => Some(&v), - None => None, - } + pub fn hieroglyp(&self) -> Option { + self.hieroglyph.clone() } - pub fn reading(&self) -> Option<&String> { - match &self.reading { - Some(v) => Some(&v), - None => None, - } + pub fn reading(&self) -> Option { + self.reading.clone() } - pub fn translation(&self) -> Option<&String> { - match &self.translation { - Some(v) => Some(&v), - None => None, - } + pub fn translation(&self) -> Option { + self.translation.clone() + } + + pub fn is_learning(&self) -> Option { + self.is_learning.clone() } }