Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 5323 - generic way to display product images, with timestamp #5333

Merged
merged 1 commit into from
Jun 2, 2024
+84 −81
Merged

feat: 5323 - generic way to display product images, with timestamp #5333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 6 additions & 58 deletions packages/smooth_app/lib/pages/image/product_image_gallery_other_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
import 'package:auto_size_text/auto_size_text.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:intl/intl.dart';
import 'package:openfoodfacts/openfoodfacts.dart';
import 'package:provider/provider.dart';
import 'package:smooth_app/data_models/fetched_product.dart';
import 'package:smooth_app/database/local_database.dart';
import 'package:smooth_app/generic_lib/design_constants.dart';
import 'package:smooth_app/generic_lib/widgets/images/smooth_image.dart';
import 'package:smooth_app/helpers/product_cards_helper.dart';
import 'package:smooth_app/pages/image/product_image_other_page.dart';
import 'package:smooth_app/pages/image/product_image_widget.dart';
import 'package:smooth_app/pages/product/common/product_refresher.dart';
import 'package:smooth_app/query/product_query.dart';

/// Number of columns for the grid.
const int _columns = 3;
Expand Down Expand Up @@ -108,12 +104,9 @@ class _RawGridGallery extends StatelessWidget {
final Product product;
final List<ProductImage> rawImages;

static final DateFormat _dateFormat = DateFormat('yyyy-MM-dd');

@override
Widget build(BuildContext context) {
final double squareSize = _getSquareSize(context);
final DateTime now = DateTime.now();
return SliverGrid(
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: _columns,
Expand All @@ -123,27 +116,6 @@ class _RawGridGallery extends StatelessWidget {
// order by descending ids
index = rawImages.length - 1 - index;
final ProductImage productImage = rawImages[index];
final DateTime? uploaded = productImage.uploaded;
final String? date;
final bool expired;
if (uploaded == null) {
date = null;
expired = false;
} else {
date = _dateFormat.format(uploaded);
expired = now.difference(uploaded).inDays > 365;
}
final Widget image = SmoothImage(
width: squareSize,
height: squareSize,
imageProvider: NetworkImage(
productImage.getUrl(
product.barcode!,
uriHelper: ProductQuery.uriProductHelper,
),
),
rounded: false,
);
return InkWell(
onTap: () async => Navigator.push<void>(
context,
Expand All @@ -154,35 +126,11 @@ class _RawGridGallery extends StatelessWidget {
),
),
),
child: date == null
? image
: Stack(
children: <Widget>[
image,
SizedBox(
width: squareSize,
height: squareSize,
child: Align(
alignment: Alignment.bottomCenter,
child: Padding(
padding: const EdgeInsets.all(SMALL_SPACE),
child: Container(
height: VERY_LARGE_SPACE,
color: expired
? Colors.red.withAlpha(128)
: Colors.white.withAlpha(128),
child: Center(
child: AutoSizeText(
date,
maxLines: 1,
),
),
),
),
),
),
],
),
child: ProductImageWidget(
productImage: productImage,
barcode: product.barcode!,
squareSize: squareSize,
),
);
},
addAutomaticKeepAlives: false,
Expand Down
71 changes: 71 additions & 0 deletions packages/smooth_app/lib/pages/image/product_image_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import 'package:auto_size_text/auto_size_text.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:openfoodfacts/openfoodfacts.dart';
import 'package:smooth_app/generic_lib/design_constants.dart';
import 'package:smooth_app/generic_lib/widgets/images/smooth_image.dart';
import 'package:smooth_app/query/product_query.dart';

/// Displays a product image thumbnail with the upload date on top.
class ProductImageWidget extends StatelessWidget {
const ProductImageWidget({
required this.productImage,
required this.barcode,
required this.squareSize,
});

final ProductImage productImage;
final String barcode;
final double squareSize;

static final DateFormat _dateFormat = DateFormat('yyyy-MM-dd');

@override
Widget build(BuildContext context) {
final Widget image = SmoothImage(
width: squareSize,
height: squareSize,
imageProvider: NetworkImage(
productImage.getUrl(
barcode,
uriHelper: ProductQuery.uriProductHelper,
),
),
rounded: false,
);
final DateTime? uploaded = productImage.uploaded;
if (uploaded == null) {
return image;
}
final DateTime now = DateTime.now();
final String date = _dateFormat.format(uploaded);
final bool expired = now.difference(uploaded).inDays > 365;
return Stack(
children: <Widget>[
image,
SizedBox(
width: squareSize,
height: squareSize,
child: Align(
alignment: Alignment.bottomCenter,
child: Padding(
padding: const EdgeInsets.all(SMALL_SPACE),
child: Container(
height: VERY_LARGE_SPACE,
color: expired
? Colors.red.withAlpha(128)
: Colors.white.withAlpha(128),
child: Center(
child: AutoSizeText(
date,
maxLines: 1,
),
),
),
),
),
),
],
);
}
}
30 changes: 7 additions & 23 deletions packages/smooth_app/lib/pages/image/uploaded_image_gallery.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import 'package:provider/provider.dart';
import 'package:smooth_app/database/dao_int.dart';
import 'package:smooth_app/database/local_database.dart';
import 'package:smooth_app/generic_lib/design_constants.dart';
import 'package:smooth_app/generic_lib/widgets/images/smooth_image.dart';
import 'package:smooth_app/generic_lib/widgets/smooth_back_button.dart';
import 'package:smooth_app/pages/crop_page.dart';
import 'package:smooth_app/pages/crop_parameters.dart';
import 'package:smooth_app/pages/image/product_image_widget.dart';
import 'package:smooth_app/pages/image_crop_page.dart';
import 'package:smooth_app/pages/product_crop_helper.dart';
import 'package:smooth_app/query/product_query.dart';
Expand Down Expand Up @@ -39,7 +39,7 @@ class UploadedImageGallery extends StatelessWidget {
Widget build(BuildContext context) {
final AppLocalizations appLocalizations = AppLocalizations.of(context);
final MediaQueryData mediaQueryData = MediaQuery.of(context);
final double columnWidth = mediaQueryData.size.width * .45;
final double columnWidth = mediaQueryData.size.width / 2;
return SmoothScaffold(
backgroundColor: Colors.black,
appBar: SmoothAppBar(
Expand All @@ -54,20 +54,13 @@ class UploadedImageGallery extends StatelessWidget {
body: GridView.builder(
itemCount: rawImages.length,
gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
maxCrossAxisExtent: mediaQueryData.size.width / 2,
maxCrossAxisExtent: columnWidth,
childAspectRatio: 1,
mainAxisSpacing: MEDIUM_SPACE,
crossAxisSpacing: MEDIUM_SPACE,
),
itemBuilder: (final BuildContext context, int index) {
// order by descending ids
index = rawImages.length - 1 - index;
final ProductImage rawImage = rawImages[index];
final String url = rawImage.getUrl(
barcode,
imageSize: ImageSize.DISPLAY,
uriHelper: ProductQuery.uriProductHelper,
);
return GestureDetector(
onTap: () async {
final LocalDatabase localDatabase = context.read<LocalDatabase>();
Expand Down Expand Up @@ -105,19 +98,10 @@ class UploadedImageGallery extends StatelessWidget {
navigatorState.pop();
}
},
child: ClipRRect(
borderRadius: ROUNDED_BORDER_RADIUS,
child: Container(
width: columnWidth,
height: columnWidth,
color: Colors.grey[900],
child: SmoothImage(
width: columnWidth,
height: columnWidth,
imageProvider: NetworkImage(url),
fit: BoxFit.contain,
),
),
child: ProductImageWidget(
productImage: rawImage,
barcode: barcode,
squareSize: columnWidth,
),
);
},
Expand Down