Skip to content

Reorganise folders to follow official flutter structure #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Renarde-dev wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Reorganise folders to follow official flutter structure #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
Expand Down
2 changes: 1 addition & 1 deletion l10n.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
46 changes: 23 additions & 23 deletions lib/app.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions lib/network/albums.dart → lib/data/services/api/albums.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/network/api_client.dart → lib/data/services/api/api_client.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
0 lib/network/api_error.dart → lib/data/services/api/api_error.dart
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions lib/network/api_interceptor.dart → lib/data/services/api/api_interceptor.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
10 changes: 5 additions & 5 deletions lib/network/authentication.dart → lib/data/services/api/authentication.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions lib/network/groups.dart → lib/data/services/api/groups.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
14 changes: 7 additions & 7 deletions lib/network/images.dart → lib/data/services/api/images.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
6 changes: 3 additions & 3 deletions lib/network/permissions.dart → lib/data/services/api/permissions.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<AlbumPermissionModel?> getAlbumPermissions(
Expand Down
6 changes: 3 additions & 3 deletions lib/network/tags.dart → lib/data/services/api/tags.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
18 changes: 9 additions & 9 deletions lib/network/upload.dart → lib/data/services/api/upload.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<bool> askMediaPermission() async {
Expand Down
8 changes: 4 additions & 4 deletions lib/network/users.dart → lib/data/services/api/users.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<List<UserModel>?> getAllUsers({
Expand Down
6 changes: 3 additions & 3 deletions lib/services/app_providers.dart → lib/data/services/local/app_providers.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
18 changes: 9 additions & 9 deletions lib/services/auto_upload_manager.dart → ...a/services/local/auto_upload_manager.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
0 lib/services/chunked_uploader.dart → ...data/services/local/chunked_uploader.dart
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/services/locale_provider.dart → lib/data/services/local/locale_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
6 changes: 3 additions & 3 deletions lib/services/notification_service.dart → .../services/local/notification_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
0 lib/services/player_provider.dart → lib/data/services/local/player_provider.dart
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions lib/services/preferences_service.dart → ...a/services/local/preferences_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
0 lib/services/receive_sharing.dart → lib/data/services/local/receive_sharing.dart
View file
Open in desktop
File renamed without changes.
0 lib/services/theme_provider.dart → lib/data/services/local/theme_provider.dart
View file
Open in desktop
File renamed without changes.
0 lib/services/upload_notifier.dart → lib/data/services/local/upload_notifier.dart
View file
Open in desktop
File renamed without changes.
0 lib/models/album_model.dart → lib/domain/models/album_model.dart
View file
Open in desktop
File renamed without changes.
0 lib/models/album_permission_model.dart → ...domain/models/album_permission_model.dart
View file
Open in desktop
File renamed without changes.
0 lib/models/group_model.dart → lib/domain/models/group_model.dart
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/models/image_model.dart → lib/domain/models/image_model.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
0 lib/models/info_model.dart → lib/domain/models/info_model.dart
View file
Open in desktop
File renamed without changes.
0 lib/models/status_model.dart → lib/domain/models/status_model.dart
View file
Open in desktop
File renamed without changes.
0 lib/models/tag_model.dart → lib/domain/models/tag_model.dart
View file
Open in desktop
File renamed without changes.
0 lib/models/user_model.dart → lib/domain/models/user_model.dart
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
26 changes: 13 additions & 13 deletions lib/views/album/album_page.dart → lib/ui/album/album_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
26 changes: 13 additions & 13 deletions lib/views/album/album_privacy_page.dart → lib/ui/album/album_privacy_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Loading