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: Add infos about the photo in the modal sheet (gallery) #6229

Merged
merged 3 commits into from
Jan 19, 2025
Merged

feat: Add infos about the photo in the modal sheet (gallery) #6229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00dc9db
Info about the photo in the banner
g123k Jan 17, 2025
b15960d
Contributor's name + expandable container
g123k Jan 18, 2025
99534a7
Recenter outdated icon
g123k Jan 18, 2025
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
43 changes: 33 additions & 10 deletions packages/smooth_app/lib/generic_lib/bottom_sheets/smooth_bottom_sheet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,13 @@ Future<T?> showSmoothListOfChoicesModalSheet<T>({
List<Widget>? suffixIcons,
Color? suffixIconTint,
EdgeInsetsGeometry? padding,
EdgeInsetsGeometry? contentPadding,
EdgeInsetsGeometry? dividerPadding,
TextStyle? textStyle,
Color? headerBackgroundColor,
Color? footerBackgroundColor,
Color? prefixIndicatorColor,
double footerSpace = 0.0,
bool safeArea = false,
}) {
assert(labels.length == values.length);
Expand Down Expand Up @@ -142,10 +145,11 @@ Future<T?> showSmoothListOfChoicesModalSheet<T>({
labels.elementAt(i),
style: textStyle ?? const TextStyle(fontWeight: FontWeight.w500),
),
contentPadding: EdgeInsetsDirectional.only(
start: LARGE_SPACE,
end: addEndArrowToItems ? 17.0 : LARGE_SPACE,
),
contentPadding: contentPadding ??
EdgeInsetsDirectional.only(
start: LARGE_SPACE,
end: addEndArrowToItems ? 17.0 : LARGE_SPACE,
),
trailing: (suffixIcons != null
? IconTheme.merge(
data: IconThemeData(color: suffixIconTint),
Expand All @@ -170,15 +174,34 @@ Future<T?> showSmoothListOfChoicesModalSheet<T>({
}
}

if (footer != null) {
items.add(footer);
double bottomPadding = MediaQuery.paddingOf(context).bottom;

if (safeArea && bottomPadding == 0.0) {
bottomPadding = MediaQuery.viewPaddingOf(context).bottom;
}

final double paddingHeight = MediaQuery.paddingOf(context).bottom;
items.add(SizedBox(height: paddingHeight));
if (footer != null) {
if (footerSpace > 0.0) {
items.add(SizedBox(height: footerSpace));
}

Widget footerChild = Column(
children: <Widget>[
footer,
SizedBox(height: bottomPadding),
],
);

if (footerBackgroundColor != null) {
footerChild = ColoredBox(
color: footerBackgroundColor,
child: footerChild,
);
}

if (safeArea && paddingHeight == 0.0) {
items.add(SizedBox(height: MediaQuery.viewPaddingOf(context).bottom));
items.add(footerChild);
} else {
items.add(SizedBox(height: bottomPadding));
}

return showSmoothModalSheet<T>(
Expand Down
28 changes: 28 additions & 0 deletions packages/smooth_app/lib/l10n/app_en.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,10 @@
"imageType": {}
}
},
"outdated_image_short_label": "may be outdated",
"@outdated_image_short_label": {
"description": "A label for outdated images"
},
"ingredients": "Ingredients",
"@ingredients": {},
"ingredients_editing_instructions": "Keep the original order. Indicate the percentage when specified. Separate with a comma or hyphen and use parentheses for ingredients of an ingredient.",
Expand Down Expand Up @@ -851,6 +855,30 @@
"@product_image_action_choose_existing_photo": {
"description": "Replace the existing picture with one from the product's photos"
},
"product_image_details_label": "Information about the photo",
"@product_image_details_label": {
"description": "Label for the photo details"
},
"product_image_details_from_producer": "From the producer",
"@product_image_details_from_producer": {
"description": "Text to indicate that the image was taken by the producer"
},
"product_image_details_contributor": "Contributor",
"@product_image_details_contributor": {
"description": "The name of the contributor who uploaded the image"
},
"product_image_details_contributor_producer": "Contributor (producer)",
"@product_image_details_contributor": {
"description": "The name of the contributor (and also the owner field) who uploaded the image"
},
"product_image_details_date": "Date",
"@product_image_details_date": {
"description": "Text to indicate the date of the image"
},
"product_image_details_date_unknown": "Unknown",
"@product_image_details_date": {
"description": "Text to indicate the date of the image is unknown"
},
"homepage_main_card_logo_description": "Welcome to Open Food Facts",
"@homepage_main_card_logo_description": {
"description": "Description for accessibility of the Open Food Facts logo on the homepage"
Expand Down
11 changes: 8 additions & 3 deletions packages/smooth_app/lib/pages/image/product_image_other_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,13 +398,15 @@ class _ProductImageDetailsButton extends StatelessWidget {
),
subtitle: Text(image.contributor ?? '-'),
),
const Divider(),
ListTile(
title: Text(
appLocalizations.photo_viewer_details_date_title),
subtitle: Text(image.uploaded != null
? DateFormat.yMMMMEEEEd().format(image.uploaded!)
: '-'),
),
const Divider(),
ListTile(
title: Text(
appLocalizations.photo_viewer_details_size_title),
Expand All @@ -418,7 +420,8 @@ class _ProductImageDetailsButton extends StatelessWidget {
: '-',
),
),
if (url.isNotEmpty)
if (url.isNotEmpty) ...<Widget>[
const Divider(),
ListTile(
title: Text(appLocalizations
.photo_viewer_details_url_title),
Expand All @@ -427,9 +430,11 @@ class _ProductImageDetailsButton extends StatelessWidget {
onTap: () {
LaunchUrlHelper.launchURL(url);
},
),
)
],
SizedBox(
height: MediaQuery.viewPaddingOf(context).bottom),
height: MediaQuery.viewPaddingOf(context).bottom,
),
],
),
);
Expand Down
Loading
Loading