Renaming navigation event

This commit is contained in:
2026-02-11 16:19:23 +03:00
parent 638080c0e9
commit 3c6eb152b4
3 changed files with 6 additions and 7 deletions
+2 -2
View File
@@ -28,7 +28,7 @@ enum Page {
Selector(SelectorState), Selector(SelectorState),
Quiz(QuizState), Quiz(QuizState),
Writing(WritingState), Writing(WritingState),
Back, PreviousPage,
} }
impl Default for Page { impl Default for Page {
@@ -93,7 +93,7 @@ macro_rules! state_update {
macro_rules! message_navigation { macro_rules! message_navigation {
($msg:expr, $stack:expr, $state:expr) => { ($msg:expr, $stack:expr, $state:expr) => {
if let Some(new_page) = $state.navigate(&$msg) { if let Some(new_page) = $state.navigate(&$msg) {
if let Page::Back = new_page { if let Page::PreviousPage = new_page {
$stack.pop(); $stack.pop();
return; return;
} }
+2 -3
View File
@@ -1,5 +1,5 @@
use crate::lang::KanaSet; use crate::lang::KanaSet;
use crate::Page::Back; use crate::Page::PreviousPage;
use crate::{NavigatedPage, Page}; use crate::{NavigatedPage, Page};
use iced::widget::*; use iced::widget::*;
use iced::{alignment, Element, Fill, Font}; use iced::{alignment, Element, Fill, Font};
@@ -19,7 +19,7 @@ pub struct QuizState {
impl NavigatedPage<QuizMessage> for QuizState { impl NavigatedPage<QuizMessage> for QuizState {
fn navigate(&self, message: &QuizMessage) -> Option<Page> { fn navigate(&self, message: &QuizMessage) -> Option<Page> {
if let QuizMessage::Back = message { if let QuizMessage::Back = message {
Some(Back) Some(PreviousPage)
} else { } else {
None None
} }
@@ -61,7 +61,6 @@ impl QuizState {
return; return;
} }
self.current_roman = content; self.current_roman = content;
println!("Content: {}", self.current_roman);
if self.correct_roman == self.current_roman { if self.correct_roman == self.current_roman {
if self.is_help == false { if self.is_help == false {
self.score.correct += 1; self.score.correct += 1;
+2 -2
View File
@@ -1,5 +1,5 @@
use crate::lang::KanaSet; use crate::lang::KanaSet;
use crate::Page::Back; use crate::Page::PreviousPage;
use crate::{NavigatedPage, Page}; use crate::{NavigatedPage, Page};
use iced::widget::*; use iced::widget::*;
use iced::{alignment, Element, Fill, Font}; use iced::{alignment, Element, Fill, Font};
@@ -19,7 +19,7 @@ pub struct WritingState {
impl NavigatedPage<WritingMessage> for WritingState { impl NavigatedPage<WritingMessage> for WritingState {
fn navigate(&self, message: &WritingMessage) -> Option<Page> { fn navigate(&self, message: &WritingMessage) -> Option<Page> {
if let WritingMessage::Back = message { if let WritingMessage::Back = message {
Some(Back) Some(PreviousPage)
} else { } else {
None None
} }