Skip to content

Commit

Permalink
feat: #3065 - using Robotoff question imageUrl if available (#3178)
Browse files Browse the repository at this point in the history
Impacted files:
* `Podfile.lock` (`app`): wtf
* `Podfile.lock` (`smooth_app`): wtf
* `product_image_carousel.dart`: added optional imageUrl that displays it instead of the standard all pictures
* `question_card.dart`: added Robotoff question imageUrl if available
  • Loading branch information
monsieurtanuki authored Oct 19, 2022
1 parent 3b2a12f commit 086ff45
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 6 deletions.
2 changes: 1 addition & 1 deletion packages/app/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ SPEC CHECKSUMS:
connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
data_importer: ab8c74aaf553878170aed03c03626d5820c5cb1f
device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_email_sender: 02d7443217d8c41483223627972bfdc09f74276b
flutter_isolate: 0edf5081826d071adf21759d1eb10ff5c24503b5
flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
Expand Down
2 changes: 1 addition & 1 deletion packages/smooth_app/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ SPEC CHECKSUMS:
connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
data_importer: ab8c74aaf553878170aed03c03626d5820c5cb1f
device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_email_sender: 02d7443217d8c41483223627972bfdc09f74276b
flutter_isolate: 0edf5081826d071adf21759d1eb10ff5c24503b5
flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
Expand Down
Original file line number Diff line number Diff line change
@@ -1,27 +1,40 @@
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:openfoodfacts/model/Product.dart';
import 'package:openfoodfacts/openfoodfacts.dart';
import 'package:smooth_app/cards/data_cards/image_upload_card.dart';
import 'package:smooth_app/data_models/product_image_data.dart';
import 'package:smooth_app/helpers/product_cards_helper.dart';

class ProductImageCarousel extends StatelessWidget {
/// Carousel of product images, or of just an [alternateImageUrl].
const ProductImageCarousel(
this.product, {
required this.height,
this.onUpload,
this.alternateImageUrl,
});

final Product product;
final double height;
final Function(BuildContext)? onUpload;
final String? alternateImageUrl;

@override
Widget build(BuildContext context) {
final AppLocalizations appLocalizations = AppLocalizations.of(context);
final List<ProductImageData> productImagesData =
getProductMainImagesData(product, appLocalizations);

final List<ProductImageData> productImagesData;
if (alternateImageUrl != null) {
productImagesData = <ProductImageData>[
ProductImageData(
imageUrl: alternateImageUrl,
imageField: ImageField.OTHER,
title: '',
buttonText: '',
),
];
} else {
productImagesData = getProductMainImagesData(product, appLocalizations);
}
return SizedBox(
height: height,
child: ListView.builder(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class QuestionCard extends StatelessWidget {
product,
height: screenSize.height / 6,
onUpload: (_) {},
alternateImageUrl: question.imageUrl,
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: SMALL_SPACE),
Expand Down

0 comments on commit 086ff45

Please sign in to comment.