Splitting to deck and srs

src/pages/repetition.rs

@@ -1,7 +1,7 @@
 use crate::app::AppState;
 use crate::data_provider::voice::get_voice;
 use crate::lang::Id;
-use crate::lang::{CardStatistics, DeckData, DeckSettings, WordData, WordOpenMode};
+use crate::lang::{ WordData};
 use crate::navigation::Page::PreviousPage;
 use crate::navigation::{KeyPressedPage, NavigatedPage, Page, RootMessage};
 use crate::notification::{NotificationData, NotificationRequest};
@@ -17,6 +17,8 @@ use rodio::MixerDeviceSink;
 use std::collections::HashSet;
 use std::sync::Arc;
 use tokio::task::spawn_blocking;
+use crate::core::deck::{CardStatistics, DeckData, DeckSettings};
+use crate::core::srs::{ WordOpenMode};
 
 pub struct RepetitionState {
     state: Arc<Mutex<AppState>>,

src/pages/repetition_settings.rs

@@ -1,7 +1,6 @@
 
 use crate::data_provider::card_sets::{delete_set, update_deck};
 use crate::data_provider::card_stats::{delete_stats, load_stats_of_deck};
-use crate::lang::DeckSettings;
 use crate::navigation::Page::PreviousPage;
 use crate::navigation::{NavigatedPage, Page, RootMessage};
 use crate::pages::repetition_settings::RepetitionSettingsMessage::*;
@@ -16,6 +15,7 @@ use parking_lot::Mutex;
 use std::sync::Arc;
 use std::time::Duration;
 use crate::app::AppState;
+use crate::core::deck::DeckSettings;
 
 pub struct RepetitionSettingsState {
     set: DeckSettings,

src/pages/repetitions.rs

@@ -1,7 +1,7 @@
 use crate::data_provider::card_sets::update_deck;
 use crate::data_provider::card_stats::{add_stat_list, load_stats_of_deck};
 use crate::pages::history::HistoryState;
-use crate::lang::{AppendMode, CardStatistics, DeckSettings, Id, OrderMode};
+use crate::lang::{Id};
 use crate::navigation::Page::{History, PreviousPage, Repetition, RepetitionSettings};
 use crate::navigation::{NavigatedPage, Page, RootMessage};
 use crate::pages::repetition::RepetitionState;
@@ -25,6 +25,8 @@ use parking_lot::Mutex;
 use std::ops::Deref;
 use std::sync::Arc;
 use crate::app::AppState;
+use crate::core::deck::{CardStatistics, DeckSettings};
+use crate::core::srs::{AppendMode, OrderMode};
 
 #[derive(Clone)]
 pub struct RepetitionsState {