From 2ea6aeb8629cc80de318582b32b0ed888771388a Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Sat, 25 Mar 2023 13:07:27 +0100
Subject: [PATCH] minor

---
 lib/widgets/about/bug_report.dart              | 18 +++++++++---------
 .../grid/sections/fixed/section_layout.dart    |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/widgets/about/bug_report.dart b/lib/widgets/about/bug_report.dart
index 47b7ac0a6..a019aea75 100644
--- a/lib/widgets/about/bug_report.dart
+++ b/lib/widgets/about/bug_report.dart
@@ -142,24 +142,24 @@ class _BugReportState extends State<BugReport> with FeedbackMixin {
   }
 
   Future<String> _getInfo(BuildContext context) async {
+    final flavor = context.read<AppFlavor>().toString().split('.')[1];
     final packageInfo = await PackageInfo.fromPlatform();
     final androidInfo = await DeviceInfoPlugin().androidInfo;
-    final flavor = context.read<AppFlavor>().toString().split('.')[1];
+    final storageVolumes = await storageService.getStorageVolumes();
+    final storageGrants = await storageService.getGrantedDirectories();
     return [
       'Package: ${packageInfo.packageName}',
-      'Aves version: ${packageInfo.version}-$flavor',
-      'Aves build: ${packageInfo.buildNumber}',
-      'Flutter version: ${version['frameworkVersion']}',
-      'Flutter channel: ${version['channel']}',
-      'Android version: ${androidInfo.version.release}',
-      'Android API: ${androidInfo.version.sdkInt}',
+      'Installer: ${packageInfo.installerStore}',
+      'Aves version: ${packageInfo.version}-$flavor, build ${packageInfo.buildNumber}',
+      'Flutter: ${version['channel']} ${version['frameworkVersion']}',
+      'Android version: ${androidInfo.version.release}, API ${androidInfo.version.sdkInt}',
       'Android build: ${androidInfo.display}',
       'Device: ${androidInfo.manufacturer} ${androidInfo.model}',
       'Geocoder: ${device.hasGeocoder ? 'ready' : 'not available'}',
       'Mobile services: ${mobileServices.isServiceAvailable ? 'ready' : 'not available'}',
       'System locales: ${WidgetsBinding.instance.window.locales.join(', ')}',
-      'Aves locale: ${settings.locale ?? 'system'} -> ${settings.appliedLocale}',
-      'Installer: ${packageInfo.installerStore}',
+      'Storage volumes: ${storageVolumes.map((v) => v.path).join(', ')}',
+      'Storage grants: ${storageGrants.join(', ')}',
       'Error reporting: ${settings.isErrorReportingAllowed}',
     ].join('\n');
   }
diff --git a/lib/widgets/common/grid/sections/fixed/section_layout.dart b/lib/widgets/common/grid/sections/fixed/section_layout.dart
index 5b38d8caf..7cdfbc96b 100644
--- a/lib/widgets/common/grid/sections/fixed/section_layout.dart
+++ b/lib/widgets/common/grid/sections/fixed/section_layout.dart
@@ -28,14 +28,14 @@ class FixedExtentSectionLayout extends SectionLayout {
   @override
   int getMinChildIndexForScrollOffset(double scrollOffset) {
     scrollOffset -= bodyMinOffset;
-    if (scrollOffset < 0 || mainAxisStride == 0) return firstIndex;
+    if (mainAxisStride == 0 || !scrollOffset.isFinite || scrollOffset < 0) return firstIndex;
     return bodyFirstIndex + scrollOffset ~/ mainAxisStride;
   }
 
   @override
   int getMaxChildIndexForScrollOffset(double scrollOffset) {
     scrollOffset -= bodyMinOffset;
-    if (scrollOffset < 0 || mainAxisStride == 0) return firstIndex;
+    if (mainAxisStride == 0 || !scrollOffset.isFinite || scrollOffset < 0) return firstIndex;
     return bodyFirstIndex + (scrollOffset / mainAxisStride).ceil() - 1;
   }
 }