diff --git a/lib/screens/clients/added_list.dart b/lib/screens/clients/added_list.dart index f5d5782..01691cc 100644 --- a/lib/screens/clients/added_list.dart +++ b/lib/screens/clients/added_list.dart @@ -209,6 +209,7 @@ class _AddedListState extends State { padding: const EdgeInsets.only(top: 0), itemCount: widget.data.length, itemBuilder: (context, index) => ListTile( + contentPadding: const EdgeInsets.symmetric(horizontal: 20, vertical: 15), isThreeLine: true, onLongPress: () => openOptionsModal(widget.data[index]), onTap: () => openClientModal(widget.data[index]), diff --git a/lib/screens/clients/search_clients.dart b/lib/screens/clients/search_clients.dart index 48ee764..a5391a7 100644 --- a/lib/screens/clients/search_clients.dart +++ b/lib/screens/clients/search_clients.dart @@ -17,7 +17,7 @@ import 'package:adguard_home_manager/classes/process_modal.dart'; import 'package:adguard_home_manager/functions/snackbar.dart'; import 'package:adguard_home_manager/providers/app_config_provider.dart'; import 'package:adguard_home_manager/models/clients.dart'; -import 'package:adguard_home_manager/screens/settings/section_label.dart'; +import 'package:adguard_home_manager/widgets/section_label.dart'; import 'package:adguard_home_manager/providers/servers_provider.dart'; class SearchClients extends StatelessWidget { @@ -243,13 +243,19 @@ class _SearchClientsWidgetState extends State { ? ListView( children: [ if (clientsScreen.isNotEmpty) ...[ - SectionLabel(label: AppLocalizations.of(context)!.added), + SectionLabel( + label: AppLocalizations.of(context)!.added, + padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 25), + ), ListView.builder( shrinkWrap: true, primary: false, itemCount: clientsScreen.length, padding: const EdgeInsets.only(bottom: 0), itemBuilder: (context, index) => ListTile( + contentPadding: index == 0 + ? const EdgeInsets.symmetric(horizontal: 20, vertical: 0) + : const EdgeInsets.symmetric(horizontal: 20, vertical: 15), isThreeLine: true, onLongPress: () => openOptionsModal(clientsScreen[index]), onTap: () => openClientModal(clientsScreen[index]), @@ -309,7 +315,10 @@ class _SearchClientsWidgetState extends State { ) ], if (autoClientsScreen.isNotEmpty) ...[ - SectionLabel(label: AppLocalizations.of(context)!.activeClients), + SectionLabel( + label: AppLocalizations.of(context)!.activeClients, + padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 25), + ), ListView.builder( shrinkWrap: true, primary: false, @@ -323,6 +332,9 @@ class _SearchClientsWidgetState extends State { ? autoClientsScreen[index].ip : null, trailing: Text(autoClientsScreen[index].source), + padding: index == 0 + ? const EdgeInsets.symmetric(horizontal: 20) + : null, ) ) ] diff --git a/lib/screens/settings/dhcp/dhcp.dart b/lib/screens/settings/dhcp/dhcp.dart index 606064d..04c368c 100644 --- a/lib/screens/settings/dhcp/dhcp.dart +++ b/lib/screens/settings/dhcp/dhcp.dart @@ -5,7 +5,7 @@ import 'package:provider/provider.dart'; import 'package:bottom_sheet/bottom_sheet.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:adguard_home_manager/screens/settings/section_label.dart'; +import 'package:adguard_home_manager/widgets/section_label.dart'; import 'package:adguard_home_manager/screens/settings/dhcp/dhcp_leases.dart'; import 'package:adguard_home_manager/screens/settings/dhcp/select_interface_modal.dart'; diff --git a/lib/screens/settings/dns/dns_server_settings.dart b/lib/screens/settings/dns/dns_server_settings.dart index 394e57a..c062a71 100644 --- a/lib/screens/settings/dns/dns_server_settings.dart +++ b/lib/screens/settings/dns/dns_server_settings.dart @@ -5,7 +5,7 @@ import 'package:provider/provider.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:adguard_home_manager/widgets/custom_radio_list_tile.dart'; -import 'package:adguard_home_manager/screens/settings/section_label.dart'; +import 'package:adguard_home_manager/widgets/section_label.dart'; import 'package:adguard_home_manager/widgets/custom_switch_list_tile.dart'; import 'package:adguard_home_manager/providers/servers_provider.dart'; diff --git a/lib/screens/settings/dns/upstream_dns.dart b/lib/screens/settings/dns/upstream_dns.dart index da05009..9c5b3ae 100644 --- a/lib/screens/settings/dns/upstream_dns.dart +++ b/lib/screens/settings/dns/upstream_dns.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:adguard_home_manager/screens/settings/section_label.dart'; +import 'package:adguard_home_manager/widgets/section_label.dart'; import 'package:adguard_home_manager/screens/settings/dns/comment_modal.dart'; import 'package:adguard_home_manager/widgets/custom_radio_list_tile.dart'; diff --git a/lib/screens/settings/encryption/encryption.dart b/lib/screens/settings/encryption/encryption.dart index 1fe611e..c4e6a81 100644 --- a/lib/screens/settings/encryption/encryption.dart +++ b/lib/screens/settings/encryption/encryption.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:adguard_home_manager/screens/settings/section_label.dart'; +import 'package:adguard_home_manager/widgets/section_label.dart'; import 'package:adguard_home_manager/screens/settings/encryption/config_error_modal.dart'; import 'package:adguard_home_manager/screens/settings/encryption/custom_text_field.dart'; import 'package:adguard_home_manager/screens/settings/encryption/master_switch.dart'; diff --git a/lib/screens/settings/settings.dart b/lib/screens/settings/settings.dart index a7d7863..a7efc45 100644 --- a/lib/screens/settings/settings.dart +++ b/lib/screens/settings/settings.dart @@ -9,7 +9,7 @@ import 'package:adguard_home_manager/screens/settings/server_info/server_info.da import 'package:adguard_home_manager/screens/settings/encryption/encryption.dart'; import 'package:adguard_home_manager/screens/settings/access_settings/access_settings.dart'; import 'package:adguard_home_manager/screens/settings/dhcp/dhcp.dart'; -import 'package:adguard_home_manager/screens/settings/section_label.dart'; +import 'package:adguard_home_manager/widgets/section_label.dart'; import 'package:adguard_home_manager/screens/settings/dns/dns.dart'; import 'package:adguard_home_manager/screens/settings/dns_rewrites/dns_rewrites.dart'; import 'package:adguard_home_manager/screens/settings/appbar.dart'; diff --git a/lib/screens/settings/section_label.dart b/lib/widgets/section_label.dart similarity index 81% rename from lib/screens/settings/section_label.dart rename to lib/widgets/section_label.dart index c637fce..ef2127e 100644 --- a/lib/screens/settings/section_label.dart +++ b/lib/widgets/section_label.dart @@ -2,10 +2,12 @@ import 'package:flutter/material.dart'; class SectionLabel extends StatelessWidget { final String label; + final EdgeInsets? padding; const SectionLabel({ Key? key, - required this.label + required this.label, + this.padding }) : super(key: key); @override @@ -14,7 +16,7 @@ class SectionLabel extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.start, children: [ Padding( - padding: const EdgeInsets.all(25), + padding: padding ?? const EdgeInsets.all(25), child: Text( label, style: TextStyle(