rewrite: Refactor entity imports and update asset paths for media and user entities

lib/application/cubits/anime_advanced_search_cubit.dart

@@ -14,9 +14,9 @@ import 'package:unyo/core/notification/anime_notifier.dart';
 import 'package:unyo/core/notification/media_list_notifier.dart';
 import 'package:unyo/core/notification/user_notifier.dart';
 import 'package:unyo/data/repositories/anime_repository_anilist.dart';
-import 'package:unyo/domain/entities/anime.dart';
-import 'package:unyo/domain/entities/media_list.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/media/anime.dart';
+import 'package:unyo/domain/entities/list/media_list.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 
 class AnimeAdvancedSearchCubit extends Cubit<AnimeAdvancedSearchState>
     with EffectMixin<AnimeAdvancedSearchState> {

lib/application/cubits/anime_cubit.dart

@@ -17,9 +17,9 @@ import 'package:unyo/core/notification/reload/reload_type.dart';
 import 'package:unyo/core/notification/user_notifier.dart';
 import 'package:unyo/core/services/api/http/http_exception.dart';
 import 'package:unyo/data/repositories/anime_repository_anilist.dart';
-import 'package:unyo/domain/entities/anime.dart';
-import 'package:unyo/domain/entities/media_list.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/media/anime.dart';
+import 'package:unyo/domain/entities/list/media_list.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 
 import '../../core/notification/reload/reload_notifier.dart';
 

lib/application/cubits/anime_details_cubit.dart

@@ -28,22 +28,22 @@ import 'package:unyo/core/notification/reload/reload_type.dart';
 import 'package:unyo/core/notification/user_notifier.dart';
 import 'package:unyo/core/notification/video_info_notifier.dart';
 import 'package:unyo/core/services/api/http/http_exception.dart';
-import 'package:unyo/data/models/anilist_user_model.dart';
-import 'package:unyo/data/models/local_user_model.dart';
+import 'package:unyo/data/models/anilist/anilist_user_model.dart';
+import 'package:unyo/data/models/local/local_user_model.dart';
 import 'package:unyo/data/repositories/anime_repository_anilist.dart';
 import 'package:unyo/data/repositories/episode_repository_anizip.dart';
 import 'package:unyo/data/repositories/extension_repository_aniyomi.dart';
 import 'package:unyo/data/repositories/repositories.dart';
-import 'package:unyo/domain/entities/anime.dart';
-import 'package:unyo/domain/entities/anime_details.dart';
-import 'package:unyo/domain/entities/episode_info.dart';
-import 'package:unyo/domain/entities/extension.dart';
+import 'package:unyo/domain/entities/media/anime.dart';
+import 'package:unyo/domain/entities/media/anime_details.dart';
+import 'package:unyo/domain/entities/media/episode_info.dart';
+import 'package:unyo/domain/entities/extension/extension.dart';
 import 'package:unyo/domain/entities/extension/video.dart' as ext;
-import 'package:unyo/domain/entities/media_list.dart';
-import 'package:unyo/domain/entities/media_list_entry.dart';
-import 'package:unyo/domain/entities/settings.dart';
-import 'package:unyo/domain/entities/user.dart';
-import 'package:unyo/domain/entities/video_info.dart';
+import 'package:unyo/domain/entities/list/media_list.dart';
+import 'package:unyo/domain/entities/list/media_list_entry.dart';
+import 'package:unyo/domain/entities/user/settings.dart';
+import 'package:unyo/domain/entities/user/user.dart';
+import 'package:unyo/domain/entities/media/video_info.dart';
 import 'package:unyo/presentation/dialogs/anime_details_media_entry_dialog.dart';
 import 'package:unyo/presentation/drawers/anime_server_selection_drawer.dart';
 

lib/application/cubits/calendar_cubit.dart

@@ -15,9 +15,9 @@ import 'package:unyo/core/notification/anime_notifier.dart';
 import 'package:unyo/core/notification/media_list_notifier.dart';
 import 'package:unyo/core/notification/user_notifier.dart';
 import 'package:unyo/data/repositories/anime_repository_anilist.dart';
-import 'package:unyo/domain/entities/anime.dart';
-import 'package:unyo/domain/entities/media_list.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/media/anime.dart';
+import 'package:unyo/domain/entities/list/media_list.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 
 class CalendarCubit extends Cubit<CalendarState> with EffectMixin<CalendarState> {
   final Logger _logger = sl<Logger>();

lib/application/cubits/extensions_cubit.dart

@@ -10,8 +10,8 @@ import 'package:unyo/core/di/locator.dart';
 import 'package:unyo/core/enums/extension_type.dart';
 import 'package:unyo/core/notification/user_notifier.dart';
 import 'package:unyo/core/services/api/http/http_exception.dart';
-import 'package:unyo/domain/entities/extension.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/extension/extension.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 import 'package:unyo/domain/repositories/extension_repository.dart';
 import 'package:unyo/presentation/dialogs/extension_preferences_dialog.dart';
 import 'package:unyo/presentation/widgets/text/text_utils.dart';

lib/application/cubits/home_cubit.dart

@@ -21,14 +21,14 @@ import 'package:unyo/core/notification/reload/reload_notifier.dart';
 import 'package:unyo/core/notification/reload/reload_type.dart';
 import 'package:unyo/core/notification/user_notifier.dart';
 import 'package:unyo/application/effects/app_effects.dart';
-import 'package:unyo/data/models/anilist_user_model.dart';
-import 'package:unyo/data/models/local_user_model.dart';
+import 'package:unyo/data/models/anilist/anilist_user_model.dart';
+import 'package:unyo/data/models/local/local_user_model.dart';
 import 'package:unyo/data/repositories/anime_repository_anilist.dart';
 import 'package:unyo/data/repositories/repositories.dart';
-import 'package:unyo/domain/entities/anime.dart';
-import 'package:unyo/domain/entities/manga.dart';
-import 'package:unyo/domain/entities/media_list.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/media/anime.dart';
+import 'package:unyo/domain/entities/media/manga.dart';
+import 'package:unyo/domain/entities/list/media_list.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 
 class HomeCubit extends Cubit<HomeState> with EffectMixin<HomeState> {
   // Repositories

lib/application/cubits/login_cubit.dart

@@ -20,7 +20,7 @@ import 'package:unyo/core/theme/theme_service.dart';
 import 'package:unyo/data/models/models.dart';
 import 'package:unyo/data/repositories/repositories.dart';
 import 'package:unyo/application/effects/app_effects.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 import 'package:unyo/presentation/dialogs/account_creation_dialog.dart';
 
 class LoginCubit extends Cubit<LoginState> with EffectMixin<LoginState> {

lib/application/cubits/manga_advanced_search_cubit.dart

@@ -14,9 +14,9 @@ import 'package:unyo/core/notification/manga_notifier.dart';
 import 'package:unyo/core/notification/media_list_notifier.dart';
 import 'package:unyo/core/notification/user_notifier.dart';
 import 'package:unyo/data/repositories/manga_repository_anilist.dart';
-import 'package:unyo/domain/entities/manga.dart';
-import 'package:unyo/domain/entities/media_list.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/media/manga.dart';
+import 'package:unyo/domain/entities/list/media_list.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 
 class MangaAdvancedSearchCubit extends Cubit<MangaAdvancedSearchState>
     with EffectMixin<MangaAdvancedSearchState> {

lib/application/cubits/manga_cubit.dart

@@ -14,9 +14,9 @@ import 'package:unyo/core/notification/reload/reload_notifier.dart';
 import 'package:unyo/core/notification/reload/reload_type.dart';
 import 'package:unyo/core/notification/user_notifier.dart';
 import 'package:unyo/data/repositories/manga_repository_anilist.dart';
-import 'package:unyo/domain/entities/manga.dart';
-import 'package:unyo/domain/entities/media_list.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/media/manga.dart';
+import 'package:unyo/domain/entities/list/media_list.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 import 'effect_mixin.dart';
 
 class MangaCubit extends Cubit<MangaState> with EffectMixin<MangaState> {

lib/application/cubits/manga_details_cubit.dart

@@ -17,18 +17,18 @@ import 'package:unyo/core/notification/manga_notifier.dart';
 import 'package:unyo/core/notification/media_list_notifier.dart';
 import 'package:unyo/core/notification/user_notifier.dart';
 import 'package:unyo/core/services/api/http/http_exception.dart';
-import 'package:unyo/data/models/anilist_user_model.dart';
-import 'package:unyo/data/models/local_user_model.dart';
+import 'package:unyo/data/models/anilist/anilist_user_model.dart';
+import 'package:unyo/data/models/local/local_user_model.dart';
 import 'package:unyo/data/repositories/extension_repository_aniyomi.dart';
 import 'package:unyo/data/repositories/manga_repository_anilist.dart';
 import 'package:unyo/data/repositories/repositories.dart';
-import 'package:unyo/domain/entities/extension.dart';
-import 'package:unyo/domain/entities/manga.dart';
-import 'package:unyo/domain/entities/manga_details.dart';
-import 'package:unyo/domain/entities/media_list.dart';
-import 'package:unyo/domain/entities/media_list_entry.dart';
-import 'package:unyo/domain/entities/settings.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/extension/extension.dart';
+import 'package:unyo/domain/entities/media/manga.dart';
+import 'package:unyo/domain/entities/media/manga_details.dart';
+import 'package:unyo/domain/entities/list/media_list.dart';
+import 'package:unyo/domain/entities/list/media_list_entry.dart';
+import 'package:unyo/domain/entities/user/settings.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 
 class MangaDetailsCubit extends Cubit<MangaDetailsState> with EffectMixin<MangaDetailsState> {
   // Repositories

lib/application/cubits/media_list_cubit.dart

@@ -11,13 +11,13 @@ import 'package:unyo/core/notification/anime_notifier.dart';
 import 'package:unyo/core/notification/manga_notifier.dart';
 import 'package:unyo/core/notification/media_list_notifier.dart';
 import 'package:unyo/core/notification/user_notifier.dart';
-import 'package:unyo/data/models/anilist_user_model.dart';
-import 'package:unyo/data/models/local_user_model.dart';
+import 'package:unyo/data/models/anilist/anilist_user_model.dart';
+import 'package:unyo/data/models/local/local_user_model.dart';
 import 'package:unyo/data/repositories/user_repository_anilist.dart';
-import 'package:unyo/domain/entities/anime.dart';
-import 'package:unyo/domain/entities/manga.dart';
-import 'package:unyo/domain/entities/media_list.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/media/anime.dart';
+import 'package:unyo/domain/entities/media/manga.dart';
+import 'package:unyo/domain/entities/list/media_list.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 
 class MediaListCubit extends Cubit<MediaListState>
     with EffectMixin<MediaListState> {

lib/application/cubits/settings_cubit.dart

@@ -18,11 +18,11 @@ import 'package:unyo/core/services/media/episode_service.dart';
 import 'package:unyo/core/services/media/media_service.dart';
 import 'package:unyo/core/theme/color_image_service.dart';
 import 'package:unyo/core/theme/theme_service.dart';
-import 'package:unyo/data/models/anilist_user_model.dart';
-import 'package:unyo/data/models/local_user_model.dart';
+import 'package:unyo/data/models/anilist/anilist_user_model.dart';
+import 'package:unyo/data/models/local/local_user_model.dart';
 import 'package:unyo/data/repositories/repositories.dart';
-import 'package:unyo/domain/entities/settings.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/user/settings.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 import 'package:unyo/presentation/dialogs/extensions_dialog.dart';
 import 'package:unyo/presentation/widgets/styled/dark_unyo_button.dart';
 import 'package:unyo/presentation/widgets/styled/light_unyo_button.dart';

lib/application/cubits/tabs_cubit.dart

@@ -11,7 +11,7 @@ import 'package:unyo/core/enums/selected_menu_option.dart';
 import 'package:unyo/core/notification/menu_bar_notifier.dart';
 import 'package:unyo/core/notification/user_notifier.dart';
 import 'package:unyo/core/theme/theme_service.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 import 'package:unyo/presentation/drawers/user_options_drawer.dart' show UserOptionsDrawer;
 
 class TabsCubit extends Cubit<TabsState>

lib/application/cubits/video_cubit.dart

@@ -29,15 +29,15 @@ import 'package:unyo/core/services/api/http/http_service.dart';
 import 'package:unyo/core/services/video/video_service.dart';
 import 'package:unyo/data/repositories/anime_repository_anilist.dart';
 import 'package:unyo/data/repositories/extension_repository_aniyomi.dart';
-import 'package:unyo/domain/entities/anime.dart';
-import 'package:unyo/domain/entities/episode_info.dart';
-import 'package:unyo/domain/entities/extension.dart';
+import 'package:unyo/domain/entities/media/anime.dart';
+import 'package:unyo/domain/entities/media/episode_info.dart';
+import 'package:unyo/domain/entities/extension/extension.dart';
 import 'package:unyo/domain/entities/extension/video.dart' as ext;
 import 'package:unyo/config/config.dart' as config;
-import 'package:unyo/domain/entities/media_list_entry.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/list/media_list_entry.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 import 'package:unyo/core/di/locator.dart';
-import 'package:unyo/domain/entities/video_info.dart';
+import 'package:unyo/domain/entities/media/video_info.dart';
 import 'package:unyo/presentation/dialogs/warning_dialog.dart';
 
 class VideoCubit extends Cubit<VideoState> with EffectMixin<VideoState> {

lib/application/states/anime_advanced_search_state.dart

@@ -1,8 +1,8 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:unyo/application/cubits/effect_mixin.dart';
 import 'package:unyo/application/effects/app_effects.dart';
-import 'package:unyo/domain/entities/anime.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/media/anime.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 
 part 'anime_advanced_search_state.freezed.dart';
 

lib/application/states/anime_details_state.dart

@@ -3,14 +3,14 @@ import 'package:unyo_lib/jmodels/jsanime.dart';
 import 'package:unyo_lib/jmodels/jsepisode.dart';
 import 'package:unyo/application/cubits/effect_mixin.dart';
 import 'package:unyo/application/effects/app_effects.dart';
-import 'package:unyo/domain/entities/anime.dart';
-import 'package:unyo/domain/entities/episode_info.dart';
-import 'package:unyo/domain/entities/extension.dart';
+import 'package:unyo/domain/entities/media/anime.dart';
+import 'package:unyo/domain/entities/media/episode_info.dart';
+import 'package:unyo/domain/entities/extension/extension.dart';
 import 'package:unyo/domain/entities/extension/video.dart' as ext;
-import 'package:unyo/domain/entities/media_character.dart';
-import 'package:unyo/domain/entities/media_list.dart';
-import 'package:unyo/domain/entities/media_list_entry.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/media/media_character.dart';
+import 'package:unyo/domain/entities/list/media_list.dart';
+import 'package:unyo/domain/entities/list/media_list_entry.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 
 part 'anime_details_state.freezed.dart';
 

lib/application/states/anime_state.dart

@@ -1,8 +1,8 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:unyo/application/cubits/effect_mixin.dart';
 import 'package:unyo/application/effects/app_effects.dart';
-import 'package:unyo/domain/entities/anime.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/media/anime.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 
 part 'anime_state.freezed.dart';
 

lib/application/states/calendar_state.dart

@@ -1,8 +1,8 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:unyo/application/cubits/effect_mixin.dart';
 import 'package:unyo/application/effects/app_effects.dart';
-import 'package:unyo/domain/entities/anime.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/media/anime.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 
 part 'calendar_state.freezed.dart';
 

lib/application/states/extensions_state.dart

@@ -1,8 +1,8 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:unyo/application/cubits/effect_mixin.dart';
 import 'package:unyo/application/effects/app_effects.dart';
-import 'package:unyo/domain/entities/extension.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/extension/extension.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 
 part 'extensions_state.freezed.dart';
 

lib/application/states/home_state.dart

@@ -5,9 +5,9 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:unyo/application/cubits/effect_mixin.dart';
 import 'package:unyo/application/effects/app_effects.dart';
 import 'package:unyo/core/enums/selected_menu_option.dart';
-import 'package:unyo/domain/entities/anime.dart';
-import 'package:unyo/domain/entities/manga.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/media/anime.dart';
+import 'package:unyo/domain/entities/media/manga.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 
 part 'home_state.freezed.dart';
 

lib/application/states/login_state.dart

@@ -5,7 +5,7 @@ import 'package:unyo/application/effects/app_effects.dart';
 import 'package:unyo/core/enums/login_card_type.dart';
 
 //Internal dependencies
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 
 part 'login_state.freezed.dart';
 

lib/application/states/manga_advanced_search_state.dart

@@ -1,8 +1,8 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:unyo/application/cubits/effect_mixin.dart';
 import 'package:unyo/application/effects/app_effects.dart';
-import 'package:unyo/domain/entities/manga.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/media/manga.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 
 part 'manga_advanced_search_state.freezed.dart';
 

lib/application/states/manga_details_state.dart

@@ -4,12 +4,12 @@ import 'package:unyo_lib/jmodels/jschapter.dart';
 import 'package:unyo_lib/jmodels/jsmanga.dart';
 import 'package:unyo/application/cubits/effect_mixin.dart';
 import 'package:unyo/application/effects/app_effects.dart';
-import 'package:unyo/domain/entities/manga.dart';
-import 'package:unyo/domain/entities/extension.dart';
-import 'package:unyo/domain/entities/media_character.dart';
-import 'package:unyo/domain/entities/media_list.dart';
-import 'package:unyo/domain/entities/media_list_entry.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/media/manga.dart';
+import 'package:unyo/domain/entities/extension/extension.dart';
+import 'package:unyo/domain/entities/media/media_character.dart';
+import 'package:unyo/domain/entities/list/media_list.dart';
+import 'package:unyo/domain/entities/list/media_list_entry.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 
 part 'manga_details_state.freezed.dart';
 

lib/application/states/manga_state.dart

@@ -3,8 +3,8 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 // Internal dependencies
 import 'package:unyo/application/cubits/effect_mixin.dart';
 import 'package:unyo/application/effects/app_effects.dart';
-import 'package:unyo/domain/entities/manga.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/media/manga.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 
 part 'manga_state.freezed.dart';
 

lib/application/states/media_list_state.dart

@@ -1,9 +1,9 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:unyo/application/cubits/effect_mixin.dart';
 import 'package:unyo/application/effects/app_effects.dart';
-import 'package:unyo/domain/entities/anime.dart';
-import 'package:unyo/domain/entities/manga.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/media/anime.dart';
+import 'package:unyo/domain/entities/media/manga.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 
 part 'media_list_state.freezed.dart';
 

lib/application/states/settings_state.dart

@@ -1,7 +1,7 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:unyo/application/cubits/effect_mixin.dart';
 import 'package:unyo/application/effects/app_effects.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 
 part 'settings_state.freezed.dart';
 

lib/application/states/tabs_state.dart

@@ -2,7 +2,7 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:unyo/application/cubits/effect_mixin.dart';
 import 'package:unyo/application/effects/app_effects.dart';
 import 'package:unyo/core/enums/selected_menu_option.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 
 part 'tabs_state.freezed.dart';
 

lib/application/states/video_state.dart

@@ -4,12 +4,12 @@ import 'package:unyo_lib/jmodels/jsepisode.dart';
 import 'package:unyo/application/cubits/effect_mixin.dart';
 import 'package:unyo/application/effects/app_effects.dart';
 import 'package:unyo/core/services/api/dto/aniskip/aniskip_times_entity.dart';
-import 'package:unyo/domain/entities/anime.dart';
-import 'package:unyo/domain/entities/episode_info.dart';
-import 'package:unyo/domain/entities/extension.dart';
-import 'package:unyo/domain/entities/media_list_entry.dart';
-import 'package:unyo/domain/entities/user.dart';
-import 'package:unyo/domain/entities/video_info.dart';
+import 'package:unyo/domain/entities/media/anime.dart';
+import 'package:unyo/domain/entities/media/episode_info.dart';
+import 'package:unyo/domain/entities/extension/extension.dart';
+import 'package:unyo/domain/entities/list/media_list_entry.dart';
+import 'package:unyo/domain/entities/user/user.dart';
+import 'package:unyo/domain/entities/media/video_info.dart';
 
 part 'video_state.freezed.dart';
 

lib/core/notification/anime_notifier.dart

@@ -1,7 +1,7 @@
 import 'package:logger/logger.dart';
 import 'package:rxdart/rxdart.dart';
 import 'package:unyo/core/di/locator.dart';
-import 'package:unyo/domain/entities/anime.dart';
+import 'package:unyo/domain/entities/media/anime.dart';
 
 class AnimeNotifier {
   final BehaviorSubject<Anime> _animeSubject;

lib/core/notification/episode_info_notifier.dart

@@ -1,7 +1,7 @@
 import 'package:logger/logger.dart';
 import 'package:rxdart/rxdart.dart';
 import 'package:unyo/core/di/locator.dart';
-import 'package:unyo/domain/entities/episode_info.dart';
+import 'package:unyo/domain/entities/media/episode_info.dart';
 
 class EpisodesInfoNotifier {
   final BehaviorSubject<List<EpisodeInfo>> _episodeInfoSubject;

lib/core/notification/extension_notifier.dart

@@ -1,7 +1,7 @@
 import 'package:logger/logger.dart';
 import 'package:rxdart/rxdart.dart';
 import 'package:unyo/core/di/locator.dart';
-import 'package:unyo/domain/entities/extension.dart';
+import 'package:unyo/domain/entities/extension/extension.dart';
 
 class ExtensionNotifier {
   final BehaviorSubject<Extension> _extensionSubject;

lib/core/notification/manga_notifier.dart

@@ -1,7 +1,7 @@
 import 'package:logger/logger.dart';
 import 'package:rxdart/rxdart.dart';
 import 'package:unyo/core/di/locator.dart';
-import 'package:unyo/domain/entities/manga.dart';
+import 'package:unyo/domain/entities/media/manga.dart';
 
 class MangaNotifier {
   final BehaviorSubject<Manga> _mangaSubject;

lib/core/notification/media_list_entry_notifier.dart

@@ -1,7 +1,7 @@
 import 'package:logger/logger.dart';
 import 'package:rxdart/rxdart.dart';
 import 'package:unyo/core/di/locator.dart';
-import 'package:unyo/domain/entities/media_list_entry.dart';
+import 'package:unyo/domain/entities/list/media_list_entry.dart';
 
 class MediaListEntryNotifier {
   final BehaviorSubject<MediaListEntry> _mediaListEntrySubject;

lib/core/notification/media_list_notifier.dart

@@ -1,7 +1,7 @@
 import 'package:logger/logger.dart';
 import 'package:rxdart/rxdart.dart';
 import 'package:unyo/core/di/locator.dart';
-import 'package:unyo/domain/entities/media_list.dart';
+import 'package:unyo/domain/entities/list/media_list.dart';
 
 class MediaListNotifier {
   final BehaviorSubject<MediaList> _mediaListSubject;

lib/core/notification/user_notifier.dart

@@ -3,7 +3,7 @@ import 'package:logger/logger.dart';
 import 'package:rxdart/rxdart.dart';
 // Internal dependencies
 import 'package:unyo/core/di/locator.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 
 class UserNotifier {
   final BehaviorSubject<User> _userSubject;

lib/core/notification/video_info_notifier.dart

@@ -2,7 +2,7 @@
 import 'package:logger/logger.dart';
 import 'package:rxdart/rxdart.dart';
 import 'package:unyo/core/di/locator.dart';
-import 'package:unyo/domain/entities/video_info.dart';
+import 'package:unyo/domain/entities/media/video_info.dart';
 
 class VideoInfoNotifier {
   final BehaviorSubject<VideoInfo> _videoInfoSubject;

lib/core/services/api/dto/anizip/anizip_mappings.dart

@@ -1,6 +1,6 @@
 import 'package:unyo/core/services/api/dto/anizip/anizip_episode_info_entity.dart';
-import 'package:unyo/domain/entities/episode_info.dart';
-import 'package:unyo/domain/entities/title.dart';
+import 'package:unyo/domain/entities/media/episode_info.dart';
+import 'package:unyo/domain/entities/media/title.dart';
 
 class AnizipMappings {
   final Title title;

lib/core/services/video/video_service.dart

@@ -244,7 +244,7 @@ class VideoService {
     }
     _currentCaptionTrack = captionTracks[captionIndex];
     if (_currentCaptionTrack!.embedded) {
-      _player.activeSubtitleTracks = [_currentCaptionTrack?.embeddedIndex ?? 0];
+      _player.setActiveTracks(mdk.MediaType.subtitle, [_currentCaptionTrack?.embeddedIndex ?? 0]);
     } else {
       _player.setMedia(_currentCaptionTrack!.url, mdk.MediaType.subtitle);
     }
@@ -258,7 +258,7 @@ class VideoService {
     }
     _currentAudioTrack = audioTracks[audioTrackIndex];
     if (_currentAudioTrack!.embedded) {
-      _player.activeAudioTracks = [_currentAudioTrack?.embeddedIndex ?? 0];
+      _player.setActiveTracks(mdk.MediaType.audio, [_currentAudioTrack?.embeddedIndex ?? 0]);
     } else {
       _player.setMedia(_currentAudioTrack!.url, mdk.MediaType.audio);
     }

lib/core/theme/theme_service.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:rxdart/rxdart.dart';
-import 'package:unyo/data/models/anilist_user_model.dart';
-import 'package:unyo/data/models/local_user_model.dart';
+import 'package:unyo/data/models/anilist/anilist_user_model.dart';
+import 'package:unyo/data/models/local/local_user_model.dart';
 import 'package:unyo/data/repositories/user_repository_anilist.dart';
 import 'package:unyo/data/repositories/user_repository_local.dart';
-import 'package:unyo/domain/entities/settings.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/user/settings.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 
 class ThemeService {
   final BehaviorSubject<ThemeData> _themeSubject;

lib/data/models/anilist/anilist_anime_details.dart

@@ -4,12 +4,12 @@ import 'package:unyo/core/services/api/dto/anilist/media_details_graphql_entity.
 import 'package:unyo/core/services/api/dto/anilist/media_details_media_list_entry_entity.dart';
 import 'package:unyo/data/adapters/adapters_names.dart' as names;
 import 'package:unyo/data/adapters/adapters_types.dart' as types;
-import 'package:unyo/data/models/anilist_anime_model.dart';
-import 'package:unyo/data/models/anilist_media_character.dart';
-import 'package:unyo/domain/entities/anime.dart';
-import 'package:unyo/domain/entities/anime_details.dart';
-import 'package:unyo/domain/entities/media_character.dart';
-import 'package:unyo/domain/entities/media_list_entry.dart';
+import 'package:unyo/data/models/anilist/anilist_anime_model.dart';
+import 'package:unyo/data/models/anilist/anilist_media_character.dart';
+import 'package:unyo/domain/entities/media/anime.dart';
+import 'package:unyo/domain/entities/media/anime_details.dart';
+import 'package:unyo/domain/entities/media/media_character.dart';
+import 'package:unyo/domain/entities/list/media_list_entry.dart';
 
 part 'anilist_anime_details.freezed.dart';
 

lib/data/models/anilist/anilist_anime_model.dart

@@ -8,9 +8,9 @@ import 'package:unyo/core/services/api/dto/anilist/media_collection_recently_rel
 import 'package:unyo/core/services/api/dto/anilist/media_collection_trendingOrPopular_graphql_entity.dart';
 import 'package:unyo/core/services/api/dto/anilist/media_collection_upcoming_graphql_entity.dart';
 import 'package:unyo/core/services/api/dto/anilist/media_details_graphql_entity.dart';
-import 'package:unyo/domain/entities/airing_episode.dart';
-import 'package:unyo/domain/entities/anime.dart';
-import 'package:unyo/domain/entities/title.dart';
+import 'package:unyo/domain/entities/media/airing_episode.dart';
+import 'package:unyo/domain/entities/media/anime.dart';
+import 'package:unyo/domain/entities/media/title.dart';
 
 part 'anilist_anime_model.freezed.dart';
 part 'anilist_anime_model.g.dart';

lib/data/models/anilist/anilist_manga_details.dart

@@ -4,12 +4,12 @@ import 'package:unyo/core/services/api/dto/anilist/media_details_graphql_entity.
 import 'package:unyo/core/services/api/dto/anilist/media_details_media_list_entry_entity.dart';
 import 'package:unyo/data/adapters/adapters_names.dart' as names;
 import 'package:unyo/data/adapters/adapters_types.dart' as types;
-import 'package:unyo/data/models/anilist_manga_model.dart';
-import 'package:unyo/data/models/anilist_media_character.dart';
-import 'package:unyo/domain/entities/manga.dart';
-import 'package:unyo/domain/entities/manga_details.dart';
-import 'package:unyo/domain/entities/media_character.dart';
-import 'package:unyo/domain/entities/media_list_entry.dart';
+import 'package:unyo/data/models/anilist/anilist_manga_model.dart';
+import 'package:unyo/data/models/anilist/anilist_media_character.dart';
+import 'package:unyo/domain/entities/media/manga.dart';
+import 'package:unyo/domain/entities/media/manga_details.dart';
+import 'package:unyo/domain/entities/media/media_character.dart';
+import 'package:unyo/domain/entities/list/media_list_entry.dart';
 
 part 'anilist_manga_details.freezed.dart';
 

lib/data/models/anilist/anilist_manga_model.dart

@@ -5,8 +5,8 @@ import 'package:unyo/core/services/api/dto/anilist/media_collection_recently_com
 import 'package:unyo/core/services/api/dto/anilist/media_collection_trendingOrPopular_graphql_entity.dart';
 import 'package:unyo/core/services/api/dto/anilist/media_collection_upcoming_graphql_entity.dart';
 import 'package:unyo/core/services/api/dto/anilist/media_details_graphql_entity.dart';
-import 'package:unyo/domain/entities/manga.dart';
-import 'package:unyo/domain/entities/title.dart';
+import 'package:unyo/domain/entities/media/manga.dart';
+import 'package:unyo/domain/entities/media/title.dart';
 
 part 'anilist_manga_model.freezed.dart';
 

lib/data/models/anilist/anilist_media_character.dart

@@ -1,6 +1,6 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:unyo/core/services/api/dto/anilist/media_details_graphql_entity.dart' show MediaDetailsGraphqlMediaCharactersNodes;
-import 'package:unyo/domain/entities/media_character.dart';
+import 'package:unyo/domain/entities/media/media_character.dart';
 
 part 'anilist_media_character.freezed.dart';
 

lib/data/models/anilist/anilist_user_model.dart

@@ -3,10 +3,10 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:hive_ce/hive.dart';
 
 //Internal dependencies
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 import 'package:unyo/data/adapters/adapters_types.dart' as types;
 import 'package:unyo/data/adapters/adapters_names.dart' as names;
-import 'package:unyo/domain/entities/settings.dart';
+import 'package:unyo/domain/entities/user/settings.dart';
 
 part 'anilist_user_model.freezed.dart';
 part 'anilist_user_model.g.dart'; // For JSON serialization

lib/data/models/local/local_user_model.dart

@@ -3,10 +3,10 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:hive_ce/hive.dart';
 
 //Internal dependencies
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 import 'package:unyo/data/adapters/adapters_types.dart' as types;
 import 'package:unyo/data/adapters/adapters_names.dart' as names;
-import 'package:unyo/domain/entities/settings.dart';
+import 'package:unyo/domain/entities/user/settings.dart';
 
 part 'local_user_model.freezed.dart';
 

lib/data/models/models.dart

@@ -1,2 +1,7 @@
-export 'anilist_user_model.dart';
-export 'local_user_model.dart';
+export 'anilist/anilist_anime_details.dart';
+export 'anilist/anilist_anime_model.dart';
+export 'anilist/anilist_manga_details.dart';
+export 'anilist/anilist_manga_model.dart';
+export 'anilist/anilist_media_character.dart';
+export 'anilist/anilist_user_model.dart';
+export 'local/local_user_model.dart';

lib/data/repositories/anime_repository_anilist.dart

@@ -19,14 +19,14 @@ import 'package:unyo/core/services/api/graphql/queries/anilist_queries.dart' as
 import 'package:unyo/core/services/api/dto/anilist/media_collection_recently_released_graphql_entity.dart';
 import 'package:unyo/core/services/api/graphql/graphql_response.dart';
 import 'package:unyo/core/services/api/graphql/graphql_service.dart';
-import 'package:unyo/data/models/anilist_anime_details.dart';
-import 'package:unyo/data/models/anilist_anime_model.dart';
-import 'package:unyo/data/models/anilist_user_model.dart';
+import 'package:unyo/data/models/anilist/anilist_anime_details.dart';
+import 'package:unyo/data/models/anilist/anilist_anime_model.dart';
+import 'package:unyo/data/models/anilist/anilist_user_model.dart';
 import 'package:unyo/data/repositories/repository_mixin.dart';
-import 'package:unyo/domain/entities/anime.dart';
-import 'package:unyo/domain/entities/anime_details.dart';
-import 'package:unyo/domain/entities/media_list_entry.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/media/anime.dart';
+import 'package:unyo/domain/entities/media/anime_details.dart';
+import 'package:unyo/domain/entities/list/media_list_entry.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 import 'package:unyo/domain/repositories/anime_repository.dart';
 import 'package:unyo/presentation/widgets/text/text_utils.dart';
 

lib/data/repositories/episode_repository_anizip.dart

@@ -4,7 +4,7 @@ import 'package:unyo/core/di/locator.dart';
 import 'package:unyo/core/services/api/dto/anizip/anizip_mappings.dart';
 import 'package:unyo/core/services/api/http/api_response.dart';
 import 'package:unyo/core/services/api/http/http_service.dart';
-import 'package:unyo/domain/entities/episode_info.dart';
+import 'package:unyo/domain/entities/media/episode_info.dart';
 import 'package:unyo/domain/repositories/episode_repository.dart';
 
 class EpisodeRepositoryAnizip implements EpisodeRepository {

lib/data/repositories/extension_repository_aniyomi.dart

@@ -17,9 +17,9 @@ import 'package:unyo/core/services/api/dto/extensions/aniyomi_repo_json_entity.d
 import 'package:unyo/core/services/api/dto/extensions/tachiyomi_repo_json_entity.dart';
 import 'package:unyo/core/services/api/http/api_response.dart';
 import 'package:unyo/core/services/api/http/http_service.dart';
-import 'package:unyo/domain/entities/extension.dart';
-import 'package:unyo/domain/entities/preference_item.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/extension/extension.dart';
+import 'package:unyo/domain/entities/extension/preference_item.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 import 'package:unyo/domain/repositories/extension_repository.dart';
 import 'package:unyo_lib/jmodels/jpreferenceitem.dart';
 import 'package:jni/jni.dart' as jni;

lib/data/repositories/manga_repository_anilist.dart

@@ -14,13 +14,13 @@ import 'package:unyo/core/services/api/dto/anilist/media_details_graphql_entity.
 import 'package:unyo/core/services/api/dto/anilist/media_details_media_list_entry_entity.dart';
 import 'package:unyo/core/services/api/graphql/graphql_response.dart';
 import 'package:unyo/core/services/api/graphql/graphql_service.dart';
-import 'package:unyo/data/models/anilist_manga_details.dart';
-import 'package:unyo/data/models/anilist_manga_model.dart';
-import 'package:unyo/data/models/anilist_user_model.dart';
+import 'package:unyo/data/models/anilist/anilist_manga_details.dart';
+import 'package:unyo/data/models/anilist/anilist_manga_model.dart';
+import 'package:unyo/data/models/anilist/anilist_user_model.dart';
 import 'package:unyo/data/repositories/repository_mixin.dart';
-import 'package:unyo/domain/entities/manga.dart';
-import 'package:unyo/domain/entities/manga_details.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/media/manga.dart';
+import 'package:unyo/domain/entities/media/manga_details.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 import 'package:unyo/domain/repositories/manga_repository.dart';
 import 'package:unyo/presentation/widgets/text/text_utils.dart';
 

lib/data/repositories/user_repository_anilist.dart

@@ -7,12 +7,12 @@ import 'package:shelf/shelf.dart' as shelf;
 import 'package:shelf/shelf_io.dart' as shelfio;
 import 'package:unyo/core/services/api/dto/anilist/auth_token_dto.dart';
 import 'package:unyo/core/services/api/dto/anilist/media_collection_graphql_entity.dart';
-import 'package:unyo/data/models/anilist_anime_model.dart';
-import 'package:unyo/data/models/anilist_manga_model.dart';
+import 'package:unyo/data/models/anilist/anilist_anime_model.dart';
+import 'package:unyo/data/models/anilist/anilist_manga_model.dart';
 import 'package:unyo/data/repositories/repository_mixin.dart';
-import 'package:unyo/domain/entities/anime.dart';
-import 'package:unyo/domain/entities/manga.dart';
-import 'package:unyo/domain/entities/settings.dart';
+import 'package:unyo/domain/entities/media/anime.dart';
+import 'package:unyo/domain/entities/media/manga.dart';
+import 'package:unyo/domain/entities/user/settings.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 //Internal dependencies
@@ -24,9 +24,9 @@ import 'package:unyo/core/services/api/graphql/graphql_response.dart';
 import 'package:unyo/core/services/api/graphql/graphql_service.dart';
 import 'package:unyo/core/services/api/http/api_response.dart';
 import 'package:unyo/core/services/api/http/http_service.dart';
-import 'package:unyo/data/models/anilist_user_model.dart';
+import 'package:unyo/data/models/anilist/anilist_user_model.dart';
 import 'package:unyo/domain/repositories/repositories.dart';
-import 'package:unyo/domain/entities/user.dart';
+import 'package:unyo/domain/entities/user/user.dart';
 
 class UserRepositoryAnilist with RepositoryMixin implements UserRepository {
   final Logger _logger = sl<Logger>();

lib/data/repositories/user_repository_local.dart

@@ -3,9 +3,9 @@ import 'package:logger/logger.dart';
 
 // Internal Dependencies
 import 'package:unyo/core/di/locator.dart';
-import 'package:unyo/domain/entities/anime.dart';
+import 'package:unyo/domain/entities/media/anime.dart';
 import 'package:unyo/domain/entities/entities.dart';
-import 'package:unyo/domain/entities/manga.dart';
+import 'package:unyo/domain/entities/media/manga.dart';
 import 'package:unyo/domain/repositories/user_repository.dart';
 
 class UserRepositoryLocal implements UserRepository {

lib/domain/entities/entities.dart

@@ -1 +1,17 @@
-export 'user.dart';
+export 'extension/extension.dart';
+export 'extension/preference_item.dart';
+export 'list/media_list.dart';
+export 'list/media_list_entry.dart';
+export 'media/airing_episode.dart';
+export 'media/anime.dart';
+export 'media/anime_details.dart';
+export 'media/episode_info.dart';
+export 'media/manga.dart';
+export 'media/manga_details.dart';
+export 'media/media_character.dart';
+export 'media/title.dart';
+export 'media/video_info.dart';
+export 'torrent/torrent_file_stat.dart';
+export 'torrent/torrent_status.dart';
+export 'user/settings.dart';
+export 'user/user.dart';

lib/domain/entities/media/anime_details.dart

@@ -1,7 +1,7 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:unyo/domain/entities/anime.dart';
-import 'package:unyo/domain/entities/media_character.dart';
-import 'package:unyo/domain/entities/media_list_entry.dart';
+import 'package:unyo/domain/entities/media/anime.dart';
+import 'package:unyo/domain/entities/media/media_character.dart';
+import 'package:unyo/domain/entities/list/media_list_entry.dart';
 
 part 'anime_details.freezed.dart';
 part 'anime_details.g.dart';

lib/domain/entities/media/episode_info.dart

@@ -1,5 +1,5 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:unyo/domain/entities/title.dart';
+import 'package:unyo/domain/entities/media/title.dart';
 
 part 'episode_info.freezed.dart';
 part 'episode_info.g.dart';

lib/domain/entities/media/manga_details.dart

@@ -1,8 +1,8 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:unyo/domain/entities/manga.dart';
-import 'package:unyo/domain/entities/media_character.dart';
+import 'package:unyo/domain/entities/media/manga.dart';
+import 'package:unyo/domain/entities/media/media_character.dart';
 
-import 'media_list_entry.dart';
+import 'package:unyo/domain/entities/list/media_list_entry.dart';
 
 part 'manga_details.freezed.dart';
 part 'manga_details.g.dart';