From 427636baf3724ce047c75f51eae54628ff2cdde2 Mon Sep 17 00:00:00 2001 From: Juan Gilsanz Polo Date: Fri, 28 Oct 2022 01:53:42 +0200 Subject: [PATCH] Some UI improvements --- lib/screens/clients/clients.dart | 20 +++++++++--- lib/screens/filters/filters.dart | 31 +++++++++++++++---- lib/screens/logs/logs.dart | 17 ++++++++++ .../access_settings/access_settings.dart | 31 +++++++++++++++---- 4 files changed, 83 insertions(+), 16 deletions(-) diff --git a/lib/screens/clients/clients.dart b/lib/screens/clients/clients.dart index 14fb109..97074d7 100644 --- a/lib/screens/clients/clients.dart +++ b/lib/screens/clients/clients.dart @@ -123,12 +123,24 @@ class _ClientsWidgetState extends State with TickerProviderStateM controller: tabController, tabs: [ Tab( - icon: const Icon(Icons.devices), - text: AppLocalizations.of(context)!.activeClients, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Icon(Icons.devices), + const SizedBox(width: 20), + Text(AppLocalizations.of(context)!.activeClients) + ], + ), ), Tab( - icon: const Icon(Icons.add), - text: AppLocalizations.of(context)!.added, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Icon(Icons.add), + const SizedBox(width: 20), + Text(AppLocalizations.of(context)!.added) + ], + ), ), ] ) diff --git a/lib/screens/filters/filters.dart b/lib/screens/filters/filters.dart index 5c36fee..610b721 100644 --- a/lib/screens/filters/filters.dart +++ b/lib/screens/filters/filters.dart @@ -366,18 +366,37 @@ class _FiltersWidgetState extends State with TickerProviderStateM ] : [], bottom: TabBar( controller: tabController, + isScrollable: true, tabs: [ Tab( - icon: const Icon(Icons.verified_user_rounded), - text: AppLocalizations.of(context)!.whitelists, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Icon(Icons.verified_user_rounded), + const SizedBox(width: 20), + Text(AppLocalizations.of(context)!.whitelists), + ], + ), ), Tab( - icon: const Icon(Icons.gpp_bad_rounded), - text: AppLocalizations.of(context)!.blacklists, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Icon(Icons.gpp_bad_rounded), + const SizedBox(width: 20), + Text(AppLocalizations.of(context)!.blacklist), + ], + ), ), Tab( - icon: const Icon(Icons.shield_rounded), - text: AppLocalizations.of(context)!.customRules, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Icon(Icons.shield_rounded), + const SizedBox(width: 20), + Text(AppLocalizations.of(context)!.customRules), + ], + ), ), ] ) diff --git a/lib/screens/logs/logs.dart b/lib/screens/logs/logs.dart index d2a8914..62f4dd4 100644 --- a/lib/screens/logs/logs.dart +++ b/lib/screens/logs/logs.dart @@ -55,6 +55,8 @@ class _LogsWidgetState extends State { bool isLoadingMore = false; + bool showDivider = true; + Future fetchLogs({ int? inOffset, bool? loadingMore, @@ -125,6 +127,12 @@ class _LogsWidgetState extends State { if (scrollController.position.extentAfter < 500 && isLoadingMore == false) { fetchLogs(loadingMore: true); } + if (scrollController.position.pixels > 0) { + setState(() => showDivider = false); + } + else { + setState(() => showDivider = true); + } } @override @@ -363,6 +371,15 @@ class _LogsWidgetState extends State { height: 50, width: double.maxFinite, padding: const EdgeInsets.only(bottom: 10), + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + color: showDivider == true + ? Theme.of(context).dividerColor + : Colors.transparent, + ) + ) + ), child: ListView( scrollDirection: Axis.horizontal, children: [ diff --git a/lib/screens/settings/access_settings/access_settings.dart b/lib/screens/settings/access_settings/access_settings.dart index fd3e1dd..e2c8bad 100644 --- a/lib/screens/settings/access_settings/access_settings.dart +++ b/lib/screens/settings/access_settings/access_settings.dart @@ -90,18 +90,37 @@ class _AccessSettingsWidgetState extends State with Ticker forceElevated: innerBoxIsScrolled, bottom: TabBar( controller: tabController, + isScrollable: true, tabs: [ Tab( - icon: const Icon(Icons.check), - text: AppLocalizations.of(context)!.allowedClients, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Icon(Icons.check), + const SizedBox(width: 20), + Text(AppLocalizations.of(context)!.allowedClients) + ], + ), ), Tab( - icon: const Icon(Icons.block), - text: AppLocalizations.of(context)!.disallowedClients, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Icon(Icons.block), + const SizedBox(width: 20), + Text(AppLocalizations.of(context)!.disallowedClients) + ], + ), ), Tab( - icon: const Icon(Icons.link_rounded), - text: AppLocalizations.of(context)!.disallowedDomains, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Icon(Icons.link_rounded), + const SizedBox(width: 20), + Text(AppLocalizations.of(context)!.disallowedDomains) + ], + ), ), ] )