From 931da1443d3b91e71f108e2e49a6b4e93e422311 Mon Sep 17 00:00:00 2001 From: Inex Code Date: Wed, 5 Apr 2023 13:33:53 +0300 Subject: [PATCH] refactor(ui): Delete BrandCards --- .../components/brand_cards/brand_cards.dart | 55 ------------------- .../{brand_cards => cards}/filled_card.dart | 0 .../{brand_cards => cards}/outlined_card.dart | 0 .../components/jobs_content/jobs_content.dart | 20 ++++++- .../components/list_tiles/log_list_tile.dart | 20 +++++-- .../not_ready_card/not_ready_card.dart | 2 +- .../pages/backup_details/backup_details.dart | 2 +- lib/ui/pages/dns_details/dns_details.dart | 2 +- lib/ui/pages/more/console.dart | 3 +- lib/ui/pages/more/more.dart | 2 +- lib/ui/pages/recovery_key/recovery_key.dart | 2 +- .../server_details/server_details_screen.dart | 2 +- .../binds_migration/services_migration.dart | 7 +-- lib/ui/pages/services/service_page.dart | 2 +- .../initializing/server_provider_picker.dart | 2 +- .../recovering/recovery_confirm_server.dart | 2 +- .../recovering/recovery_method_select.dart | 2 +- lib/ui/pages/users/users.dart | 2 +- 18 files changed, 45 insertions(+), 82 deletions(-) delete mode 100644 lib/ui/components/brand_cards/brand_cards.dart rename lib/ui/components/{brand_cards => cards}/filled_card.dart (100%) rename lib/ui/components/{brand_cards => cards}/outlined_card.dart (100%) diff --git a/lib/ui/components/brand_cards/brand_cards.dart b/lib/ui/components/brand_cards/brand_cards.dart deleted file mode 100644 index 67e7f725..00000000 --- a/lib/ui/components/brand_cards/brand_cards.dart +++ /dev/null @@ -1,55 +0,0 @@ -import 'package:flutter/material.dart'; - -class BrandCards { - static Widget big({required final Widget child}) => _BrandCard( - padding: const EdgeInsets.symmetric( - horizontal: 20, - vertical: 15, - ), - shadow: bigShadow, - borderRadius: BorderRadius.circular(20), - child: child, - ); - static Widget small({required final Widget child}) => _BrandCard( - padding: const EdgeInsets.symmetric( - horizontal: 15, - vertical: 10, - ), - shadow: bigShadow, - borderRadius: BorderRadius.circular(10), - child: child, - ); -} - -class _BrandCard extends StatelessWidget { - const _BrandCard({ - required this.child, - required this.padding, - required this.shadow, - required this.borderRadius, - }); - - final Widget child; - final EdgeInsets padding; - final List shadow; - final BorderRadius borderRadius; - - @override - Widget build(final BuildContext context) => Container( - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surface, - borderRadius: borderRadius, - boxShadow: shadow, - ), - padding: padding, - child: child, - ); -} - -final List bigShadow = [ - BoxShadow( - offset: const Offset(0, 4), - blurRadius: 8, - color: Colors.black.withOpacity(.08), - ) -]; diff --git a/lib/ui/components/brand_cards/filled_card.dart b/lib/ui/components/cards/filled_card.dart similarity index 100% rename from lib/ui/components/brand_cards/filled_card.dart rename to lib/ui/components/cards/filled_card.dart diff --git a/lib/ui/components/brand_cards/outlined_card.dart b/lib/ui/components/cards/outlined_card.dart similarity index 100% rename from lib/ui/components/brand_cards/outlined_card.dart rename to lib/ui/components/cards/outlined_card.dart diff --git a/lib/ui/components/jobs_content/jobs_content.dart b/lib/ui/components/jobs_content/jobs_content.dart index 5d609d65..5ba00f89 100644 --- a/lib/ui/components/jobs_content/jobs_content.dart +++ b/lib/ui/components/jobs_content/jobs_content.dart @@ -7,7 +7,6 @@ import 'package:selfprivacy/logic/cubit/server_installation/server_installation_ 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/components/brand_cards/brand_cards.dart'; import 'package:selfprivacy/ui/components/brand_loader/brand_loader.dart'; import 'package:selfprivacy/ui/components/jobs_content/server_job_card.dart'; import 'package:selfprivacy/ui/helpers/modals.dart'; @@ -73,8 +72,23 @@ class JobsContent extends StatelessWidget { (final j) => Row( children: [ Expanded( - child: BrandCards.small( - child: Text(j.title), + child: Card( + color: Theme.of(context).colorScheme.surfaceVariant, + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 15, + vertical: 10, + ), + child: Text( + j.title, + style: + Theme.of(context).textTheme.labelLarge?.copyWith( + color: Theme.of(context) + .colorScheme + .onSurfaceVariant, + ), + ), + ), ), ), const SizedBox(width: 10), diff --git a/lib/ui/components/list_tiles/log_list_tile.dart b/lib/ui/components/list_tiles/log_list_tile.dart index 1165ff25..88505d8f 100644 --- a/lib/ui/components/list_tiles/log_list_tile.dart +++ b/lib/ui/components/list_tiles/log_list_tile.dart @@ -143,8 +143,11 @@ class _GraphQlResponseMessageItem extends StatelessWidget { title: Text( 'GraphQL Response at ${message.timeString}', ), - subtitle: Text(message.data.toString(), - overflow: TextOverflow.ellipsis, maxLines: 1,), + subtitle: Text( + message.data.toString(), + overflow: TextOverflow.ellipsis, + maxLines: 1, + ), leading: const Icon(Icons.arrow_circle_down_outlined), iconColor: Theme.of(context).colorScheme.tertiary, onTap: () => showDialog( @@ -171,8 +174,10 @@ class _GraphQlResponseMessageItem extends StatelessWidget { if (message.errors != null) Text( message.errors! - .map((final entry) => - '${entry.message} at ${entry.locations}',) + .map( + (final entry) => + '${entry.message} at ${entry.locations}', + ) .join('\n'), ), const Divider(), @@ -211,8 +216,11 @@ class _GraphQlRequestMessageItem extends StatelessWidget { title: Text( 'GraphQL Request at ${message.timeString}', ), - subtitle: Text(message.operation.toString(), - overflow: TextOverflow.ellipsis, maxLines: 1,), + subtitle: Text( + message.operation.toString(), + overflow: TextOverflow.ellipsis, + maxLines: 1, + ), leading: const Icon(Icons.arrow_circle_up_outlined), iconColor: Theme.of(context).colorScheme.secondary, onTap: () => showDialog( diff --git a/lib/ui/components/not_ready_card/not_ready_card.dart b/lib/ui/components/not_ready_card/not_ready_card.dart index 5e62e093..4b174a41 100644 --- a/lib/ui/components/not_ready_card/not_ready_card.dart +++ b/lib/ui/components/not_ready_card/not_ready_card.dart @@ -1,6 +1,6 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; -import 'package:selfprivacy/ui/components/brand_cards/filled_card.dart'; +import 'package:selfprivacy/ui/components/cards/filled_card.dart'; import 'package:selfprivacy/ui/router/router.dart'; import 'package:easy_localization/easy_localization.dart'; diff --git a/lib/ui/pages/backup_details/backup_details.dart b/lib/ui/pages/backup_details/backup_details.dart index 36d76c29..f909e481 100644 --- a/lib/ui/pages/backup_details/backup_details.dart +++ b/lib/ui/pages/backup_details/backup_details.dart @@ -6,7 +6,7 @@ import 'package:selfprivacy/logic/cubit/backups/backups_cubit.dart'; import 'package:selfprivacy/logic/models/json/backup.dart'; import 'package:selfprivacy/logic/models/state_types.dart'; import 'package:selfprivacy/ui/components/buttons/brand_button.dart'; -import 'package:selfprivacy/ui/components/brand_cards/outlined_card.dart'; +import 'package:selfprivacy/ui/components/cards/outlined_card.dart'; import 'package:selfprivacy/ui/layouts/brand_hero_screen.dart'; import 'package:selfprivacy/ui/components/brand_icons/brand_icons.dart'; import 'package:selfprivacy/ui/helpers/modals.dart'; diff --git a/lib/ui/pages/dns_details/dns_details.dart b/lib/ui/pages/dns_details/dns_details.dart index 61aace92..5efc4164 100644 --- a/lib/ui/pages/dns_details/dns_details.dart +++ b/lib/ui/pages/dns_details/dns_details.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:selfprivacy/config/get_it_config.dart'; import 'package:selfprivacy/logic/cubit/server_installation/server_installation_cubit.dart'; import 'package:selfprivacy/logic/cubit/dns_records/dns_records_cubit.dart'; -import 'package:selfprivacy/ui/components/brand_cards/filled_card.dart'; +import 'package:selfprivacy/ui/components/cards/filled_card.dart'; import 'package:selfprivacy/ui/layouts/brand_hero_screen.dart'; import 'package:selfprivacy/ui/components/brand_icons/brand_icons.dart'; import 'package:selfprivacy/utils/network_utils.dart'; diff --git a/lib/ui/pages/more/console.dart b/lib/ui/pages/more/console.dart index 59ad514a..95670475 100644 --- a/lib/ui/pages/more/console.dart +++ b/lib/ui/pages/more/console.dart @@ -48,7 +48,8 @@ class _ConsolePageState extends State { ), actions: [ IconButton( - icon: Icon(paused ? Icons.play_arrow_outlined : Icons.pause_outlined), + icon: Icon( + paused ? Icons.play_arrow_outlined : Icons.pause_outlined), onPressed: () => setState(() => paused = !paused), ), ], diff --git a/lib/ui/pages/more/more.dart b/lib/ui/pages/more/more.dart index 20eaeb2d..3d85b093 100644 --- a/lib/ui/pages/more/more.dart +++ b/lib/ui/pages/more/more.dart @@ -6,7 +6,7 @@ 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/brand_cards/filled_card.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'; import 'package:selfprivacy/utils/breakpoints.dart'; diff --git a/lib/ui/pages/recovery_key/recovery_key.dart b/lib/ui/pages/recovery_key/recovery_key.dart index e96d2f44..86d678bb 100644 --- a/lib/ui/pages/recovery_key/recovery_key.dart +++ b/lib/ui/pages/recovery_key/recovery_key.dart @@ -7,7 +7,7 @@ import 'package:selfprivacy/logic/common_enum/common_enum.dart'; import 'package:selfprivacy/logic/cubit/recovery_key/recovery_key_cubit.dart'; import 'package:selfprivacy/logic/cubit/server_installation/server_installation_cubit.dart'; import 'package:selfprivacy/ui/components/buttons/brand_button.dart'; -import 'package:selfprivacy/ui/components/brand_cards/filled_card.dart'; +import 'package:selfprivacy/ui/components/cards/filled_card.dart'; import 'package:selfprivacy/ui/layouts/brand_hero_screen.dart'; import 'package:selfprivacy/ui/pages/recovery_key/recovery_key_receiving.dart'; import 'package:selfprivacy/utils/route_transitions/basic.dart'; diff --git a/lib/ui/pages/server_details/server_details_screen.dart b/lib/ui/pages/server_details/server_details_screen.dart index 6707d287..a3a521b5 100644 --- a/lib/ui/pages/server_details/server_details_screen.dart +++ b/lib/ui/pages/server_details/server_details_screen.dart @@ -11,7 +11,7 @@ import 'package:selfprivacy/logic/cubit/server_volumes/server_volume_cubit.dart' import 'package:selfprivacy/logic/models/auto_upgrade_settings.dart'; import 'package:selfprivacy/logic/models/job.dart'; import 'package:selfprivacy/ui/components/buttons/segmented_buttons.dart'; -import 'package:selfprivacy/ui/components/brand_cards/filled_card.dart'; +import 'package:selfprivacy/ui/components/cards/filled_card.dart'; import 'package:selfprivacy/ui/layouts/brand_hero_screen.dart'; import 'package:selfprivacy/ui/components/brand_icons/brand_icons.dart'; import 'package:selfprivacy/ui/components/brand_loader/brand_loader.dart'; 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 d747cafa..cdb3339b 100644 --- a/lib/ui/pages/server_storage/binds_migration/services_migration.dart +++ b/lib/ui/pages/server_storage/binds_migration/services_migration.dart @@ -12,8 +12,6 @@ import 'package:selfprivacy/logic/models/disk_status.dart'; import 'package:selfprivacy/ui/components/jobs_content/jobs_content.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'; -import 'package:selfprivacy/ui/pages/root_route.dart'; -import 'package:selfprivacy/utils/route_transitions/basic.dart'; @RoutePage() class ServicesMigrationPage extends StatefulWidget { @@ -176,10 +174,7 @@ class _ServicesMigrationPageState extends State { } } } - Navigator.of(context).pushAndRemoveUntil( - materialRoute(const RootPage()), - (final predicate) => false, - ); + context.router.popUntilRoot(); showModalBottomSheet( context: context, builder: (final BuildContext context) => const JobsContent(), diff --git a/lib/ui/pages/services/service_page.dart b/lib/ui/pages/services/service_page.dart index ff3b0e38..0c7beafb 100644 --- a/lib/ui/pages/services/service_page.dart +++ b/lib/ui/pages/services/service_page.dart @@ -7,7 +7,7 @@ import 'package:selfprivacy/logic/cubit/server_volumes/server_volume_cubit.dart' import 'package:selfprivacy/logic/cubit/services/services_cubit.dart'; import 'package:selfprivacy/logic/models/job.dart'; import 'package:selfprivacy/logic/models/service.dart'; -import 'package:selfprivacy/ui/components/brand_cards/filled_card.dart'; +import 'package:selfprivacy/ui/components/cards/filled_card.dart'; import 'package:selfprivacy/ui/layouts/brand_hero_screen.dart'; import 'package:selfprivacy/ui/router/router.dart'; import 'package:selfprivacy/utils/launch_url.dart'; diff --git a/lib/ui/pages/setup/initializing/server_provider_picker.dart b/lib/ui/pages/setup/initializing/server_provider_picker.dart index 4e09ae82..1257cc75 100644 --- a/lib/ui/pages/setup/initializing/server_provider_picker.dart +++ b/lib/ui/pages/setup/initializing/server_provider_picker.dart @@ -8,7 +8,7 @@ import 'package:selfprivacy/logic/cubit/support_system/support_system_cubit.dart import 'package:selfprivacy/logic/models/hive/server_details.dart'; import 'package:selfprivacy/ui/components/buttons/brand_button.dart'; import 'package:selfprivacy/ui/components/buttons/outlined_button.dart'; -import 'package:selfprivacy/ui/components/brand_cards/outlined_card.dart'; +import 'package:selfprivacy/ui/components/cards/outlined_card.dart'; import 'package:selfprivacy/ui/components/info_box/info_box.dart'; import 'package:selfprivacy/ui/layouts/responsive_layout_with_infobox.dart'; import 'package:selfprivacy/utils/launch_url.dart'; diff --git a/lib/ui/pages/setup/recovering/recovery_confirm_server.dart b/lib/ui/pages/setup/recovering/recovery_confirm_server.dart index 1c75ad75..2efcff87 100644 --- a/lib/ui/pages/setup/recovering/recovery_confirm_server.dart +++ b/lib/ui/pages/setup/recovering/recovery_confirm_server.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:selfprivacy/logic/cubit/app_config_dependent/authentication_dependend_cubit.dart'; import 'package:selfprivacy/logic/models/server_basic_info.dart'; import 'package:selfprivacy/ui/components/buttons/brand_button.dart'; -import 'package:selfprivacy/ui/components/brand_cards/filled_card.dart'; +import 'package:selfprivacy/ui/components/cards/filled_card.dart'; import 'package:selfprivacy/ui/layouts/brand_hero_screen.dart'; class RecoveryConfirmServer extends StatefulWidget { diff --git a/lib/ui/pages/setup/recovering/recovery_method_select.dart b/lib/ui/pages/setup/recovering/recovery_method_select.dart index 8713685d..f8cec44a 100644 --- a/lib/ui/pages/setup/recovering/recovery_method_select.dart +++ b/lib/ui/pages/setup/recovering/recovery_method_select.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:selfprivacy/logic/cubit/server_installation/server_installation_cubit.dart'; import 'package:selfprivacy/ui/components/buttons/brand_button.dart'; -import 'package:selfprivacy/ui/components/brand_cards/outlined_card.dart'; +import 'package:selfprivacy/ui/components/cards/outlined_card.dart'; import 'package:selfprivacy/ui/layouts/brand_hero_screen.dart'; import 'package:selfprivacy/ui/pages/setup/recovering/recover_by_old_token.dart'; import 'package:selfprivacy/utils/route_transitions/basic.dart'; diff --git a/lib/ui/pages/users/users.dart b/lib/ui/pages/users/users.dart index fdba2cb5..58cb3b7d 100644 --- a/lib/ui/pages/users/users.dart +++ b/lib/ui/pages/users/users.dart @@ -13,7 +13,7 @@ import 'package:selfprivacy/logic/models/job.dart'; import 'package:selfprivacy/logic/models/hive/user.dart'; import 'package:selfprivacy/ui/components/buttons/brand_button.dart'; import 'package:selfprivacy/ui/components/buttons/outlined_button.dart'; -import 'package:selfprivacy/ui/components/brand_cards/filled_card.dart'; +import 'package:selfprivacy/ui/components/cards/filled_card.dart'; import 'package:selfprivacy/ui/components/brand_header/brand_header.dart'; import 'package:selfprivacy/ui/layouts/brand_hero_screen.dart'; import 'package:selfprivacy/ui/components/brand_icons/brand_icons.dart';