diff --git a/.gitignore b/.gitignore index 0b6ba3e..1bd4267 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,7 @@ devtools_options.yaml /.dart_tool/ # Localizations -/lib/l10n/app_localizations*.dart +/lib/ui/core/localization/app_localizations*.dart /l10n/untranslated.json # Disable targeting web : diff --git a/l10n.yaml b/l10n.yaml index 9c5154c..b806c0c 100644 --- a/l10n.yaml +++ b/l10n.yaml @@ -1,5 +1,5 @@ arb-dir: l10n template-arb-file: app_en.arb untranslated-messages-file: l10n/untranslated.json -output-dir: lib/l10n +output-dir: lib/ui/core/localization output-localization-file: app_localizations.dart \ No newline at end of file diff --git a/lib/app.dart b/lib/app.dart index fb08499..a340a96 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -2,32 +2,32 @@ import 'package:flutter/material.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:image_picker/image_picker.dart'; -import 'package:piwigo_ng/services/app_providers.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; -import 'package:piwigo_ng/services/receive_sharing.dart'; +import 'package:piwigo_ng/data/services/local/app_providers.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; +import 'package:piwigo_ng/data/services/local/receive_sharing.dart'; import 'package:piwigo_ng/utils/overscroll_behavior.dart'; import 'package:piwigo_ng/utils/themes.dart'; -import 'package:piwigo_ng/views/album/album_page.dart'; -import 'package:piwigo_ng/views/album/album_privacy_page.dart'; -import 'package:piwigo_ng/views/album/root_album_page.dart'; -import 'package:piwigo_ng/views/authentication/login_page.dart'; -import 'package:piwigo_ng/views/authentication/login_settings_page.dart'; -import 'package:piwigo_ng/views/image/edit_image_page.dart'; -import 'package:piwigo_ng/views/image/image_favorites_page.dart'; -import 'package:piwigo_ng/views/image/image_page.dart'; -import 'package:piwigo_ng/views/image/image_search_page.dart'; -import 'package:piwigo_ng/views/image/image_tags_page.dart'; -import 'package:piwigo_ng/views/image/video_player_page.dart'; -import 'package:piwigo_ng/views/settings/auto_upload_page.dart'; -import 'package:piwigo_ng/views/settings/privacy_policy_page.dart'; -import 'package:piwigo_ng/views/settings/select_language_page.dart'; -import 'package:piwigo_ng/views/settings/settings_page.dart'; -import 'package:piwigo_ng/views/unknown_route_page.dart'; -import 'package:piwigo_ng/views/upload/upload_page.dart'; -import 'package:piwigo_ng/views/upload/upload_status_page.dart'; +import 'package:piwigo_ng/ui/album/album_page.dart'; +import 'package:piwigo_ng/ui/album/album_privacy_page.dart'; +import 'package:piwigo_ng/ui/album/root_album_page.dart'; +import 'package:piwigo_ng/ui/authentication/login_page.dart'; +import 'package:piwigo_ng/ui/authentication/login_settings_page.dart'; +import 'package:piwigo_ng/ui/image/edit_image_page.dart'; +import 'package:piwigo_ng/ui/image/image_favorites_page.dart'; +import 'package:piwigo_ng/ui/image/image_page.dart'; +import 'package:piwigo_ng/ui/image/image_search_page.dart'; +import 'package:piwigo_ng/ui/image/image_tags_page.dart'; +import 'package:piwigo_ng/ui/image/video_player_page.dart'; +import 'package:piwigo_ng/ui/settings/auto_upload_page.dart'; +import 'package:piwigo_ng/ui/settings/privacy_policy_page.dart'; +import 'package:piwigo_ng/ui/settings/select_language_page.dart'; +import 'package:piwigo_ng/ui/settings/settings_page.dart'; +import 'package:piwigo_ng/ui/unknown_route_page.dart'; +import 'package:piwigo_ng/ui/upload/upload_page.dart'; +import 'package:piwigo_ng/ui/upload/upload_status_page.dart'; -import '/l10n/app_localizations.dart'; -import 'models/image_model.dart'; +import 'package:piwigo_ng/ui/core/localization/app_localizations.dart'; +import 'package:piwigo_ng/domain/models/image_model.dart'; class App extends StatelessWidget { const App({Key? key}) : super(key: key); diff --git a/lib/network/albums.dart b/lib/data/services/api/albums.dart similarity index 97% rename from lib/network/albums.dart rename to lib/data/services/api/albums.dart index fa80a34..85437e9 100644 --- a/lib/network/albums.dart +++ b/lib/data/services/api/albums.dart @@ -2,9 +2,9 @@ import 'dart:convert'; import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; -import 'package:piwigo_ng/models/album_model.dart'; -import 'package:piwigo_ng/network/api_error.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/domain/models/album_model.dart'; +import 'package:piwigo_ng/data/services/api/api_error.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; import 'api_client.dart'; import 'authentication.dart'; diff --git a/lib/network/api_client.dart b/lib/data/services/api/api_client.dart similarity index 98% rename from lib/network/api_client.dart rename to lib/data/services/api/api_client.dart index a507c61..b772e41 100644 --- a/lib/network/api_client.dart +++ b/lib/data/services/api/api_client.dart @@ -7,7 +7,7 @@ import 'package:dio/io.dart'; import 'package:dio_cookie_manager/dio_cookie_manager.dart'; import 'package:flutter/foundation.dart'; import 'package:package_info_plus/package_info_plus.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; import 'api_interceptor.dart'; diff --git a/lib/network/api_error.dart b/lib/data/services/api/api_error.dart similarity index 100% rename from lib/network/api_error.dart rename to lib/data/services/api/api_error.dart diff --git a/lib/network/api_interceptor.dart b/lib/data/services/api/api_interceptor.dart similarity index 96% rename from lib/network/api_interceptor.dart rename to lib/data/services/api/api_interceptor.dart index a84a1e1..af5afd8 100644 --- a/lib/network/api_interceptor.dart +++ b/lib/data/services/api/api_interceptor.dart @@ -4,8 +4,8 @@ import 'dart:io'; import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; import 'package:piwigo_ng/app.dart'; -import 'package:piwigo_ng/components/snackbars.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/ui/core/ui/snackbars.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; import 'package:piwigo_ng/utils/localizations.dart'; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/lib/network/authentication.dart b/lib/data/services/api/authentication.dart similarity index 94% rename from lib/network/authentication.dart rename to lib/data/services/api/authentication.dart index f20468c..25933fa 100644 --- a/lib/network/authentication.dart +++ b/lib/data/services/api/authentication.dart @@ -2,11 +2,11 @@ import 'dart:convert'; import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; -import 'package:piwigo_ng/models/info_model.dart'; -import 'package:piwigo_ng/models/status_model.dart'; -import 'package:piwigo_ng/network/api_error.dart'; -import 'package:piwigo_ng/network/upload.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/domain/models/info_model.dart'; +import 'package:piwigo_ng/domain/models/status_model.dart'; +import 'package:piwigo_ng/data/services/api/api_error.dart'; +import 'package:piwigo_ng/data/services/api/upload.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'api_client.dart'; diff --git a/lib/network/groups.dart b/lib/data/services/api/groups.dart similarity index 95% rename from lib/network/groups.dart rename to lib/data/services/api/groups.dart index b3fd988..8bbcc66 100644 --- a/lib/network/groups.dart +++ b/lib/data/services/api/groups.dart @@ -2,8 +2,8 @@ import 'dart:convert'; import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; -import 'package:piwigo_ng/models/group_model.dart'; -import 'package:piwigo_ng/network/api_client.dart'; +import 'package:piwigo_ng/domain/models/group_model.dart'; +import 'package:piwigo_ng/data/services/api/api_client.dart'; import 'package:piwigo_ng/utils/settings.dart'; import 'api_error.dart'; diff --git a/lib/network/images.dart b/lib/data/services/api/images.dart similarity index 97% rename from lib/network/images.dart rename to lib/data/services/api/images.dart index 4a290ad..a327257 100644 --- a/lib/network/images.dart +++ b/lib/data/services/api/images.dart @@ -9,13 +9,13 @@ import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:gal/gal.dart'; import 'package:path/path.dart' as path; import 'package:path_provider/path_provider.dart'; -import 'package:piwigo_ng/models/album_model.dart'; -import 'package:piwigo_ng/models/image_model.dart'; -import 'package:piwigo_ng/network/api_error.dart'; -import 'package:piwigo_ng/network/upload.dart'; -import 'package:piwigo_ng/services/chunked_uploader.dart'; -import 'package:piwigo_ng/services/notification_service.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/domain/models/album_model.dart'; +import 'package:piwigo_ng/domain/models/image_model.dart'; +import 'package:piwigo_ng/data/services/api/api_error.dart'; +import 'package:piwigo_ng/data/services/api/upload.dart'; +import 'package:piwigo_ng/data/services/local/chunked_uploader.dart'; +import 'package:piwigo_ng/data/services/local/notification_service.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; import 'package:piwigo_ng/utils/localizations.dart'; import 'package:piwigo_ng/utils/settings.dart'; import 'package:share_plus/share_plus.dart'; diff --git a/lib/network/permissions.dart b/lib/data/services/api/permissions.dart similarity index 94% rename from lib/network/permissions.dart rename to lib/data/services/api/permissions.dart index b474b3c..0fee583 100644 --- a/lib/network/permissions.dart +++ b/lib/data/services/api/permissions.dart @@ -2,9 +2,9 @@ import 'dart:convert'; import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; -import 'package:piwigo_ng/models/album_permission_model.dart'; -import 'package:piwigo_ng/network/api_client.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/domain/models/album_permission_model.dart'; +import 'package:piwigo_ng/data/services/api/api_client.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; import 'package:shared_preferences/shared_preferences.dart'; Future getAlbumPermissions( diff --git a/lib/network/tags.dart b/lib/data/services/api/tags.dart similarity index 94% rename from lib/network/tags.dart rename to lib/data/services/api/tags.dart index c038000..fa1a5b1 100644 --- a/lib/network/tags.dart +++ b/lib/data/services/api/tags.dart @@ -2,9 +2,9 @@ import 'dart:convert'; import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; -import 'package:piwigo_ng/models/tag_model.dart'; -import 'package:piwigo_ng/network/api_error.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/domain/models/tag_model.dart'; +import 'package:piwigo_ng/data/services/api/api_error.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; import 'api_client.dart'; diff --git a/lib/network/upload.dart b/lib/data/services/api/upload.dart similarity index 93% rename from lib/network/upload.dart rename to lib/data/services/api/upload.dart index ffa08ee..a26461d 100644 --- a/lib/network/upload.dart +++ b/lib/data/services/api/upload.dart @@ -10,19 +10,19 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:image_picker/image_picker.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:piwigo_ng/app.dart'; -import 'package:piwigo_ng/components/dialogs/confirm_dialog.dart'; -import 'package:piwigo_ng/network/api_client.dart'; -import 'package:piwigo_ng/network/api_interceptor.dart'; -import 'package:piwigo_ng/network/authentication.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; -import 'package:piwigo_ng/services/upload_notifier.dart'; +import 'package:piwigo_ng/ui/core/ui/dialogs/confirm_dialog.dart'; +import 'package:piwigo_ng/data/services/api/api_client.dart'; +import 'package:piwigo_ng/data/services/api/api_interceptor.dart'; +import 'package:piwigo_ng/data/services/api/authentication.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; +import 'package:piwigo_ng/data/services/local/upload_notifier.dart'; import 'package:piwigo_ng/utils/localizations.dart'; -import 'package:piwigo_ng/views/upload/upload_status_page.dart'; +import 'package:piwigo_ng/ui/upload/upload_status_page.dart'; import 'package:provider/provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import '../services/chunked_uploader.dart'; -import '../services/notification_service.dart'; +import 'package:piwigo_ng/data/services/local/chunked_uploader.dart'; +import 'package:piwigo_ng/data/services/local/notification_service.dart'; /// Handle Android API 33 permissions Future askMediaPermission() async { diff --git a/lib/network/users.dart b/lib/data/services/api/users.dart similarity index 96% rename from lib/network/users.dart rename to lib/data/services/api/users.dart index 784c3bc..b9771a6 100644 --- a/lib/network/users.dart +++ b/lib/data/services/api/users.dart @@ -2,10 +2,10 @@ import 'dart:convert'; import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; -import 'package:piwigo_ng/models/image_model.dart'; -import 'package:piwigo_ng/models/user_model.dart'; -import 'package:piwigo_ng/network/api_client.dart'; -import 'package:piwigo_ng/network/api_error.dart'; +import 'package:piwigo_ng/domain/models/image_model.dart'; +import 'package:piwigo_ng/domain/models/user_model.dart'; +import 'package:piwigo_ng/data/services/api/api_client.dart'; +import 'package:piwigo_ng/data/services/api/api_error.dart'; import 'package:piwigo_ng/utils/settings.dart'; Future?> getAllUsers({ diff --git a/lib/services/app_providers.dart b/lib/data/services/local/app_providers.dart similarity index 81% rename from lib/services/app_providers.dart rename to lib/data/services/local/app_providers.dart index 2a13d9e..0f6fcd8 100644 --- a/lib/services/app_providers.dart +++ b/lib/data/services/local/app_providers.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:piwigo_ng/services/locale_provider.dart'; -import 'package:piwigo_ng/services/theme_provider.dart'; -import 'package:piwigo_ng/services/upload_notifier.dart'; +import 'package:piwigo_ng/data/services/local/locale_provider.dart'; +import 'package:piwigo_ng/data/services/local/theme_provider.dart'; +import 'package:piwigo_ng/data/services/local/upload_notifier.dart'; import 'package:provider/provider.dart'; class AppProviders extends StatelessWidget { diff --git a/lib/services/auto_upload_manager.dart b/lib/data/services/local/auto_upload_manager.dart similarity index 95% rename from lib/services/auto_upload_manager.dart rename to lib/data/services/local/auto_upload_manager.dart index 0c13e44..79ef438 100644 --- a/lib/services/auto_upload_manager.dart +++ b/lib/data/services/local/auto_upload_manager.dart @@ -7,15 +7,15 @@ import 'package:dio/dio.dart'; import 'package:dio_cookie_manager/dio_cookie_manager.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; -import 'package:piwigo_ng/models/album_model.dart'; -import 'package:piwigo_ng/models/status_model.dart'; -import 'package:piwigo_ng/network/api_client.dart'; -import 'package:piwigo_ng/network/api_error.dart'; -import 'package:piwigo_ng/network/api_interceptor.dart'; -import 'package:piwigo_ng/network/upload.dart'; -import 'package:piwigo_ng/services/chunked_uploader.dart'; -import 'package:piwigo_ng/services/notification_service.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/domain/models/album_model.dart'; +import 'package:piwigo_ng/domain/models/status_model.dart'; +import 'package:piwigo_ng/data/services/api/api_client.dart'; +import 'package:piwigo_ng/data/services/api/api_error.dart'; +import 'package:piwigo_ng/data/services/api/api_interceptor.dart'; +import 'package:piwigo_ng/data/services/api/upload.dart'; +import 'package:piwigo_ng/data/services/local/chunked_uploader.dart'; +import 'package:piwigo_ng/data/services/local/notification_service.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; import 'package:piwigo_ng/utils/settings.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:workmanager/workmanager.dart'; diff --git a/lib/services/chunked_uploader.dart b/lib/data/services/local/chunked_uploader.dart similarity index 100% rename from lib/services/chunked_uploader.dart rename to lib/data/services/local/chunked_uploader.dart diff --git a/lib/services/locale_provider.dart b/lib/data/services/local/locale_provider.dart similarity index 88% rename from lib/services/locale_provider.dart rename to lib/data/services/local/locale_provider.dart index 92f594c..84a5c52 100644 --- a/lib/services/locale_provider.dart +++ b/lib/data/services/local/locale_provider.dart @@ -1,7 +1,7 @@ import 'dart:io'; import 'package:flutter/material.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; class LocaleNotifier extends ChangeNotifier { static final String key = 'LOCALE'; diff --git a/lib/services/notification_service.dart b/lib/data/services/local/notification_service.dart similarity index 95% rename from lib/services/notification_service.dart rename to lib/data/services/local/notification_service.dart index 72e0d11..b81a9eb 100644 --- a/lib/services/notification_service.dart +++ b/lib/data/services/local/notification_service.dart @@ -3,12 +3,12 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:open_filex/open_filex.dart'; -import 'package:piwigo_ng/services/locale_provider.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/data/services/local/locale_provider.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; import 'package:piwigo_ng/utils/localizations.dart'; import 'package:piwigo_ng/utils/settings.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import '/l10n/app_localizations.dart'; +import 'package:piwigo_ng/ui/core/localization/app_localizations.dart'; final FlutterLocalNotificationsPlugin localNotification = FlutterLocalNotificationsPlugin(); diff --git a/lib/services/player_provider.dart b/lib/data/services/local/player_provider.dart similarity index 100% rename from lib/services/player_provider.dart rename to lib/data/services/local/player_provider.dart diff --git a/lib/services/preferences_service.dart b/lib/data/services/local/preferences_service.dart similarity index 98% rename from lib/services/preferences_service.dart rename to lib/data/services/local/preferences_service.dart index aef7f0e..e81a693 100644 --- a/lib/services/preferences_service.dart +++ b/lib/data/services/local/preferences_service.dart @@ -2,8 +2,8 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; -import 'package:piwigo_ng/models/album_model.dart'; -import 'package:piwigo_ng/models/status_model.dart'; +import 'package:piwigo_ng/domain/models/album_model.dart'; +import 'package:piwigo_ng/domain/models/status_model.dart'; import 'package:piwigo_ng/utils/settings.dart'; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/lib/services/receive_sharing.dart b/lib/data/services/local/receive_sharing.dart similarity index 100% rename from lib/services/receive_sharing.dart rename to lib/data/services/local/receive_sharing.dart diff --git a/lib/services/theme_provider.dart b/lib/data/services/local/theme_provider.dart similarity index 100% rename from lib/services/theme_provider.dart rename to lib/data/services/local/theme_provider.dart diff --git a/lib/services/upload_notifier.dart b/lib/data/services/local/upload_notifier.dart similarity index 100% rename from lib/services/upload_notifier.dart rename to lib/data/services/local/upload_notifier.dart diff --git a/lib/models/album_model.dart b/lib/domain/models/album_model.dart similarity index 100% rename from lib/models/album_model.dart rename to lib/domain/models/album_model.dart diff --git a/lib/models/album_permission_model.dart b/lib/domain/models/album_permission_model.dart similarity index 100% rename from lib/models/album_permission_model.dart rename to lib/domain/models/album_permission_model.dart diff --git a/lib/models/group_model.dart b/lib/domain/models/group_model.dart similarity index 100% rename from lib/models/group_model.dart rename to lib/domain/models/group_model.dart diff --git a/lib/models/image_model.dart b/lib/domain/models/image_model.dart similarity index 98% rename from lib/models/image_model.dart rename to lib/domain/models/image_model.dart index f3b960b..4bb43df 100644 --- a/lib/models/image_model.dart +++ b/lib/domain/models/image_model.dart @@ -1,5 +1,5 @@ import 'package:mime_type/mime_type.dart'; -import 'package:piwigo_ng/models/tag_model.dart'; +import 'package:piwigo_ng/domain/models/tag_model.dart'; class ImageModel { int id; diff --git a/lib/models/info_model.dart b/lib/domain/models/info_model.dart similarity index 100% rename from lib/models/info_model.dart rename to lib/domain/models/info_model.dart diff --git a/lib/models/status_model.dart b/lib/domain/models/status_model.dart similarity index 100% rename from lib/models/status_model.dart rename to lib/domain/models/status_model.dart diff --git a/lib/models/tag_model.dart b/lib/domain/models/tag_model.dart similarity index 100% rename from lib/models/tag_model.dart rename to lib/domain/models/tag_model.dart diff --git a/lib/models/user_model.dart b/lib/domain/models/user_model.dart similarity index 100% rename from lib/models/user_model.dart rename to lib/domain/models/user_model.dart diff --git a/lib/main.dart b/lib/main.dart index a537668..dc52062 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -4,12 +4,12 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:piwigo_ng/app.dart'; -import 'package:piwigo_ng/network/api_client.dart'; -import 'package:piwigo_ng/services/auto_upload_manager.dart'; -import 'package:piwigo_ng/services/notification_service.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; -import 'package:piwigo_ng/services/receive_sharing.dart'; -import 'package:piwigo_ng/services/theme_provider.dart'; +import 'package:piwigo_ng/data/services/api/api_client.dart'; +import 'package:piwigo_ng/data/services/local/auto_upload_manager.dart'; +import 'package:piwigo_ng/data/services/local/notification_service.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; +import 'package:piwigo_ng/data/services/local/receive_sharing.dart'; +import 'package:piwigo_ng/data/services/local/theme_provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; void main() async { diff --git a/lib/views/album/album_page.dart b/lib/ui/album/album_page.dart similarity index 96% rename from lib/views/album/album_page.dart rename to lib/ui/album/album_page.dart index 2805001..76a9857 100644 --- a/lib/views/album/album_page.dart +++ b/lib/ui/album/album_page.dart @@ -4,23 +4,23 @@ import 'package:flutter/material.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:image_picker/image_picker.dart'; -import 'package:piwigo_ng/components/lists/album_grid_view.dart'; -import 'package:piwigo_ng/components/lists/image_grid_view.dart'; -import 'package:piwigo_ng/components/popup_list_item.dart'; -import 'package:piwigo_ng/models/album_model.dart'; -import 'package:piwigo_ng/models/image_model.dart'; -import 'package:piwigo_ng/network/albums.dart'; -import 'package:piwigo_ng/network/api_error.dart'; -import 'package:piwigo_ng/network/images.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; -import 'package:piwigo_ng/services/upload_notifier.dart'; +import 'package:piwigo_ng/ui/core/ui/lists/album_grid_view.dart'; +import 'package:piwigo_ng/ui/core/ui/lists/image_grid_view.dart'; +import 'package:piwigo_ng/ui/core/ui/popup_list_item.dart'; +import 'package:piwigo_ng/domain/models/album_model.dart'; +import 'package:piwigo_ng/domain/models/image_model.dart'; +import 'package:piwigo_ng/data/services/api/albums.dart'; +import 'package:piwigo_ng/data/services/api/api_error.dart'; +import 'package:piwigo_ng/data/services/api/images.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; +import 'package:piwigo_ng/data/services/local/upload_notifier.dart'; import 'package:piwigo_ng/utils/album_actions.dart'; import 'package:piwigo_ng/utils/image_actions.dart'; import 'package:piwigo_ng/utils/localizations.dart'; import 'package:piwigo_ng/utils/settings.dart'; -import 'package:piwigo_ng/views/image/image_page.dart'; -import 'package:piwigo_ng/views/upload/upload_page.dart'; -import 'package:piwigo_ng/views/upload/upload_status_page.dart'; +import 'package:piwigo_ng/ui/image/image_page.dart'; +import 'package:piwigo_ng/ui/upload/upload_page.dart'; +import 'package:piwigo_ng/ui/upload/upload_status_page.dart'; import 'package:provider/provider.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart'; diff --git a/lib/views/album/album_privacy_page.dart b/lib/ui/album/album_privacy_page.dart similarity index 92% rename from lib/views/album/album_privacy_page.dart rename to lib/ui/album/album_privacy_page.dart index 0038415..e1a625f 100644 --- a/lib/views/album/album_privacy_page.dart +++ b/lib/ui/album/album_privacy_page.dart @@ -1,17 +1,17 @@ import 'package:flutter/material.dart'; -import 'package:piwigo_ng/components/buttons/piwigo_button.dart'; -import 'package:piwigo_ng/components/cards/piwigo_chip.dart'; -import 'package:piwigo_ng/components/modals/select_groups_modal.dart'; -import 'package:piwigo_ng/components/sections/form_section.dart'; -import 'package:piwigo_ng/models/album_model.dart'; -import 'package:piwigo_ng/models/album_permission_model.dart'; -import 'package:piwigo_ng/models/group_model.dart'; -import 'package:piwigo_ng/models/user_model.dart'; -import 'package:piwigo_ng/network/albums.dart'; -import 'package:piwigo_ng/network/api_error.dart'; -import 'package:piwigo_ng/network/groups.dart'; -import 'package:piwigo_ng/network/permissions.dart'; -import 'package:piwigo_ng/network/users.dart'; +import 'package:piwigo_ng/ui/core/ui/buttons/piwigo_button.dart'; +import 'package:piwigo_ng/ui/core/ui/cards/piwigo_chip.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/select_groups_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/sections/form_section.dart'; +import 'package:piwigo_ng/domain/models/album_model.dart'; +import 'package:piwigo_ng/domain/models/album_permission_model.dart'; +import 'package:piwigo_ng/domain/models/group_model.dart'; +import 'package:piwigo_ng/domain/models/user_model.dart'; +import 'package:piwigo_ng/data/services/api/albums.dart'; +import 'package:piwigo_ng/data/services/api/api_error.dart'; +import 'package:piwigo_ng/data/services/api/groups.dart'; +import 'package:piwigo_ng/data/services/api/permissions.dart'; +import 'package:piwigo_ng/data/services/api/users.dart'; import 'package:piwigo_ng/utils/localizations.dart'; class AlbumPrivacyPage extends StatefulWidget { diff --git a/lib/views/album/root_album_page.dart b/lib/ui/album/root_album_page.dart similarity index 93% rename from lib/views/album/root_album_page.dart rename to lib/ui/album/root_album_page.dart index 8528ea6..f56d14b 100644 --- a/lib/views/album/root_album_page.dart +++ b/lib/ui/album/root_album_page.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; -import 'package:piwigo_ng/components/lists/album_grid_view.dart'; -import 'package:piwigo_ng/models/album_model.dart'; -import 'package:piwigo_ng/network/albums.dart'; -import 'package:piwigo_ng/network/api_error.dart'; +import 'package:piwigo_ng/ui/core/ui/lists/album_grid_view.dart'; +import 'package:piwigo_ng/domain/models/album_model.dart'; +import 'package:piwigo_ng/data/services/api/albums.dart'; +import 'package:piwigo_ng/data/services/api/api_error.dart'; import 'package:piwigo_ng/utils/album_actions.dart'; import 'package:piwigo_ng/utils/localizations.dart'; -import '../../components/appbars/root_search_app_bar.dart'; +import 'package:piwigo_ng/ui/core/ui/appbars/root_search_app_bar.dart'; import '../image/image_search_page.dart'; class RootAlbumPage extends StatefulWidget { diff --git a/lib/views/authentication/login_form_view.dart b/lib/ui/authentication/login_form_view.dart similarity index 95% rename from lib/views/authentication/login_form_view.dart rename to lib/ui/authentication/login_form_view.dart index a2dcf35..dcd2244 100644 --- a/lib/views/authentication/login_form_view.dart +++ b/lib/ui/authentication/login_form_view.dart @@ -2,17 +2,17 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:piwigo_ng/app.dart'; -import 'package:piwigo_ng/components/buttons/animated_piwigo_button.dart'; -import 'package:piwigo_ng/components/snackbars.dart'; -import 'package:piwigo_ng/network/api_error.dart'; -import 'package:piwigo_ng/network/authentication.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/ui/core/ui/buttons/animated_piwigo_button.dart'; +import 'package:piwigo_ng/ui/core/ui/snackbars.dart'; +import 'package:piwigo_ng/data/services/api/api_error.dart'; +import 'package:piwigo_ng/data/services/api/authentication.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; import 'package:piwigo_ng/utils/localizations.dart'; -import 'package:piwigo_ng/views/authentication/login_settings_page.dart'; +import 'package:piwigo_ng/ui/authentication/login_settings_page.dart'; import 'package:rounded_loading_button/rounded_loading_button.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import '../../components/fields/app_field.dart'; +import 'package:piwigo_ng/ui/core/ui/fields/app_field.dart'; import '../album/root_album_page.dart'; class LoginFormView extends StatefulWidget { diff --git a/lib/views/authentication/login_page.dart b/lib/ui/authentication/login_page.dart similarity index 96% rename from lib/views/authentication/login_page.dart rename to lib/ui/authentication/login_page.dart index 383868e..c54ec0a 100644 --- a/lib/views/authentication/login_page.dart +++ b/lib/ui/authentication/login_page.dart @@ -3,9 +3,9 @@ import 'package:package_info_plus/package_info_plus.dart'; import 'package:piwigo_ng/app.dart'; import 'package:piwigo_ng/utils/localizations.dart'; import 'package:piwigo_ng/utils/settings.dart'; -import 'package:piwigo_ng/views/settings/privacy_policy_page.dart'; +import 'package:piwigo_ng/ui/settings/privacy_policy_page.dart'; -import '../../components/buttons/app_text_button.dart'; +import 'package:piwigo_ng/ui/core/ui/buttons/app_text_button.dart'; import 'login_form_view.dart'; class LoginPage extends StatefulWidget { diff --git a/lib/views/authentication/login_settings_page.dart b/lib/ui/authentication/login_settings_page.dart similarity index 97% rename from lib/views/authentication/login_settings_page.dart rename to lib/ui/authentication/login_settings_page.dart index 6e4af7a..603348b 100644 --- a/lib/views/authentication/login_settings_page.dart +++ b/lib/ui/authentication/login_settings_page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:piwigo_ng/components/sections/settings_section.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/ui/core/ui/sections/settings_section.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; import 'package:piwigo_ng/utils/localizations.dart'; class LoginSettingsPage extends StatefulWidget { diff --git a/lib/components/animated/animatedCrossSwitch.dart b/lib/ui/core/ui/animated/animatedCrossSwitch.dart similarity index 100% rename from lib/components/animated/animatedCrossSwitch.dart rename to lib/ui/core/ui/animated/animatedCrossSwitch.dart diff --git a/lib/components/app_image_display.dart b/lib/ui/core/ui/app_image_display.dart similarity index 97% rename from lib/components/app_image_display.dart rename to lib/ui/core/ui/app_image_display.dart index 42d98a0..aa2cec9 100644 --- a/lib/components/app_image_display.dart +++ b/lib/ui/core/ui/app_image_display.dart @@ -3,8 +3,8 @@ import 'dart:io'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; -import 'package:piwigo_ng/network/api_client.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/data/services/api/api_client.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; import 'package:piwigo_ng/utils/settings.dart'; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/lib/components/appbars/root_search_app_bar.dart b/lib/ui/core/ui/appbars/root_search_app_bar.dart similarity index 91% rename from lib/components/appbars/root_search_app_bar.dart rename to lib/ui/core/ui/appbars/root_search_app_bar.dart index d12413f..ca61f7f 100644 --- a/lib/components/appbars/root_search_app_bar.dart +++ b/lib/ui/core/ui/appbars/root_search_app_bar.dart @@ -1,15 +1,15 @@ import 'package:flutter/material.dart'; -import 'package:piwigo_ng/components/modals/open_tag_modal.dart'; -import 'package:piwigo_ng/components/notification_dot.dart'; -import 'package:piwigo_ng/components/popup_list_item.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; -import 'package:piwigo_ng/services/upload_notifier.dart'; -import 'package:piwigo_ng/utils/localizations.dart'; -import 'package:piwigo_ng/views/image/image_favorites_page.dart'; -import 'package:piwigo_ng/views/upload/upload_status_page.dart'; import 'package:provider/provider.dart'; -import '../../views/settings/settings_page.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/open_tag_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/notification_dot.dart'; +import 'package:piwigo_ng/ui/core/ui/popup_list_item.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; +import 'package:piwigo_ng/data/services/local/upload_notifier.dart'; +import 'package:piwigo_ng/utils/localizations.dart'; +import 'package:piwigo_ng/ui/image/image_favorites_page.dart'; +import 'package:piwigo_ng/ui/upload/upload_status_page.dart'; +import 'package:piwigo_ng/ui/settings/settings_page.dart'; import '../fields/app_field.dart'; class RootSearchAppBar extends StatefulWidget { diff --git a/lib/components/appbars/settings_app_bar.dart b/lib/ui/core/ui/appbars/settings_app_bar.dart similarity index 100% rename from lib/components/appbars/settings_app_bar.dart rename to lib/ui/core/ui/appbars/settings_app_bar.dart diff --git a/lib/components/buttons/animated_piwigo_button.dart b/lib/ui/core/ui/buttons/animated_piwigo_button.dart similarity index 100% rename from lib/components/buttons/animated_piwigo_button.dart rename to lib/ui/core/ui/buttons/animated_piwigo_button.dart diff --git a/lib/components/buttons/app_text_button.dart b/lib/ui/core/ui/buttons/app_text_button.dart similarity index 100% rename from lib/components/buttons/app_text_button.dart rename to lib/ui/core/ui/buttons/app_text_button.dart diff --git a/lib/components/buttons/piwigo_button.dart b/lib/ui/core/ui/buttons/piwigo_button.dart similarity index 100% rename from lib/components/buttons/piwigo_button.dart rename to lib/ui/core/ui/buttons/piwigo_button.dart diff --git a/lib/components/cards/album_card.dart b/lib/ui/core/ui/cards/album_card.dart similarity index 97% rename from lib/components/cards/album_card.dart rename to lib/ui/core/ui/cards/album_card.dart index ee02765..8b1a851 100644 --- a/lib/components/cards/album_card.dart +++ b/lib/ui/core/ui/cards/album_card.dart @@ -1,10 +1,10 @@ import 'package:auto_size_text/auto_size_text.dart'; import 'package:flutter/material.dart'; import 'package:flutter_slidable/flutter_slidable.dart'; -import 'package:piwigo_ng/components/app_image_display.dart'; -import 'package:piwigo_ng/components/clippers/album_card_clipper.dart'; -import 'package:piwigo_ng/components/clippers/clip_shadow_path.dart'; -import 'package:piwigo_ng/models/album_model.dart'; +import 'package:piwigo_ng/ui/core/ui/app_image_display.dart'; +import 'package:piwigo_ng/ui/core/ui/clippers/album_card_clipper.dart'; +import 'package:piwigo_ng/ui/core/ui/clippers/clip_shadow_path.dart'; +import 'package:piwigo_ng/domain/models/album_model.dart'; import 'package:piwigo_ng/utils/localizations.dart'; import 'album_card_action.dart'; diff --git a/lib/components/cards/album_card_action.dart b/lib/ui/core/ui/cards/album_card_action.dart similarity index 100% rename from lib/components/cards/album_card_action.dart rename to lib/ui/core/ui/cards/album_card_action.dart diff --git a/lib/components/cards/image_card.dart b/lib/ui/core/ui/cards/image_card.dart similarity index 96% rename from lib/components/cards/image_card.dart rename to lib/ui/core/ui/cards/image_card.dart index 1285901..b8dee11 100644 --- a/lib/components/cards/image_card.dart +++ b/lib/ui/core/ui/cards/image_card.dart @@ -1,8 +1,8 @@ import 'package:auto_size_text/auto_size_text.dart'; import 'package:flutter/material.dart'; -import 'package:piwigo_ng/components/app_image_display.dart'; -import 'package:piwigo_ng/models/image_model.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/ui/core/ui/app_image_display.dart'; +import 'package:piwigo_ng/domain/models/image_model.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; import 'package:piwigo_ng/utils/resources.dart'; class ImageCard extends StatelessWidget { diff --git a/lib/components/cards/image_details_card.dart b/lib/ui/core/ui/cards/image_details_card.dart similarity index 98% rename from lib/components/cards/image_details_card.dart rename to lib/ui/core/ui/cards/image_details_card.dart index f078c66..e81883a 100644 --- a/lib/components/cards/image_details_card.dart +++ b/lib/ui/core/ui/cards/image_details_card.dart @@ -7,10 +7,10 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:mime_type/mime_type.dart'; import 'package:path/path.dart' as path; -import 'package:piwigo_ng/components/app_image_display.dart'; -import 'package:piwigo_ng/models/image_model.dart'; -import 'package:piwigo_ng/services/locale_provider.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/ui/core/ui/app_image_display.dart'; +import 'package:piwigo_ng/domain/models/image_model.dart'; +import 'package:piwigo_ng/data/services/local/locale_provider.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; import 'package:piwigo_ng/utils/resources.dart'; import 'package:piwigo_ng/utils/settings.dart'; import 'package:provider/provider.dart'; diff --git a/lib/components/cards/image_drag_feedback.dart b/lib/ui/core/ui/cards/image_drag_feedback.dart similarity index 94% rename from lib/components/cards/image_drag_feedback.dart rename to lib/ui/core/ui/cards/image_drag_feedback.dart index 32f6ae0..a6970ea 100644 --- a/lib/components/cards/image_drag_feedback.dart +++ b/lib/ui/core/ui/cards/image_drag_feedback.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:piwigo_ng/components/cards/image_card.dart'; -import 'package:piwigo_ng/models/image_model.dart'; +import 'package:piwigo_ng/ui/core/ui/cards/image_card.dart'; +import 'package:piwigo_ng/domain/models/image_model.dart'; import 'package:piwigo_ng/utils/resources.dart'; class ImageDragFeedback extends StatelessWidget { diff --git a/lib/components/cards/piwigo_chip.dart b/lib/ui/core/ui/cards/piwigo_chip.dart similarity index 100% rename from lib/components/cards/piwigo_chip.dart rename to lib/ui/core/ui/cards/piwigo_chip.dart diff --git a/lib/components/clippers/album_card_clipper.dart b/lib/ui/core/ui/clippers/album_card_clipper.dart similarity index 100% rename from lib/components/clippers/album_card_clipper.dart rename to lib/ui/core/ui/clippers/album_card_clipper.dart diff --git a/lib/components/clippers/clip_shadow_path.dart b/lib/ui/core/ui/clippers/clip_shadow_path.dart similarity index 100% rename from lib/components/clippers/clip_shadow_path.dart rename to lib/ui/core/ui/clippers/clip_shadow_path.dart diff --git a/lib/components/dialogs/confirm_dialog.dart b/lib/ui/core/ui/dialogs/confirm_dialog.dart similarity index 100% rename from lib/components/dialogs/confirm_dialog.dart rename to lib/ui/core/ui/dialogs/confirm_dialog.dart diff --git a/lib/components/dialogs/image_comment_dialog.dart b/lib/ui/core/ui/dialogs/image_comment_dialog.dart similarity index 99% rename from lib/components/dialogs/image_comment_dialog.dart rename to lib/ui/core/ui/dialogs/image_comment_dialog.dart index 5544ab6..f2196ee 100644 --- a/lib/components/dialogs/image_comment_dialog.dart +++ b/lib/ui/core/ui/dialogs/image_comment_dialog.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:piwigo_ng/models/image_model.dart'; +import 'package:piwigo_ng/domain/models/image_model.dart'; import 'package:piwigo_ng/utils/settings.dart'; class ImageCommentDialog extends StatefulWidget { diff --git a/lib/components/fields/app_field.dart b/lib/ui/core/ui/fields/app_field.dart similarity index 100% rename from lib/components/fields/app_field.dart rename to lib/ui/core/ui/fields/app_field.dart diff --git a/lib/components/fields/settings_field.dart b/lib/ui/core/ui/fields/settings_field.dart similarity index 100% rename from lib/components/fields/settings_field.dart rename to lib/ui/core/ui/fields/settings_field.dart diff --git a/lib/components/lists/album_grid_view.dart b/lib/ui/core/ui/lists/album_grid_view.dart similarity index 92% rename from lib/components/lists/album_grid_view.dart rename to lib/ui/core/ui/lists/album_grid_view.dart index db07628..315a31f 100644 --- a/lib/components/lists/album_grid_view.dart +++ b/lib/ui/core/ui/lists/album_grid_view.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:piwigo_ng/components/cards/album_card.dart'; -import 'package:piwigo_ng/models/album_model.dart'; +import 'package:piwigo_ng/ui/core/ui/cards/album_card.dart'; +import 'package:piwigo_ng/domain/models/album_model.dart'; import 'package:piwigo_ng/utils/settings.dart'; class AlbumGridView extends StatelessWidget { diff --git a/lib/components/lists/image_grid_view.dart b/lib/ui/core/ui/lists/image_grid_view.dart similarity index 94% rename from lib/components/lists/image_grid_view.dart rename to lib/ui/core/ui/lists/image_grid_view.dart index bfe91ab..eb08b5e 100644 --- a/lib/components/lists/image_grid_view.dart +++ b/lib/ui/core/ui/lists/image_grid_view.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:piwigo_ng/components/cards/image_card.dart'; -import 'package:piwigo_ng/models/album_model.dart'; -import 'package:piwigo_ng/models/image_model.dart'; +import 'package:piwigo_ng/ui/core/ui/cards/image_card.dart'; +import 'package:piwigo_ng/domain/models/album_model.dart'; +import 'package:piwigo_ng/domain/models/image_model.dart'; import 'package:piwigo_ng/utils/settings.dart'; class ImageGridView extends StatefulWidget { diff --git a/lib/components/lists/select_model_list.dart b/lib/ui/core/ui/lists/select_model_list.dart similarity index 98% rename from lib/components/lists/select_model_list.dart rename to lib/ui/core/ui/lists/select_model_list.dart index 06d2373..cc6d374 100644 --- a/lib/components/lists/select_model_list.dart +++ b/lib/ui/core/ui/lists/select_model_list.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:piwigo_ng/components/sections/form_section.dart'; +import 'package:piwigo_ng/ui/core/ui/sections/form_section.dart'; import 'package:piwigo_ng/utils/localizations.dart'; class SelectModelList extends StatefulWidget { diff --git a/lib/components/loading_overlay.dart b/lib/ui/core/ui/loading_overlay.dart similarity index 100% rename from lib/components/loading_overlay.dart rename to lib/ui/core/ui/loading_overlay.dart diff --git a/lib/components/modals/choose_camera_picker_modal.dart b/lib/ui/core/ui/modals/choose_camera_picker_modal.dart similarity index 94% rename from lib/components/modals/choose_camera_picker_modal.dart rename to lib/ui/core/ui/modals/choose_camera_picker_modal.dart index fad9821..17392b7 100644 --- a/lib/components/modals/choose_camera_picker_modal.dart +++ b/lib/ui/core/ui/modals/choose_camera_picker_modal.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:piwigo_ng/components/modals/piwigo_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/piwigo_modal.dart'; import 'package:piwigo_ng/utils/localizations.dart'; class ChooseCameraPickerModal extends StatelessWidget { diff --git a/lib/components/modals/choose_move_option_modal.dart b/lib/ui/core/ui/modals/choose_move_option_modal.dart similarity index 94% rename from lib/components/modals/choose_move_option_modal.dart rename to lib/ui/core/ui/modals/choose_move_option_modal.dart index 6eac86f..d7fc51b 100644 --- a/lib/components/modals/choose_move_option_modal.dart +++ b/lib/ui/core/ui/modals/choose_move_option_modal.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:piwigo_ng/components/modals/piwigo_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/piwigo_modal.dart'; import 'package:piwigo_ng/utils/localizations.dart'; class ChooseMoveOptionModal extends StatelessWidget { diff --git a/lib/components/modals/create_album_modal.dart b/lib/ui/core/ui/modals/create_album_modal.dart similarity index 89% rename from lib/components/modals/create_album_modal.dart rename to lib/ui/core/ui/modals/create_album_modal.dart index f4c5b66..fb6c719 100644 --- a/lib/components/modals/create_album_modal.dart +++ b/lib/ui/core/ui/modals/create_album_modal.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:piwigo_ng/components/buttons/animated_piwigo_button.dart'; -import 'package:piwigo_ng/components/fields/app_field.dart'; -import 'package:piwigo_ng/components/modals/piwigo_modal.dart'; -import 'package:piwigo_ng/components/snackbars.dart'; -import 'package:piwigo_ng/network/albums.dart'; -import 'package:piwigo_ng/network/api_error.dart'; +import 'package:piwigo_ng/ui/core/ui/buttons/animated_piwigo_button.dart'; +import 'package:piwigo_ng/ui/core/ui/fields/app_field.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/piwigo_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/snackbars.dart'; +import 'package:piwigo_ng/data/services/api/albums.dart'; +import 'package:piwigo_ng/data/services/api/api_error.dart'; import 'package:piwigo_ng/utils/localizations.dart'; import 'package:rounded_loading_button/rounded_loading_button.dart'; diff --git a/lib/components/modals/create_tag_modal.dart b/lib/ui/core/ui/modals/create_tag_modal.dart similarity index 88% rename from lib/components/modals/create_tag_modal.dart rename to lib/ui/core/ui/modals/create_tag_modal.dart index 5ed6047..1720220 100644 --- a/lib/components/modals/create_tag_modal.dart +++ b/lib/ui/core/ui/modals/create_tag_modal.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:piwigo_ng/components/buttons/animated_piwigo_button.dart'; -import 'package:piwigo_ng/components/fields/app_field.dart'; -import 'package:piwigo_ng/components/modals/piwigo_modal.dart'; -import 'package:piwigo_ng/components/snackbars.dart'; -import 'package:piwigo_ng/network/api_error.dart'; -import 'package:piwigo_ng/network/tags.dart'; +import 'package:piwigo_ng/ui/core/ui/buttons/animated_piwigo_button.dart'; +import 'package:piwigo_ng/ui/core/ui/fields/app_field.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/piwigo_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/snackbars.dart'; +import 'package:piwigo_ng/data/services/api/api_error.dart'; +import 'package:piwigo_ng/data/services/api/tags.dart'; import 'package:piwigo_ng/utils/localizations.dart'; import 'package:rounded_loading_button/rounded_loading_button.dart'; diff --git a/lib/components/modals/delete_album_mode_modal.dart b/lib/ui/core/ui/modals/delete_album_mode_modal.dart similarity index 94% rename from lib/components/modals/delete_album_mode_modal.dart rename to lib/ui/core/ui/modals/delete_album_mode_modal.dart index 510d21c..339a484 100644 --- a/lib/components/modals/delete_album_mode_modal.dart +++ b/lib/ui/core/ui/modals/delete_album_mode_modal.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:piwigo_ng/components/modals/piwigo_modal.dart'; -import 'package:piwigo_ng/models/album_model.dart'; -import 'package:piwigo_ng/network/albums.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/piwigo_modal.dart'; +import 'package:piwigo_ng/domain/models/album_model.dart'; +import 'package:piwigo_ng/data/services/api/albums.dart'; import 'package:piwigo_ng/utils/localizations.dart'; class DeleteAlbumModeModal extends StatelessWidget { diff --git a/lib/components/modals/delete_images_modal.dart b/lib/ui/core/ui/modals/delete_images_modal.dart similarity index 92% rename from lib/components/modals/delete_images_modal.dart rename to lib/ui/core/ui/modals/delete_images_modal.dart index fc573ff..7792bdb 100644 --- a/lib/components/modals/delete_images_modal.dart +++ b/lib/ui/core/ui/modals/delete_images_modal.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:piwigo_ng/components/modals/piwigo_modal.dart'; -import 'package:piwigo_ng/models/album_model.dart'; -import 'package:piwigo_ng/models/image_model.dart'; -import 'package:piwigo_ng/network/albums.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/piwigo_modal.dart'; +import 'package:piwigo_ng/domain/models/album_model.dart'; +import 'package:piwigo_ng/domain/models/image_model.dart'; +import 'package:piwigo_ng/data/services/api/albums.dart'; import 'package:piwigo_ng/utils/localizations.dart'; class DeleteImagesModal extends StatelessWidget { diff --git a/lib/components/modals/edit_album_modal.dart b/lib/ui/core/ui/modals/edit_album_modal.dart similarity index 89% rename from lib/components/modals/edit_album_modal.dart rename to lib/ui/core/ui/modals/edit_album_modal.dart index d23678a..5b1b7ef 100644 --- a/lib/components/modals/edit_album_modal.dart +++ b/lib/ui/core/ui/modals/edit_album_modal.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; -import 'package:piwigo_ng/components/buttons/animated_piwigo_button.dart'; -import 'package:piwigo_ng/components/fields/app_field.dart'; -import 'package:piwigo_ng/components/modals/piwigo_modal.dart'; -import 'package:piwigo_ng/components/snackbars.dart'; -import 'package:piwigo_ng/models/album_model.dart'; -import 'package:piwigo_ng/network/albums.dart'; -import 'package:piwigo_ng/network/api_error.dart'; +import 'package:piwigo_ng/ui/core/ui/buttons/animated_piwigo_button.dart'; +import 'package:piwigo_ng/ui/core/ui/fields/app_field.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/piwigo_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/snackbars.dart'; +import 'package:piwigo_ng/domain/models/album_model.dart'; +import 'package:piwigo_ng/data/services/api/albums.dart'; +import 'package:piwigo_ng/data/services/api/api_error.dart'; import 'package:piwigo_ng/utils/localizations.dart'; import 'package:rounded_loading_button/rounded_loading_button.dart'; diff --git a/lib/components/modals/image_info_modal.dart b/lib/ui/core/ui/modals/image_info_modal.dart similarity index 91% rename from lib/components/modals/image_info_modal.dart rename to lib/ui/core/ui/modals/image_info_modal.dart index a9b85ae..467ac14 100644 --- a/lib/components/modals/image_info_modal.dart +++ b/lib/ui/core/ui/modals/image_info_modal.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; -import 'package:piwigo_ng/components/cards/piwigo_chip.dart'; -import 'package:piwigo_ng/components/modals/piwigo_modal.dart'; -import 'package:piwigo_ng/components/sections/form_section.dart'; -import 'package:piwigo_ng/components/sections/settings_section.dart'; -import 'package:piwigo_ng/models/image_model.dart'; -import 'package:piwigo_ng/services/locale_provider.dart'; +import 'package:piwigo_ng/ui/core/ui/cards/piwigo_chip.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/piwigo_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/sections/form_section.dart'; +import 'package:piwigo_ng/ui/core/ui/sections/settings_section.dart'; +import 'package:piwigo_ng/domain/models/image_model.dart'; +import 'package:piwigo_ng/data/services/local/locale_provider.dart'; import 'package:piwigo_ng/utils/localizations.dart'; import 'package:provider/provider.dart'; diff --git a/lib/components/modals/open_tag_modal.dart b/lib/ui/core/ui/modals/open_tag_modal.dart similarity index 93% rename from lib/components/modals/open_tag_modal.dart rename to lib/ui/core/ui/modals/open_tag_modal.dart index 5e3a6b1..49c9f86 100644 --- a/lib/components/modals/open_tag_modal.dart +++ b/lib/ui/core/ui/modals/open_tag_modal.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:modal_bottom_sheet/modal_bottom_sheet.dart'; -import 'package:piwigo_ng/components/fields/app_field.dart'; -import 'package:piwigo_ng/models/tag_model.dart'; -import 'package:piwigo_ng/network/api_error.dart'; -import 'package:piwigo_ng/network/tags.dart'; +import 'package:piwigo_ng/ui/core/ui/fields/app_field.dart'; +import 'package:piwigo_ng/domain/models/tag_model.dart'; +import 'package:piwigo_ng/data/services/api/api_error.dart'; +import 'package:piwigo_ng/data/services/api/tags.dart'; import 'package:piwigo_ng/utils/localizations.dart'; -import 'package:piwigo_ng/views/image/image_tags_page.dart'; +import 'package:piwigo_ng/ui/image/image_tags_page.dart'; class OpenTagModal extends StatefulWidget { const OpenTagModal({super.key}); diff --git a/lib/components/modals/piwigo_modal.dart b/lib/ui/core/ui/modals/piwigo_modal.dart similarity index 100% rename from lib/components/modals/piwigo_modal.dart rename to lib/ui/core/ui/modals/piwigo_modal.dart diff --git a/lib/components/modals/select_groups_modal.dart b/lib/ui/core/ui/modals/select_groups_modal.dart similarity index 94% rename from lib/components/modals/select_groups_modal.dart rename to lib/ui/core/ui/modals/select_groups_modal.dart index 51fecf9..3e8a818 100644 --- a/lib/components/modals/select_groups_modal.dart +++ b/lib/ui/core/ui/modals/select_groups_modal.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:modal_bottom_sheet/modal_bottom_sheet.dart'; -import 'package:piwigo_ng/components/buttons/piwigo_button.dart'; -import 'package:piwigo_ng/components/lists/select_model_list.dart'; -import 'package:piwigo_ng/models/group_model.dart'; -import 'package:piwigo_ng/network/groups.dart'; +import 'package:piwigo_ng/ui/core/ui/buttons/piwigo_button.dart'; +import 'package:piwigo_ng/ui/core/ui/lists/select_model_list.dart'; +import 'package:piwigo_ng/domain/models/group_model.dart'; +import 'package:piwigo_ng/data/services/api/groups.dart'; import 'package:piwigo_ng/utils/localizations.dart'; class SelectGroupsModal extends StatefulWidget { diff --git a/lib/components/modals/select_move_or_copy_modal.dart b/lib/ui/core/ui/modals/select_move_or_copy_modal.dart similarity index 97% rename from lib/components/modals/select_move_or_copy_modal.dart rename to lib/ui/core/ui/modals/select_move_or_copy_modal.dart index af0c8e5..3adc264 100644 --- a/lib/components/modals/select_move_or_copy_modal.dart +++ b/lib/ui/core/ui/modals/select_move_or_copy_modal.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:modal_bottom_sheet/modal_bottom_sheet.dart'; -import 'package:piwigo_ng/models/album_model.dart'; -import 'package:piwigo_ng/network/albums.dart'; -import 'package:piwigo_ng/network/api_error.dart'; +import 'package:piwigo_ng/domain/models/album_model.dart'; +import 'package:piwigo_ng/data/services/api/albums.dart'; +import 'package:piwigo_ng/data/services/api/api_error.dart'; import 'package:piwigo_ng/utils/localizations.dart'; class SelectMoveOrCopyModal extends StatefulWidget { diff --git a/lib/components/modals/select_tags_modal.dart b/lib/ui/core/ui/modals/select_tags_modal.dart similarity index 92% rename from lib/components/modals/select_tags_modal.dart rename to lib/ui/core/ui/modals/select_tags_modal.dart index 56d291b..ecc3303 100644 --- a/lib/components/modals/select_tags_modal.dart +++ b/lib/ui/core/ui/modals/select_tags_modal.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; import 'package:modal_bottom_sheet/modal_bottom_sheet.dart'; -import 'package:piwigo_ng/components/buttons/piwigo_button.dart'; -import 'package:piwigo_ng/components/lists/select_model_list.dart'; -import 'package:piwigo_ng/components/modals/create_tag_modal.dart'; -import 'package:piwigo_ng/components/modals/piwigo_modal.dart'; -import 'package:piwigo_ng/models/tag_model.dart'; -import 'package:piwigo_ng/network/api_error.dart'; -import 'package:piwigo_ng/network/tags.dart'; +import 'package:piwigo_ng/ui/core/ui/buttons/piwigo_button.dart'; +import 'package:piwigo_ng/ui/core/ui/lists/select_model_list.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/create_tag_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/piwigo_modal.dart'; +import 'package:piwigo_ng/domain/models/tag_model.dart'; +import 'package:piwigo_ng/data/services/api/api_error.dart'; +import 'package:piwigo_ng/data/services/api/tags.dart'; import 'package:piwigo_ng/utils/localizations.dart'; class SelectTagsModal extends StatefulWidget { diff --git a/lib/components/notification_dot.dart b/lib/ui/core/ui/notification_dot.dart similarity index 100% rename from lib/components/notification_dot.dart rename to lib/ui/core/ui/notification_dot.dart diff --git a/lib/components/player_controls.dart b/lib/ui/core/ui/player_controls.dart similarity index 99% rename from lib/components/player_controls.dart rename to lib/ui/core/ui/player_controls.dart index 67ba1d9..0ae78bc 100644 --- a/lib/components/player_controls.dart +++ b/lib/ui/core/ui/player_controls.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:chewie/chewie.dart'; import 'package:flutter/material.dart'; -import 'package:piwigo_ng/services/player_provider.dart'; +import 'package:piwigo_ng/data/services/local/player_provider.dart'; import 'package:provider/provider.dart'; import 'package:video_player/video_player.dart'; diff --git a/lib/components/popup_list_item.dart b/lib/ui/core/ui/popup_list_item.dart similarity index 100% rename from lib/components/popup_list_item.dart rename to lib/ui/core/ui/popup_list_item.dart diff --git a/lib/components/sections/form_section.dart b/lib/ui/core/ui/sections/form_section.dart similarity index 100% rename from lib/components/sections/form_section.dart rename to lib/ui/core/ui/sections/form_section.dart diff --git a/lib/components/sections/settings_section.dart b/lib/ui/core/ui/sections/settings_section.dart similarity index 100% rename from lib/components/sections/settings_section.dart rename to lib/ui/core/ui/sections/settings_section.dart diff --git a/lib/components/snackbars.dart b/lib/ui/core/ui/snackbars.dart similarity index 96% rename from lib/components/snackbars.dart rename to lib/ui/core/ui/snackbars.dart index 859216d..69f56bf 100644 --- a/lib/components/snackbars.dart +++ b/lib/ui/core/ui/snackbars.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; import 'package:piwigo_ng/utils/localizations.dart'; import 'package:piwigo_ng/utils/resources.dart'; import 'package:piwigo_ng/utils/themes.dart'; diff --git a/lib/views/image/edit_image_page.dart b/lib/ui/image/edit_image_page.dart similarity index 92% rename from lib/views/image/edit_image_page.dart rename to lib/ui/image/edit_image_page.dart index 709f656..0d27545 100644 --- a/lib/views/image/edit_image_page.dart +++ b/lib/ui/image/edit_image_page.dart @@ -1,17 +1,17 @@ import 'dart:math'; import 'package:flutter/material.dart'; -import 'package:piwigo_ng/components/buttons/animated_piwigo_button.dart'; -import 'package:piwigo_ng/components/cards/image_details_card.dart'; -import 'package:piwigo_ng/components/cards/piwigo_chip.dart'; -import 'package:piwigo_ng/components/dialogs/confirm_dialog.dart'; -import 'package:piwigo_ng/components/fields/app_field.dart'; -import 'package:piwigo_ng/components/modals/select_tags_modal.dart'; -import 'package:piwigo_ng/components/sections/form_section.dart'; -import 'package:piwigo_ng/models/image_model.dart'; -import 'package:piwigo_ng/models/tag_model.dart'; -import 'package:piwigo_ng/network/api_error.dart'; -import 'package:piwigo_ng/network/images.dart'; +import 'package:piwigo_ng/ui/core/ui/buttons/animated_piwigo_button.dart'; +import 'package:piwigo_ng/ui/core/ui/cards/image_details_card.dart'; +import 'package:piwigo_ng/ui/core/ui/cards/piwigo_chip.dart'; +import 'package:piwigo_ng/ui/core/ui/dialogs/confirm_dialog.dart'; +import 'package:piwigo_ng/ui/core/ui/fields/app_field.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/select_tags_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/sections/form_section.dart'; +import 'package:piwigo_ng/domain/models/image_model.dart'; +import 'package:piwigo_ng/domain/models/tag_model.dart'; +import 'package:piwigo_ng/data/services/api/api_error.dart'; +import 'package:piwigo_ng/data/services/api/images.dart'; import 'package:piwigo_ng/utils/localizations.dart'; import 'package:rounded_loading_button/rounded_loading_button.dart'; diff --git a/lib/views/image/image_favorites_page.dart b/lib/ui/image/image_favorites_page.dart similarity index 95% rename from lib/views/image/image_favorites_page.dart rename to lib/ui/image/image_favorites_page.dart index 6144f75..a91968a 100644 --- a/lib/views/image/image_favorites_page.dart +++ b/lib/ui/image/image_favorites_page.dart @@ -1,15 +1,15 @@ import 'package:flutter/material.dart'; -import 'package:piwigo_ng/components/lists/image_grid_view.dart'; -import 'package:piwigo_ng/components/popup_list_item.dart'; -import 'package:piwigo_ng/models/album_model.dart'; -import 'package:piwigo_ng/models/image_model.dart'; -import 'package:piwigo_ng/network/api_error.dart'; -import 'package:piwigo_ng/network/images.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/ui/core/ui/lists/image_grid_view.dart'; +import 'package:piwigo_ng/ui/core/ui/popup_list_item.dart'; +import 'package:piwigo_ng/domain/models/album_model.dart'; +import 'package:piwigo_ng/domain/models/image_model.dart'; +import 'package:piwigo_ng/data/services/api/api_error.dart'; +import 'package:piwigo_ng/data/services/api/images.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; import 'package:piwigo_ng/utils/image_actions.dart'; import 'package:piwigo_ng/utils/localizations.dart'; import 'package:piwigo_ng/utils/settings.dart'; -import 'package:piwigo_ng/views/image/image_page.dart'; +import 'package:piwigo_ng/ui/image/image_page.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart'; class ImageFavoritesPage extends StatefulWidget { diff --git a/lib/views/image/image_page.dart b/lib/ui/image/image_page.dart similarity index 96% rename from lib/views/image/image_page.dart rename to lib/ui/image/image_page.dart index 69c206b..b7bdfc6 100644 --- a/lib/views/image/image_page.dart +++ b/lib/ui/image/image_page.dart @@ -8,22 +8,22 @@ import 'package:html_unescape/html_unescape.dart'; import 'package:photo_view/photo_view.dart'; import 'package:photo_view/photo_view_gallery.dart'; import 'package:piwigo_ng/app.dart'; -import 'package:piwigo_ng/components/app_image_display.dart'; -import 'package:piwigo_ng/components/modals/image_info_modal.dart'; -import 'package:piwigo_ng/components/popup_list_item.dart'; -import 'package:piwigo_ng/models/album_model.dart'; -import 'package:piwigo_ng/models/image_model.dart'; -import 'package:piwigo_ng/models/tag_model.dart'; -import 'package:piwigo_ng/network/api_client.dart'; -import 'package:piwigo_ng/network/api_error.dart'; -import 'package:piwigo_ng/network/images.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; -import 'package:piwigo_ng/services/theme_provider.dart'; +import 'package:piwigo_ng/ui/core/ui/app_image_display.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/image_info_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/popup_list_item.dart'; +import 'package:piwigo_ng/domain/models/album_model.dart'; +import 'package:piwigo_ng/domain/models/image_model.dart'; +import 'package:piwigo_ng/domain/models/tag_model.dart'; +import 'package:piwigo_ng/data/services/api/api_client.dart'; +import 'package:piwigo_ng/data/services/api/api_error.dart'; +import 'package:piwigo_ng/data/services/api/images.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; +import 'package:piwigo_ng/data/services/local/theme_provider.dart'; import 'package:piwigo_ng/utils/image_actions.dart'; import 'package:piwigo_ng/utils/localizations.dart'; import 'package:piwigo_ng/utils/resources.dart'; import 'package:piwigo_ng/utils/settings.dart'; -import 'package:piwigo_ng/views/image/video_player_page.dart'; +import 'package:piwigo_ng/ui/image/video_player_page.dart'; import 'package:provider/provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/lib/views/image/image_search_page.dart b/lib/ui/image/image_search_page.dart similarity index 95% rename from lib/views/image/image_search_page.dart rename to lib/ui/image/image_search_page.dart index 21212c9..9d153c5 100644 --- a/lib/views/image/image_search_page.dart +++ b/lib/ui/image/image_search_page.dart @@ -1,20 +1,20 @@ import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; -import 'package:piwigo_ng/components/lists/image_grid_view.dart'; -import 'package:piwigo_ng/components/popup_list_item.dart'; -import 'package:piwigo_ng/models/album_model.dart'; -import 'package:piwigo_ng/models/image_model.dart'; -import 'package:piwigo_ng/network/api_error.dart'; -import 'package:piwigo_ng/network/images.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/ui/core/ui/lists/image_grid_view.dart'; +import 'package:piwigo_ng/ui/core/ui/popup_list_item.dart'; +import 'package:piwigo_ng/domain/models/album_model.dart'; +import 'package:piwigo_ng/domain/models/image_model.dart'; +import 'package:piwigo_ng/data/services/api/api_error.dart'; +import 'package:piwigo_ng/data/services/api/images.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; import 'package:piwigo_ng/utils/image_actions.dart'; import 'package:piwigo_ng/utils/localizations.dart'; import 'package:piwigo_ng/utils/page_routes.dart'; import 'package:piwigo_ng/utils/settings.dart'; -import 'package:piwigo_ng/views/image/image_page.dart'; +import 'package:piwigo_ng/ui/image/image_page.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart'; -import '../../components/fields/app_field.dart'; +import 'package:piwigo_ng/ui/core/ui/fields/app_field.dart'; class ImageSearchPage extends StatefulWidget { const ImageSearchPage({Key? key, this.isAdmin = false}) : super(key: key); diff --git a/lib/views/image/image_tags_page.dart b/lib/ui/image/image_tags_page.dart similarity index 95% rename from lib/views/image/image_tags_page.dart rename to lib/ui/image/image_tags_page.dart index 3a47667..2a6773e 100644 --- a/lib/views/image/image_tags_page.dart +++ b/lib/ui/image/image_tags_page.dart @@ -1,16 +1,16 @@ import 'package:flutter/material.dart'; -import 'package:piwigo_ng/components/lists/image_grid_view.dart'; -import 'package:piwigo_ng/components/popup_list_item.dart'; -import 'package:piwigo_ng/models/album_model.dart'; -import 'package:piwigo_ng/models/image_model.dart'; -import 'package:piwigo_ng/models/tag_model.dart'; -import 'package:piwigo_ng/network/api_error.dart'; -import 'package:piwigo_ng/network/images.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/ui/core/ui/lists/image_grid_view.dart'; +import 'package:piwigo_ng/ui/core/ui/popup_list_item.dart'; +import 'package:piwigo_ng/domain/models/album_model.dart'; +import 'package:piwigo_ng/domain/models/image_model.dart'; +import 'package:piwigo_ng/domain/models/tag_model.dart'; +import 'package:piwigo_ng/data/services/api/api_error.dart'; +import 'package:piwigo_ng/data/services/api/images.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; import 'package:piwigo_ng/utils/image_actions.dart'; import 'package:piwigo_ng/utils/localizations.dart'; import 'package:piwigo_ng/utils/settings.dart'; -import 'package:piwigo_ng/views/image/image_page.dart'; +import 'package:piwigo_ng/ui/image/image_page.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart'; class ImageTagsPage extends StatefulWidget { diff --git a/lib/views/image/video_player_page.dart b/lib/ui/image/video_player_page.dart similarity index 96% rename from lib/views/image/video_player_page.dart rename to lib/ui/image/video_player_page.dart index 0c903d0..2156f17 100644 --- a/lib/views/image/video_player_page.dart +++ b/lib/ui/image/video_player_page.dart @@ -1,7 +1,7 @@ import 'package:chewie/chewie.dart'; import 'package:flutter/material.dart'; -import 'package:piwigo_ng/components/player_controls.dart'; -import 'package:piwigo_ng/services/player_provider.dart'; +import 'package:piwigo_ng/ui/core/ui/player_controls.dart'; +import 'package:piwigo_ng/data/services/local/player_provider.dart'; import 'package:piwigo_ng/utils/localizations.dart'; import 'package:provider/provider.dart'; import 'package:video_player/video_player.dart'; diff --git a/lib/views/image/video_view.dart b/lib/ui/image/video_view.dart similarity index 99% rename from lib/views/image/video_view.dart rename to lib/ui/image/video_view.dart index 0d00b70..43d747a 100644 --- a/lib/views/image/video_view.dart +++ b/lib/ui/image/video_view.dart @@ -2,8 +2,8 @@ import 'dart:math'; import 'package:chewie/chewie.dart'; import 'package:flutter/material.dart'; -import 'package:piwigo_ng/components/player_controls.dart'; -import 'package:piwigo_ng/services/player_provider.dart'; +import 'package:piwigo_ng/ui/core/ui/player_controls.dart'; +import 'package:piwigo_ng/data/services/local/player_provider.dart'; import 'package:piwigo_ng/utils/localizations.dart'; import 'package:piwigo_ng/utils/resources.dart'; import 'package:piwigo_ng/utils/themes.dart'; diff --git a/lib/views/settings/auto_upload_page.dart b/lib/ui/settings/auto_upload_page.dart similarity index 93% rename from lib/views/settings/auto_upload_page.dart rename to lib/ui/settings/auto_upload_page.dart index bb51fc6..b53f69f 100644 --- a/lib/views/settings/auto_upload_page.dart +++ b/lib/ui/settings/auto_upload_page.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; -import 'package:piwigo_ng/components/modals/select_move_or_copy_modal.dart'; -import 'package:piwigo_ng/components/modals/piwigo_modal.dart'; -import 'package:piwigo_ng/components/sections/settings_section.dart'; -import 'package:piwigo_ng/models/album_model.dart'; -import 'package:piwigo_ng/network/images.dart'; -import 'package:piwigo_ng/services/auto_upload_manager.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/select_move_or_copy_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/piwigo_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/sections/settings_section.dart'; +import 'package:piwigo_ng/domain/models/album_model.dart'; +import 'package:piwigo_ng/data/services/api/images.dart'; +import 'package:piwigo_ng/data/services/local/auto_upload_manager.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; import 'package:piwigo_ng/utils/localizations.dart'; import 'package:piwigo_ng/utils/settings.dart'; diff --git a/lib/views/settings/privacy_policy_page.dart b/lib/ui/settings/privacy_policy_page.dart similarity index 100% rename from lib/views/settings/privacy_policy_page.dart rename to lib/ui/settings/privacy_policy_page.dart diff --git a/lib/views/settings/select_language_page.dart b/lib/ui/settings/select_language_page.dart similarity index 90% rename from lib/views/settings/select_language_page.dart rename to lib/ui/settings/select_language_page.dart index 499b6a7..3f115bb 100644 --- a/lib/views/settings/select_language_page.dart +++ b/lib/ui/settings/select_language_page.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:piwigo_ng/services/locale_provider.dart'; +import 'package:piwigo_ng/data/services/local/locale_provider.dart'; import 'package:piwigo_ng/utils/localizations.dart'; import 'package:provider/provider.dart'; -import '/l10n/app_localizations.dart'; +import 'package:piwigo_ng/ui/core/localization/app_localizations.dart'; class SelectLanguagePage extends StatefulWidget { const SelectLanguagePage({Key? key}) : super(key: key); diff --git a/lib/views/settings/settings_page.dart b/lib/ui/settings/settings_page.dart similarity index 97% rename from lib/views/settings/settings_page.dart rename to lib/ui/settings/settings_page.dart index 8f54a89..24cd454 100644 --- a/lib/views/settings/settings_page.dart +++ b/lib/ui/settings/settings_page.dart @@ -7,22 +7,22 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:package_info_plus/package_info_plus.dart'; import 'package:path_provider/path_provider.dart'; import 'package:piwigo_ng/app.dart'; -import 'package:piwigo_ng/components/appbars/settings_app_bar.dart'; -import 'package:piwigo_ng/components/sections/settings_section.dart'; -import 'package:piwigo_ng/models/info_model.dart'; -import 'package:piwigo_ng/network/api_error.dart'; -import 'package:piwigo_ng/network/authentication.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/ui/core/ui/appbars/settings_app_bar.dart'; +import 'package:piwigo_ng/ui/core/ui/sections/settings_section.dart'; +import 'package:piwigo_ng/domain/models/info_model.dart'; +import 'package:piwigo_ng/data/services/api/api_error.dart'; +import 'package:piwigo_ng/data/services/api/authentication.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; import 'package:piwigo_ng/utils/localizations.dart'; import 'package:piwigo_ng/utils/settings.dart'; -import 'package:piwigo_ng/views/authentication/login_page.dart'; -import 'package:piwigo_ng/views/settings/auto_upload_page.dart'; -import 'package:piwigo_ng/views/settings/privacy_policy_page.dart'; -import 'package:piwigo_ng/views/settings/select_language_page.dart'; +import 'package:piwigo_ng/ui/authentication/login_page.dart'; +import 'package:piwigo_ng/ui/settings/auto_upload_page.dart'; +import 'package:piwigo_ng/ui/settings/privacy_policy_page.dart'; +import 'package:piwigo_ng/ui/settings/select_language_page.dart'; import 'package:provider/provider.dart'; import 'package:url_launcher/url_launcher.dart'; -import '../../services/theme_provider.dart'; +import 'package:piwigo_ng/data/services/local/theme_provider.dart'; class SettingsPage extends StatefulWidget { const SettingsPage({Key? key}) : super(key: key); diff --git a/lib/views/unknown_route_page.dart b/lib/ui/unknown_route_page.dart similarity index 100% rename from lib/views/unknown_route_page.dart rename to lib/ui/unknown_route_page.dart diff --git a/lib/views/upload/upload_page.dart b/lib/ui/upload/upload_page.dart similarity index 94% rename from lib/views/upload/upload_page.dart rename to lib/ui/upload/upload_page.dart index afae679..e45b9df 100644 --- a/lib/views/upload/upload_page.dart +++ b/lib/ui/upload/upload_page.dart @@ -5,19 +5,19 @@ import 'package:flutter/material.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:image_picker/image_picker.dart'; import 'package:mime_type/mime_type.dart'; -import 'package:piwigo_ng/components/buttons/animated_piwigo_button.dart'; -import 'package:piwigo_ng/components/cards/image_details_card.dart'; -import 'package:piwigo_ng/components/cards/piwigo_chip.dart'; -import 'package:piwigo_ng/components/dialogs/confirm_dialog.dart'; -import 'package:piwigo_ng/components/fields/app_field.dart'; -import 'package:piwigo_ng/components/modals/select_move_or_copy_modal.dart'; -import 'package:piwigo_ng/components/modals/piwigo_modal.dart'; -import 'package:piwigo_ng/components/modals/select_tags_modal.dart'; -import 'package:piwigo_ng/components/sections/form_section.dart'; -import 'package:piwigo_ng/models/tag_model.dart'; -import 'package:piwigo_ng/network/images.dart'; -import 'package:piwigo_ng/network/upload.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/ui/core/ui/buttons/animated_piwigo_button.dart'; +import 'package:piwigo_ng/ui/core/ui/cards/image_details_card.dart'; +import 'package:piwigo_ng/ui/core/ui/cards/piwigo_chip.dart'; +import 'package:piwigo_ng/ui/core/ui/dialogs/confirm_dialog.dart'; +import 'package:piwigo_ng/ui/core/ui/fields/app_field.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/select_move_or_copy_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/piwigo_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/select_tags_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/sections/form_section.dart'; +import 'package:piwigo_ng/domain/models/tag_model.dart'; +import 'package:piwigo_ng/data/services/api/images.dart'; +import 'package:piwigo_ng/data/services/api/upload.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; import 'package:piwigo_ng/utils/image_actions.dart'; import 'package:piwigo_ng/utils/localizations.dart'; import 'package:piwigo_ng/utils/resources.dart'; diff --git a/lib/views/upload/upload_status_page.dart b/lib/ui/upload/upload_status_page.dart similarity index 98% rename from lib/views/upload/upload_status_page.dart rename to lib/ui/upload/upload_status_page.dart index 089e4c9..28deb02 100644 --- a/lib/views/upload/upload_status_page.dart +++ b/lib/ui/upload/upload_status_page.dart @@ -1,7 +1,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; -import 'package:piwigo_ng/services/upload_notifier.dart'; +import 'package:piwigo_ng/data/services/local/upload_notifier.dart'; import 'package:piwigo_ng/utils/localizations.dart'; import 'package:provider/provider.dart'; diff --git a/lib/utils/album_actions.dart b/lib/utils/album_actions.dart index 4cba2eb..55b6498 100644 --- a/lib/utils/album_actions.dart +++ b/lib/utils/album_actions.dart @@ -1,17 +1,17 @@ import 'package:flutter/material.dart'; -import 'package:piwigo_ng/components/dialogs/confirm_dialog.dart'; -import 'package:piwigo_ng/components/modals/create_album_modal.dart'; -import 'package:piwigo_ng/components/modals/delete_album_mode_modal.dart'; -import 'package:piwigo_ng/components/modals/edit_album_modal.dart'; -import 'package:piwigo_ng/components/modals/select_move_or_copy_modal.dart'; -import 'package:piwigo_ng/components/modals/piwigo_modal.dart'; -import 'package:piwigo_ng/components/snackbars.dart'; -import 'package:piwigo_ng/models/album_model.dart'; -import 'package:piwigo_ng/network/albums.dart'; -import 'package:piwigo_ng/network/api_error.dart'; +import 'package:piwigo_ng/ui/core/ui/dialogs/confirm_dialog.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/create_album_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/delete_album_mode_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/edit_album_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/select_move_or_copy_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/piwigo_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/snackbars.dart'; +import 'package:piwigo_ng/domain/models/album_model.dart'; +import 'package:piwigo_ng/data/services/api/albums.dart'; +import 'package:piwigo_ng/data/services/api/api_error.dart'; import 'package:piwigo_ng/utils/localizations.dart'; -import 'package:piwigo_ng/views/album/album_page.dart'; -import 'package:piwigo_ng/views/album/album_privacy_page.dart'; +import 'package:piwigo_ng/ui/album/album_page.dart'; +import 'package:piwigo_ng/ui/album/album_privacy_page.dart'; Future onOpenAlbum(BuildContext context, AlbumModel album) async { Navigator.of(context).pushNamed( diff --git a/lib/utils/image_actions.dart b/lib/utils/image_actions.dart index 1f31f61..51cda9d 100644 --- a/lib/utils/image_actions.dart +++ b/lib/utils/image_actions.dart @@ -4,21 +4,21 @@ import 'package:flutter/material.dart'; import 'package:flutter_image_compress/flutter_image_compress.dart'; import 'package:image_picker/image_picker.dart'; import 'package:path_provider/path_provider.dart'; -import 'package:piwigo_ng/components/dialogs/confirm_dialog.dart'; -import 'package:piwigo_ng/components/modals/choose_camera_picker_modal.dart'; -import 'package:piwigo_ng/components/modals/choose_move_option_modal.dart'; -import 'package:piwigo_ng/components/modals/delete_images_modal.dart'; -import 'package:piwigo_ng/components/modals/select_move_or_copy_modal.dart'; -import 'package:piwigo_ng/components/modals/piwigo_modal.dart'; -import 'package:piwigo_ng/components/snackbars.dart'; -import 'package:piwigo_ng/models/album_model.dart'; -import 'package:piwigo_ng/models/image_model.dart'; -import 'package:piwigo_ng/network/albums.dart'; -import 'package:piwigo_ng/network/images.dart'; -import 'package:piwigo_ng/network/users.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/ui/core/ui/dialogs/confirm_dialog.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/choose_camera_picker_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/choose_move_option_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/delete_images_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/select_move_or_copy_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/modals/piwigo_modal.dart'; +import 'package:piwigo_ng/ui/core/ui/snackbars.dart'; +import 'package:piwigo_ng/domain/models/album_model.dart'; +import 'package:piwigo_ng/domain/models/image_model.dart'; +import 'package:piwigo_ng/data/services/api/albums.dart'; +import 'package:piwigo_ng/data/services/api/images.dart'; +import 'package:piwigo_ng/data/services/api/users.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; import 'package:piwigo_ng/utils/localizations.dart'; -import 'package:piwigo_ng/views/image/edit_image_page.dart'; +import 'package:piwigo_ng/ui/image/edit_image_page.dart'; final ImagePicker _picker = ImagePicker(); diff --git a/lib/utils/localizations.dart b/lib/utils/localizations.dart index 6f5715a..bddf499 100644 --- a/lib/utils/localizations.dart +++ b/lib/utils/localizations.dart @@ -1,5 +1,5 @@ import 'package:piwigo_ng/app.dart'; -import '/l10n/app_localizations.dart'; +import 'package:piwigo_ng/ui/core/localization/app_localizations.dart'; AppLocalizations get appStrings => AppLocalizations.of(App.scaffoldMessengerKey.currentContext!)!; diff --git a/lib/utils/settings.dart b/lib/utils/settings.dart index 85877ca..5ee490b 100644 --- a/lib/utils/settings.dart +++ b/lib/utils/settings.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:piwigo_ng/services/preferences_service.dart'; +import 'package:piwigo_ng/data/services/local/preferences_service.dart'; import 'package:piwigo_ng/utils/localizations.dart'; enum SortMethods {