Routing to history page
This commit is contained in:
+9
-3
@@ -2,7 +2,7 @@ use crate::data_provider::card_sets::{delete_set, update_card_set};
|
||||
use crate::data_provider::card_stats::load_stats_of_set;
|
||||
use crate::lang::{SetOrderMode, WordData};
|
||||
use crate::repetition::RepetitionState;
|
||||
use crate::Page::{PreviousPage, Repetition};
|
||||
use crate::Page::{History, PreviousPage, Repetition};
|
||||
use crate::{AppState, NavigatedPage, Page, RootMessage, DEFAULT_SPACING};
|
||||
use iced::widget::button::danger;
|
||||
pub use iced::widget::button::{Catalog, Style};
|
||||
@@ -11,6 +11,7 @@ use iced::widget::{button, column, container, radio, row, scrollable, space, tex
|
||||
use iced::{Border, Center, Element, Fill, Left, Length, Shadow, Task, Theme};
|
||||
use rhai::{Engine, Scope};
|
||||
use std::sync::{Arc, Mutex};
|
||||
use crate::history::HistoryState;
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct RepetitionsState {
|
||||
@@ -24,6 +25,8 @@ impl NavigatedPage<RepetitionsMessage> for RepetitionsState {
|
||||
fn navigate(&self, message: &RepetitionsMessage) -> Option<Page> {
|
||||
if let RepetitionsMessage::Back = message {
|
||||
Some(PreviousPage)
|
||||
} else if let RepetitionsMessage::GoToHistory = message {
|
||||
Some(History(HistoryState::new(self.selected_set.unwrap(), self.state.clone())))
|
||||
} else if let RepetitionsMessage::GoToRepetition = message {
|
||||
let clone = self.state.clone();
|
||||
let card_set;
|
||||
@@ -55,6 +58,7 @@ impl RepetitionsState {
|
||||
RepetitionsMessage::Next => {}
|
||||
RepetitionsMessage::Back => {}
|
||||
RepetitionsMessage::GoToRepetition => {}
|
||||
RepetitionsMessage::GoToHistory => {}
|
||||
RepetitionsMessage::CreateSet => {
|
||||
let index = state.card_sets.len() + 1;
|
||||
state
|
||||
@@ -169,7 +173,8 @@ impl RepetitionsState {
|
||||
button("Проверить фильтр").on_press(RepetitionsMessage::TryFilter),
|
||||
self.count_view(&set),
|
||||
radio("Обычный режим", SetOrderMode::Default, Some(set.open_mode), RepetitionsMessage::SetOpenMode),
|
||||
self.words_words_view(&set)
|
||||
self.words_words_view(&set),
|
||||
button("История").on_press(RepetitionsMessage::GoToHistory),
|
||||
]
|
||||
.spacing(DEFAULT_SPACING)
|
||||
)
|
||||
@@ -260,7 +265,8 @@ pub enum RepetitionsMessage {
|
||||
SetBackward(String),
|
||||
SetFilter(String),
|
||||
TryFilter,
|
||||
SetOpenMode(SetOrderMode)
|
||||
SetOpenMode(SetOrderMode),
|
||||
GoToHistory,
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
|
||||
Reference in New Issue
Block a user