luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-05-25 11:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved modal bottom sheet scoll

Browse source
This commit is contained in:
Juan Gilsanz Polo 2022-10-02 22:23:20 +02:00
parent 72eba31200
commit 0a35fcefc5
2 changed files with 100 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

196
lib/screens/logs/filter_status_modal.dart
View file

@ -29,6 +29,8 @@ class _FilterStatusModalState extends State<FilterStatusModal> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final logsProvider = Provider.of<LogsProvider>(context); final logsProvider = Provider.of<LogsProvider>(context);
final height = MediaQuery.of(context).size.height;
void apply() async { void apply() async {
logsProvider.setSelectedResultStatus(selectedResultStatus); logsProvider.setSelectedResultStatus(selectedResultStatus);
@ -79,107 +81,107 @@ class _FilterStatusModalState extends State<FilterStatusModal> {
); );
} }
return DraggableScrollableSheet( return Container(
initialChildSize: 0.7, height: height >= 680 == true
minChildSize: 0.2, ? 680
maxChildSize: 0.7, : height-25,
builder: (context, scrollController) => Container( decoration: BoxDecoration(
decoration: BoxDecoration( borderRadius: const BorderRadius.only(
borderRadius: const BorderRadius.only( topLeft: Radius.circular(28),
topLeft: Radius.circular(28), topRight: Radius.circular(28)
topRight: Radius.circular(28) ),
color: Theme.of(context).dialogBackgroundColor
),
child: Column(
children: [
const Padding(
padding: EdgeInsets.only(
top: 24,
bottom: 20,
),
child: Icon(
Icons.shield_rounded,
size: 26,
),
), ),
color: Theme.of(context).dialogBackgroundColor Text(
), AppLocalizations.of(context)!.responseStatus,
child: Column( style: const TextStyle(
children: [ fontSize: 24
const Padding(
padding: EdgeInsets.only(
top: 24,
bottom: 20,
),
child: Icon(
Icons.shield_rounded,
size: 26,
),
), ),
Text( ),
AppLocalizations.of(context)!.responseStatus, const SizedBox(height: 20),
style: const TextStyle( Expanded(
fontSize: 24 child: ListView(
), physics: height >= 680 == true
? const NeverScrollableScrollPhysics()
: null,
children: [
filterStatusListItem(
id: "all",
icon: Icons.shield_rounded,
label: AppLocalizations.of(context)!.all,
onChanged: (value) => setState(() => selectedResultStatus = value!)
),
filterStatusListItem(
id: "filtered",
icon: Icons.shield_rounded,
label: AppLocalizations.of(context)!.filtered,
onChanged: (value) => setState(() => selectedResultStatus = value!)
),
filterStatusListItem(
id: "processed",
icon: Icons.verified_user_rounded,
label: AppLocalizations.of(context)!.processed,
onChanged: (value) => setState(() => selectedResultStatus = value!)
),
filterStatusListItem(
id: "whitelisted",
icon: Icons.verified_user_rounded,
label: AppLocalizations.of(context)!.processedWhitelist,
onChanged: (value) => setState(() => selectedResultStatus = value!)
),
filterStatusListItem(
id: "blocked",
icon: Icons.gpp_bad_rounded,
label: AppLocalizations.of(context)!.blocked,
onChanged: (value) => setState(() => selectedResultStatus = value!)
),
filterStatusListItem(
id: "blocked_safebrowsing",
icon: Icons.gpp_bad_rounded,
label: AppLocalizations.of(context)!.blockedSafeBrowsing,
onChanged: (value) => setState(() => selectedResultStatus = value!)
),
filterStatusListItem(
id: "blocked_parental",
icon: Icons.gpp_bad_rounded,
label: AppLocalizations.of(context)!.blockedParental,
onChanged: (value) => setState(() => selectedResultStatus = value!)
),
filterStatusListItem(
id: "safe_search",
icon: Icons.gpp_bad_rounded,
label: AppLocalizations.of(context)!.blockedSafeSearch,
onChanged: (value) => setState(() => selectedResultStatus = value!)
),
],
), ),
const SizedBox(height: 20), ),
Expanded( Padding(
child: ListView( padding: const EdgeInsets.all(20),
controller: scrollController, child: Row(
children: [ mainAxisAlignment: MainAxisAlignment.end,
filterStatusListItem( children: [
id: "all", TextButton(
icon: Icons.shield_rounded, onPressed: apply,
label: AppLocalizations.of(context)!.all, child: Text(AppLocalizations.of(context)!.apply)
onChanged: (value) => setState(() => selectedResultStatus = value!) )
), ],
filterStatusListItem(
id: "filtered",
icon: Icons.shield_rounded,
label: AppLocalizations.of(context)!.filtered,
onChanged: (value) => setState(() => selectedResultStatus = value!)
),
filterStatusListItem(
id: "processed",
icon: Icons.verified_user_rounded,
label: AppLocalizations.of(context)!.processed,
onChanged: (value) => setState(() => selectedResultStatus = value!)
),
filterStatusListItem(
id: "whitelisted",
icon: Icons.verified_user_rounded,
label: AppLocalizations.of(context)!.processedWhitelist,
onChanged: (value) => setState(() => selectedResultStatus = value!)
),
filterStatusListItem(
id: "blocked",
icon: Icons.gpp_bad_rounded,
label: AppLocalizations.of(context)!.blocked,
onChanged: (value) => setState(() => selectedResultStatus = value!)
),
filterStatusListItem(
id: "blocked_safebrowsing",
icon: Icons.gpp_bad_rounded,
label: AppLocalizations.of(context)!.blockedSafeBrowsing,
onChanged: (value) => setState(() => selectedResultStatus = value!)
),
filterStatusListItem(
id: "blocked_parental",
icon: Icons.gpp_bad_rounded,
label: AppLocalizations.of(context)!.blockedParental,
onChanged: (value) => setState(() => selectedResultStatus = value!)
),
filterStatusListItem(
id: "safe_search",
icon: Icons.gpp_bad_rounded,
label: AppLocalizations.of(context)!.blockedSafeSearch,
onChanged: (value) => setState(() => selectedResultStatus = value!)
),
],
),
), ),
Padding( )
padding: const EdgeInsets.all(20), ],
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
TextButton(
onPressed: apply,
child: Text(AppLocalizations.of(context)!.apply)
)
],
),
)
],
),
), ),
); );
} }

2
lib/screens/logs/log_details_modal.dart
View file

@ -32,7 +32,7 @@ class LogDetailsModal extends StatelessWidget {
return DraggableScrollableSheet( return DraggableScrollableSheet(
initialChildSize: 0.6, initialChildSize: 0.6,
minChildSize: 0.4, minChildSize: 0.6,
maxChildSize: 0.95, maxChildSize: 0.95,
builder: (context, controller) => Container( builder: (context, controller) => Container(
decoration: BoxDecoration( decoration: BoxDecoration(