diff --git a/README.md b/README.md index f869326..62e32ba 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# MookNote - Flutter 观影阅读笔记应用 +# MookNote - 极简风格的观影阅读笔记应用 ## 项目简介 MookNote 是一款用于记录观影、阅读和笔记的 Android 软件，基于 Flutter 框架开发。 @@ -82,6 +82,7 @@ cd mooknote ### 2. 安装依赖 ```bash +flutter clean flutter pub get # 如果失败可以先添加代理再进行get $env:HTTP_PROXY="http://127.0.0.1:10808" diff --git a/lib/main.dart b/lib/main.dart index afda4bd..40175a8 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'pages/home_page.dart'; -import 'utils/app_theme.dart'; +import 'utils/theme/app_theme.dart'; import 'utils/app_router.dart'; import 'utils/user_prefs.dart'; -import 'utils/webdav_service.dart'; -import 'utils/auto_backup_service.dart'; +import 'utils/sync/webdav_service.dart'; +import 'utils/sync/auto_backup_service.dart'; import 'providers/app_provider.dart'; void main() async { diff --git a/lib/pages/book_detail_page.dart b/lib/pages/book/book_detail_page.dart similarity index 99% rename from lib/pages/book_detail_page.dart rename to lib/pages/book/book_detail_page.dart index 4926218..eb74b9b 100644 --- a/lib/pages/book_detail_page.dart +++ b/lib/pages/book/book_detail_page.dart @@ -3,9 +3,9 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:share_plus/share_plus.dart'; import 'package:cross_file/cross_file.dart'; -import '../providers/app_provider.dart'; -import '../models/data_models.dart'; -import '../utils/toast_util.dart'; +import '../../providers/app_provider.dart'; +import '../../models/data_models.dart'; +import '../../utils/toast_util.dart'; import 'book_reviews_page.dart'; import 'book_excerpts_page.dart'; diff --git a/lib/pages/book_excerpt_form_page.dart b/lib/pages/book/book_excerpt_form_page.dart similarity index 97% rename from lib/pages/book_excerpt_form_page.dart rename to lib/pages/book/book_excerpt_form_page.dart index c380dcd..a568fc0 100644 --- a/lib/pages/book_excerpt_form_page.dart +++ b/lib/pages/book/book_excerpt_form_page.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../providers/app_provider.dart'; -import '../models/data_models.dart'; -import '../utils/toast_util.dart'; +import '../../providers/app_provider.dart'; +import '../../models/data_models.dart'; +import '../../utils/toast_util.dart'; import 'package:uuid/uuid.dart'; /// 摘抄表单页面 - 新增/编辑摘抄 diff --git a/lib/pages/book_excerpts_page.dart b/lib/pages/book/book_excerpts_page.dart similarity index 98% rename from lib/pages/book_excerpts_page.dart rename to lib/pages/book/book_excerpts_page.dart index eb48f59..97618a7 100644 --- a/lib/pages/book_excerpts_page.dart +++ b/lib/pages/book/book_excerpts_page.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../providers/app_provider.dart'; -import '../models/data_models.dart'; -import '../utils/toast_util.dart'; +import '../../providers/app_provider.dart'; +import '../../models/data_models.dart'; +import '../../utils/toast_util.dart'; import 'book_excerpt_form_page.dart'; /// 书籍摘抄列表页面 diff --git a/lib/pages/book_form_page.dart b/lib/pages/book/book_form_page.dart similarity index 99% rename from lib/pages/book_form_page.dart rename to lib/pages/book/book_form_page.dart index 7b38c33..118e98b 100644 --- a/lib/pages/book_form_page.dart +++ b/lib/pages/book/book_form_page.dart @@ -4,10 +4,10 @@ import 'package:image_picker/image_picker.dart'; import 'package:path_provider/path_provider.dart'; import 'package:path/path.dart' as p; import 'package:provider/provider.dart'; -import '../providers/app_provider.dart'; -import '../models/data_models.dart'; -import '../utils/toast_util.dart'; -import '../utils/image_path_helper.dart'; +import '../../providers/app_provider.dart'; +import '../../models/data_models.dart'; +import '../../utils/toast_util.dart'; +import '../../utils/image_path_helper.dart'; /// 添加/编辑书籍页面 - 紧凑双行布局设计 class BookFormPage extends StatefulWidget { diff --git a/lib/pages/book_review_form_page.dart b/lib/pages/book/book_review_form_page.dart similarity index 98% rename from lib/pages/book_review_form_page.dart rename to lib/pages/book/book_review_form_page.dart index 5ec1f86..c9cc4ef 100644 --- a/lib/pages/book_review_form_page.dart +++ b/lib/pages/book/book_review_form_page.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../providers/app_provider.dart'; -import '../models/data_models.dart'; -import '../utils/toast_util.dart'; +import '../../providers/app_provider.dart'; +import '../../models/data_models.dart'; +import '../../utils/toast_util.dart'; import 'package:uuid/uuid.dart'; /// 添加/编辑书评页面 - 极简设计 diff --git a/lib/pages/book_reviews_page.dart b/lib/pages/book/book_reviews_page.dart similarity index 98% rename from lib/pages/book_reviews_page.dart rename to lib/pages/book/book_reviews_page.dart index 83db608..1f4d5e5 100644 --- a/lib/pages/book_reviews_page.dart +++ b/lib/pages/book/book_reviews_page.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../providers/app_provider.dart'; -import '../models/data_models.dart'; -import '../utils/toast_util.dart'; +import '../../providers/app_provider.dart'; +import '../../models/data_models.dart'; +import '../../utils/toast_util.dart'; import 'book_review_form_page.dart'; /// 书籍书评列表页面 diff --git a/lib/pages/book_tab_page.dart b/lib/pages/book/book_tab_page.dart similarity index 96% rename from lib/pages/book_tab_page.dart rename to lib/pages/book/book_tab_page.dart index 4b53f82..08cb9a3 100644 --- a/lib/pages/book_tab_page.dart +++ b/lib/pages/book/book_tab_page.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../providers/app_provider.dart'; -import '../models/data_models.dart'; -import '../widgets/book_status_bar.dart'; -import '../widgets/book_list_item.dart'; +import '../../providers/app_provider.dart'; +import '../../models/data_models.dart'; +import '../../widgets/book_status_bar.dart'; +import '../../widgets/book_list_item.dart'; /// 阅读标签页 class BookTabPage extends StatelessWidget { diff --git a/lib/pages/main_content_page.dart b/lib/pages/main_content_page.dart index d7e0f87..f0ec501 100644 --- a/lib/pages/main_content_page.dart +++ b/lib/pages/main_content_page.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import '../providers/app_provider.dart'; -import 'movie_tab_page.dart'; -import 'book_tab_page.dart'; -import 'note_tab_page.dart'; +import 'movies/movie_tab_page.dart'; +import 'book/book_tab_page.dart'; +import 'note/note_tab_page.dart'; import 'search_page.dart'; /// 主内容页 - 观影/阅读/笔记标签页 diff --git a/lib/pages/movie_detail_page.dart b/lib/pages/movies/movie_detail_page.dart similarity index 99% rename from lib/pages/movie_detail_page.dart rename to lib/pages/movies/movie_detail_page.dart index 8ce9232..30291a1 100644 --- a/lib/pages/movie_detail_page.dart +++ b/lib/pages/movies/movie_detail_page.dart @@ -6,9 +6,9 @@ import 'package:path/path.dart' as path; import 'package:share_plus/share_plus.dart'; import 'package:cross_file/cross_file.dart'; import 'package:permission_handler/permission_handler.dart'; -import '../providers/app_provider.dart'; -import '../models/data_models.dart'; -import '../utils/toast_util.dart'; +import '../../providers/app_provider.dart'; +import '../../models/data_models.dart'; +import '../../utils/toast_util.dart'; import 'movie_reviews_page.dart'; import 'movie_posters_page.dart'; diff --git a/lib/pages/movie_form_page.dart b/lib/pages/movies/movie_form_page.dart similarity index 99% rename from lib/pages/movie_form_page.dart rename to lib/pages/movies/movie_form_page.dart index 1d301e9..ebff702 100644 --- a/lib/pages/movie_form_page.dart +++ b/lib/pages/movies/movie_form_page.dart @@ -4,10 +4,10 @@ import 'package:image_picker/image_picker.dart'; import 'package:path_provider/path_provider.dart'; import 'package:path/path.dart' as p; import 'package:provider/provider.dart'; -import '../providers/app_provider.dart'; -import '../models/data_models.dart'; -import '../utils/toast_util.dart'; -import '../utils/image_path_helper.dart'; +import '../../providers/app_provider.dart'; +import '../../models/data_models.dart'; +import '../../utils/toast_util.dart'; +import '../../utils/image_path_helper.dart'; /// 添加/编辑影视页面 - 紧凑双行布局设计 class MovieFormPage extends StatefulWidget { diff --git a/lib/pages/movie_form_page_new.dart b/lib/pages/movies/movie_form_page_new.dart similarity index 99% rename from lib/pages/movie_form_page_new.dart rename to lib/pages/movies/movie_form_page_new.dart index d8e5f49..70ca906 100644 --- a/lib/pages/movie_form_page_new.dart +++ b/lib/pages/movies/movie_form_page_new.dart @@ -4,9 +4,9 @@ import 'package:image_picker/image_picker.dart'; import 'package:path_provider/path_provider.dart'; import 'package:provider/provider.dart'; import 'package:uuid/uuid.dart'; -import '../providers/app_provider.dart'; -import '../models/data_models.dart'; -import '../utils/toast_util.dart'; +import '../../providers/app_provider.dart'; +import '../../models/data_models.dart'; +import '../../utils/toast_util.dart'; /// 添加/编辑影视记录页面（Typecho 风格） class MovieFormPage extends StatefulWidget { diff --git a/lib/pages/movie_posters_page.dart b/lib/pages/movies/movie_posters_page.dart similarity index 97% rename from lib/pages/movie_posters_page.dart rename to lib/pages/movies/movie_posters_page.dart index 7dbdac8..325b890 100644 --- a/lib/pages/movie_posters_page.dart +++ b/lib/pages/movies/movie_posters_page.dart @@ -6,10 +6,10 @@ import 'package:path_provider/path_provider.dart'; import 'package:path/path.dart' as p; import 'package:provider/provider.dart'; import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart'; -import '../providers/app_provider.dart'; -import '../models/data_models.dart'; -import '../utils/toast_util.dart'; -import '../utils/image_path_helper.dart'; +import '../../providers/app_provider.dart'; +import '../../models/data_models.dart'; +import '../../utils/toast_util.dart'; +import '../../utils/image_path_helper.dart'; import 'poster_gallery_page.dart'; /// 影视海报墙页面 diff --git a/lib/pages/movie_review_form_page.dart b/lib/pages/movies/movie_review_form_page.dart similarity index 98% rename from lib/pages/movie_review_form_page.dart rename to lib/pages/movies/movie_review_form_page.dart index 6bc58ed..7f32ae0 100644 --- a/lib/pages/movie_review_form_page.dart +++ b/lib/pages/movies/movie_review_form_page.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../providers/app_provider.dart'; -import '../models/data_models.dart'; -import '../utils/toast_util.dart'; +import '../../providers/app_provider.dart'; +import '../../models/data_models.dart'; +import '../../utils/toast_util.dart'; /// 添加/编辑影评页面 - 极简设计 class MovieReviewFormPage extends StatefulWidget { diff --git a/lib/pages/movie_reviews_page.dart b/lib/pages/movies/movie_reviews_page.dart similarity index 98% rename from lib/pages/movie_reviews_page.dart rename to lib/pages/movies/movie_reviews_page.dart index 8f13ee0..17c3b5d 100644 --- a/lib/pages/movie_reviews_page.dart +++ b/lib/pages/movies/movie_reviews_page.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../providers/app_provider.dart'; -import '../models/data_models.dart'; -import '../utils/toast_util.dart'; +import '../../providers/app_provider.dart'; +import '../../models/data_models.dart'; +import '../../utils/toast_util.dart'; import 'movie_review_form_page.dart'; /// 影视影评列表页面 diff --git a/lib/pages/movie_tab_page.dart b/lib/pages/movies/movie_tab_page.dart similarity index 95% rename from lib/pages/movie_tab_page.dart rename to lib/pages/movies/movie_tab_page.dart index 9e370ed..117ab9d 100644 --- a/lib/pages/movie_tab_page.dart +++ b/lib/pages/movies/movie_tab_page.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../providers/app_provider.dart'; -import '../widgets/movie_status_bar.dart'; -import '../widgets/movie_list_item.dart'; +import '../../providers/app_provider.dart'; +import '../../widgets/movie_status_bar.dart'; +import '../../widgets/movie_list_item.dart'; /// 观影标签页 - 极简主义设计 class MovieTabPage extends StatelessWidget { diff --git a/lib/pages/poster_gallery_page.dart b/lib/pages/movies/poster_gallery_page.dart similarity index 99% rename from lib/pages/poster_gallery_page.dart rename to lib/pages/movies/poster_gallery_page.dart index 102e936..db6861d 100644 --- a/lib/pages/poster_gallery_page.dart +++ b/lib/pages/movies/poster_gallery_page.dart @@ -1,6 +1,6 @@ import 'dart:io'; import 'package:flutter/material.dart'; -import '../models/data_models.dart'; +import '../../models/data_models.dart'; /// 海报画廊页面 - 支持左右滑动浏览 class PosterGalleryPage extends StatefulWidget { diff --git a/lib/pages/note_detail_page.dart b/lib/pages/note/note_detail_page.dart similarity index 99% rename from lib/pages/note_detail_page.dart rename to lib/pages/note/note_detail_page.dart index 6789e46..9cfb482 100644 --- a/lib/pages/note_detail_page.dart +++ b/lib/pages/note/note_detail_page.dart @@ -2,9 +2,9 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; import 'package:provider/provider.dart'; -import '../providers/app_provider.dart'; -import '../models/data_models.dart'; -import '../utils/toast_util.dart'; +import '../../providers/app_provider.dart'; +import '../../models/data_models.dart'; +import '../../utils/toast_util.dart'; /// 笔记详情页 - 极简主义设计 class NoteDetailPage extends StatefulWidget { diff --git a/lib/pages/note_form_page.dart b/lib/pages/note/note_form_page.dart similarity index 99% rename from lib/pages/note_form_page.dart rename to lib/pages/note/note_form_page.dart index 4df6de0..04330ed 100644 --- a/lib/pages/note_form_page.dart +++ b/lib/pages/note/note_form_page.dart @@ -3,10 +3,10 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:image_picker/image_picker.dart'; import 'package:path/path.dart' as p; -import '../providers/app_provider.dart'; -import '../models/data_models.dart'; -import '../utils/toast_util.dart'; -import '../utils/image_path_helper.dart'; +import '../../providers/app_provider.dart'; +import '../../models/data_models.dart'; +import '../../utils/toast_util.dart'; +import '../../utils/image_path_helper.dart'; /// 添加/编辑笔记页面 - 极简书写界面 class NoteFormPage extends StatefulWidget { diff --git a/lib/pages/note_tab_page.dart b/lib/pages/note/note_tab_page.dart similarity index 98% rename from lib/pages/note_tab_page.dart rename to lib/pages/note/note_tab_page.dart index fc8041a..28a73bb 100644 --- a/lib/pages/note_tab_page.dart +++ b/lib/pages/note/note_tab_page.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../providers/app_provider.dart'; -import '../models/data_models.dart'; -import '../widgets/note_list_item.dart'; +import '../../providers/app_provider.dart'; +import '../../models/data_models.dart'; +import '../../widgets/note_list_item.dart'; /// 笔记标签页 class NoteTabPage extends StatefulWidget { diff --git a/lib/pages/profile_page.dart b/lib/pages/profile_page.dart index f79d7ba..fba21d8 100644 --- a/lib/pages/profile_page.dart +++ b/lib/pages/profile_page.dart @@ -10,9 +10,9 @@ import '../providers/app_provider.dart'; import '../utils/user_prefs.dart'; import '../utils/toast_util.dart'; import 'recycle_bin_page.dart'; -import 'backup_page.dart'; +import 'sync/backup_page.dart'; import 'statistics_page.dart'; -import 'cloud_sync_page.dart'; +import 'sync/cloud_sync_page.dart'; /// 个人中心页面 - 极简主义设计 class ProfilePage extends StatefulWidget { diff --git a/lib/pages/search_page.dart b/lib/pages/search_page.dart index d0d0c42..d99ce28 100644 --- a/lib/pages/search_page.dart +++ b/lib/pages/search_page.dart @@ -4,9 +4,9 @@ import 'package:provider/provider.dart'; import '../providers/app_provider.dart'; import '../models/data_models.dart'; import '../utils/toast_util.dart'; -import 'movie_detail_page.dart'; -import 'book_detail_page.dart'; -import 'note_detail_page.dart'; +import 'movies/movie_detail_page.dart'; +import 'book/book_detail_page.dart'; +import 'note/note_detail_page.dart'; /// 搜索页面 class SearchPage extends StatefulWidget { diff --git a/lib/pages/backup_page.dart b/lib/pages/sync/backup_page.dart similarity index 98% rename from lib/pages/backup_page.dart rename to lib/pages/sync/backup_page.dart index cdd7675..d6ad370 100644 --- a/lib/pages/backup_page.dart +++ b/lib/pages/sync/backup_page.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../providers/app_provider.dart'; -import '../utils/backup_service.dart'; -import '../utils/auto_backup_service.dart'; -import '../utils/toast_util.dart'; +import '../../providers/app_provider.dart'; +import '../../utils/sync/backup_service.dart'; +import '../../utils/sync/auto_backup_service.dart'; +import '../../utils/toast_util.dart'; /// 本地备份页面 class BackupPage extends StatefulWidget { diff --git a/lib/pages/cloud_sync_page.dart b/lib/pages/sync/cloud_sync_page.dart similarity index 100% rename from lib/pages/cloud_sync_page.dart rename to lib/pages/sync/cloud_sync_page.dart diff --git a/lib/pages/webdav_sync_page.dart b/lib/pages/sync/webdav_sync_page.dart similarity index 99% rename from lib/pages/webdav_sync_page.dart rename to lib/pages/sync/webdav_sync_page.dart index fc69322..0489a56 100644 --- a/lib/pages/webdav_sync_page.dart +++ b/lib/pages/sync/webdav_sync_page.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../utils/toast_util.dart'; -import '../utils/webdav_service.dart'; -import '../providers/app_provider.dart'; +import '../../utils/toast_util.dart'; +import '../../utils/sync/webdav_service.dart'; +import '../../providers/app_provider.dart'; /// WebDAV 备份页面 class WebDAVSyncPage extends StatefulWidget { diff --git a/lib/providers/app_provider.dart b/lib/providers/app_provider.dart index 1f87df6..87a7ef8 100644 --- a/lib/providers/app_provider.dart +++ b/lib/providers/app_provider.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; import '../models/data_models.dart'; -import '../utils/movie_dao.dart'; -import '../utils/book_dao.dart'; -import '../utils/note_dao.dart'; -import '../utils/movie_review_dao.dart'; -import '../utils/movie_poster_dao.dart'; -import '../utils/book_review_dao.dart'; -import '../utils/book_excerpt_dao.dart'; +import '../utils/movie/movie_dao.dart'; +import '../utils/book/book_dao.dart'; +import '../utils/note/note_dao.dart'; +import '../utils/movie/movie_review_dao.dart'; +import '../utils/movie/movie_poster_dao.dart'; +import '../utils/book/book_review_dao.dart'; +import '../utils/book/book_excerpt_dao.dart'; import '../utils/image_path_helper.dart'; /// 应用全局状态管理 diff --git a/lib/utils/app_router.dart b/lib/utils/app_router.dart index eec4be9..ad93f80 100644 --- a/lib/utils/app_router.dart +++ b/lib/utils/app_router.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import '../models/data_models.dart'; -import '../pages/movie_form_page.dart'; -import '../pages/book_form_page.dart'; -import '../pages/note_form_page.dart'; -import '../pages/movie_detail_page.dart'; -import '../pages/book_detail_page.dart'; -import '../pages/note_detail_page.dart'; +import '../pages/movies/movie_form_page.dart'; +import '../pages/book/book_form_page.dart'; +import '../pages/note/note_form_page.dart'; +import '../pages/movies/movie_detail_page.dart'; +import '../pages/book/book_detail_page.dart'; +import '../pages/note/note_detail_page.dart'; /// 路由生成器 class AppRouter { diff --git a/lib/utils/book_dao.dart b/lib/utils/book/book_dao.dart similarity index 98% rename from lib/utils/book_dao.dart rename to lib/utils/book/book_dao.dart index 6d92dbf..af3dcec 100644 --- a/lib/utils/book_dao.dart +++ b/lib/utils/book/book_dao.dart @@ -1,6 +1,6 @@ import 'package:sqflite/sqflite.dart'; -import '../models/data_models.dart'; -import 'database_helper.dart'; +import '../../models/data_models.dart'; +import '../database_helper.dart'; /// 书籍数据访问对象 class BookDao { diff --git a/lib/utils/book_excerpt_dao.dart b/lib/utils/book/book_excerpt_dao.dart similarity index 97% rename from lib/utils/book_excerpt_dao.dart rename to lib/utils/book/book_excerpt_dao.dart index 670cf62..2d617d7 100644 --- a/lib/utils/book_excerpt_dao.dart +++ b/lib/utils/book/book_excerpt_dao.dart @@ -1,6 +1,6 @@ import 'package:sqflite/sqflite.dart'; -import '../models/data_models.dart'; -import 'database_helper.dart'; +import '../../models/data_models.dart'; +import '../database_helper.dart'; /// 书籍摘抄数据访问对象 class BookExcerptDao { diff --git a/lib/utils/book_review_dao.dart b/lib/utils/book/book_review_dao.dart similarity index 97% rename from lib/utils/book_review_dao.dart rename to lib/utils/book/book_review_dao.dart index 1e4f269..e722583 100644 --- a/lib/utils/book_review_dao.dart +++ b/lib/utils/book/book_review_dao.dart @@ -1,6 +1,6 @@ import 'package:sqflite/sqflite.dart'; -import '../models/data_models.dart'; -import 'database_helper.dart'; +import '../../models/data_models.dart'; +import '../database_helper.dart'; /// 书评数据访问对象 class BookReviewDao { diff --git a/lib/utils/movie_dao.dart b/lib/utils/movie/movie_dao.dart similarity index 98% rename from lib/utils/movie_dao.dart rename to lib/utils/movie/movie_dao.dart index e774ef7..944f30d 100644 --- a/lib/utils/movie_dao.dart +++ b/lib/utils/movie/movie_dao.dart @@ -1,6 +1,6 @@ import 'package:sqflite/sqflite.dart'; -import '../models/data_models.dart'; -import 'database_helper.dart'; +import '../../models/data_models.dart'; +import '../database_helper.dart'; /// 影视数据访问对象 class MovieDao { diff --git a/lib/utils/movie_poster_dao.dart b/lib/utils/movie/movie_poster_dao.dart similarity index 95% rename from lib/utils/movie_poster_dao.dart rename to lib/utils/movie/movie_poster_dao.dart index 75af9e6..9b11480 100644 --- a/lib/utils/movie_poster_dao.dart +++ b/lib/utils/movie/movie_poster_dao.dart @@ -1,6 +1,6 @@ import 'package:sqflite/sqflite.dart'; -import '../models/data_models.dart'; -import 'database_helper.dart'; +import '../../models/data_models.dart'; +import '../database_helper.dart'; /// 影视海报墙数据访问对象 class MoviePosterDao { diff --git a/lib/utils/movie_review_dao.dart b/lib/utils/movie/movie_review_dao.dart similarity index 97% rename from lib/utils/movie_review_dao.dart rename to lib/utils/movie/movie_review_dao.dart index a324a45..95d7032 100644 --- a/lib/utils/movie_review_dao.dart +++ b/lib/utils/movie/movie_review_dao.dart @@ -1,6 +1,6 @@ import 'package:sqflite/sqflite.dart'; -import '../models/data_models.dart'; -import 'database_helper.dart'; +import '../../models/data_models.dart'; +import '../database_helper.dart'; /// 影评数据访问对象 class MovieReviewDao { diff --git a/lib/utils/note_dao.dart b/lib/utils/note/note_dao.dart similarity index 97% rename from lib/utils/note_dao.dart rename to lib/utils/note/note_dao.dart index 84a3064..592717e 100644 --- a/lib/utils/note_dao.dart +++ b/lib/utils/note/note_dao.dart @@ -1,6 +1,6 @@ import 'package:sqflite/sqflite.dart'; -import '../models/data_models.dart'; -import 'database_helper.dart'; +import '../../models/data_models.dart'; +import '../database_helper.dart'; /// 笔记数据访问对象 class NoteDao { diff --git a/lib/utils/auto_backup_service.dart b/lib/utils/sync/auto_backup_service.dart similarity index 100% rename from lib/utils/auto_backup_service.dart rename to lib/utils/sync/auto_backup_service.dart diff --git a/lib/utils/backup_service.dart b/lib/utils/sync/backup_service.dart similarity index 99% rename from lib/utils/backup_service.dart rename to lib/utils/sync/backup_service.dart index d00822b..133477a 100644 --- a/lib/utils/backup_service.dart +++ b/lib/utils/sync/backup_service.dart @@ -7,7 +7,7 @@ import 'package:file_picker/file_picker.dart'; import 'package:path_provider/path_provider.dart'; import 'package:path/path.dart' as path; import 'package:share_plus/share_plus.dart'; -import 'database_helper.dart'; +import '../database_helper.dart'; /// 数据备份服务 - 支持导出和导入数据（包含图片） class BackupService { diff --git a/lib/utils/webdav_service.dart b/lib/utils/sync/webdav_service.dart similarity index 99% rename from lib/utils/webdav_service.dart rename to lib/utils/sync/webdav_service.dart index cbcb95d..126daee 100644 --- a/lib/utils/webdav_service.dart +++ b/lib/utils/sync/webdav_service.dart @@ -8,7 +8,7 @@ import 'package:sqflite/sqflite.dart'; import 'package:path/path.dart' as p; import 'package:archive/archive.dart'; import 'package:archive/archive_io.dart'; -import 'database_helper.dart'; +import '../database_helper.dart'; /// WebDAV 同步结果 class SyncResult { diff --git a/lib/utils/app_theme.dart b/lib/utils/theme/app_theme.dart similarity index 100% rename from lib/utils/app_theme.dart rename to lib/utils/theme/app_theme.dart