luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-05-27 04:07:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix duplicated snackbars logs

Browse source
This commit is contained in:
Juan Gilsanz Polo 2024-02-29 14:44:10 +01:00
parent 8859468a66
commit 0821fd4e0e
2 changed files with 181 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

348
lib/screens/logs/logs_list.dart
View file

@ -33,6 +33,7 @@ class LogsListWidget extends StatefulWidget {
} }
class _LogsListWidgetState extends State<LogsListWidget> { class _LogsListWidgetState extends State<LogsListWidget> {
final _scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
bool showDivider = true; bool showDivider = true;
void fetchFilteringRules() async { void fetchFilteringRules() async {
@ -93,194 +94,197 @@ class _LogsListWidgetState extends State<LogsListWidget> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final logsProvider = Provider.of<LogsProvider>(context); final logsProvider = Provider.of<LogsProvider>(context);
return Scaffold( return ScaffoldMessenger(
body: NestedScrollView( key: widget.twoColumns ? _scaffoldMessengerKey : null,
headerSliverBuilder: (context, innerBoxIsScrolled) => [ child: Scaffold(
SliverOverlapAbsorber( body: NestedScrollView(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context), headerSliverBuilder: (context, innerBoxIsScrolled) => [
sliver: LogsListAppBar( SliverOverlapAbsorber(
innerBoxIsScrolled: innerBoxIsScrolled, handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
showDivider: showDivider, sliver: LogsListAppBar(
innerBoxIsScrolled: innerBoxIsScrolled,
showDivider: showDivider,
)
) )
) ],
], body: Builder(
body: Builder( builder: (context) {
builder: (context) { switch (logsProvider.loadStatus) {
switch (logsProvider.loadStatus) { case LoadStatus.loading:
case LoadStatus.loading: return SafeArea(
return SafeArea( top: false,
top: false, bottom: false,
bottom: false, child: Builder(
child: Builder( builder: (context) => CustomScrollView(
builder: (context) => CustomScrollView( slivers: [
slivers: [ SliverOverlapInjector(
SliverOverlapInjector( handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context), ),
), SliverFillRemaining(
SliverFillRemaining( child: SizedBox(
child: SizedBox( width: double.maxFinite,
width: double.maxFinite, child: Column(
child: Column( mainAxisAlignment: MainAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, children: [
children: [ const CircularProgressIndicator(),
const CircularProgressIndicator(), const SizedBox(height: 30),
const SizedBox(height: 30), Text(
Text( AppLocalizations.of(context)!.loadingLogs,
AppLocalizations.of(context)!.loadingLogs, style: TextStyle(
style: TextStyle( fontSize: 22,
fontSize: 22, color: Theme.of(context).colorScheme.onSurfaceVariant,
color: Theme.of(context).colorScheme.onSurfaceVariant, ),
), )
) ],
], ),
), )
) )
) ],
], ),
), )
) );
);
case LoadStatus.loaded: case LoadStatus.loaded:
return SafeArea( return SafeArea(
top: false, top: false,
bottom: false, bottom: false,
child: Builder( child: Builder(
builder: (context) => RefreshIndicator( builder: (context) => RefreshIndicator(
onRefresh: () async { onRefresh: () async {
await logsProvider.fetchLogs(inOffset: 0); await logsProvider.fetchLogs(inOffset: 0);
}, },
displacement: 95, displacement: 95,
child: NotificationListener( child: NotificationListener(
onNotification: scrollListener, onNotification: scrollListener,
child: CustomScrollView( child: CustomScrollView(
slivers: [ slivers: [
SliverOverlapInjector( SliverOverlapInjector(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context), handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
), ),
if (logsProvider.logsData!.data.isNotEmpty) SliverList.builder( if (logsProvider.logsData!.data.isNotEmpty) SliverList.builder(
itemCount: logsProvider.isLoadingMore itemCount: logsProvider.isLoadingMore
? logsProvider.logsData!.data.length + 1 ? logsProvider.logsData!.data.length + 1
: logsProvider.logsData!.data.length, : logsProvider.logsData!.data.length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
if (logsProvider.isLoadingMore == true && index == logsProvider.logsData!.data.length) { if (logsProvider.isLoadingMore == true && index == logsProvider.logsData!.data.length) {
return const Padding( return const Padding(
padding: EdgeInsets.symmetric(vertical: 20), padding: EdgeInsets.symmetric(vertical: 20),
child: Center( child: Center(
child: CircularProgressIndicator(), child: CircularProgressIndicator(),
), ),
); );
} }
else if (logsProvider.logsData!.data[index].question.name != null) { else if (logsProvider.logsData!.data[index].question.name != null) {
return LogTile( return LogTile(
log: logsProvider.logsData!.data[index], log: logsProvider.logsData!.data[index],
index: index, index: index,
length: logsProvider.logsData!.data.length, length: logsProvider.logsData!.data.length,
isLogSelected: widget.selectedLog != null && widget.selectedLog == logsProvider.logsData!.data[index], isLogSelected: widget.selectedLog != null && widget.selectedLog == logsProvider.logsData!.data[index],
onLogTap: (log) { onLogTap: (log) {
if (!widget.twoColumns) { if (!widget.twoColumns) {
Navigator.of(context).push( Navigator.of(context).push(
MaterialPageRoute( MaterialPageRoute(
builder: (context) => LogDetailsScreen( builder: (context) => LogDetailsScreen(
log: log, log: log,
dialog: false, dialog: false,
)
) )
) );
); }
} widget.onLogSelected(log);
widget.onLogSelected(log); },
}, twoColumns: widget.twoColumns,
twoColumns: widget.twoColumns, );
); }
else {
return null;
}
} }
else { ),
return null; if (logsProvider.logsData!.data.isEmpty) SliverFillRemaining(
} child: Center(
} child: Column(
), mainAxisSize: MainAxisSize.min,
if (logsProvider.logsData!.data.isEmpty) SliverFillRemaining( children: [
child: Center( Text(
child: Column( AppLocalizations.of(context)!.noLogsDisplay,
mainAxisSize: MainAxisSize.min,
children: [
Text(
AppLocalizations.of(context)!.noLogsDisplay,
style: TextStyle(
fontSize: 24,
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
if (logsProvider.logsOlderThan != null) Padding(
padding: const EdgeInsets.only(
top: 30,
left: 20,
right: 20
),
child: Text(
AppLocalizations.of(context)!.noLogsThatOld,
textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 24,
color: Theme.of(context).colorScheme.onSurfaceVariant, color: Theme.of(context).colorScheme.onSurfaceVariant,
), ),
), ),
), if (logsProvider.logsOlderThan != null) Padding(
] padding: const EdgeInsets.only(
top: 30,
left: 20,
right: 20
),
child: Text(
AppLocalizations.of(context)!.noLogsThatOld,
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 16,
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
),
]
),
), ),
), )
) ],
], ),
), ),
), ),
), )
) );
);
case LoadStatus.error: case LoadStatus.error:
return SafeArea( return SafeArea(
top: false, top: false,
bottom: false, bottom: false,
child: Builder( child: Builder(
builder: (context) => CustomScrollView( builder: (context) => CustomScrollView(
slivers: [ slivers: [
SliverOverlapInjector( SliverOverlapInjector(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context), handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
), ),
SliverFillRemaining( SliverFillRemaining(
child: SizedBox( child: SizedBox(
width: double.maxFinite, width: double.maxFinite,
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
const Icon( const Icon(
Icons.error, Icons.error,
color: Colors.red, color: Colors.red,
size: 50, size: 50,
),
const SizedBox(height: 30),
Text(
AppLocalizations.of(context)!.logsNotLoaded,
style: TextStyle(
fontSize: 22,
color: Theme.of(context).colorScheme.onSurfaceVariant,
), ),
) const SizedBox(height: 30),
], Text(
), AppLocalizations.of(context)!.logsNotLoaded,
style: TextStyle(
fontSize: 22,
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
)
],
),
)
) )
) ],
], ),
), )
) );
);
default: default:
return const SizedBox(); return const SizedBox();
} }
}, },
) )
),
), ),
); );
} }

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

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