diff --git a/lib/ui/pages/more/more.dart b/lib/ui/pages/more/more.dart index 99821373..189446db 100644 --- a/lib/ui/pages/more/more.dart +++ b/lib/ui/pages/more/more.dart @@ -4,8 +4,6 @@ import 'package:flutter/material.dart'; import 'package:ionicons/ionicons.dart'; import 'package:selfprivacy/config/brand_theme.dart'; import 'package:selfprivacy/logic/cubit/server_installation/server_installation_cubit.dart'; -import 'package:selfprivacy/logic/cubit/server_volumes/server_volume_cubit.dart'; -import 'package:selfprivacy/logic/cubit/services/services_cubit.dart'; import 'package:selfprivacy/ui/components/cards/filled_card.dart'; import 'package:selfprivacy/ui/components/brand_header/brand_header.dart'; import 'package:selfprivacy/ui/components/brand_icons/brand_icons.dart'; @@ -21,9 +19,6 @@ class MorePage extends StatelessWidget { final bool isReady = context.watch().state is ServerInstallationFinished; - final bool? usesBinds = - context.watch().state.usesBinds; - return Scaffold( appBar: Breakpoints.small.isActive(context) ? PreferredSize( @@ -39,31 +34,6 @@ class MorePage extends StatelessWidget { padding: paddingH15V0, child: Column( children: [ - if (isReady && usesBinds != null && !usesBinds) - _MoreMenuItem( - title: 'storage.start_migration_button'.tr(), - iconData: Icons.drive_file_move_outline, - goTo: () => ServicesMigrationRoute( - diskStatus: - context.read().state.diskStatus, - services: context - .read() - .state - .services - .where( - (final service) => - service.id == 'bitwarden' || - service.id == 'gitea' || - service.id == 'pleroma' || - service.id == 'mailserver' || - service.id == 'nextcloud', - ) - .toList(), - isMigration: true, - ), - subtitle: 'storage.data_migration_notice'.tr(), - accent: true, - ), if (!isReady) _MoreMenuItem( title: 'more_page.configuration_wizard'.tr(), diff --git a/lib/ui/pages/server_storage/binds_migration/migration_process_page.dart b/lib/ui/pages/server_storage/binds_migration/migration_process_page.dart deleted file mode 100644 index 8d42cb6f..00000000 --- a/lib/ui/pages/server_storage/binds_migration/migration_process_page.dart +++ /dev/null @@ -1,79 +0,0 @@ -import 'package:easy_localization/easy_localization.dart'; -import 'package:flutter/material.dart'; -import 'package:selfprivacy/logic/cubit/server_jobs/server_jobs_cubit.dart'; -import 'package:selfprivacy/logic/models/json/server_job.dart'; -import 'package:selfprivacy/ui/components/buttons/brand_button.dart'; -import 'package:selfprivacy/ui/layouts/brand_hero_screen.dart'; -import 'package:selfprivacy/ui/components/brand_linear_indicator/brand_linear_indicator.dart'; -import 'package:selfprivacy/ui/pages/root_route.dart'; -import 'package:selfprivacy/utils/route_transitions/basic.dart'; - -class MigrationProcessPage extends StatefulWidget { - const MigrationProcessPage({super.key}); - - @override - State createState() => _MigrationProcessPageState(); -} - -class _MigrationProcessPageState extends State { - @override - void initState() { - super.initState(); - } - - @override - Widget build(final BuildContext context) { - ServerJob? job; - String? subtitle = ''; - double value = 0.0; - List children = []; - - final serverJobsState = context.watch().state; - if (serverJobsState.migrationJobUid != null) { - job = context.read().getServerJobByUid( - serverJobsState.migrationJobUid!, - ); - } - - if (job == null) { - subtitle = 'basis.loading'.tr(); - } else { - value = job.progress == null ? 0.0 : job.progress! / 100; - subtitle = job.statusText; - children = [ - ...children, - const SizedBox(height: 16), - if (job.finishedAt != null) - Text( - job.result!, - style: Theme.of(context).textTheme.titleMedium, - ), - if (job.finishedAt != null) const SizedBox(height: 16), - if (job.finishedAt != null) - BrandButton.filled( - child: Text('storage.migration_done'.tr()), - onPressed: () { - Navigator.of(context).pushAndRemoveUntil( - materialRoute(const RootPage()), - (final predicate) => false, - ); - }, - ), - ]; - } - return BrandHeroScreen( - hasBackButton: false, - heroTitle: 'storage.migration_process'.tr(), - heroSubtitle: subtitle, - children: [ - BrandLinearIndicator( - value: value, - color: Theme.of(context).colorScheme.primary, - backgroundColor: Theme.of(context).colorScheme.surfaceVariant, - height: 4.0, - ), - ...children, - ], - ); - } -} diff --git a/lib/ui/pages/server_storage/binds_migration/services_migration.dart b/lib/ui/pages/server_storage/binds_migration/services_migration.dart index edb7474e..e981cb03 100644 --- a/lib/ui/pages/server_storage/binds_migration/services_migration.dart +++ b/lib/ui/pages/server_storage/binds_migration/services_migration.dart @@ -18,13 +18,11 @@ class ServicesMigrationPage extends StatefulWidget { const ServicesMigrationPage({ required this.services, required this.diskStatus, - required this.isMigration, super.key, }); final DiskStatus diskStatus; final List services; - final bool isMigration; @override State createState() => _ServicesMigrationPageState(); @@ -171,22 +169,16 @@ class _ServicesMigrationPageState extends State { ), ), const SizedBox(height: 16), - if (widget.isMigration || (!widget.isMigration && isVolumePicked)) + if (isVolumePicked) BrandButton.filled( child: Text('storage.start_migration_button'.tr()), onPressed: () { - if (widget.isMigration) { - context.read().migrateToBinds( - serviceToDisk, - ); - } else { - for (final service in widget.services) { - if (serviceToDisk[service.id] != null) { - context.read().moveService( - service.id, - serviceToDisk[service.id]!, - ); - } + for (final service in widget.services) { + if (serviceToDisk[service.id] != null) { + context.read().moveService( + service.id, + serviceToDisk[service.id]!, + ); } } context.router.popUntilRoot(); diff --git a/lib/ui/pages/services/service_page.dart b/lib/ui/pages/services/service_page.dart index 37f9515c..96560db0 100644 --- a/lib/ui/pages/services/service_page.dart +++ b/lib/ui/pages/services/service_page.dart @@ -118,7 +118,6 @@ class _ServicePageState extends State { services: [service], diskStatus: context.read().state.diskStatus, - isMigration: false, ), ), leading: const Icon(Icons.drive_file_move_outlined), diff --git a/lib/ui/router/router.gr.dart b/lib/ui/router/router.gr.dart index 98f4453a..1ff6d09c 100644 --- a/lib/ui/router/router.gr.dart +++ b/lib/ui/router/router.gr.dart @@ -159,7 +159,6 @@ abstract class _$RootRouter extends RootStackRouter { child: ServicesMigrationPage( services: args.services, diskStatus: args.diskStatus, - isMigration: args.isMigration, key: args.key, ), ); @@ -576,7 +575,6 @@ class ServicesMigrationRoute extends PageRouteInfo { ServicesMigrationRoute({ required List services, required DiskStatus diskStatus, - required bool isMigration, Key? key, List? children, }) : super( @@ -584,7 +582,6 @@ class ServicesMigrationRoute extends PageRouteInfo { args: ServicesMigrationRouteArgs( services: services, diskStatus: diskStatus, - isMigration: isMigration, key: key, ), initialChildren: children, @@ -600,7 +597,6 @@ class ServicesMigrationRouteArgs { const ServicesMigrationRouteArgs({ required this.services, required this.diskStatus, - required this.isMigration, this.key, }); @@ -608,13 +604,11 @@ class ServicesMigrationRouteArgs { final DiskStatus diskStatus; - final bool isMigration; - final Key? key; @override String toString() { - return 'ServicesMigrationRouteArgs{services: $services, diskStatus: $diskStatus, isMigration: $isMigration, key: $key}'; + return 'ServicesMigrationRouteArgs{services: $services, diskStatus: $diskStatus, key: $key}'; } }