diff --git a/src/main.rs b/src/main.rs index 3283b0d..2f28070 100644 --- a/src/main.rs +++ b/src/main.rs @@ -28,7 +28,7 @@ enum Page { Selector(SelectorState), Quiz(QuizState), Writing(WritingState), - Back, + PreviousPage, } impl Default for Page { @@ -93,7 +93,7 @@ macro_rules! state_update { macro_rules! message_navigation { ($msg:expr, $stack:expr, $state:expr) => { if let Some(new_page) = $state.navigate(&$msg) { - if let Page::Back = new_page { + if let Page::PreviousPage = new_page { $stack.pop(); return; } diff --git a/src/quiz.rs b/src/quiz.rs index 1b12683..cfa5830 100644 --- a/src/quiz.rs +++ b/src/quiz.rs @@ -1,5 +1,5 @@ use crate::lang::KanaSet; -use crate::Page::Back; +use crate::Page::PreviousPage; use crate::{NavigatedPage, Page}; use iced::widget::*; use iced::{alignment, Element, Fill, Font}; @@ -19,7 +19,7 @@ pub struct QuizState { impl NavigatedPage for QuizState { fn navigate(&self, message: &QuizMessage) -> Option { if let QuizMessage::Back = message { - Some(Back) + Some(PreviousPage) } else { None } @@ -61,7 +61,6 @@ impl QuizState { return; } self.current_roman = content; - println!("Content: {}", self.current_roman); if self.correct_roman == self.current_roman { if self.is_help == false { self.score.correct += 1; diff --git a/src/writing.rs b/src/writing.rs index 28fffa2..82bc5af 100644 --- a/src/writing.rs +++ b/src/writing.rs @@ -1,5 +1,5 @@ use crate::lang::KanaSet; -use crate::Page::Back; +use crate::Page::PreviousPage; use crate::{NavigatedPage, Page}; use iced::widget::*; use iced::{alignment, Element, Fill, Font}; @@ -19,7 +19,7 @@ pub struct WritingState { impl NavigatedPage for WritingState { fn navigate(&self, message: &WritingMessage) -> Option { if let WritingMessage::Back = message { - Some(Back) + Some(PreviousPage) } else { None }