From c84d16d8b7e1cc3d0ac2fe179a92aea1dbe095f6 Mon Sep 17 00:00:00 2001 From: Inex Code Date: Fri, 16 Sep 2022 16:49:53 +0300 Subject: [PATCH] Move files related to storage --- .../cubit/server_volumes/server_volume_state.dart | 7 ++++--- .../server_storage_list_item.dart | 0 .../service_migration_list_item.dart | 0 .../service_storage_consumption_list_item.dart | 0 lib/ui/pages/more/more.dart | 4 ++-- .../data_to_binds_migration.dart} | 13 +++++++------ .../migration_process_page.dart | 2 +- lib/ui/pages/server_storage/server_storage.dart | 2 +- lib/ui/pages/server_storage/storage_card.dart | 2 +- 9 files changed, 16 insertions(+), 14 deletions(-) rename lib/ui/{pages/server_storage => components/storage_list_items}/server_storage_list_item.dart (100%) rename lib/ui/{pages/server_storage => components/storage_list_items}/service_migration_list_item.dart (100%) rename lib/ui/{pages/server_storage => components/storage_list_items}/service_storage_consumption_list_item.dart (100%) rename lib/ui/pages/server_storage/{data_migration.dart => binds_migration/data_to_binds_migration.dart} (92%) rename lib/ui/pages/server_storage/{ => binds_migration}/migration_process_page.dart (98%) diff --git a/lib/logic/cubit/server_volumes/server_volume_state.dart b/lib/logic/cubit/server_volumes/server_volume_state.dart index b2b1fce0..d68daa58 100644 --- a/lib/logic/cubit/server_volumes/server_volume_state.dart +++ b/lib/logic/cubit/server_volumes/server_volume_state.dart @@ -19,9 +19,10 @@ class ApiServerVolumeState extends ServerInstallationDependendState { List get volumes => _diskStatus.diskVolumes; DiskStatus get diskStatus => _diskStatus; - DiskVolume getVolume(final String volumeName) => - volumes.firstWhere((final volume) => volume.name == volumeName, - orElse: () => DiskVolume()); + DiskVolume getVolume(final String volumeName) => volumes.firstWhere( + (final volume) => volume.name == volumeName, + orElse: () => DiskVolume(), + ); ApiServerVolumeState copyWith({ final List? volumes, diff --git a/lib/ui/pages/server_storage/server_storage_list_item.dart b/lib/ui/components/storage_list_items/server_storage_list_item.dart similarity index 100% rename from lib/ui/pages/server_storage/server_storage_list_item.dart rename to lib/ui/components/storage_list_items/server_storage_list_item.dart diff --git a/lib/ui/pages/server_storage/service_migration_list_item.dart b/lib/ui/components/storage_list_items/service_migration_list_item.dart similarity index 100% rename from lib/ui/pages/server_storage/service_migration_list_item.dart rename to lib/ui/components/storage_list_items/service_migration_list_item.dart diff --git a/lib/ui/pages/server_storage/service_storage_consumption_list_item.dart b/lib/ui/components/storage_list_items/service_storage_consumption_list_item.dart similarity index 100% rename from lib/ui/pages/server_storage/service_storage_consumption_list_item.dart rename to lib/ui/components/storage_list_items/service_storage_consumption_list_item.dart diff --git a/lib/ui/pages/more/more.dart b/lib/ui/pages/more/more.dart index 0d1f9802..eeedd4d8 100644 --- a/lib/ui/pages/more/more.dart +++ b/lib/ui/pages/more/more.dart @@ -10,7 +10,7 @@ import 'package:selfprivacy/ui/components/brand_header/brand_header.dart'; import 'package:selfprivacy/ui/components/brand_icons/brand_icons.dart'; import 'package:selfprivacy/ui/pages/devices/devices.dart'; import 'package:selfprivacy/ui/pages/recovery_key/recovery_key.dart'; -import 'package:selfprivacy/ui/pages/server_storage/data_migration.dart'; +import 'package:selfprivacy/ui/pages/server_storage/binds_migration/data_to_binds_migration.dart'; import 'package:selfprivacy/ui/pages/setup/initializing.dart'; import 'package:selfprivacy/ui/pages/onboarding/onboarding.dart'; import 'package:selfprivacy/ui/pages/root_route.dart'; @@ -50,7 +50,7 @@ class MorePage extends StatelessWidget { _MoreMenuItem( title: 'providers.storage.start_migration_button'.tr(), iconData: Icons.drive_file_move_outline, - goTo: DataMigrationPage( + goTo: DataToBindsMigrationPage( diskStatus: context .watch() .state diff --git a/lib/ui/pages/server_storage/data_migration.dart b/lib/ui/pages/server_storage/binds_migration/data_to_binds_migration.dart similarity index 92% rename from lib/ui/pages/server_storage/data_migration.dart rename to lib/ui/pages/server_storage/binds_migration/data_to_binds_migration.dart index cf43bd9c..7c21e102 100644 --- a/lib/ui/pages/server_storage/data_migration.dart +++ b/lib/ui/pages/server_storage/binds_migration/data_to_binds_migration.dart @@ -6,11 +6,11 @@ import 'package:selfprivacy/ui/components/brand_button/filled_button.dart'; import 'package:selfprivacy/ui/components/brand_header/brand_header.dart'; import 'package:selfprivacy/ui/components/info_box/info_box.dart'; import 'package:selfprivacy/logic/models/disk_status.dart'; -import 'package:selfprivacy/ui/pages/server_storage/server_storage_list_item.dart'; -import 'package:selfprivacy/ui/pages/server_storage/service_migration_list_item.dart'; +import 'package:selfprivacy/ui/components/storage_list_items/server_storage_list_item.dart'; +import 'package:selfprivacy/ui/components/storage_list_items/service_migration_list_item.dart'; -class DataMigrationPage extends StatefulWidget { - const DataMigrationPage({ +class DataToBindsMigrationPage extends StatefulWidget { + const DataToBindsMigrationPage({ required this.services, required this.diskStatus, final super.key, @@ -20,10 +20,11 @@ class DataMigrationPage extends StatefulWidget { final List services; @override - State createState() => _DataMigrationPageState(); + State createState() => + _DataToBindsMigrationPageState(); } -class _DataMigrationPageState extends State { +class _DataToBindsMigrationPageState extends State { /// Service id to target migration disk name final Map serviceToDisk = {}; diff --git a/lib/ui/pages/server_storage/migration_process_page.dart b/lib/ui/pages/server_storage/binds_migration/migration_process_page.dart similarity index 98% rename from lib/ui/pages/server_storage/migration_process_page.dart rename to lib/ui/pages/server_storage/binds_migration/migration_process_page.dart index 12dd8fea..b1d20411 100644 --- a/lib/ui/pages/server_storage/migration_process_page.dart +++ b/lib/ui/pages/server_storage/binds_migration/migration_process_page.dart @@ -42,7 +42,7 @@ class _MigrationProcessPageState extends State { value: value, color: Theme.of(context).colorScheme.primary, backgroundColor: Theme.of(context).colorScheme.surfaceVariant, - height: 14.0, + height: 4.0, ), const SizedBox(height: 16), if (job.finishedAt != null) diff --git a/lib/ui/pages/server_storage/server_storage.dart b/lib/ui/pages/server_storage/server_storage.dart index 94a0532e..f29e9694 100644 --- a/lib/ui/pages/server_storage/server_storage.dart +++ b/lib/ui/pages/server_storage/server_storage.dart @@ -5,7 +5,7 @@ import 'package:selfprivacy/ui/components/brand_button/outlined_button.dart'; import 'package:selfprivacy/ui/components/brand_hero_screen/brand_hero_screen.dart'; import 'package:selfprivacy/logic/models/disk_status.dart'; import 'package:selfprivacy/ui/pages/server_storage/extending_volume.dart'; -import 'package:selfprivacy/ui/pages/server_storage/server_storage_list_item.dart'; +import 'package:selfprivacy/ui/components/storage_list_items/server_storage_list_item.dart'; import 'package:selfprivacy/utils/route_transitions/basic.dart'; class ServerStoragePage extends StatefulWidget { diff --git a/lib/ui/pages/server_storage/storage_card.dart b/lib/ui/pages/server_storage/storage_card.dart index 7bad8958..33b742a2 100644 --- a/lib/ui/pages/server_storage/storage_card.dart +++ b/lib/ui/pages/server_storage/storage_card.dart @@ -5,7 +5,7 @@ import 'package:selfprivacy/logic/cubit/providers/providers_cubit.dart'; import 'package:selfprivacy/ui/components/icon_status_mask/icon_status_mask.dart'; import 'package:selfprivacy/logic/models/disk_status.dart'; import 'package:selfprivacy/ui/pages/server_storage/server_storage.dart'; -import 'package:selfprivacy/ui/pages/server_storage/server_storage_list_item.dart'; +import 'package:selfprivacy/ui/components/storage_list_items/server_storage_list_item.dart'; import 'package:selfprivacy/utils/route_transitions/basic.dart'; class StorageCard extends StatelessWidget {