diff --git a/lib/screens/filters/add_custom_rule.dart b/lib/screens/filters/add_custom_rule.dart index 82b6bb9..a0941c1 100644 --- a/lib/screens/filters/add_custom_rule.dart +++ b/lib/screens/filters/add_custom_rule.dart @@ -91,47 +91,6 @@ class _AddCustomRuleState extends State { @override Widget build(BuildContext context) { - final appConfigProvider = Provider.of(context); - - Map presets = { - 0: Text( - AppLocalizations.of(context)!.block, - style: TextStyle( - color: appConfigProvider.useDynamicColor == true - ? Theme.of(context).floatingActionButtonTheme.foregroundColor! - : preset == 0 - ? Colors.white - : Theme.of(context).colorScheme.primary, - fontSize: 14, - fontWeight: FontWeight.w500 - ), - ), - 1: Text( - AppLocalizations.of(context)!.unblock, - style: TextStyle( - color: appConfigProvider.useDynamicColor == true - ? Theme.of(context).floatingActionButtonTheme.foregroundColor! - : preset == 1 - ? Colors.white - : Theme.of(context).colorScheme.primary, - fontSize: 14, - fontWeight: FontWeight.w500 - ), - ), - 2: Text( - AppLocalizations.of(context)!.custom, - style: TextStyle( - color: appConfigProvider.useDynamicColor == true - ? Theme.of(context).floatingActionButtonTheme.foregroundColor! - : preset == 2 - ? Colors.white - : Theme.of(context).colorScheme.primary, - fontSize: 14, - fontWeight: FontWeight.w500 - ), - ), - }; - return Scaffold( appBar: AppBar( title: Text(AppLocalizations.of(context)!.addCustomRule), @@ -403,38 +362,4 @@ class _AddCustomRuleState extends State { ), ); } -} - // Padding( - // padding: const EdgeInsets.only( - // left: 28, - // right: 28, - // top: 20, - // bottom: 28 - // ), - // child: Row( - // mainAxisAlignment: MainAxisAlignment.end, - // children: [ - // TextButton( - // onPressed: () => Navigator.pop(context), - // child: Text(AppLocalizations.of(context)!.cancel) - // ), - // const SizedBox(width: 20), - // TextButton( - // onPressed: checkValidValues() == true - // ? () { - // Navigator.pop(context); - // widget.onConfirm(buildRule()); - // } - // : null, - // child: Text( - // AppLocalizations.of(context)!.confirm, - // style: TextStyle( - // color: checkValidValues() == true - // ? Theme.of(context).colorScheme.primary - // : Colors.grey - // ), - // ) - // ), - // ], - // ), - // ) \ No newline at end of file +} \ No newline at end of file diff --git a/lib/widgets/servers_list/servers_list.dart b/lib/widgets/servers_list/servers_list.dart index 1d6123c..ea0fc35 100644 --- a/lib/widgets/servers_list/servers_list.dart +++ b/lib/widgets/servers_list/servers_list.dart @@ -187,12 +187,12 @@ class _ServersListState extends State with SingleTickerProviderStat Container( padding: const EdgeInsets.all(1), decoration: BoxDecoration( - color: Theme.of(context).floatingActionButtonTheme.backgroundColor, + color: Theme.of(context).colorScheme.primaryContainer, borderRadius: BorderRadius.circular(20) ), child: Icon( Icons.star, - color: Theme.of(context).floatingActionButtonTheme.foregroundColor, + color: Theme.of(context).colorScheme.onPrimaryContainer, size: 10, ), ),