Restructure directories

r52 · Nov 24, 2024 · 92870d3 · 92870d3
1 parent e2f797c
commit 92870d3
Show file tree

Hide file tree

Showing 66 changed files with 108 additions and 113 deletions.
diff --git a/lib/drawer.dart b/lib/drawer.dart
@@ -1,7 +1,7 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
-import 'package:gagaku/model.dart';
+import 'package:gagaku/model/model.dart';
 import 'package:gagaku/util/util.dart';
 import 'package:gagaku/version.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';

diff --git a/lib/local/archive_reader.dart b/lib/local/archive_reader.dart
@@ -2,10 +2,10 @@ import 'package:archive/archive_io.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:gagaku/local/model.dart';
-import 'package:gagaku/local/types.dart';
+import 'package:gagaku/local/model/model.dart';
+import 'package:gagaku/local/model/types.dart';
 import 'package:gagaku/reader/main.dart';
-import 'package:gagaku/reader/types.dart';
+import 'package:gagaku/reader/model/types.dart';
 import 'package:gagaku/util/ui.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 

diff --git a/lib/local/directory_reader.dart b/lib/local/directory_reader.dart
@@ -3,9 +3,9 @@ import 'dart:io';
 import 'package:collection/collection.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:gagaku/local/model.dart';
+import 'package:gagaku/local/model/model.dart';
 import 'package:gagaku/reader/main.dart';
-import 'package:gagaku/reader/types.dart';
+import 'package:gagaku/reader/model/types.dart';
 import 'package:gagaku/util/ui.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 

diff --git a/lib/local/main.dart b/lib/local/main.dart
@@ -6,9 +6,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gagaku/drawer.dart';
 import 'package:gagaku/local/archive_reader.dart';
-import 'package:gagaku/local/config.dart';
+import 'package:gagaku/local/model/config.dart';
 import 'package:gagaku/local/directory_reader.dart';
-import 'package:gagaku/local/model.dart';
+import 'package:gagaku/local/model/model.dart';
 import 'package:gagaku/local/settings.dart';
 import 'package:gagaku/local/widgets.dart';
 import 'package:gagaku/util/ui.dart';

diff --git a/lib/local/config.dart → lib/local/model/config.dart b/lib/local/config.dart → lib/local/model/config.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:gagaku/model.dart';
+import 'package:gagaku/model/model.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
@@ -14,8 +14,7 @@ class LocalLibConfig with _$LocalLibConfig {
     @Default('') String libraryDirectory,
   }) = _LocalLibConfig;
 
-  factory LocalLibConfig.fromJson(Map<String, dynamic> json) =>
-      _$LocalLibConfigFromJson(json);
+  factory LocalLibConfig.fromJson(Map<String, dynamic> json) => _$LocalLibConfigFromJson(json);
 }
 
 @Riverpod(keepAlive: true)

diff --git a/lib/local/config.freezed.dart → lib/local/model/config.freezed.dart b/lib/local/config.freezed.dart → lib/local/model/config.freezed.dart
diff --git a/lib/local/config.g.dart → lib/local/model/config.g.dart b/lib/local/config.g.dart → lib/local/model/config.g.dart
diff --git a/lib/local/model.dart → lib/local/model/model.dart b/lib/local/model.dart → lib/local/model/model.dart
@@ -5,7 +5,7 @@ import 'dart:io';
 import 'package:collection/collection.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:easy_localization/easy_localization.dart';
-import 'package:gagaku/local/config.dart';
+import 'package:gagaku/local/model/config.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 

diff --git a/lib/local/model.g.dart → lib/local/model/model.g.dart b/lib/local/model.g.dart → lib/local/model/model.g.dart
diff --git a/lib/local/types.dart → lib/local/model/types.dart b/lib/local/types.dart → lib/local/model/types.dart
diff --git a/lib/local/settings.dart b/lib/local/settings.dart
@@ -2,7 +2,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:gagaku/local/config.dart';
+import 'package:gagaku/local/model/config.dart';
 import 'package:gagaku/util/ui.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:permission_handler/permission_handler.dart';

diff --git a/lib/local/widgets.dart b/lib/local/widgets.dart
@@ -3,8 +3,8 @@ import 'dart:io';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:gagaku/config.dart';
-import 'package:gagaku/local/model.dart';
+import 'package:gagaku/model/config.dart';
+import 'package:gagaku/local/model/model.dart';
 import 'package:gagaku/util/ui.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 

diff --git a/lib/main.dart b/lib/main.dart
@@ -3,10 +3,10 @@ import 'dart:io';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:gagaku/config.dart';
+import 'package:gagaku/model/config.dart';
 import 'package:gagaku/local/main.dart';
 import 'package:gagaku/log.dart';
-import 'package:gagaku/cache.dart';
+import 'package:gagaku/model/cache.dart';
 import 'package:gagaku/mangadex/chapter_feed.dart';
 import 'package:gagaku/mangadex/creator_view.dart';
 import 'package:gagaku/mangadex/edit_list.dart';
@@ -23,9 +23,9 @@ import 'package:gagaku/mangadex/manga_view.dart';
 import 'package:gagaku/mangadex/reader.dart';
 import 'package:gagaku/mangadex/recent_feed.dart';
 import 'package:gagaku/mangadex/search.dart';
-import 'package:gagaku/model.dart';
+import 'package:gagaku/model/model.dart';
 import 'package:gagaku/settings.dart';
-import 'package:gagaku/types.dart';
+import 'package:gagaku/model/types.dart';
 import 'package:gagaku/util/ui.dart';
 import 'package:gagaku/util/util.dart';
 import 'package:gagaku/web/favorites.dart';

diff --git a/lib/mangadex/chapter_feed.dart b/lib/mangadex/chapter_feed.dart
@@ -2,8 +2,8 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gagaku/mangadex/manga_feed.dart';
-import 'package:gagaku/mangadex/model.dart';
-import 'package:gagaku/mangadex/types.dart';
+import 'package:gagaku/mangadex/model/model.dart';
+import 'package:gagaku/mangadex/model/types.dart';
 import 'package:gagaku/mangadex/widgets.dart';
 import 'package:gagaku/util/default_scroll_controller.dart';
 import 'package:gagaku/util/util.dart';

diff --git a/lib/mangadex/creator_view.dart b/lib/mangadex/creator_view.dart
@@ -2,8 +2,8 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
-import 'package:gagaku/mangadex/model.dart';
-import 'package:gagaku/mangadex/types.dart';
+import 'package:gagaku/mangadex/model/model.dart';
+import 'package:gagaku/mangadex/model/types.dart';
 import 'package:gagaku/mangadex/widgets.dart';
 import 'package:gagaku/util/ui.dart';
 import 'package:gagaku/util/util.dart';

diff --git a/lib/mangadex/edit_list.dart b/lib/mangadex/edit_list.dart
@@ -4,8 +4,8 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:gagaku/mangadex/model.dart';
-import 'package:gagaku/mangadex/types.dart';
+import 'package:gagaku/mangadex/model/model.dart';
+import 'package:gagaku/mangadex/model/types.dart';
 import 'package:gagaku/mangadex/widgets.dart';
 import 'package:gagaku/util/ui.dart';
 import 'package:gagaku/util/util.dart';

diff --git a/lib/mangadex/frontpage.dart b/lib/mangadex/frontpage.dart
@@ -1,8 +1,8 @@
 import 'package:carousel_slider/carousel_slider.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:gagaku/mangadex/model.dart';
-import 'package:gagaku/mangadex/types.dart';
+import 'package:gagaku/mangadex/model/model.dart';
+import 'package:gagaku/mangadex/model/types.dart';
 import 'package:gagaku/mangadex/widgets.dart';
 import 'package:gagaku/util/default_scroll_controller.dart';
 import 'package:gagaku/util/ui.dart';

diff --git a/lib/mangadex/group_view.dart b/lib/mangadex/group_view.dart
@@ -2,9 +2,9 @@ import 'package:animations/animations.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:gagaku/mangadex/config.dart';
-import 'package:gagaku/mangadex/model.dart';
-import 'package:gagaku/mangadex/types.dart';
+import 'package:gagaku/mangadex/model/config.dart';
+import 'package:gagaku/mangadex/model/model.dart';
+import 'package:gagaku/mangadex/model/types.dart';
 import 'package:gagaku/mangadex/widgets.dart';
 import 'package:gagaku/util/ui.dart';
 import 'package:gagaku/util/util.dart';

diff --git a/lib/mangadex/history_feed.dart b/lib/mangadex/history_feed.dart
@@ -1,7 +1,7 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:gagaku/mangadex/model.dart';
-import 'package:gagaku/mangadex/types.dart';
+import 'package:gagaku/mangadex/model/model.dart';
+import 'package:gagaku/mangadex/model/types.dart';
 import 'package:gagaku/mangadex/widgets.dart';
 import 'package:gagaku/util/default_scroll_controller.dart';
 import 'package:gagaku/util/util.dart';

diff --git a/lib/mangadex/latest_feed.dart b/lib/mangadex/latest_feed.dart
@@ -1,8 +1,8 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:gagaku/mangadex/model.dart';
-import 'package:gagaku/mangadex/types.dart';
+import 'package:gagaku/mangadex/model/model.dart';
+import 'package:gagaku/mangadex/model/types.dart';
 import 'package:gagaku/mangadex/widgets.dart';
 import 'package:gagaku/util/ui.dart';
 import 'package:gagaku/util/util.dart';

diff --git a/lib/mangadex/library.dart b/lib/mangadex/library.dart
@@ -3,8 +3,8 @@ import 'dart:math';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:gagaku/mangadex/model.dart';
-import 'package:gagaku/mangadex/types.dart';
+import 'package:gagaku/mangadex/model/model.dart';
+import 'package:gagaku/mangadex/model/types.dart';
 import 'package:gagaku/mangadex/widgets.dart';
 import 'package:gagaku/util/default_scroll_controller.dart';
 import 'package:gagaku/util/ui.dart';

diff --git a/lib/mangadex/list_view.dart b/lib/mangadex/list_view.dart
@@ -4,8 +4,8 @@ import 'package:animations/animations.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:gagaku/mangadex/model.dart';
-import 'package:gagaku/mangadex/types.dart';
+import 'package:gagaku/mangadex/model/model.dart';
+import 'package:gagaku/mangadex/model/types.dart';
 import 'package:gagaku/mangadex/widgets.dart';
 import 'package:gagaku/util/ui.dart';
 import 'package:gagaku/util/util.dart';

diff --git a/lib/mangadex/lists.dart b/lib/mangadex/lists.dart
@@ -2,10 +2,10 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gagaku/drawer.dart';
-import 'package:gagaku/mangadex/model.dart';
-import 'package:gagaku/mangadex/types.dart';
+import 'package:gagaku/mangadex/model/model.dart';
+import 'package:gagaku/mangadex/model/types.dart';
 import 'package:gagaku/mangadex/widgets.dart';
-import 'package:gagaku/model.dart';
+import 'package:gagaku/model/model.dart';
 import 'package:gagaku/util/default_scroll_controller.dart';
 import 'package:gagaku/util/ui.dart';
 import 'package:gagaku/util/util.dart';

diff --git a/lib/mangadex/login_auth.dart b/lib/mangadex/login_auth.dart
@@ -1,6 +1,6 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:gagaku/mangadex/model.dart';
+import 'package:gagaku/mangadex/model/model.dart';
 import 'package:gagaku/util/ui.dart';
 
 class MangaDexLoginWidget extends StatelessWidget {

diff --git a/lib/mangadex/login_password.dart b/lib/mangadex/login_password.dart
@@ -1,8 +1,8 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:gagaku/mangadex/model.dart';
-import 'package:gagaku/model.dart';
+import 'package:gagaku/mangadex/model/model.dart';
+import 'package:gagaku/model/model.dart';
 import 'package:gagaku/util/ui.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hive_flutter/hive_flutter.dart';

diff --git a/lib/mangadex/main.dart b/lib/mangadex/main.dart
@@ -2,8 +2,8 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gagaku/drawer.dart';
-import 'package:gagaku/mangadex/model.dart';
-import 'package:gagaku/model.dart';
+import 'package:gagaku/mangadex/model/model.dart';
+import 'package:gagaku/model/model.dart';
 import 'package:gagaku/util/default_scroll_controller.dart';
 import 'package:gagaku/util/util.dart';
 import 'package:go_router/go_router.dart';

diff --git a/lib/mangadex/manga_feed.dart b/lib/mangadex/manga_feed.dart
@@ -1,7 +1,7 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:gagaku/mangadex/model.dart';
-import 'package:gagaku/mangadex/types.dart';
+import 'package:gagaku/mangadex/model/model.dart';
+import 'package:gagaku/mangadex/model/types.dart';
 import 'package:gagaku/mangadex/widgets.dart';
 import 'package:gagaku/util/ui.dart';
 import 'package:gagaku/util/util.dart';

diff --git a/lib/mangadex/manga_view.dart b/lib/mangadex/manga_view.dart
@@ -5,8 +5,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
-import 'package:gagaku/mangadex/model.dart';
-import 'package:gagaku/mangadex/types.dart';
+import 'package:gagaku/mangadex/model/model.dart';
+import 'package:gagaku/mangadex/model/types.dart';
 import 'package:gagaku/mangadex/widgets.dart';
 import 'package:gagaku/util/ui.dart';
 import 'package:gagaku/util/util.dart';

diff --git a/lib/mangadex/cache.dart → lib/mangadex/model/cache.dart b/lib/mangadex/cache.dart → lib/mangadex/model/cache.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 
-import 'package:gagaku/cache.dart';
+import 'package:gagaku/model/cache.dart';
 import 'package:gagaku/log.dart';
-import 'package:gagaku/mangadex/types.dart';
+import 'package:gagaku/mangadex/model/types.dart';
 
 extension MDCacheManagerExt on CacheManager {
   /// Adds all API data from a [list] into the cache, resolving its ids automatically

diff --git a/lib/mangadex/config.dart → lib/mangadex/model/config.dart b/lib/mangadex/config.dart → lib/mangadex/model/config.dart
@@ -1,10 +1,10 @@
 import 'dart:convert';
 
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:gagaku/model.dart';
+import 'package:gagaku/model/model.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:gagaku/mangadex/types.dart';
+import 'package:gagaku/mangadex/model/types.dart';
 
 part 'config.freezed.dart';
 part 'config.g.dart';
@@ -14,15 +14,12 @@ class MangaDexConfig with _$MangaDexConfig {
   factory MangaDexConfig({
     @Default({}) @LanguageConverter() Set<Language> translatedLanguages,
     @Default({}) @LanguageConverter() Set<Language> originalLanguage,
-    @Default(
-        {ContentRating.safe, ContentRating.suggestive, ContentRating.erotica})
-    Set<ContentRating> contentRating,
+    @Default({ContentRating.safe, ContentRating.suggestive, ContentRating.erotica}) Set<ContentRating> contentRating,
     @Default(false) bool dataSaver,
     @Default({}) Set<String> groupBlacklist,
   }) = _MangaDexConfig;
 
-  factory MangaDexConfig.fromJson(Map<String, dynamic> json) =>
-      _$MangaDexConfigFromJson(json);
+  factory MangaDexConfig.fromJson(Map<String, dynamic> json) => _$MangaDexConfigFromJson(json);
 }
 
 @riverpod

diff --git a/lib/mangadex/config.freezed.dart → lib/mangadex/model/config.freezed.dart b/lib/mangadex/config.freezed.dart → lib/mangadex/model/config.freezed.dart
diff --git a/lib/mangadex/config.g.dart → lib/mangadex/model/config.g.dart b/lib/mangadex/config.g.dart → lib/mangadex/model/config.g.dart
diff --git a/lib/mangadex/model.dart → lib/mangadex/model/model.dart b/lib/mangadex/model.dart → lib/mangadex/model/model.dart
@@ -5,11 +5,11 @@ import 'dart:math';
 
 import 'package:gagaku/util/http.dart';
 import 'package:gagaku/log.dart';
-import 'package:gagaku/cache.dart';
-import 'package:gagaku/mangadex/cache.dart';
-import 'package:gagaku/mangadex/config.dart';
-import 'package:gagaku/mangadex/types.dart';
-import 'package:gagaku/model.dart';
+import 'package:gagaku/model/cache.dart';
+import 'package:gagaku/mangadex/model/cache.dart';
+import 'package:gagaku/mangadex/model/config.dart';
+import 'package:gagaku/mangadex/model/types.dart';
+import 'package:gagaku/model/model.dart';
 import 'package:gagaku/util/util.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:mutex/mutex.dart';

diff --git a/lib/mangadex/model.g.dart → lib/mangadex/model/model.g.dart b/lib/mangadex/model.g.dart → lib/mangadex/model/model.g.dart
diff --git a/lib/mangadex/types.dart → lib/mangadex/model/types.dart b/lib/mangadex/types.dart → lib/mangadex/model/types.dart
diff --git a/lib/mangadex/types.freezed.dart → lib/mangadex/model/types.freezed.dart b/lib/mangadex/types.freezed.dart → lib/mangadex/model/types.freezed.dart
diff --git a/lib/mangadex/types.g.dart → lib/mangadex/model/types.g.dart b/lib/mangadex/types.g.dart → lib/mangadex/model/types.g.dart
diff --git a/lib/mangadex/reader.dart b/lib/mangadex/reader.dart
@@ -2,10 +2,10 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:gagaku/mangadex/model.dart';
-import 'package:gagaku/mangadex/types.dart';
+import 'package:gagaku/mangadex/model/model.dart';
+import 'package:gagaku/mangadex/model/types.dart';
 import 'package:gagaku/reader/main.dart';
-import 'package:gagaku/reader/types.dart';
+import 'package:gagaku/reader/model/types.dart';
 import 'package:gagaku/util/ui.dart';
 import 'package:gagaku/util/util.dart';
 import 'package:go_router/go_router.dart';

diff --git a/lib/mangadex/recent_feed.dart b/lib/mangadex/recent_feed.dart
@@ -1,8 +1,8 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:gagaku/mangadex/model.dart';
-import 'package:gagaku/mangadex/types.dart';
+import 'package:gagaku/mangadex/model/model.dart';
+import 'package:gagaku/mangadex/model/types.dart';
 import 'package:gagaku/mangadex/widgets.dart';
 import 'package:gagaku/util/ui.dart';
 import 'package:gagaku/util/util.dart';

diff --git a/lib/mangadex/search.dart b/lib/mangadex/search.dart
@@ -1,8 +1,8 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:gagaku/mangadex/model.dart';
-import 'package:gagaku/mangadex/types.dart';
+import 'package:gagaku/mangadex/model/model.dart';
+import 'package:gagaku/mangadex/model/types.dart';
 import 'package:gagaku/mangadex/widgets.dart';
 import 'package:gagaku/util/ui.dart';
 import 'package:gagaku/util/util.dart';

diff --git a/lib/mangadex/settings.dart b/lib/mangadex/settings.dart
@@ -2,9 +2,9 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gagaku/log.dart';
-import 'package:gagaku/mangadex/config.dart';
-import 'package:gagaku/mangadex/model.dart';
-import 'package:gagaku/mangadex/types.dart';
+import 'package:gagaku/mangadex/model/config.dart';
+import 'package:gagaku/mangadex/model/model.dart';
+import 'package:gagaku/mangadex/model/types.dart';
 import 'package:gagaku/util/ui.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';