Scrolling issue fixed, minor UI improvements

Author: chetanr25

packages/smooth_app/lib/pages/prices/prices_dashboard_page.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:openfoodfacts/openfoodfacts.dart';
+import 'package:smooth_app/generic_lib/design_constants.dart';
 import 'package:smooth_app/helpers/launch_url_helper.dart';
 import 'package:smooth_app/pages/prices/prices_dashboard_widget.dart';
 import 'package:smooth_app/pages/prices/prices_user_profile.dart';
@@ -48,12 +49,14 @@ class PricesDashboardPage extends StatelessWidget {
               return Text(snapshot.error!.toString());
             }
             final PriceUser userProfile = snapshot.data!.value;
-            return Column(
-              children: <Widget>[
-                PricesUserProfile(profile: userProfile),
-                Expanded(
-                    child: PricesDashboardWidget(userProfile: userProfile)),
-              ],
+            return SingleChildScrollView(
+              child: Column(
+                children: <Widget>[
+                  PricesUserProfile(profile: userProfile),
+                  PricesDashboardWidget(userProfile: userProfile),
+                  const SizedBox(height: VERY_LARGE_SPACE),
+                ],
+              ),
             );
           }),
     );

packages/smooth_app/lib/pages/prices/prices_dashboard_widget.dart

@@ -5,9 +5,10 @@ import 'package:openfoodfacts/openfoodfacts.dart';
 import 'package:smooth_app/generic_lib/design_constants.dart';
 import 'package:smooth_app/generic_lib/widgets/smooth_card.dart';
 import 'package:smooth_app/pages/prices/get_prices_model.dart';
+import 'package:smooth_app/pages/prices/price_data_widget.dart';
+import 'package:smooth_app/pages/prices/price_product_widget.dart';
 import 'package:smooth_app/pages/prices/price_user_button.dart';
 import 'package:smooth_app/pages/prices/prices_proofs_page.dart';
-import 'package:smooth_app/pages/prices/product_prices_list.dart';
 import 'package:smooth_app/query/product_query.dart';
 
 class PricesDashboardWidget extends StatefulWidget {
@@ -24,12 +25,10 @@ class _PricesDashboardWidgetState extends State<PricesDashboardWidget> {
   @override
   Widget build(BuildContext context) {
     final AppLocalizations appLocalizations = AppLocalizations.of(context);
-
     return Column(
       mainAxisSize: MainAxisSize.min,
       mainAxisAlignment: MainAxisAlignment.start,
       crossAxisAlignment: CrossAxisAlignment.start,
-      spacing: MEDIUM_SPACE,
       children: <Widget>[
         _categorySwitch(),
         const SizedBox(height: SMALL_SPACE),
@@ -45,36 +44,69 @@ class _PricesDashboardWidgetState extends State<PricesDashboardWidget> {
               return Center(child: Text(snapshot.error.toString()));
             }
 
-            return Expanded(
-              child: ProductPricesList(
-                GetPricesModel(
-                  title: appLocalizations.prices_generic_title,
-                  parameters: GetPricesParameters(),
-                  uri: OpenPricesAPIClient.getUri(
-                    path: 'users/${widget.userProfile.userId}',
-                    uriHelper: ProductQuery.uriPricesHelper,
-                  ),
+            if (snapshot.data?.value == null ||
+                snapshot.data?.value!.items == null ||
+                snapshot.data!.value!.items!.isEmpty) {
+              return const Center(
+                child: Padding(
+                  padding: EdgeInsets.all(LARGE_SPACE),
+                  child:
+                      Text('No prices found', style: TextStyle(fontSize: 14)),
                 ),
-                pricesResult: snapshot.data!.value,
+              );
+            }
+            final List<Price> prices = snapshot.data!.value!.items!;
+
+            final GetPricesModel model = GetPricesModel(
+              title: appLocalizations.prices_generic_title,
+              parameters: GetPricesParameters()
+                ..owner = widget.userProfile.userId
+                ..kind = selectedCategory == 'consumption'
+                    ? ContributionKind.consumption
+                    : ContributionKind.community,
+              uri: OpenPricesAPIClient.getUri(
+                path: 'users/${widget.userProfile.userId}',
+                uriHelper: ProductQuery.uriPricesHelper,
               ),
             );
+
+            return Column(
+              children: prices.map((Price item) {
+                final PriceProduct? priceProduct = item.product;
+                return SmoothCard(
+                  child: Column(
+                    mainAxisAlignment: MainAxisAlignment.start,
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: <Widget>[
+                      if (model.displayEachProduct && priceProduct != null)
+                        PriceProductWidget(
+                          priceProduct,
+                          enableCountButton: model.enableCountButton,
+                        ),
+                      PriceDataWidget(
+                        item,
+                        model: model,
+                      ),
+                    ],
+                  ),
+                );
+              }).toList(),
+            );
           },
         ),
       ],
     );
   }
 
   Future<MaybeError<GetPricesResult?>> _getUserPrices() async {
-    final MaybeError<GetPricesResult?> prices =
-        await OpenPricesAPIClient.getPrices(
+    return OpenPricesAPIClient.getPrices(
       GetPricesParameters()
-        ..owner = OpenFoodAPIConfiguration.globalUser?.userId
+        ..owner = widget.userProfile.userId
         ..kind = selectedCategory == 'consumption'
             ? ContributionKind.consumption
             : ContributionKind.community,
       uriHelper: ProductQuery.uriPricesHelper,
     );
-    return prices;
   }
 
   /// Toggle between "My Consumption" and "Other Contributions"
@@ -87,7 +119,7 @@ class _PricesDashboardWidgetState extends State<PricesDashboardWidget> {
         children: <Widget>[
           Expanded(
               flex: 1,
-              child: customToggleButton(
+              child: _categoryToggleButton(
                   'consumption',
                   Icons.shopping_cart,
                   appLocalizations.prices_dashboard_receipts_and_gdpr_requests,
@@ -97,7 +129,7 @@ class _PricesDashboardWidgetState extends State<PricesDashboardWidget> {
                       }))),
           Expanded(
             flex: 1,
-            child: customToggleButton('community', Icons.people,
+            child: _categoryToggleButton('community', Icons.people,
                 appLocalizations.prices_dashboard_price_labels, () {
               setState(() {
                 selectedCategory = 'community';
@@ -110,7 +142,7 @@ class _PricesDashboardWidgetState extends State<PricesDashboardWidget> {
     );
   }
 
-  Widget customToggleButton(
+  Widget _categoryToggleButton(
       String category, IconData icon, String label, VoidCallback onTap) {
     final Color selectedColor = Theme.of(context).colorScheme.onSurface;
     final Color unselectedColor = selectedColor.withAlpha(128);