Code cleanup
This commit is contained in:
1 parent
1ad991667b
commit
f66bf69ef5
32 files changed
+234
-899
No files matched your search
@@ -2,11 +2,11 @@ use crate::app::AppState;
|
||||
use crate::core::deck::DeckData;
|
||||
use crate::data::entities::{DeckSettings, EntityHandle};
|
||||
use crate::data::repositories::{BatchedRepository, Repository};
|
||||
use crate::jl_button;
|
||||
use crate::navigation::Page::PreviousPage;
|
||||
use crate::navigation::{NavigatedPage, Page, RootMessage};
|
||||
use crate::notification::MaybeError;
|
||||
use crate::pages::repetition_settings::RepetitionSettingsMessage::*;
|
||||
use crate::jl_button;
|
||||
use crate::styling::*;
|
||||
use crate::{push_error, push_error_task};
|
||||
use iced::widget::button::danger;
|
||||
@@ -123,7 +123,10 @@ impl NavigatedPage<RepetitionSettingsMessage> for RepetitionSettingsState {
|
||||
}
|
||||
let mut states = self.state.card_states.write();
|
||||
let deck_id = self.settings_handle.id;
|
||||
let mut query = states.query(Arc::new(move |state| {state.deck_id == deck_id})).handles().collect::<Vec<_>>();
|
||||
let mut query = states
|
||||
.query(Arc::new(move |state| state.deck_id == deck_id))
|
||||
.handles()
|
||||
.collect::<Vec<_>>();
|
||||
if let Err(e) = states.delete_many(query.as_mut_slice()) {
|
||||
return push_error_task!(e);
|
||||
}
|
||||
@@ -164,8 +167,7 @@ impl NavigatedPage<RepetitionSettingsMessage> for RepetitionSettingsState {
|
||||
primary
|
||||
})
|
||||
.on_input(SetFilter),
|
||||
jl_button!("Проверить фильтр")
|
||||
.on_press(TryFilter),
|
||||
jl_button!("Проверить фильтр").on_press(TryFilter),
|
||||
self.count_view(),
|
||||
]
|
||||
.spacing(QUARTER_SPACING),
|
||||
@@ -211,7 +213,7 @@ fn update_deck_stats(deck: &DeckSettings, state: &AppState) -> MaybeError {
|
||||
let deck_id = deck.id;
|
||||
let mut db_stats = states_repo
|
||||
.query_par(Arc::new(move |s| s.deck_id == deck_id))
|
||||
.iter(&states_repo)
|
||||
.iter(states_repo)
|
||||
.collect::<Vec<_>>();
|
||||
let filtered_words = DeckData::list(deck, state)
|
||||
.iter()
|
||||
|
||||
Reference in new issue
Block a user