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: empty product addition #3265

Merged
merged 6 commits into from
Nov 5, 2022
Merged

fix: empty product addition #3265

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
abe6588
empty product addition check
AshAman999 Nov 4, 2022
93f9a50
trailing comma added
AshAman999 Nov 4, 2022
d95d5c5
pr suggestions
AshAman999 Nov 4, 2022
1ec36d1
Merge branch 'develop' into empty-product-added-to-history
AshAman999 Nov 4, 2022
6afc759
remove unncessary variable
AshAman999 Nov 4, 2022
8196f66
Merge branch 'empty-product-added-to-history' of https://github.com/A…
AshAman999 Nov 4, 2022
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
88 changes: 47 additions & 41 deletions packages/smooth_app/lib/pages/product/add_new_product_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ class _AddNewProductPageState extends State<AddNewProductPage> {

bool _nutritionFactsAdded = false;
bool _basicDetailsAdded = false;
bool _isProductLoaded = false;

@override
void initState() {
Expand Down Expand Up @@ -74,24 +73,33 @@ class _AddNewProductPageState extends State<AddNewProductPage> {
return SmoothScaffold(
appBar: AppBar(
title: Text(appLocalizations.new_product),
automaticallyImplyLeading: !_isProductLoaded),
automaticallyImplyLeading: _uploadedImages.isEmpty),
floatingActionButton: FloatingActionButton.extended(
onPressed: () async {
final LocalDatabase localDatabase = context.read<LocalDatabase>();
final DaoProduct daoProduct = DaoProduct(localDatabase);
final Product? localProduct = await daoProduct.get(widget.barcode);
if (localProduct == null) {
product = Product(
barcode: widget.barcode,
);
daoProduct.put(product);
localDatabase.notifyListeners();
}
localDatabase.upToDate.set(product);
if (mounted) {
if (_basicDetailsAdded ||
_nutritionFactsAdded ||
_uploadedImages.isNotEmpty) {
AshAman999 marked this conversation as resolved.
Show resolved Hide resolved
AshAman999 marked this conversation as resolved.
Show resolved Hide resolved
final LocalDatabase localDatabase = context.read<LocalDatabase>();
final DaoProduct daoProduct = DaoProduct(localDatabase);
final Product? localProduct = await daoProduct.get(widget.barcode);
if (localProduct == null) {
product = Product(
barcode: widget.barcode,
);
daoProduct.put(product);
localDatabase.notifyListeners();
}
localDatabase.upToDate.set(product);
if (mounted) {
await Navigator.maybePop(
context,
widget.barcode,
);
}
} else {
await Navigator.maybePop(
context,
_isProductLoaded ? widget.barcode : null,
null,
);
}
},
Expand Down Expand Up @@ -183,9 +191,6 @@ class _AddNewProductPageState extends State<AddNewProductPage> {
if (finalPhoto != null) {
_uploadedImages[imageType] = _uploadedImages[imageType] ?? <File>[];
_uploadedImages[imageType]!.add(initialPhoto);
setState(() {
_isProductLoaded = true;
});
}
},
),
Expand Down Expand Up @@ -318,30 +323,31 @@ class _InfoAddedRow extends StatelessWidget {
Widget build(BuildContext context) {
final ThemeData themeData = Theme.of(context);
return Padding(
padding: _ROW_PADDING_TOP,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
SizedBox(
height: 50,
width: 50,
child: ClipRRect(
borderRadius: ROUNDED_BORDER_RADIUS,
child: imgStart == null
? null
: Image.file(imgStart!, fit: BoxFit.cover),
),
padding: _ROW_PADDING_TOP,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
SizedBox(
height: 50,
width: 50,
child: ClipRRect(
borderRadius: ROUNDED_BORDER_RADIUS,
child: imgStart == null
? null
: Image.file(imgStart!, fit: BoxFit.cover),
),
Expanded(
child: Center(
child: Text(text, style: themeData.textTheme.bodyText1),
),
),
Expanded(
child: Center(
child: Text(text, style: themeData.textTheme.bodyText1),
),
Icon(
Icons.check,
color: themeData.bottomNavigationBarTheme.selectedItemColor,
)
],
));
),
Icon(
Icons.check,
color: themeData.bottomNavigationBarTheme.selectedItemColor,
)
],
),
);
}
}