Rename and clear bad code

src/repetition.rs

@@ -1,5 +1,5 @@
 use crate::data_provider::voice::get_voice;
-use crate::lang::{CardSet, CardSetSettings, CardStatistics, WordData, WordOpenMode};
+use crate::lang::{DeckData, DeckSettings, CardStatistics, WordData, WordOpenMode};
 use crate::navigation::Page::PreviousPage;
 use crate::navigation::{KeyPressedPage, NavigatedPage, Page};
 use crate::styling::*;
@@ -17,8 +17,8 @@ use tokio::task::spawn_blocking;
 
 pub struct RepetitionState {
     state: Arc<Mutex<AppState>>,
-    pub settings: CardSetSettings,
-    pub set: CardSet,
+    pub settings: DeckSettings,
+    pub set: DeckData,
     current_word: WordData,
     current_statistic: CardStatistics,
     open: bool,
@@ -28,7 +28,7 @@ pub struct RepetitionState {
 }
 
 impl NavigatedPage<RepetitionMessage> for RepetitionState {
-    fn navigate(&self, message: &RepetitionMessage) -> Option<Page> {
+    fn navigate(&mut self, message: &RepetitionMessage) -> Option<Page> {
         if let RepetitionMessage::Back = message {
             Some(PreviousPage)
         } else {
@@ -95,8 +95,8 @@ impl NavigatedPage<RepetitionMessage> for RepetitionState {
 }
 
 impl RepetitionState {
-    pub(crate) fn new(set: CardSetSettings, state: Arc<Mutex<AppState>>) -> RepetitionState {
-        let mut card_set = CardSet::new(&set, state.clone());
+    pub(crate) fn new(set: DeckSettings, state: Arc<Mutex<AppState>>) -> RepetitionState {
+        let mut card_set = DeckData::new(&set, state.clone());
         let (word, stat) = card_set.next();
         let sink_handle = rodio::DeviceSinkBuilder::open_default_sink().unwrap();