luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-04-20 13:59:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug fixes

Browse source
This commit is contained in:
Juan Gilsanz Polo 2024-02-09 03:00:42 +01:00
parent eb703c6f58
commit ca4fa5d7df
7 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/screens/clients/clients.dart
View file

@ -23,7 +23,7 @@ class _ClientsState extends State<Clients> with TickerProviderStateMixin {
return Scaffold( return Scaffold(
body: LayoutBuilder( body: LayoutBuilder(
builder: (context, constraints) { builder: (context, constraints) {
if (constraints.maxWidth > 1000) { if (constraints.maxWidth > 900) {
return SplitView.material( return SplitView.material(
hideDivider: true, hideDivider: true,
flexWidth: const FlexWidth(mainViewFlexWidth: 1, secondaryViewFlexWidth: 2), flexWidth: const FlexWidth(mainViewFlexWidth: 1, secondaryViewFlexWidth: 2),

4
lib/screens/filters/add_button.dart
View file

@ -6,8 +6,8 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/screens/filters/modals/add_custom_rule/edit_custom_rules.dart'; import 'package:adguard_home_manager/screens/filters/modals/custom_rules/edit_custom_rules.dart';
import 'package:adguard_home_manager/screens/filters/modals/add_custom_rule/add_custom_rule.dart'; import 'package:adguard_home_manager/screens/filters/modals/custom_rules/add_custom_rule.dart';
import 'package:adguard_home_manager/screens/filters/details/add_list_modal.dart'; import 'package:adguard_home_manager/screens/filters/details/add_list_modal.dart';
import 'package:adguard_home_manager/providers/filtering_provider.dart'; import 'package:adguard_home_manager/providers/filtering_provider.dart';

27
lib/screens/filters/filters_triple_column.dart
View file

@ -247,21 +247,34 @@ class FiltersTripleColumn extends StatelessWidget {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Text( Flexible(
AppLocalizations.of(context)!.customRules, child: Text(
style: const TextStyle( AppLocalizations.of(context)!.customRules,
fontSize: 18, overflow: TextOverflow.ellipsis,
fontWeight: FontWeight.w500 style: const TextStyle(
fontSize: 18,
fontWeight: FontWeight.w500
),
), ),
), ),
const SizedBox(width: 16),
AddFiltersButton( AddFiltersButton(
type: '', type: 'edit_custom_rule',
widget: (fn) => IconButton(
onPressed: fn,
icon: const Icon(Icons.edit_rounded),
tooltip: AppLocalizations.of(context)!.editCustomRules,
)
),
const SizedBox(width: 8),
AddFiltersButton(
type: 'add_custom_rule',
widget: (fn) => IconButton( widget: (fn) => IconButton(
onPressed: fn, onPressed: fn,
icon: const Icon(Icons.add_rounded), icon: const Icon(Icons.add_rounded),
tooltip: AppLocalizations.of(context)!.addCustomRule, tooltip: AppLocalizations.of(context)!.addCustomRule,
) )
) ),
], ],
), ),
), ),

2
lib/screens/filters/modals/add_custom_rule/add_custom_rule.dart → lib/screens/filters/modals/custom_rules/add_custom_rule.dart
View file

@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:segmented_button_slide/segmented_button_slide.dart'; import 'package:segmented_button_slide/segmented_button_slide.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/screens/filters/modals/add_custom_rule/custom_rule_docs.dart'; import 'package:adguard_home_manager/screens/filters/modals/custom_rules/custom_rule_docs.dart';
enum _BlockingPresets { block, unblock, custom } enum _BlockingPresets { block, unblock, custom }

0
lib/screens/filters/modals/add_custom_rule/custom_rule_docs.dart → lib/screens/filters/modals/custom_rules/custom_rule_docs.dart
View file

5
lib/screens/filters/modals/add_custom_rule/edit_custom_rules.dart → lib/screens/filters/modals/custom_rules/edit_custom_rules.dart
View file

@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/screens/filters/modals/add_custom_rule/custom_rule_docs.dart'; import 'package:adguard_home_manager/screens/filters/modals/custom_rules/custom_rule_docs.dart';
import 'package:adguard_home_manager/providers/filtering_provider.dart'; import 'package:adguard_home_manager/providers/filtering_provider.dart';
@ -26,7 +26,6 @@ class _EditCustomRulesState extends State<EditCustomRules> {
@override @override
void initState() { void initState() {
final filteringProvider = Provider.of<FilteringProvider>(context, listen: false); final filteringProvider = Provider.of<FilteringProvider>(context, listen: false);
print(filteringProvider.filtering!.userRules);
if (filteringProvider.filtering != null) { if (filteringProvider.filtering != null) {
_fieldController.text = filteringProvider.filtering!.userRules.join("\n"); _fieldController.text = filteringProvider.filtering!.userRules.join("\n");
} }
@ -87,7 +86,7 @@ class _EditCustomRulesState extends State<EditCustomRules> {
), ),
const SizedBox(width: 8), const SizedBox(width: 8),
Text( Text(
AppLocalizations.of(context)!.addCustomRule, AppLocalizations.of(context)!.editCustomRules,
style: const TextStyle( style: const TextStyle(
fontSize: 22 fontSize: 22
), ),

4
lib/screens/settings/settings.dart
View file

@ -83,6 +83,8 @@ class _SettingsWidget extends StatefulWidget {
} }
class _SettingsWidgetState extends State<_SettingsWidget> { class _SettingsWidgetState extends State<_SettingsWidget> {
final scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
@override @override
void initState() { void initState() {
Provider.of<AppConfigProvider>(context, listen: false).setSelectedSettingsScreen(screen: null); Provider.of<AppConfigProvider>(context, listen: false).setSelectedSettingsScreen(screen: null);
@ -102,7 +104,7 @@ class _SettingsWidgetState extends State<_SettingsWidget> {
} }
return ScaffoldMessenger( return ScaffoldMessenger(
key: widget.twoColumns ? GlobalKey() : null, key: widget.twoColumns ? scaffoldMessengerKey : null,
child: Scaffold( child: Scaffold(
body: NestedScrollView( body: NestedScrollView(
headerSliverBuilder: (context, innerBoxIsScrolled) => [ headerSliverBuilder: (context, innerBoxIsScrolled) => [