Button restyle

src/repetitions.rs

@@ -1,19 +1,19 @@
 use crate::data_provider::card_sets::{delete_set, update_card_set};
 use crate::data_provider::card_stats::load_stats_of_set;
+use crate::history::HistoryState;
 use crate::lang::{SetOrderMode, WordData};
+use crate::navigation::Page::{History, PreviousPage, Repetition};
+use crate::navigation::{NavigatedPage, Page};
 use crate::repetition::RepetitionState;
+use crate::styling::*;
 use crate::{AppState, RootMessage};
 use iced::widget::button::{danger, Status};
 pub use iced::widget::button::{Catalog, Style};
 use iced::widget::container::bordered_box;
 use iced::widget::{button, column, container, radio, row, scrollable, space, text, text_input, Column};
-use iced::{color, Background, Border, Center, Color, Element, Fill, Left, Length, Shadow, Task, Theme};
+use iced::{Background, Border, Center, Color, Element, Fill, Left, Length, Shadow, Task, Theme};
 use rhai::{Engine, Scope};
 use std::sync::{Arc, Mutex};
-use crate::history::HistoryState;
-use crate::navigation::{NavigatedPage, Page};
-use crate::navigation::Page::{History, PreviousPage, Repetition};
-use crate::styling::*;
 
 #[derive(Clone)]
 pub struct RepetitionsState {
@@ -122,11 +122,11 @@ impl RepetitionsState {
     pub fn view(&self) -> Element<'_, RepetitionsMessage> {
         container(
             iced::widget::column![
-                button("Назад").on_press(RepetitionsMessage::Back),
+                button("Назад").style(jl_button).on_press(RepetitionsMessage::Back),
                 row![
                     column![
                         scrollable(self.sets_list()).height(Fill),
-                        button("Добавить")
+                        button("Добавить").style(jl_button)
                             .width(Fill)
                             .on_press(RepetitionsMessage::CreateSet),
                     ]
@@ -150,7 +150,7 @@ impl RepetitionsState {
 
     fn launch_button(&self) -> Element<'_, RepetitionsMessage> {
         if let Some(set) = self.selected_set && self.state.lock().unwrap().card_sets[set].id != 0 {
-            return button(text!("▷").height(Fill).center())
+            return button(text!("▷").height(Fill).center()).style(jl_button)
                 .height(200)
                 .on_press(RepetitionsMessage::GoToRepetition)
                 .into();
@@ -175,17 +175,17 @@ impl RepetitionsState {
                             .on_input(RepetitionsMessage::SetBackward),
                         text!("Фильтр"),
                         text_input("", &set.filter).on_input(RepetitionsMessage::SetFilter),
-                        button("Проверить фильтр").on_press(RepetitionsMessage::TryFilter),
+                        button("Проверить фильтр").style(jl_button).on_press(RepetitionsMessage::TryFilter),
                         self.count_view(&set),
                         radio("Обычный режим", SetOrderMode::Default, Some(set.open_mode), RepetitionsMessage::SetOpenMode),
                         self.words_words_view(&set),
-                        button("История").on_press(RepetitionsMessage::GoToHistory),
+                        button("История").style(jl_button).on_press(RepetitionsMessage::GoToHistory),
                     ]
                     .spacing(DEFAULT_SPACING)
                 )
                 .height(Fill),
                 row![
-                    button("Сохранить").on_press(RepetitionsMessage::Save),
+                    button("Сохранить").style(jl_button).on_press(RepetitionsMessage::Save),
                     button("Удалить")
                         .style(danger)
                         .on_press(RepetitionsMessage::DeleteSet)