Full split of lang.rs

src/pages/dictionary.rs

@@ -1,8 +1,8 @@
+use crate::data::Id;
 use crate::data_provider::words::{delete_group, delete_word, update_group, update_word};
 use crate::pages::dictionary::DictionaryMessage::*;
 use crate::pages::dictionary_quiz::DictionaryQuizState;
 use crate::pages::import::ImportState;
-use crate::lang::{WordData, WordGroup};
 use crate::navigation::Page::{Import, Word};
 use crate::navigation::{NavigatedPage, Page, RootMessage};
 use crate::styling::*;
@@ -19,13 +19,12 @@ use iced::{Border, Color, Shadow, Task};
 use iced_core::Length::Fill;
 use parking_lot::Mutex;
 use rand::random_range;
-use std::fs;
 use std::ops::Add;
-use std::path::PathBuf;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 use log::info;
 use crate::app::AppState;
+use crate::data::entities::{WordData, WordGroup};
 
 #[derive(Clone)]
 pub struct DictionaryState {
@@ -529,7 +528,7 @@ impl DictionaryState {
         });
     }
 
-    fn update_words_include(&mut self, group_id: crate::lang::Id) {
+    fn update_words_include(&mut self, group_id: Id) {
         let include_tags = self
             .tag_map
             .iter()
@@ -619,14 +618,12 @@ pub fn split_with_coma(ts: &str) -> Vec<String> {
         .collect::<Vec<String>>()
 }
 
-
-
 #[derive(Hash, PartialEq, Eq)]
 struct WordLineState {
     is_included: bool,
     key: String,
     value: String,
     tags: String,
-    id: crate::lang::Id,
+    id: Id,
     index: usize,
 }