From 2816448ee2ec3f6aa4dc47d32faf3cc8afd0b54a Mon Sep 17 00:00:00 2001 From: Juan Gilsanz Polo Date: Wed, 26 Oct 2022 14:26:31 +0200 Subject: [PATCH] Fab color dynamic based on primary color --- lib/screens/clients/fab.dart | 5 ++++- lib/screens/connect/fab.dart | 5 ++++- lib/screens/filters/fab.dart | 5 ++++- lib/screens/home/fab.dart | 5 ++++- lib/screens/servers/servers.dart | 5 ++++- lib/screens/settings/access_settings/clients_list.dart | 5 ++++- lib/screens/settings/dhcp/dhcp_leases.dart | 5 ++++- lib/screens/settings/dns_rewrites/dns_rewrites.dart | 5 ++++- 8 files changed, 32 insertions(+), 8 deletions(-) diff --git a/lib/screens/clients/fab.dart b/lib/screens/clients/fab.dart index c7e5744..b39b2fa 100644 --- a/lib/screens/clients/fab.dart +++ b/lib/screens/clients/fab.dart @@ -80,7 +80,10 @@ class ClientsFab extends StatelessWidget { return FloatingActionButton( onPressed: () => openAddClient(), - child: const Icon(Icons.add), + child: Icon( + Icons.add, + color: Theme.of(context).primaryColor.computeLuminance() > 0.5 ? Colors.black : Colors.white, + ), ); } } \ No newline at end of file diff --git a/lib/screens/connect/fab.dart b/lib/screens/connect/fab.dart index 0c3204d..c83f94f 100644 --- a/lib/screens/connect/fab.dart +++ b/lib/screens/connect/fab.dart @@ -17,7 +17,10 @@ class FabConnect extends StatelessWidget { return FloatingActionButton( onPressed: openAddServerModal, - child: const Icon(Icons.add_rounded), + child: Icon( + Icons.add_rounded, + color: Theme.of(context).primaryColor.computeLuminance() > 0.5 ? Colors.black : Colors.white, + ), ); } } \ No newline at end of file diff --git a/lib/screens/filters/fab.dart b/lib/screens/filters/fab.dart index 748e9b6..479ea04 100644 --- a/lib/screens/filters/fab.dart +++ b/lib/screens/filters/fab.dart @@ -176,7 +176,10 @@ class FiltersFab extends StatelessWidget { onPressed: type == 'blacklist' || type == 'whitelist' ? () => openAddWhitelistBlacklist() : () => openAddCustomRule(), - child: const Icon(Icons.add), + child: Icon( + Icons.add, + color: Theme.of(context).primaryColor.computeLuminance() > 0.5 ? Colors.black : Colors.white, + ), ); } } \ No newline at end of file diff --git a/lib/screens/home/fab.dart b/lib/screens/home/fab.dart index ce5f8a9..bfa266f 100644 --- a/lib/screens/home/fab.dart +++ b/lib/screens/home/fab.dart @@ -24,7 +24,10 @@ class HomeFab extends StatelessWidget { return serversProvider.serverStatus.loadStatus == 1 ? FloatingActionButton( onPressed: openManagementBottomSheet, - child: const Icon(Icons.shield_rounded), + child: Icon( + Icons.shield_rounded, + color: Theme.of(context).primaryColor.computeLuminance() > 0.5 ? Colors.black : Colors.white, + ), ) : const SizedBox(); } diff --git a/lib/screens/servers/servers.dart b/lib/screens/servers/servers.dart index db0877d..49273f0 100644 --- a/lib/screens/servers/servers.dart +++ b/lib/screens/servers/servers.dart @@ -50,7 +50,10 @@ class _ServersState extends State { ), floatingActionButton: FloatingActionButton( onPressed: openAddServerModal, - child: const Icon(Icons.add), + child: Icon( + Icons.add, + color: Theme.of(context).primaryColor.computeLuminance() > 0.5 ? Colors.black : Colors.white, + ), ), ); } diff --git a/lib/screens/settings/access_settings/clients_list.dart b/lib/screens/settings/access_settings/clients_list.dart index 59b74ce..db71b2d 100644 --- a/lib/screens/settings/access_settings/clients_list.dart +++ b/lib/screens/settings/access_settings/clients_list.dart @@ -319,7 +319,10 @@ class _ClientsListState extends State { isScrollControlled: true ); }, - child: const Icon(Icons.add), + child: Icon( + Icons.add, + color: Theme.of(context).primaryColor.computeLuminance() > 0.5 ? Colors.black : Colors.white, + ), ), ) ] diff --git a/lib/screens/settings/dhcp/dhcp_leases.dart b/lib/screens/settings/dhcp/dhcp_leases.dart index d34cb46..f1033d6 100644 --- a/lib/screens/settings/dhcp/dhcp_leases.dart +++ b/lib/screens/settings/dhcp/dhcp_leases.dart @@ -184,7 +184,10 @@ class DhcpLeases extends StatelessWidget { floatingActionButton: staticLeases == true ? FloatingActionButton( onPressed: openAddStaticLease, - child: const Icon(Icons.add), + child: Icon( + Icons.add, + color: Theme.of(context).primaryColor.computeLuminance() > 0.5 ? Colors.black : Colors.white, + ), ) : null, ); diff --git a/lib/screens/settings/dns_rewrites/dns_rewrites.dart b/lib/screens/settings/dns_rewrites/dns_rewrites.dart index 142a55b..0ad4fbb 100644 --- a/lib/screens/settings/dns_rewrites/dns_rewrites.dart +++ b/lib/screens/settings/dns_rewrites/dns_rewrites.dart @@ -287,7 +287,10 @@ class _DnsRewritesWidgetState extends State { isScrollControlled: true ) }, - child: const Icon(Icons.add), + child: Icon( + Icons.add, + color: Theme.of(context).primaryColor.computeLuminance() > 0.5 ? Colors.black : Colors.white, + ), ), ); }