From 2118f1f02d7c48950a72222746ad7ab363428077 Mon Sep 17 00:00:00 2001 From: Juan Gilsanz Polo Date: Sat, 5 Nov 2022 04:10:49 +0100 Subject: [PATCH] More UI improvements --- lib/screens/settings/dhcp/dhcp.dart | 1 + .../dns_rewrites/delete_dns_rewrite.dart | 2 +- .../settings/dns_rewrites/dns_rewrites.dart | 2 +- .../settings/encryption/custom_text_field.dart | 2 +- lib/screens/settings/encryption/encryption.dart | 17 +++++++++++++---- .../settings/encryption/master_switch.dart | 4 ++-- lib/widgets/custom_radio_list_tile.dart | 16 ++++++++-------- 7 files changed, 27 insertions(+), 17 deletions(-) diff --git a/lib/screens/settings/dhcp/dhcp.dart b/lib/screens/settings/dhcp/dhcp.dart index e5e6c215..b70cc028 100644 --- a/lib/screens/settings/dhcp/dhcp.dart +++ b/lib/screens/settings/dhcp/dhcp.dart @@ -431,6 +431,7 @@ class _DhcpWidgetState extends State { if (selectedInterface!.ipv4Addresses.isNotEmpty) ...[ SectionLabel( label: AppLocalizations.of(context)!.ipv4settings, + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 24), ), Padding( padding: const EdgeInsets.symmetric(horizontal: 16), diff --git a/lib/screens/settings/dns_rewrites/delete_dns_rewrite.dart b/lib/screens/settings/dns_rewrites/delete_dns_rewrite.dart index 7419b2c2..fb2c7059 100644 --- a/lib/screens/settings/dns_rewrites/delete_dns_rewrite.dart +++ b/lib/screens/settings/dns_rewrites/delete_dns_rewrite.dart @@ -17,7 +17,7 @@ class DeleteDnsRewrite extends StatelessWidget { Icon( Icons.delete_rounded, size: 24, - color: Theme.of(context).colorScheme.secondary, + color: Theme.of(context).listTileTheme.iconColor, ), const SizedBox(height: 16), Text( diff --git a/lib/screens/settings/dns_rewrites/dns_rewrites.dart b/lib/screens/settings/dns_rewrites/dns_rewrites.dart index 3d2e77ad..569530f1 100644 --- a/lib/screens/settings/dns_rewrites/dns_rewrites.dart +++ b/lib/screens/settings/dns_rewrites/dns_rewrites.dart @@ -175,7 +175,7 @@ class _DnsRewritesWidgetState extends State { border: Border( bottom: BorderSide( width: 1, - color: Theme.of(context).colorScheme.outline.withOpacity(0.5) + color: Theme.of(context).colorScheme.outline.withOpacity(0.2) ) ) ), diff --git a/lib/screens/settings/encryption/custom_text_field.dart b/lib/screens/settings/encryption/custom_text_field.dart index f068152a..c1498731 100644 --- a/lib/screens/settings/encryption/custom_text_field.dart +++ b/lib/screens/settings/encryption/custom_text_field.dart @@ -27,7 +27,7 @@ class EncryptionTextField extends StatelessWidget { @override Widget build(BuildContext context) { return Padding( - padding: const EdgeInsets.symmetric(horizontal: 24), + padding: const EdgeInsets.symmetric(horizontal: 16), child: ConstrainedBox( constraints: const BoxConstraints( maxHeight: 200 diff --git a/lib/screens/settings/encryption/encryption.dart b/lib/screens/settings/encryption/encryption.dart index d57c5a85..a99d5ec2 100644 --- a/lib/screens/settings/encryption/encryption.dart +++ b/lib/screens/settings/encryption/encryption.dart @@ -305,7 +305,10 @@ class _EncryptionSettingsWidgetState extends State { onEditValidate(); } ), - SectionLabel(label: AppLocalizations.of(context)!.serverConfiguration), + SectionLabel( + label: AppLocalizations.of(context)!.serverConfiguration, + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 24), + ), EncryptionTextField( enabled: enabled, controller: domainNameController, @@ -367,9 +370,12 @@ class _EncryptionSettingsWidgetState extends State { label: AppLocalizations.of(context)!.dnsOverQuicPort, keyboardType: TextInputType.number, ), - SectionLabel(label: AppLocalizations.of(context)!.certificates), + SectionLabel( + label: AppLocalizations.of(context)!.certificates, + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 24), + ), Card( - margin: const EdgeInsets.symmetric(horizontal: 24), + margin: const EdgeInsets.symmetric(horizontal: 16), child: Padding( padding: const EdgeInsets.all(20), child: Row( @@ -489,7 +495,10 @@ class _EncryptionSettingsWidgetState extends State { const SizedBox(height: 10), ], ], - SectionLabel(label: AppLocalizations.of(context)!.privateKey), + SectionLabel( + label: AppLocalizations.of(context)!.privateKey, + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 24), + ), RadioListTile( value: 0, groupValue: privateKeyOption, diff --git a/lib/screens/settings/encryption/master_switch.dart b/lib/screens/settings/encryption/master_switch.dart index 61c1f140..5632cc8c 100644 --- a/lib/screens/settings/encryption/master_switch.dart +++ b/lib/screens/settings/encryption/master_switch.dart @@ -16,8 +16,8 @@ class EncryptionMasterSwitch extends StatelessWidget { return Padding( padding: const EdgeInsets.only( top: 10, - left: 24, - right: 24 + left: 16, + right: 16 ), child: Material( color: Theme.of(context).primaryColor.withOpacity(0.1), diff --git a/lib/widgets/custom_radio_list_tile.dart b/lib/widgets/custom_radio_list_tile.dart index 8af37aa8..b800aa32 100644 --- a/lib/widgets/custom_radio_list_tile.dart +++ b/lib/widgets/custom_radio_list_tile.dart @@ -32,8 +32,15 @@ class CustomRadioListTile extends StatelessWidget { vertical: 12 ), child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisAlignment: MainAxisAlignment.start, children: [ + const SizedBox(width: 8), + CustomRadio( + value: value, + groupValue: groupValue, + backgroundColor: radioBackgroundColor, + ), + const SizedBox(width: 24), Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -62,13 +69,6 @@ class CustomRadioListTile extends StatelessWidget { ] ], ), - const SizedBox(width: 16), - CustomRadio( - value: value, - groupValue: groupValue, - backgroundColor: radioBackgroundColor, - ), - const SizedBox(width: 8), ], ), ),