More UI improvements

JGeek00 · Nov 5, 2022 · 2118f1f · 2118f1f
1 parent 5a12311
commit 2118f1f
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 17 deletions.
diff --git a/lib/screens/settings/dhcp/dhcp.dart b/lib/screens/settings/dhcp/dhcp.dart
@@ -431,6 +431,7 @@ class _DhcpWidgetState extends State<DhcpWidget> {
                 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
@@ -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
@@ -175,7 +175,7 @@ class _DnsRewritesWidgetState extends State<DnsRewritesWidget> {
                     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
@@ -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
@@ -305,7 +305,10 @@ class _EncryptionSettingsWidgetState extends State<EncryptionSettingsWidget> {
                   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<EncryptionSettingsWidget> {
                 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<EncryptionSettingsWidget> {
                   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
@@ -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
@@ -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),
             ],
           ),
         ),