luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-06-07 15:17:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes and improvements

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-04-13 02:05:00 +02:00
parent 38172a2c1c
commit e77c31b367
1 changed files with 83 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

163
lib/screens/home/management_modal.dart
View file

@ -21,8 +21,6 @@ class ManagementModal extends StatefulWidget {
} }
class _ManagementModalState extends State<ManagementModal> with SingleTickerProviderStateMixin { class _ManagementModalState extends State<ManagementModal> with SingleTickerProviderStateMixin {
double height = 540;
bool showTimes = false;
late AnimationController animationController; late AnimationController animationController;
late Animation<double> animation; late Animation<double> animation;
final ExpandableController expandableController = ExpandableController(); final ExpandableController expandableController = ExpandableController();
@ -142,7 +140,7 @@ class _ManagementModalState extends State<ManagementModal> with SingleTickerProv
} }
} }
void disableWithCountdown(int time) { void disableWithCountdown(int time) async {
updateBlocking(value: false, filter: 'general', time: time); updateBlocking(value: false, filter: 'general', time: time);
expandableController.toggle(); expandableController.toggle();
} }
@ -263,6 +261,10 @@ class _ManagementModalState extends State<ManagementModal> with SingleTickerProv
color: Theme.of(context).primaryColor.withOpacity(0.1) color: Theme.of(context).primaryColor.withOpacity(0.1)
), ),
child: Expandable( child: Expandable(
theme: const ExpandableThemeData(
animationDuration: Duration(milliseconds: 200),
fadeCurve: Curves.ease
),
collapsed: topRow(), collapsed: topRow(),
expanded: Column( expanded: Column(
children: [ children: [
@ -326,90 +328,91 @@ class _ManagementModalState extends State<ManagementModal> with SingleTickerProv
); );
} }
return Container( return SafeArea(
width: double.maxFinite, child: Container(
height: Platform.isIOS ? height+16 : height, decoration: BoxDecoration(
decoration: BoxDecoration( color: Theme.of(context).colorScheme.surface,
color: Theme.of(context).dialogBackgroundColor, borderRadius: const BorderRadius.only(
borderRadius: const BorderRadius.only( topLeft: Radius.circular(28),
topLeft: Radius.circular(28), topRight: Radius.circular(28)
topRight: Radius.circular(28) )
) ),
), child: Wrap(
child: Column( children: [
children: [ Row(
Expanded( mainAxisAlignment: MainAxisAlignment.center,
child: ListView(
physics: (Platform.isIOS ? height+16 : height) < MediaQuery.of(context).size.height
? const NeverScrollableScrollPhysics()
: null,
children: [ children: [
Padding( Column(
padding: const EdgeInsets.only(top: 24), crossAxisAlignment: CrossAxisAlignment.center,
child: Icon( children: [
Icons.shield_rounded, Padding(
size: 24, padding: const EdgeInsets.only(top: 24),
color: Theme.of(context).listTileTheme.iconColor child: Icon(
), Icons.shield_rounded,
), size: 24,
Padding( color: Theme.of(context).listTileTheme.iconColor
padding: const EdgeInsets.symmetric(vertical: 16),
child: Text(
AppLocalizations.of(context)!.manageServer,
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 24,
color: Theme.of(context).colorScheme.onSurface,
), ),
), ),
), Padding(
mainSwitch(), padding: const EdgeInsets.symmetric(vertical: 16),
const SizedBox(height: 10), child: Text(
smallSwitch( AppLocalizations.of(context)!.manageServer,
AppLocalizations.of(context)!.ruleFiltering, textAlign: TextAlign.center,
Icons.filter_list_rounded, style: TextStyle(
serversProvider.serverStatus.data!.filteringEnabled, fontSize: 24,
(value) => updateBlocking(value: value, filter: 'filtering'), color: Theme.of(context).colorScheme.onSurface,
serversProvider.protectionsManagementProcess.contains('filtering') ),
), ),
smallSwitch( ),
AppLocalizations.of(context)!.safeBrowsing, ],
Icons.vpn_lock_rounded,
serversProvider.serverStatus.data!.safeBrowsingEnabled,
(value) => updateBlocking(value: value, filter: 'safeBrowsing'),
serversProvider.protectionsManagementProcess.contains('safeBrowsing')
),
smallSwitch(
AppLocalizations.of(context)!.parentalFiltering,
Icons.block,
serversProvider.serverStatus.data!.parentalControlEnabled,
(value) => updateBlocking(value: value, filter: 'parentalControl'),
serversProvider.protectionsManagementProcess.contains('parentalControl')
),
smallSwitch(
AppLocalizations.of(context)!.safeSearch,
Icons.search_rounded,
serversProvider.serverStatus.data!.safeSearchEnabled,
(value) => updateBlocking(value: value, filter: 'safeSearch'),
serversProvider.protectionsManagementProcess.contains('safeSearch')
), ),
], ],
), ),
), mainSwitch(),
Padding( const SizedBox(height: 10),
padding: const EdgeInsets.all(24), smallSwitch(
child: Row( AppLocalizations.of(context)!.ruleFiltering,
mainAxisAlignment: MainAxisAlignment.end, Icons.filter_list_rounded,
children: [ serversProvider.serverStatus.data!.filteringEnabled,
TextButton( (value) => updateBlocking(value: value, filter: 'filtering'),
onPressed: () => Navigator.pop(context), serversProvider.protectionsManagementProcess.contains('filtering')
child: Text(AppLocalizations.of(context)!.close),
),
],
), ),
), smallSwitch(
if (Platform.isIOS) const SizedBox(height: 16) AppLocalizations.of(context)!.safeBrowsing,
], Icons.vpn_lock_rounded,
serversProvider.serverStatus.data!.safeBrowsingEnabled,
(value) => updateBlocking(value: value, filter: 'safeBrowsing'),
serversProvider.protectionsManagementProcess.contains('safeBrowsing')
),
smallSwitch(
AppLocalizations.of(context)!.parentalFiltering,
Icons.block,
serversProvider.serverStatus.data!.parentalControlEnabled,
(value) => updateBlocking(value: value, filter: 'parentalControl'),
serversProvider.protectionsManagementProcess.contains('parentalControl')
),
smallSwitch(
AppLocalizations.of(context)!.safeSearch,
Icons.search_rounded,
serversProvider.serverStatus.data!.safeSearchEnabled,
(value) => updateBlocking(value: value, filter: 'safeSearch'),
serversProvider.protectionsManagementProcess.contains('safeSearch')
),
Padding(
padding: const EdgeInsets.all(24),
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
TextButton(
onPressed: () => Navigator.pop(context),
child: Text(AppLocalizations.of(context)!.close),
),
],
),
),
if (Platform.isIOS) const SizedBox(height: 16)
],
),
), ),
); );
} }