fix: bottom overflow rendering issue (#3221)

openfoodfacts · Oct 27, 2022 · e06fdf1 · e06fdf1
1 parent 510104d
commit e06fdf1
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 60 deletions.
diff --git a/packages/smooth_app/lib/pages/onboarding/welcome_page.dart b/packages/smooth_app/lib/pages/onboarding/welcome_page.dart
@@ -25,6 +25,7 @@ class WelcomePage extends StatelessWidget {
     return SmoothScaffold(
       backgroundColor: backgroundColor,
       brightness: Brightness.dark,
+      resizeToAvoidBottomInset: false,
       body: Column(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         crossAxisAlignment: CrossAxisAlignment.start,

diff --git a/packages/smooth_app/lib/pages/product/common/product_list_page.dart b/packages/smooth_app/lib/pages/product/common/product_list_page.dart
@@ -192,71 +192,73 @@ class _ProductListPageState extends State<ProductListPage>
           )
         ],
       ),
-      body: products.isEmpty
-          ? GestureDetector(
-              child: Center(
-                child: Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: <Widget>[
-                    SvgPicture.asset(
-                      'assets/misc/empty-list.svg',
-                      height: MediaQuery.of(context).size.height * .4,
-                      package: AppHelper.APP_PACKAGE,
-                    ),
-                    Text(
-                      appLocalizations.product_list_empty_title,
-                      style: themeData.textTheme.headlineLarge
-                          ?.apply(color: colorScheme.onBackground),
-                    ),
-                    Padding(
-                      padding: const EdgeInsets.all(VERY_LARGE_SPACE),
-                      child: Text(
-                        appLocalizations.product_list_empty_message,
-                        textAlign: TextAlign.center,
-                        style: themeData.textTheme.bodyText2?.apply(
-                          color: colorScheme.onBackground,
-                        ),
+      body: SingleChildScrollView(
+        child: products.isEmpty
+            ? GestureDetector(
+                child: Center(
+                  child: Column(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: <Widget>[
+                      SvgPicture.asset(
+                        'assets/misc/empty-list.svg',
+                        height: MediaQuery.of(context).size.height * .4,
+                        package: AppHelper.APP_PACKAGE,
                       ),
-                    )
-                  ],
-                ),
-              ),
-              onTap: () {
-                InheritedDataManager.of(context).resetShowSearchCard(true);
-              },
-            )
-          : WillPopScope(
-              onWillPop: _handleUserBacktap,
-              child: RefreshIndicator(
-                //if it is in selectmode then refresh indicator is not shown
-                notificationPredicate:
-                    _selectionMode ? (_) => false : (_) => true,
-                onRefresh: () async => _refreshListProducts(
-                  products,
-                  localDatabase,
-                  appLocalizations,
+                      Text(
+                        appLocalizations.product_list_empty_title,
+                        style: themeData.textTheme.headlineLarge
+                            ?.apply(color: colorScheme.onBackground),
+                      ),
+                      Padding(
+                        padding: const EdgeInsets.all(VERY_LARGE_SPACE),
+                        child: Text(
+                          appLocalizations.product_list_empty_message,
+                          textAlign: TextAlign.center,
+                          style: themeData.textTheme.bodyText2?.apply(
+                            color: colorScheme.onBackground,
+                          ),
+                        ),
+                      )
+                    ],
+                  ),
                 ),
-                child: Consumer<UpToDateProductProvider>(
-                  builder: (
-                    _,
-                    final UpToDateProductProvider provider,
-                    __,
-                  ) =>
-                      ListView.builder(
-                    itemCount: products.length,
-                    itemBuilder: (BuildContext context, int index) {
-                      return _buildItem(
-                        dismissible,
-                        products,
-                        index,
-                        localDatabase,
-                        appLocalizations,
-                      );
-                    },
+                onTap: () {
+                  InheritedDataManager.of(context).resetShowSearchCard(true);
+                },
+              )
+            : WillPopScope(
+                onWillPop: _handleUserBacktap,
+                child: RefreshIndicator(
+                  //if it is in selectmode then refresh indicator is not shown
+                  notificationPredicate:
+                      _selectionMode ? (_) => false : (_) => true,
+                  onRefresh: () async => _refreshListProducts(
+                    products,
+                    localDatabase,
+                    appLocalizations,
+                  ),
+                  child: Consumer<UpToDateProductProvider>(
+                    builder: (
+                      _,
+                      final UpToDateProductProvider provider,
+                      __,
+                    ) =>
+                        ListView.builder(
+                      itemCount: products.length,
+                      itemBuilder: (BuildContext context, int index) {
+                        return _buildItem(
+                          dismissible,
+                          products,
+                          index,
+                          localDatabase,
+                          appLocalizations,
+                        );
+                      },
+                    ),
                   ),
                 ),
               ),
-            ),
+      ),
     );
   }