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

fix: Edit page: fix regressions after migration to Material 3 #5781

Merged
merged 1 commit into from
Nov 3, 2024
Merged

fix: Edit page: fix regressions after migration to Material 3 #5781

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
25 changes: 20 additions & 5 deletions packages/smooth_app/lib/pages/product/edit_product_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import 'package:smooth_app/pages/product/product_field_editor.dart';
import 'package:smooth_app/pages/product/product_image_gallery_view.dart';
import 'package:smooth_app/pages/product/simple_input_page.dart';
import 'package:smooth_app/pages/product/simple_input_page_helpers.dart';
import 'package:smooth_app/themes/smooth_theme_colors.dart';
import 'package:smooth_app/themes/theme_provider.dart';
import 'package:smooth_app/widgets/smooth_app_bar.dart';
import 'package:smooth_app/widgets/smooth_floating_message.dart';
import 'package:smooth_app/widgets/smooth_scaffold.dart';
Expand Down Expand Up @@ -53,6 +55,8 @@ class _EditProductPageState extends State<EditProductPage> with UpToDateMixin {
context.watch<LocalDatabase>();
refreshUpToDate();
final ThemeData theme = Theme.of(context);
final bool lightTheme = context.lightTheme();

final String productName = getProductName(
upToDateProduct,
appLocalizations,
Expand All @@ -61,9 +65,13 @@ class _EditProductPageState extends State<EditProductPage> with UpToDateMixin {
getProductBrands(upToDateProduct, appLocalizations);

return SmoothScaffold(
backgroundColor: lightTheme
? theme.extension<SmoothColorsThemeExtension>()!.primaryLight
: null,
appBar: SmoothAppBar(
centerTitle: false,
leading: const SmoothBackButton(),
backgroundColor: lightTheme ? Colors.white : null,
title: Semantics(
value: productName,
child: ExcludeSemantics(
Expand Down Expand Up @@ -174,8 +182,10 @@ class _EditProductPageState extends State<EditProductPage> with UpToDateMixin {
),
if (upToDateProduct.productType != ProductType.product)
_ListTitleItem(
leading:
const SvgIcon('assets/cacheTintable/ingredients.svg'),
leading: const SvgIcon(
'assets/cacheTintable/ingredients.svg',
dontAddColor: true,
),
title:
appLocalizations.edit_product_form_item_ingredients_title,
onTap: () async => ProductFieldOcrIngredientEditor().edit(
Expand All @@ -191,8 +201,10 @@ class _EditProductPageState extends State<EditProductPage> with UpToDateMixin {
if (upToDateProduct.productType != ProductType.beauty &&
upToDateProduct.productType != ProductType.product)
_ListTitleItem(
leading:
const SvgIcon('assets/cacheTintable/scale-balance.svg'),
leading: const SvgIcon(
'assets/cacheTintable/scale-balance.svg',
dontAddColor: true,
),
title: appLocalizations
.edit_product_form_item_nutrition_facts_title,
subtitle: appLocalizations
Expand All @@ -219,7 +231,10 @@ class _EditProductPageState extends State<EditProductPage> with UpToDateMixin {
}),
_getSimpleListTileItem(SimpleInputPageLabelHelper()),
_ListTitleItem(
leading: const SvgIcon('assets/cacheTintable/packaging.svg'),
leading: const SvgIcon(
'assets/cacheTintable/packaging.svg',
dontAddColor: true,
),
title: appLocalizations.edit_packagings_title,
onTap: () async => ProductFieldPackagingEditor().edit(
context: context,
Expand Down
29 changes: 21 additions & 8 deletions packages/smooth_app/lib/widgets/smooth_app_bar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ class SmoothAppBar extends StatelessWidget implements PreferredSizeWidget {
this.flexibleSpace,
this.bottom,
this.elevation,
this.scrolledUnderElevation,
this.scrolledUnderElevation = 0.0,
this.notificationPredicate,
this.shadowColor,
this.surfaceTintColor,
// this.surfaceTintColor,
this.backgroundColor,
this.foregroundColor,
this.iconTheme,
Expand All @@ -41,6 +42,8 @@ class SmoothAppBar extends StatelessWidget implements PreferredSizeWidget {
this.actionModeCloseTooltip,
this.onLeaveActionMode,
this.ignoreSemanticsForSubtitle = false,
this.forceMaterialTransparency = false,
this.clipBehavior,
super.key,
}) : assert(!actionMode || actionModeTitle != null),
preferredSize =
Expand All @@ -58,8 +61,11 @@ class SmoothAppBar extends StatelessWidget implements PreferredSizeWidget {
final PreferredSizeWidget? bottom;
final double? elevation;
final double? scrolledUnderElevation;
final ScrollNotificationPredicate? notificationPredicate;
final Color? shadowColor;
final Color? surfaceTintColor;

// Disabled as it will do unexpected things with [backgroundColor]
// final Color? surfaceTintColor;
final Color? backgroundColor;
final Color? foregroundColor;
final IconThemeData? iconTheme;
Expand All @@ -79,6 +85,8 @@ class SmoothAppBar extends StatelessWidget implements PreferredSizeWidget {
final TextStyle? titleTextStyle;
final SystemUiOverlayStyle? systemOverlayStyle;
final bool? ignoreSemanticsForSubtitle;
final bool forceMaterialTransparency;
final Clip? clipBehavior;

final VoidCallback? onLeaveActionMode;
final String? actionModeCloseTooltip;
Expand All @@ -101,11 +109,11 @@ class SmoothAppBar extends StatelessWidget implements PreferredSizeWidget {
},
child: actionMode
? _createActionModeAppBar(context)
: _createAppBar(parentRoute),
: _createAppBar(context, parentRoute),
);
}

Widget _createAppBar(ModalRoute<dynamic>? parentRoute) {
Widget _createAppBar(BuildContext context, ModalRoute<dynamic>? parentRoute) {
final bool useCloseButton =
parentRoute is PageRoute<dynamic> && parentRoute.fullscreenDialog;
Widget? leadingWidget = leading;
Expand All @@ -127,8 +135,11 @@ class SmoothAppBar extends StatelessWidget implements PreferredSizeWidget {
bottom: bottom,
elevation: elevation,
scrolledUnderElevation: scrolledUnderElevation,
notificationPredicate:
notificationPredicate ?? defaultScrollNotificationPredicate,
shadowColor: shadowColor,
surfaceTintColor: surfaceTintColor,
surfaceTintColor:
backgroundColor ?? Theme.of(context).appBarTheme.backgroundColor,
backgroundColor: backgroundColor,
foregroundColor: foregroundColor,
iconTheme: iconTheme,
Expand All @@ -143,8 +154,9 @@ class SmoothAppBar extends StatelessWidget implements PreferredSizeWidget {
toolbarHeight: toolbarHeight,
leadingWidth: leadingWidth,
toolbarTextStyle: toolbarTextStyle,
titleTextStyle: titleTextStyle,
systemOverlayStyle: systemOverlayStyle,
forceMaterialTransparency: forceMaterialTransparency,
clipBehavior: clipBehavior,
);
}

Expand All @@ -171,7 +183,8 @@ class SmoothAppBar extends StatelessWidget implements PreferredSizeWidget {
elevation: elevation,
scrolledUnderElevation: scrolledUnderElevation,
shadowColor: shadowColor,
surfaceTintColor: surfaceTintColor,
surfaceTintColor:
backgroundColor ?? Theme.of(context).appBarTheme.backgroundColor,
backgroundColor: backgroundColor,
foregroundColor: foregroundColor,
iconTheme: iconTheme,
Expand Down