More styling

src/quiz.rs

@@ -5,6 +5,7 @@ use iced::{alignment, Element, Fill, Task};
 use rand::seq::SliceRandom;
 use crate::navigation::{NavigatedPage, Page};
 use crate::navigation::Page::PreviousPage;
+use crate::quiz::QuizMessage::*;
 use crate::styling::*;
 
 #[derive(Clone, Debug)]
@@ -20,7 +21,7 @@ pub struct QuizState {
 
 impl NavigatedPage<QuizMessage> for QuizState {
     fn navigate(&self, message: &QuizMessage) -> Option<Page> {
-        if let QuizMessage::Back = message {
+        if let Back = message {
             Some(PreviousPage)
         } else {
             None
@@ -55,7 +56,7 @@ impl Default for QuizState {
 impl QuizState {
     pub fn update(&mut self, message: QuizMessage) -> Task<RootMessage> {
         match message {
-            QuizMessage::ContentChanged(content) => {
+            ContentChanged(content) => {
                 if content.contains("`") {
                     self.is_help = true;
                     self.score.fail += 1;
@@ -77,7 +78,7 @@ impl QuizState {
                     self.update_showed()
                 }
             }
-            QuizMessage::Back => todo!(),
+            Back => todo!(),
         }
         Task::none()
     }
@@ -118,7 +119,7 @@ impl QuizState {
                 text_input("Романдзи", &self.current_roman)
                     .size(28)
                     .width(150)
-                    .on_input(QuizMessage::ContentChanged),
+                    .on_input(ContentChanged),
                 row![
                     text!("{}", self.score.total.to_string()).size(25),
                     text!("{}", self.score.correct.to_string())
@@ -129,7 +130,7 @@ impl QuizState {
                         .size(25),
                 ]
                 .spacing(DEFAULT_SPACING),
-                button("Закончить").style(jl_button).on_press(QuizMessage::Back),
+                button("Закончить").style(jl_button).on_press(Back),
             ]
             .spacing(DEFAULT_SPACING)
             .align_x(alignment::Horizontal::Center),