SelfPrivacy/selfprivacy.org.app
1
0
Fork 0
mirror of https://git.selfprivacy.org/kherel/selfprivacy.org.app.git synced 2025-01-23 09:16:54 +00:00
Code Issues Projects Releases Wiki Activity

Refactor server_settings.dart to use vanilla ListTiles

Browse source
This commit is contained in:
Inex Code 2022-09-18 17:17:13 +03:00
parent 39358a827f
commit cb660eb2bb
2 changed files with 25 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ui/pages/server_details/server_details_screen.dart
View file

@ -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_loader/brand_loader.dart';
import 'package:selfprivacy/ui/components/brand_text/brand_text.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/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_storage/storage_card.dart';
import 'package:selfprivacy/ui/pages/server_details/time_zone/lang.dart'; import 'package:selfprivacy/ui/pages/server_details/time_zone/lang.dart';
import 'package:selfprivacy/utils/extensions/duration.dart'; import 'package:selfprivacy/utils/extensions/duration.dart';
@ -85,6 +84,8 @@ class _ServerDetailsScreenState extends State<ServerDetailsScreen>
StorageCard( StorageCard(
diskStatus: context.watch<ApiServerVolumeCubit>().state.diskStatus, diskStatus: context.watch<ApiServerVolumeCubit>().state.diskStatus,
), ),
const SizedBox(height: 16),
const _ServerSettings(),
const Divider(height: 32), const Divider(height: 32),
Text( Text(
'providers.server.resource_usage'.tr(), 'providers.server.resource_usage'.tr(),
@ -95,9 +96,8 @@ class _ServerDetailsScreenState extends State<ServerDetailsScreen>
create: (final context) => HetznerMetricsCubit()..restart(), create: (final context) => HetznerMetricsCubit()..restart(),
child: _Chart(), child: _Chart(),
), ),
const Divider(height: 32), const SizedBox(height: 8),
_TextDetails(), _TextDetails(),
const _ServerSettings(),
], ],
), ),
); );

88
lib/ui/pages/server_details/server_settings.dart
View file

@ -26,8 +26,9 @@ class _ServerSettingsState extends State<_ServerSettings> {
return Column( return Column(
children: [ children: [
SwitcherBlock( SwitchListTile(
onChange: (final switched) { value: allowAutoUpgrade ?? false,
onChanged: (final switched) {
context context
.read<ServerDetailsCubit>() .read<ServerDetailsCubit>()
.repository .repository
@ -41,15 +42,15 @@ class _ServerSettingsState extends State<_ServerSettings> {
allowAutoUpgrade = switched; allowAutoUpgrade = switched;
}); });
}, },
isActive: allowAutoUpgrade ?? false, title: Text('providers.server.settings.allow_autoupgrade'.tr()),
child: _TextColumn( subtitle: Text(
title: 'providers.server.settings.allow_autoupgrade'.tr(), 'providers.server.settings.allow_autoupgrade_hint'.tr(),
value: 'providers.server.settings.allow_autoupgrade_hint'.tr(),
), ),
activeColor: Theme.of(context).colorScheme.primary,
), ),
const Divider(height: 0), SwitchListTile(
SwitcherBlock( value: rebootAfterUpgrade ?? false,
onChange: (final switched) { onChanged: (final switched) {
context context
.read<ServerDetailsCubit>() .read<ServerDetailsCubit>()
.repository .repository
@ -59,20 +60,21 @@ class _ServerSettingsState extends State<_ServerSettings> {
allowReboot: switched, allowReboot: switched,
), ),
); );
setState( setState(() {
() {
rebootAfterUpgrade = switched; rebootAfterUpgrade = switched;
});
}, },
); title: Text('providers.server.settings.reboot_after_upgrade'.tr()),
}, subtitle: Text(
isActive: rebootAfterUpgrade ?? false, 'providers.server.settings.reboot_after_upgrade_hint'.tr(),
child: _TextColumn(
title: 'providers.server.settings.reboot_after_upgrade'.tr(),
value: 'providers.server.settings.reboot_after_upgrade_hint'.tr(),
), ),
activeColor: Theme.of(context).colorScheme.primary,
),
ListTile(
title: Text('providers.server.settings.server_timezone'.tr()),
subtitle: Text(
serverDetailsState.serverTimezone.toString(),
), ),
const Divider(height: 0),
_Button(
onTap: () { onTap: () {
Navigator.of(context).push( Navigator.of(context).push(
materialRoute( 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,
),
],
);
}