From cb660eb2bb1e08c8864c36a33a19711d3322735e Mon Sep 17 00:00:00 2001
From: Inex Code <inex.code@selfprivacy.org>
Date: Sun, 18 Sep 2022 17:17:13 +0300
Subject: [PATCH] Refactor server_settings.dart to use vanilla ListTiles

---
 .../server_details/server_details_screen.dart |  6 +-
 .../pages/server_details/server_settings.dart | 90 +++++--------------
 2 files changed, 25 insertions(+), 71 deletions(-)

diff --git a/lib/ui/pages/server_details/server_details_screen.dart b/lib/ui/pages/server_details/server_details_screen.dart
index 4d5d5ebd59..367d8de8c6 100644
--- a/lib/ui/pages/server_details/server_details_screen.dart
+++ b/lib/ui/pages/server_details/server_details_screen.dart
@@ -16,7 +16,6 @@ import 'package:selfprivacy/ui/components/brand_icons/brand_icons.dart';
 import 'package:selfprivacy/ui/components/brand_loader/brand_loader.dart';
 import 'package:selfprivacy/ui/components/brand_text/brand_text.dart';
 import 'package:selfprivacy/ui/components/list_tiles/list_tile_on_surface_variant.dart';
-import 'package:selfprivacy/ui/components/switch_block/switch_bloc.dart';
 import 'package:selfprivacy/ui/pages/server_storage/storage_card.dart';
 import 'package:selfprivacy/ui/pages/server_details/time_zone/lang.dart';
 import 'package:selfprivacy/utils/extensions/duration.dart';
@@ -85,6 +84,8 @@ class _ServerDetailsScreenState extends State<ServerDetailsScreen>
           StorageCard(
             diskStatus: context.watch<ApiServerVolumeCubit>().state.diskStatus,
           ),
+          const SizedBox(height: 16),
+          const _ServerSettings(),
           const Divider(height: 32),
           Text(
             'providers.server.resource_usage'.tr(),
@@ -95,9 +96,8 @@ class _ServerDetailsScreenState extends State<ServerDetailsScreen>
             create: (final context) => HetznerMetricsCubit()..restart(),
             child: _Chart(),
           ),
-          const Divider(height: 32),
+          const SizedBox(height: 8),
           _TextDetails(),
-          const _ServerSettings(),
         ],
       ),
     );
diff --git a/lib/ui/pages/server_details/server_settings.dart b/lib/ui/pages/server_details/server_settings.dart
index 62269496f7..9a35e74a73 100644
--- a/lib/ui/pages/server_details/server_settings.dart
+++ b/lib/ui/pages/server_details/server_settings.dart
@@ -26,8 +26,9 @@ class _ServerSettingsState extends State<_ServerSettings> {
 
     return Column(
       children: [
-        SwitcherBlock(
-          onChange: (final switched) {
+        SwitchListTile(
+          value: allowAutoUpgrade ?? false,
+          onChanged: (final switched) {
             context
                 .read<ServerDetailsCubit>()
                 .repository
@@ -41,15 +42,15 @@ class _ServerSettingsState extends State<_ServerSettings> {
               allowAutoUpgrade = switched;
             });
           },
-          isActive: allowAutoUpgrade ?? false,
-          child: _TextColumn(
-            title: 'providers.server.settings.allow_autoupgrade'.tr(),
-            value: 'providers.server.settings.allow_autoupgrade_hint'.tr(),
+          title: Text('providers.server.settings.allow_autoupgrade'.tr()),
+          subtitle: Text(
+            'providers.server.settings.allow_autoupgrade_hint'.tr(),
           ),
+          activeColor: Theme.of(context).colorScheme.primary,
         ),
-        const Divider(height: 0),
-        SwitcherBlock(
-          onChange: (final switched) {
+        SwitchListTile(
+          value: rebootAfterUpgrade ?? false,
+          onChanged: (final switched) {
             context
                 .read<ServerDetailsCubit>()
                 .repository
@@ -59,20 +60,21 @@ class _ServerSettingsState extends State<_ServerSettings> {
                     allowReboot: switched,
                   ),
                 );
-            setState(
-              () {
-                rebootAfterUpgrade = switched;
-              },
-            );
+            setState(() {
+              rebootAfterUpgrade = switched;
+            });
           },
-          isActive: rebootAfterUpgrade ?? false,
-          child: _TextColumn(
-            title: 'providers.server.settings.reboot_after_upgrade'.tr(),
-            value: 'providers.server.settings.reboot_after_upgrade_hint'.tr(),
+          title: Text('providers.server.settings.reboot_after_upgrade'.tr()),
+          subtitle: Text(
+            'providers.server.settings.reboot_after_upgrade_hint'.tr(),
           ),
+          activeColor: Theme.of(context).colorScheme.primary,
         ),
-        const Divider(height: 0),
-        _Button(
+        ListTile(
+          title: Text('providers.server.settings.server_timezone'.tr()),
+          subtitle: Text(
+            serverDetailsState.serverTimezone.toString(),
+          ),
           onTap: () {
             Navigator.of(context).push(
               materialRoute(
@@ -80,56 +82,8 @@ class _ServerSettingsState extends State<_ServerSettings> {
               ),
             );
           },
-          child: _TextColumn(
-            title: 'providers.server.settings.server_timezone'.tr(),
-            value: serverDetailsState.serverTimezone.toString(),
-          ),
         ),
       ],
     );
   }
 }
-
-class _Button extends StatelessWidget {
-  const _Button({
-    required this.onTap,
-    required this.child,
-  });
-
-  final Widget child;
-  final VoidCallback onTap;
-
-  @override
-  Widget build(final BuildContext context) => InkWell(
-        onTap: onTap,
-        child: Container(
-          padding: const EdgeInsets.symmetric(vertical: 16),
-          child: child,
-        ),
-      );
-}
-
-class _TextColumn extends StatelessWidget {
-  const _TextColumn({
-    required this.title,
-    required this.value,
-  });
-
-  final String title;
-  final String value;
-  @override
-  Widget build(final BuildContext context) => Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          BrandText.body1(
-            title,
-            style: Theme.of(context).textTheme.bodyLarge,
-          ),
-          const SizedBox(height: 5),
-          BrandText.body1(
-            value,
-            style: Theme.of(context).textTheme.bodyMedium,
-          ),
-        ],
-      );
-}