refactor(ui): Delete BrandCards

lib/ui/components/brand_cards/brand_cards.dart

@@ -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<BoxShadow> 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<BoxShadow> bigShadow = [
-  BoxShadow(
-    offset: const Offset(0, 4),
-    blurRadius: 8,
-    color: Colors.black.withOpacity(.08),
-  )
-];

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: Card(
-                      child: Text(j.title),
+                      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),

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(),
+        subtitle: Text(
-            overflow: TextOverflow.ellipsis, maxLines: 1,),
+          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) =>
+                        .map(
-                            '${entry.message} at ${entry.locations}',)
+                          (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(),
+        subtitle: Text(
-            overflow: TextOverflow.ellipsis, maxLines: 1,),
+          message.operation.toString(),
+          overflow: TextOverflow.ellipsis,
+          maxLines: 1,
+        ),
         leading: const Icon(Icons.arrow_circle_up_outlined),
         iconColor: Theme.of(context).colorScheme.secondary,
         onTap: () => showDialog(

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';
 

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';

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';

lib/ui/pages/more/console.dart

@@ -48,7 +48,8 @@ class _ConsolePageState extends State<ConsolePage> {
             ),
             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),
               ),
             ],

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';

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';

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';

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<ServicesMigrationPage> {
                     }
                   }
                 }
-                Navigator.of(context).pushAndRemoveUntil(
+                context.router.popUntilRoot();
-                  materialRoute(const RootPage()),
-                  (final predicate) => false,
-                );
                 showModalBottomSheet(
                   context: context,
                   builder: (final BuildContext context) => const JobsContent(),

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';

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';

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 {

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';

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';