code cleanup

src/selector.rs

@@ -1,22 +1,22 @@
-use std::sync::{Arc, Mutex};
 use crate::dictionary::DictionaryState;
 use crate::lang::{KanaSet, KanaType};
-use crate::randomizer::randomizer::RandomizerState;
+use crate::navigation::Page::*;
+use crate::navigation::{NavigatedPage, Page};
+use crate::randomizer::RandomizerState;
 use crate::repetitions::RepetitionsState;
 use crate::selector::SelectorMessage::ChangeMode;
+use crate::styling::*;
+use crate::sync::SyncState;
 use crate::writing::WritingState;
 use crate::{AppState, QuizState, RootMessage};
 use iced::widget::*;
 use iced::{alignment, Element, Task};
-use crate::navigation::{NavigatedPage, Page};
-use crate::navigation::Page::*;
-use crate::styling::*;
-use crate::sync::SyncState;
+use std::sync::{Arc, Mutex};
 
 pub struct SelectorState {
     pub set: KanaSet,
     is_writing: bool,
-    state: Arc<Mutex<AppState>>
+    state: Arc<Mutex<AppState>>,
 }
 
 #[derive(Debug, Clone)]
@@ -61,7 +61,7 @@ impl NavigatedPage<SelectorMessage> for SelectorState {
 
 impl SelectorState {
     pub fn new(state: Arc<Mutex<AppState>>) -> Self {
-        Self{
+        Self {
             set: Default::default(),
             is_writing: false,
             state,
@@ -84,18 +84,30 @@ impl SelectorState {
         container(
             iced::widget::column![
                 row![
-                    button("あ ↔ ア").on_press(SelectorMessage::Change).style(jl_button),
-                    button("Словарь").on_press(SelectorMessage::ToDictionary).style(button::text),
-                    button("Рандомайзер").on_press(SelectorMessage::ToRandomize).style(button::text),
-                    button("Повторение").on_press(SelectorMessage::ToRepetitions).style(button::text),
-                    button("Синхронизация").on_press(SelectorMessage::ToSync).style(button::text)
+                    button("あ ↔ ア")
+                        .on_press(SelectorMessage::Change)
+                        .style(jl_button),
+                    button("Словарь")
+                        .on_press(SelectorMessage::ToDictionary)
+                        .style(button::text),
+                    button("Рандомайзер")
+                        .on_press(SelectorMessage::ToRandomize)
+                        .style(button::text),
+                    button("Повторение")
+                        .on_press(SelectorMessage::ToRepetitions)
+                        .style(button::text),
+                    button("Синхронизация")
+                        .on_press(SelectorMessage::ToSync)
+                        .style(button::text)
                 ]
                 .spacing(DEFAULT_SPACING),
                 self.rows_selector(),
                 toggler(self.is_writing)
                     .label("Режим письма")
                     .on_toggle(ChangeMode),
-                button("К тесту").on_press(SelectorMessage::Goto).style(jl_button),
+                button("К тесту")
+                    .on_press(SelectorMessage::Goto)
+                    .style(jl_button),
             ]
             .spacing(DEFAULT_SPACING),
         )