fixes before build
This commit is contained in:
gitea
@@ -0,0 +1,175 @@
|
||||
/// Multi-select sheet for adding catalog products to a shopping list.
|
||||
library;
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../models/product.dart';
|
||||
import 'product_image.dart';
|
||||
|
||||
class AddListItemSelection {
|
||||
const AddListItemSelection({required this.name, this.productId});
|
||||
|
||||
final String name;
|
||||
final int? productId;
|
||||
}
|
||||
|
||||
Future<List<AddListItemSelection>?> showAddListItemsSheet(
|
||||
BuildContext context, {
|
||||
required List<Product> products,
|
||||
}) {
|
||||
return showModalBottomSheet<List<AddListItemSelection>>(
|
||||
context: context,
|
||||
isScrollControlled: true,
|
||||
showDragHandle: true,
|
||||
builder: (context) => _AddListItemsSheet(products: products),
|
||||
);
|
||||
}
|
||||
|
||||
class _AddListItemsSheet extends StatefulWidget {
|
||||
const _AddListItemsSheet({required this.products});
|
||||
|
||||
final List<Product> products;
|
||||
|
||||
@override
|
||||
State<_AddListItemsSheet> createState() => _AddListItemsSheetState();
|
||||
}
|
||||
|
||||
class _AddListItemsSheetState extends State<_AddListItemsSheet> {
|
||||
final TextEditingController _controller = TextEditingController();
|
||||
final Set<int> _selectedProductIds = {};
|
||||
String? _error;
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_controller.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
List<Product> get _matches {
|
||||
final query = _controller.text.trim().toLowerCase();
|
||||
if (query.isEmpty) return widget.products;
|
||||
return widget.products
|
||||
.where((product) => product.name.toLowerCase().contains(query))
|
||||
.toList();
|
||||
}
|
||||
|
||||
int get _addCount {
|
||||
var count = _selectedProductIds.length;
|
||||
final typed = _controller.text.trim();
|
||||
if (typed.isEmpty) return count;
|
||||
final selectedNames = {
|
||||
for (final product in widget.products)
|
||||
if (_selectedProductIds.contains(product.id))
|
||||
product.name.toLowerCase(),
|
||||
};
|
||||
if (!selectedNames.contains(typed.toLowerCase())) count++;
|
||||
return count;
|
||||
}
|
||||
|
||||
void _toggleProduct(Product product) {
|
||||
setState(() {
|
||||
if (_selectedProductIds.contains(product.id)) {
|
||||
_selectedProductIds.remove(product.id);
|
||||
} else {
|
||||
_selectedProductIds.add(product.id);
|
||||
}
|
||||
_error = null;
|
||||
});
|
||||
}
|
||||
|
||||
void _add() {
|
||||
final selections = <AddListItemSelection>[
|
||||
for (final product in widget.products)
|
||||
if (_selectedProductIds.contains(product.id))
|
||||
AddListItemSelection(name: product.name, productId: product.id),
|
||||
];
|
||||
final typed = _controller.text.trim();
|
||||
if (typed.isNotEmpty &&
|
||||
!selections.any(
|
||||
(item) => item.name.toLowerCase() == typed.toLowerCase(),
|
||||
)) {
|
||||
selections.add(AddListItemSelection(name: typed));
|
||||
}
|
||||
if (selections.isEmpty) {
|
||||
setState(() => _error = 'Select products or enter an item name.');
|
||||
return;
|
||||
}
|
||||
Navigator.of(context).pop(selections);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final theme = Theme.of(context);
|
||||
final bottom = MediaQuery.viewInsetsOf(context).bottom;
|
||||
final matches = _matches;
|
||||
final addCount = _addCount;
|
||||
|
||||
return Padding(
|
||||
padding: EdgeInsets.fromLTRB(16, 0, 16, 16 + bottom),
|
||||
child: SizedBox(
|
||||
height: MediaQuery.sizeOf(context).height * 0.72,
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Text('Add items', style: theme.textTheme.titleLarge),
|
||||
const SizedBox(height: 12),
|
||||
TextField(
|
||||
controller: _controller,
|
||||
autofocus: true,
|
||||
textCapitalization: TextCapitalization.sentences,
|
||||
decoration: const InputDecoration(
|
||||
labelText: 'Search or type a new item',
|
||||
),
|
||||
onChanged: (_) => setState(() => _error = null),
|
||||
),
|
||||
if (_error != null) ...[
|
||||
const SizedBox(height: 8),
|
||||
Text(_error!, style: TextStyle(color: theme.colorScheme.error)),
|
||||
],
|
||||
const SizedBox(height: 8),
|
||||
Text('From products', style: theme.textTheme.labelMedium),
|
||||
const SizedBox(height: 4),
|
||||
Expanded(
|
||||
child: matches.isEmpty
|
||||
? Center(
|
||||
child: Text(
|
||||
widget.products.isEmpty
|
||||
? 'No products in your catalog yet.'
|
||||
: 'No products match this search.',
|
||||
style: theme.textTheme.bodyMedium,
|
||||
),
|
||||
)
|
||||
: ListView.builder(
|
||||
itemCount: matches.length,
|
||||
itemBuilder: (context, index) {
|
||||
final product = matches[index];
|
||||
final selected = _selectedProductIds.contains(
|
||||
product.id,
|
||||
);
|
||||
return ListTile(
|
||||
contentPadding: EdgeInsets.zero,
|
||||
leading: Checkbox(
|
||||
value: selected,
|
||||
onChanged: (_) => _toggleProduct(product),
|
||||
),
|
||||
title: Text(product.name),
|
||||
trailing: ProductImage(
|
||||
name: product.name,
|
||||
path: product.imagePath,
|
||||
size: 32,
|
||||
),
|
||||
onTap: () => _toggleProduct(product),
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
FilledButton(
|
||||
onPressed: addCount == 0 ? null : _add,
|
||||
child: Text(addCount == 1 ? 'Add 1 item' : 'Add $addCount items'),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
/// Paid amount, with the pre-discount price struck through when there is one.
|
||||
library;
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../models/line_item.dart';
|
||||
import '../utils/money.dart';
|
||||
|
||||
class DiscountedPrice extends StatelessWidget {
|
||||
const DiscountedPrice({super.key, required this.item});
|
||||
|
||||
final LineItem item;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final theme = Theme.of(context);
|
||||
final paid = Text(
|
||||
formatEuro(item.price),
|
||||
style: theme.textTheme.titleMedium,
|
||||
);
|
||||
if (!item.hasDiscount) return paid;
|
||||
|
||||
return Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Text(
|
||||
formatEuro(item.originalPrice),
|
||||
style: theme.textTheme.bodyMedium?.copyWith(
|
||||
decoration: TextDecoration.lineThrough,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
paid,
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -66,6 +66,9 @@ class _ItemEditSheetState extends State<ItemEditSheet> {
|
||||
unitPrice: quantity != null && quantity > 0
|
||||
? roundMoney(rounded / quantity)
|
||||
: widget.item?.unitPrice,
|
||||
discount: widget.item?.price == rounded
|
||||
? widget.item?.discount ?? 0
|
||||
: 0,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
/// Bottom sheet for picking a shopping list to add a product to.
|
||||
library;
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../models/shopping_list.dart';
|
||||
import '../services/product_repository.dart';
|
||||
import 'name_dialog.dart';
|
||||
|
||||
Future<int?> showPickShoppingListSheet(
|
||||
BuildContext context, {
|
||||
required ProductRepository repository,
|
||||
}) async {
|
||||
final lists = await repository.getShoppingLists();
|
||||
if (!context.mounted) return null;
|
||||
|
||||
if (lists.isEmpty) {
|
||||
final name = await showNameDialog(
|
||||
context,
|
||||
title: 'New shopping list',
|
||||
label: 'List name',
|
||||
confirmLabel: 'Create',
|
||||
);
|
||||
if (name == null || !context.mounted) return null;
|
||||
return repository.createShoppingList(name);
|
||||
}
|
||||
|
||||
return showModalBottomSheet<int>(
|
||||
context: context,
|
||||
showDragHandle: true,
|
||||
builder: (context) {
|
||||
return _PickShoppingListSheet(repository: repository, lists: lists);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
class _PickShoppingListSheet extends StatelessWidget {
|
||||
const _PickShoppingListSheet({required this.repository, required this.lists});
|
||||
|
||||
final ProductRepository repository;
|
||||
final List<ShoppingList> lists;
|
||||
|
||||
Future<void> _create(BuildContext context) async {
|
||||
final name = await showNameDialog(
|
||||
context,
|
||||
title: 'New shopping list',
|
||||
label: 'List name',
|
||||
confirmLabel: 'Create',
|
||||
);
|
||||
if (name == null || !context.mounted) return;
|
||||
final id = await repository.createShoppingList(name);
|
||||
if (context.mounted) Navigator.of(context).pop(id);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final theme = Theme.of(context);
|
||||
|
||||
return SafeArea(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.fromLTRB(16, 8, 16, 0),
|
||||
child: Text('Add to list', style: theme.textTheme.titleLarge),
|
||||
),
|
||||
for (final list in lists)
|
||||
ListTile(
|
||||
leading: const Icon(Icons.checklist_outlined),
|
||||
title: Text(list.name),
|
||||
subtitle: Text(
|
||||
list.itemCount == 0
|
||||
? 'Empty'
|
||||
: list.itemCount == 1
|
||||
? '1 item'
|
||||
: '${list.itemCount} items',
|
||||
),
|
||||
onTap: () => Navigator.of(context).pop(list.id),
|
||||
),
|
||||
ListTile(
|
||||
leading: const Icon(Icons.add),
|
||||
title: const Text('Create new list'),
|
||||
onTap: () => _create(context),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -28,9 +28,7 @@ class PriceChart extends StatelessWidget {
|
||||
height: 160,
|
||||
child: CustomPaint(
|
||||
painter: _PriceChartPainter(
|
||||
prices: [
|
||||
for (final purchase in points) purchase.unitOrLinePrice,
|
||||
],
|
||||
prices: [for (final purchase in points) purchase.unitOrLinePrice],
|
||||
lineColor: theme.colorScheme.primary,
|
||||
fillColor: theme.colorScheme.primary.withValues(alpha: 0.12),
|
||||
gridColor: theme.colorScheme.outlineVariant,
|
||||
@@ -87,7 +85,12 @@ class _PriceChartPainter extends CustomPainter {
|
||||
const right = 8.0;
|
||||
const top = 12.0;
|
||||
const bottom = 8.0;
|
||||
final chart = Rect.fromLTRB(left, top, size.width - right, size.height - bottom);
|
||||
final chart = Rect.fromLTRB(
|
||||
left,
|
||||
top,
|
||||
size.width - right,
|
||||
size.height - bottom,
|
||||
);
|
||||
|
||||
final gridPaint = Paint()
|
||||
..color = gridColor
|
||||
|
||||
@@ -63,7 +63,9 @@ class _LetterAvatar extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final trimmed = name.trim();
|
||||
final letter = trimmed.isEmpty ? '?' : trimmed.substring(0, 1).toUpperCase();
|
||||
final letter = trimmed.isEmpty
|
||||
? '?'
|
||||
: trimmed.substring(0, 1).toUpperCase();
|
||||
return ColoredBox(
|
||||
color: colorScheme.secondaryContainer,
|
||||
child: Center(
|
||||
|
||||
@@ -0,0 +1,618 @@
|
||||
/// Banner, list markers, and merge sheet for name duplicates.
|
||||
library;
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../models/product.dart';
|
||||
import '../services/product_repository.dart';
|
||||
import '../utils/money.dart';
|
||||
import '../utils/product_names.dart';
|
||||
import 'product_image.dart';
|
||||
|
||||
const IconData kProductNameConflictIcon = Icons.merge_type;
|
||||
|
||||
class ProductNameConflictBanner extends StatelessWidget {
|
||||
const ProductNameConflictBanner({
|
||||
super.key,
|
||||
required this.issues,
|
||||
required this.onTap,
|
||||
});
|
||||
|
||||
final ProductNameIssues issues;
|
||||
final VoidCallback onTap;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final theme = Theme.of(context);
|
||||
final scheme = theme.colorScheme;
|
||||
final title = _bannerTitle(issues);
|
||||
final subtitle = _bannerSubtitle(issues);
|
||||
|
||||
return Padding(
|
||||
padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
|
||||
child: Material(
|
||||
color: scheme.errorContainer.withValues(alpha: 0.65),
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
child: InkWell(
|
||||
onTap: onTap,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.fromLTRB(12, 10, 8, 10),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(kProductNameConflictIcon, color: scheme.error),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(title, style: theme.textTheme.titleSmall),
|
||||
Text(
|
||||
subtitle,
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: theme.textTheme.bodySmall,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
Icon(Icons.chevron_right, color: scheme.onSurfaceVariant),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
String _bannerTitle(ProductNameIssues issues) {
|
||||
final count = issues.issueCount;
|
||||
if (count == 1 && issues.mergeGroups.length == 1) {
|
||||
return '1 duplicate product';
|
||||
}
|
||||
if (count == 1 && issues.spellingVariants.length == 1) {
|
||||
return '1 product, multiple spellings';
|
||||
}
|
||||
return '$count name issues';
|
||||
}
|
||||
|
||||
String _bannerSubtitle(ProductNameIssues issues) {
|
||||
final examples = <String>[];
|
||||
for (final group in issues.mergeGroups.take(2)) {
|
||||
final store = group.supermarket == null ? '' : ' @ ${group.supermarket}';
|
||||
examples.add(
|
||||
'${group.products.map((product) => product.name).join(' / ')}$store',
|
||||
);
|
||||
}
|
||||
for (final variant in issues.spellingVariants.take(2)) {
|
||||
final store = variant.supermarket == null
|
||||
? ''
|
||||
: ' @ ${variant.supermarket}';
|
||||
examples.add('${variant.variants.join(' / ')}$store');
|
||||
}
|
||||
return examples.join(', ');
|
||||
}
|
||||
|
||||
class ProductNameConflictMarker extends StatelessWidget {
|
||||
const ProductNameConflictMarker({
|
||||
super.key,
|
||||
this.onTap,
|
||||
this.compact = false,
|
||||
});
|
||||
|
||||
final VoidCallback? onTap;
|
||||
final bool compact;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final scheme = Theme.of(context).colorScheme;
|
||||
final icon = Icon(
|
||||
kProductNameConflictIcon,
|
||||
size: compact ? 14 : 20,
|
||||
color: scheme.error,
|
||||
);
|
||||
if (onTap == null) return icon;
|
||||
if (compact) {
|
||||
return Material(
|
||||
color: scheme.errorContainer,
|
||||
shape: const CircleBorder(),
|
||||
child: InkWell(
|
||||
onTap: onTap,
|
||||
customBorder: const CircleBorder(),
|
||||
child: Padding(padding: const EdgeInsets.all(2), child: icon),
|
||||
),
|
||||
);
|
||||
}
|
||||
return IconButton(
|
||||
tooltip: 'Resolve name issues',
|
||||
visualDensity: VisualDensity.compact,
|
||||
padding: EdgeInsets.zero,
|
||||
constraints: const BoxConstraints(minWidth: 32, minHeight: 32),
|
||||
onPressed: onTap,
|
||||
icon: icon,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Future<bool> showProductNameConflictSheet(
|
||||
BuildContext context, {
|
||||
required ProductRepository repository,
|
||||
required ProductNameIssues issues,
|
||||
int? focusProductId,
|
||||
}) {
|
||||
if (issues.isEmpty) return Future.value(false);
|
||||
|
||||
return showModalBottomSheet<bool>(
|
||||
context: context,
|
||||
isScrollControlled: true,
|
||||
showDragHandle: true,
|
||||
useSafeArea: true,
|
||||
builder: (context) {
|
||||
final size = MediaQuery.sizeOf(context);
|
||||
return SizedBox(
|
||||
width: size.width,
|
||||
height: size.height * 0.85,
|
||||
child: _ProductNameConflictSheet(
|
||||
repository: repository,
|
||||
issues: issues,
|
||||
focusProductId: focusProductId,
|
||||
),
|
||||
);
|
||||
},
|
||||
).then((resolved) => resolved == true);
|
||||
}
|
||||
|
||||
class _ProductNameConflictSheet extends StatefulWidget {
|
||||
const _ProductNameConflictSheet({
|
||||
required this.repository,
|
||||
required this.issues,
|
||||
this.focusProductId,
|
||||
});
|
||||
|
||||
final ProductRepository repository;
|
||||
final ProductNameIssues issues;
|
||||
final int? focusProductId;
|
||||
|
||||
@override
|
||||
State<_ProductNameConflictSheet> createState() =>
|
||||
_ProductNameConflictSheetState();
|
||||
}
|
||||
|
||||
class _ProductNameConflictSheetState extends State<_ProductNameConflictSheet> {
|
||||
late List<ProductMergeGroup> _mergeGroups;
|
||||
late List<ProductSpellingVariant> _spellingVariants;
|
||||
late Map<int, int> _keepByMergeGroup;
|
||||
late Map<int, String> _spellingChoiceByIndex;
|
||||
final Set<int> _busyMergeGroups = {};
|
||||
final Set<int> _busySpellingGroups = {};
|
||||
bool _resolvedAny = false;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_mergeGroups = [for (final group in widget.issues.mergeGroups) group];
|
||||
_spellingVariants = [
|
||||
for (final variant in widget.issues.spellingVariants) variant,
|
||||
];
|
||||
_rebuildChoices();
|
||||
}
|
||||
|
||||
void _rebuildChoices() {
|
||||
_keepByMergeGroup = {
|
||||
for (var i = 0; i < _mergeGroups.length; i++)
|
||||
i: _defaultKeep(_mergeGroups[i].products),
|
||||
};
|
||||
_spellingChoiceByIndex = {
|
||||
for (var i = 0; i < _spellingVariants.length; i++)
|
||||
i: _spellingVariants[i].variants.first,
|
||||
};
|
||||
}
|
||||
|
||||
int _defaultKeep(List<Product> group) {
|
||||
final sorted = [...group]
|
||||
..sort((a, b) {
|
||||
final seen = b.timesSeen.compareTo(a.timesSeen);
|
||||
if (seen != 0) return seen;
|
||||
return a.id.compareTo(b.id);
|
||||
});
|
||||
return sorted.first.id;
|
||||
}
|
||||
|
||||
bool get _isEmpty => _mergeGroups.isEmpty && _spellingVariants.isEmpty;
|
||||
|
||||
int? _focusedMergeIndex() {
|
||||
final focus = widget.focusProductId;
|
||||
if (focus == null) return null;
|
||||
for (var i = 0; i < _mergeGroups.length; i++) {
|
||||
if (_mergeGroups[i].products.any((product) => product.id == focus)) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
int? _focusedSpellingIndex() {
|
||||
final focus = widget.focusProductId;
|
||||
if (focus == null) return null;
|
||||
for (var i = 0; i < _spellingVariants.length; i++) {
|
||||
if (_spellingVariants[i].product.id == focus) return i;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
void _maybeClose() {
|
||||
if (_isEmpty && mounted) {
|
||||
Navigator.of(context).pop(true);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _mergeGroup(int index) async {
|
||||
if (_busyMergeGroups.contains(index)) return;
|
||||
final group = _mergeGroups[index];
|
||||
final keepId = _keepByMergeGroup[index]!;
|
||||
setState(() => _busyMergeGroups.add(index));
|
||||
try {
|
||||
await widget.repository.mergeProducts(
|
||||
keepId: keepId,
|
||||
sourceIds: [for (final product in group.products) product.id],
|
||||
);
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_resolvedAny = true;
|
||||
_busyMergeGroups.remove(index);
|
||||
_mergeGroups.removeAt(index);
|
||||
_rebuildChoices();
|
||||
});
|
||||
_maybeClose();
|
||||
} catch (_) {
|
||||
if (!mounted) return;
|
||||
setState(() => _busyMergeGroups.remove(index));
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
const SnackBar(content: Text('Could not merge these products.')),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _leaveMergeAsIs(int index) async {
|
||||
final group = _mergeGroups[index];
|
||||
await widget.repository.dismissNameIssue(group.key);
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_resolvedAny = true;
|
||||
_mergeGroups.removeAt(index);
|
||||
_rebuildChoices();
|
||||
});
|
||||
_maybeClose();
|
||||
}
|
||||
|
||||
Future<void> _applySpelling(int index) async {
|
||||
if (_busySpellingGroups.contains(index)) return;
|
||||
final variant = _spellingVariants[index];
|
||||
final chosen = _spellingChoiceByIndex[index]!;
|
||||
setState(() => _busySpellingGroups.add(index));
|
||||
try {
|
||||
await widget.repository.unifyProductSpelling(
|
||||
productId: variant.product.id,
|
||||
name: chosen,
|
||||
supermarket: variant.supermarket,
|
||||
);
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_resolvedAny = true;
|
||||
_busySpellingGroups.remove(index);
|
||||
_spellingVariants.removeAt(index);
|
||||
_rebuildChoices();
|
||||
});
|
||||
_maybeClose();
|
||||
} catch (_) {
|
||||
if (!mounted) return;
|
||||
setState(() => _busySpellingGroups.remove(index));
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
const SnackBar(content: Text('Could not update this spelling.')),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _leaveSpellingAsIs(int index) async {
|
||||
final variant = _spellingVariants[index];
|
||||
await widget.repository.dismissNameIssue(variant.key);
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_resolvedAny = true;
|
||||
_spellingVariants.removeAt(index);
|
||||
_rebuildChoices();
|
||||
});
|
||||
_maybeClose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final theme = Theme.of(context);
|
||||
final focusMergeIndex = _focusedMergeIndex();
|
||||
final focusSpellingIndex = _focusedSpellingIndex();
|
||||
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.fromLTRB(16, 0, 16, 0),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Text('Resolve name issues', style: theme.textTheme.titleLarge),
|
||||
const SizedBox(height: 4),
|
||||
Text(
|
||||
'Same name at the same store. Pick which entry to keep, '
|
||||
'then merge or leave as separate products.',
|
||||
style: theme.textTheme.bodyMedium,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
Expanded(
|
||||
child: _isEmpty
|
||||
? Center(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Text(
|
||||
_resolvedAny
|
||||
? 'All name issues resolved.'
|
||||
: 'No name issues found.',
|
||||
textAlign: TextAlign.center,
|
||||
style: theme.textTheme.bodyLarge,
|
||||
),
|
||||
),
|
||||
)
|
||||
: ListView(
|
||||
padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
|
||||
children: [
|
||||
if (_mergeGroups.isNotEmpty) ...[
|
||||
Text(
|
||||
'Separate products to merge',
|
||||
style: theme.textTheme.titleSmall,
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
for (var i = 0; i < _mergeGroups.length; i++) ...[
|
||||
if (i > 0) const SizedBox(height: 12),
|
||||
_MergeGroupCard(
|
||||
group: _mergeGroups[i],
|
||||
keepId: _keepByMergeGroup[i]!,
|
||||
busy: _busyMergeGroups.contains(i),
|
||||
highlighted: focusMergeIndex == i,
|
||||
onKeepChanged: (id) {
|
||||
setState(() => _keepByMergeGroup[i] = id);
|
||||
},
|
||||
onMerge: () => _mergeGroup(i),
|
||||
onLeaveAsIs: () => _leaveMergeAsIs(i),
|
||||
),
|
||||
],
|
||||
],
|
||||
if (_spellingVariants.isNotEmpty) ...[
|
||||
if (_mergeGroups.isNotEmpty) const SizedBox(height: 20),
|
||||
Text(
|
||||
'One product, multiple spellings',
|
||||
style: theme.textTheme.titleSmall,
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
for (var i = 0; i < _spellingVariants.length; i++) ...[
|
||||
if (i > 0) const SizedBox(height: 12),
|
||||
_SpellingVariantCard(
|
||||
variant: _spellingVariants[i],
|
||||
chosen: _spellingChoiceByIndex[i]!,
|
||||
busy: _busySpellingGroups.contains(i),
|
||||
highlighted: focusSpellingIndex == i,
|
||||
onChosen: (name) {
|
||||
setState(() => _spellingChoiceByIndex[i] = name);
|
||||
},
|
||||
onApply: () => _applySpelling(i),
|
||||
onLeaveAsIs: () => _leaveSpellingAsIs(i),
|
||||
),
|
||||
],
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _MergeGroupCard extends StatelessWidget {
|
||||
const _MergeGroupCard({
|
||||
required this.group,
|
||||
required this.keepId,
|
||||
required this.busy,
|
||||
required this.highlighted,
|
||||
required this.onKeepChanged,
|
||||
required this.onMerge,
|
||||
required this.onLeaveAsIs,
|
||||
});
|
||||
|
||||
final ProductMergeGroup group;
|
||||
final int keepId;
|
||||
final bool busy;
|
||||
final bool highlighted;
|
||||
final ValueChanged<int> onKeepChanged;
|
||||
final VoidCallback onMerge;
|
||||
final VoidCallback onLeaveAsIs;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final theme = Theme.of(context);
|
||||
final products = group.products;
|
||||
|
||||
return Card(
|
||||
color: highlighted
|
||||
? theme.colorScheme.tertiaryContainer.withValues(alpha: 0.35)
|
||||
: null,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.fromLTRB(12, 12, 12, 8),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
Icon(
|
||||
kProductNameConflictIcon,
|
||||
size: 18,
|
||||
color: theme.colorScheme.tertiary,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Text(
|
||||
[
|
||||
normalizeProductName(products.first.name),
|
||||
if (group.supermarket != null) group.supermarket!,
|
||||
].join(' · '),
|
||||
style: theme.textTheme.titleSmall,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
for (final product in products)
|
||||
ListTile(
|
||||
contentPadding: EdgeInsets.zero,
|
||||
dense: true,
|
||||
leading: ProductImage(
|
||||
name: product.name,
|
||||
path: product.imagePath,
|
||||
size: 36,
|
||||
),
|
||||
title: Text(product.name),
|
||||
subtitle: Text(
|
||||
[
|
||||
formatEuro(product.lastPrice),
|
||||
product.timesSeen == 1
|
||||
? '1 purchase'
|
||||
: '${product.timesSeen} purchases',
|
||||
].join(' · '),
|
||||
),
|
||||
trailing: Icon(
|
||||
keepId == product.id
|
||||
? Icons.check_circle
|
||||
: Icons.circle_outlined,
|
||||
color: keepId == product.id
|
||||
? theme.colorScheme.primary
|
||||
: theme.colorScheme.outline,
|
||||
),
|
||||
onTap: busy ? null : () => onKeepChanged(product.id),
|
||||
),
|
||||
Wrap(
|
||||
alignment: WrapAlignment.end,
|
||||
spacing: 8,
|
||||
runSpacing: 8,
|
||||
children: [
|
||||
TextButton(
|
||||
onPressed: busy ? null : onLeaveAsIs,
|
||||
child: const Text('Leave as is'),
|
||||
),
|
||||
FilledButton(
|
||||
onPressed: busy ? null : onMerge,
|
||||
child: busy
|
||||
? const SizedBox(
|
||||
width: 16,
|
||||
height: 16,
|
||||
child: CircularProgressIndicator(strokeWidth: 2),
|
||||
)
|
||||
: const Text('Merge'),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _SpellingVariantCard extends StatelessWidget {
|
||||
const _SpellingVariantCard({
|
||||
required this.variant,
|
||||
required this.chosen,
|
||||
required this.busy,
|
||||
required this.highlighted,
|
||||
required this.onChosen,
|
||||
required this.onApply,
|
||||
required this.onLeaveAsIs,
|
||||
});
|
||||
|
||||
final ProductSpellingVariant variant;
|
||||
final String chosen;
|
||||
final bool busy;
|
||||
final bool highlighted;
|
||||
final ValueChanged<String> onChosen;
|
||||
final VoidCallback onApply;
|
||||
final VoidCallback onLeaveAsIs;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final theme = Theme.of(context);
|
||||
final product = variant.product;
|
||||
|
||||
return Card(
|
||||
color: highlighted
|
||||
? theme.colorScheme.tertiaryContainer.withValues(alpha: 0.35)
|
||||
: null,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.fromLTRB(12, 12, 12, 8),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
ListTile(
|
||||
contentPadding: EdgeInsets.zero,
|
||||
dense: true,
|
||||
leading: ProductImage(
|
||||
name: product.name,
|
||||
path: product.imagePath,
|
||||
size: 36,
|
||||
),
|
||||
title: Text(product.name),
|
||||
subtitle: Text(
|
||||
[
|
||||
if (variant.supermarket != null) variant.supermarket!,
|
||||
product.timesSeen == 1
|
||||
? '1 purchase'
|
||||
: '${product.timesSeen} purchases',
|
||||
].join(' · '),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 4),
|
||||
Text('Recorded as:', style: theme.textTheme.labelLarge),
|
||||
const SizedBox(height: 4),
|
||||
for (final name in variant.variants)
|
||||
ListTile(
|
||||
contentPadding: EdgeInsets.zero,
|
||||
dense: true,
|
||||
title: Text(name),
|
||||
trailing: Icon(
|
||||
chosen == name ? Icons.check_circle : Icons.circle_outlined,
|
||||
color: chosen == name
|
||||
? theme.colorScheme.primary
|
||||
: theme.colorScheme.outline,
|
||||
),
|
||||
onTap: busy ? null : () => onChosen(name),
|
||||
),
|
||||
Wrap(
|
||||
alignment: WrapAlignment.end,
|
||||
spacing: 8,
|
||||
runSpacing: 8,
|
||||
children: [
|
||||
TextButton(
|
||||
onPressed: busy ? null : onLeaveAsIs,
|
||||
child: const Text('Leave as is'),
|
||||
),
|
||||
FilledButton(
|
||||
onPressed: busy ? null : onApply,
|
||||
child: Text(busy ? 'Saving…' : 'Use this spelling'),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -13,9 +13,9 @@ class ProfileButton extends StatelessWidget {
|
||||
return IconButton(
|
||||
tooltip: 'Profile',
|
||||
onPressed: () {
|
||||
Navigator.of(context).push<void>(
|
||||
MaterialPageRoute(builder: (_) => const ProfileScreen()),
|
||||
);
|
||||
Navigator.of(
|
||||
context,
|
||||
).push<void>(MaterialPageRoute(builder: (_) => const ProfileScreen()));
|
||||
},
|
||||
icon: const Icon(Icons.person_outline),
|
||||
);
|
||||
|
||||
@@ -3,9 +3,9 @@ library;
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../models/supermarket.dart';
|
||||
import '../services/app_settings.dart';
|
||||
import '../services/backup_service.dart';
|
||||
import '../supermarkets_screen.dart';
|
||||
|
||||
class SettingsButton extends StatelessWidget {
|
||||
const SettingsButton({super.key});
|
||||
@@ -47,9 +47,8 @@ class _SettingsSheetState extends State<_SettingsSheet> {
|
||||
final shared = await BackupService(settings.repository).exportBackup();
|
||||
if (!mounted) return;
|
||||
if (shared) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
const SnackBar(content: Text('Backup ready.')),
|
||||
);
|
||||
ScaffoldMessenger.of(context)
|
||||
.showSnackBar(const SnackBar(content: Text('Backup ready.')));
|
||||
}
|
||||
} catch (_) {
|
||||
if (!mounted) return;
|
||||
@@ -92,9 +91,8 @@ class _SettingsSheetState extends State<_SettingsSheet> {
|
||||
if (imported) {
|
||||
await settings.reload();
|
||||
if (!mounted) return;
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
const SnackBar(content: Text('Backup imported.')),
|
||||
);
|
||||
ScaffoldMessenger.of(context)
|
||||
.showSnackBar(const SnackBar(content: Text('Backup imported.')));
|
||||
}
|
||||
} catch (_) {
|
||||
if (!mounted) return;
|
||||
@@ -106,6 +104,16 @@ class _SettingsSheetState extends State<_SettingsSheet> {
|
||||
}
|
||||
}
|
||||
|
||||
void _openSupermarkets(BuildContext context, AppSettings settings) {
|
||||
Navigator.of(context)
|
||||
..pop()
|
||||
..push(
|
||||
MaterialPageRoute(
|
||||
builder: (_) => SupermarketsScreen(repository: settings.repository),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final settings = SettingsScope.of(context);
|
||||
@@ -116,257 +124,66 @@ class _SettingsSheetState extends State<_SettingsSheet> {
|
||||
builder: (context, _) {
|
||||
return Padding(
|
||||
padding: EdgeInsets.fromLTRB(16, 0, 16, 16 + bottom),
|
||||
child: SizedBox(
|
||||
height: MediaQuery.sizeOf(context).height * 0.75,
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Text('Settings', style: Theme.of(context).textTheme.titleLarge),
|
||||
const SizedBox(height: 8),
|
||||
SwitchListTile(
|
||||
contentPadding: EdgeInsets.zero,
|
||||
title: const Text('Dark mode'),
|
||||
value: settings.darkMode,
|
||||
onChanged: _busy ? null : settings.setDarkMode,
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Text('Settings', style: Theme.of(context).textTheme.titleLarge),
|
||||
const SizedBox(height: 8),
|
||||
SwitchListTile(
|
||||
contentPadding: EdgeInsets.zero,
|
||||
title: const Text('Dark mode'),
|
||||
value: settings.darkMode,
|
||||
onChanged: _busy ? null : settings.setDarkMode,
|
||||
),
|
||||
ListTile(
|
||||
contentPadding: EdgeInsets.zero,
|
||||
leading: const Icon(Icons.store_outlined),
|
||||
title: const Text('Supermarkets'),
|
||||
subtitle: Text(
|
||||
settings.supermarkets.isEmpty
|
||||
? 'Names, colors, and bonus cards'
|
||||
: '${settings.supermarkets.length} stores',
|
||||
),
|
||||
Text('Backup', style: Theme.of(context).textTheme.titleMedium),
|
||||
Text(
|
||||
'Save everything to a JSON file, or replace this device from a backup.',
|
||||
style: Theme.of(context).textTheme.bodyMedium,
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: OutlinedButton.icon(
|
||||
onPressed: _busy ? null : () => _export(settings),
|
||||
icon: const Icon(Icons.file_upload_outlined),
|
||||
label: const Text('Export'),
|
||||
),
|
||||
trailing: const Icon(Icons.chevron_right),
|
||||
onTap: _busy
|
||||
? null
|
||||
: () => _openSupermarkets(context, settings),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
Text('Backup', style: Theme.of(context).textTheme.titleMedium),
|
||||
Text(
|
||||
'Save everything to a JSON file, or replace this device from a backup.',
|
||||
style: Theme.of(context).textTheme.bodyMedium,
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: OutlinedButton.icon(
|
||||
onPressed: _busy ? null : () => _export(settings),
|
||||
icon: const Icon(Icons.file_upload_outlined),
|
||||
label: const Text('Export'),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: OutlinedButton.icon(
|
||||
onPressed: _busy ? null : () => _import(settings),
|
||||
icon: const Icon(Icons.file_download_outlined),
|
||||
label: const Text('Import'),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
if (_busy) ...[
|
||||
const SizedBox(height: 8),
|
||||
const LinearProgressIndicator(),
|
||||
],
|
||||
const SizedBox(height: 16),
|
||||
Text(
|
||||
'Supermarkets',
|
||||
style: Theme.of(context).textTheme.titleMedium,
|
||||
),
|
||||
Text(
|
||||
'Name and color used as tags on products.',
|
||||
style: Theme.of(context).textTheme.bodyMedium,
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Expanded(
|
||||
child: ListView(
|
||||
children: [
|
||||
for (final store in settings.supermarkets)
|
||||
_StoreRow(
|
||||
store: store,
|
||||
onEdit: _busy
|
||||
? () {}
|
||||
: () => _editStore(context, settings, store),
|
||||
onDelete: _busy || store.id == null
|
||||
? null
|
||||
: () => settings.deleteSupermarket(store.id!),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: OutlinedButton.icon(
|
||||
onPressed: _busy ? null : () => _import(settings),
|
||||
icon: const Icon(Icons.file_download_outlined),
|
||||
label: const Text('Import'),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
if (_busy) ...[
|
||||
const SizedBox(height: 8),
|
||||
OutlinedButton.icon(
|
||||
onPressed: _busy
|
||||
? null
|
||||
: () => _editStore(context, settings, null),
|
||||
icon: const Icon(Icons.add),
|
||||
label: const Text('Add supermarket'),
|
||||
),
|
||||
const LinearProgressIndicator(),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _editStore(
|
||||
BuildContext context,
|
||||
AppSettings settings,
|
||||
Supermarket? existing,
|
||||
) async {
|
||||
final result = await showDialog<Supermarket>(
|
||||
context: context,
|
||||
builder: (context) => _StoreEditDialog(store: existing),
|
||||
);
|
||||
if (result == null) return;
|
||||
if (existing == null) {
|
||||
try {
|
||||
await settings.addSupermarket(result.name, result.colorValue);
|
||||
} catch (_) {
|
||||
if (context.mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
const SnackBar(content: Text('That supermarket already exists.')),
|
||||
);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
await settings.updateSupermarket(
|
||||
existing.copyWith(name: result.name, colorValue: result.colorValue),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class _StoreRow extends StatelessWidget {
|
||||
const _StoreRow({
|
||||
required this.store,
|
||||
required this.onEdit,
|
||||
this.onDelete,
|
||||
});
|
||||
|
||||
final Supermarket store;
|
||||
final VoidCallback onEdit;
|
||||
final VoidCallback? onDelete;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final onColor = store.color.computeLuminance() > 0.55
|
||||
? Colors.black87
|
||||
: Colors.white;
|
||||
|
||||
return ListTile(
|
||||
contentPadding: EdgeInsets.zero,
|
||||
leading: CircleAvatar(
|
||||
backgroundColor: store.color,
|
||||
child: Text(
|
||||
store.name.isEmpty ? '?' : store.name.substring(0, 1),
|
||||
style: TextStyle(color: onColor, fontWeight: FontWeight.w700),
|
||||
),
|
||||
),
|
||||
title: Text(store.name),
|
||||
trailing: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
IconButton(
|
||||
tooltip: 'Edit',
|
||||
onPressed: onEdit,
|
||||
icon: const Icon(Icons.edit_outlined),
|
||||
),
|
||||
IconButton(
|
||||
tooltip: 'Delete',
|
||||
onPressed: onDelete,
|
||||
icon: const Icon(Icons.delete_outline),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _StoreEditDialog extends StatefulWidget {
|
||||
const _StoreEditDialog({this.store});
|
||||
|
||||
final Supermarket? store;
|
||||
|
||||
@override
|
||||
State<_StoreEditDialog> createState() => _StoreEditDialogState();
|
||||
}
|
||||
|
||||
class _StoreEditDialogState extends State<_StoreEditDialog> {
|
||||
late final TextEditingController _name;
|
||||
late int _color;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_name = TextEditingController(text: widget.store?.name ?? '');
|
||||
_color = widget.store?.colorValue ?? kStoreColorPalette.first;
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_name.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return AlertDialog(
|
||||
title: Text(widget.store == null ? 'Add supermarket' : 'Edit supermarket'),
|
||||
content: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
TextField(
|
||||
controller: _name,
|
||||
textCapitalization: TextCapitalization.words,
|
||||
decoration: const InputDecoration(labelText: 'Name'),
|
||||
autofocus: widget.store == null,
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
Align(
|
||||
alignment: Alignment.centerLeft,
|
||||
child: Text('Color', style: Theme.of(context).textTheme.titleMedium),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Wrap(
|
||||
spacing: 8,
|
||||
runSpacing: 8,
|
||||
children: [
|
||||
for (final value in kStoreColorPalette)
|
||||
GestureDetector(
|
||||
onTap: () => setState(() => _color = value),
|
||||
child: Container(
|
||||
width: 32,
|
||||
height: 32,
|
||||
decoration: BoxDecoration(
|
||||
color: Color(value),
|
||||
shape: BoxShape.circle,
|
||||
border: Border.all(
|
||||
color: _color == value
|
||||
? Theme.of(context).colorScheme.onSurface
|
||||
: Colors.transparent,
|
||||
width: 2,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(context),
|
||||
child: const Text('Cancel'),
|
||||
),
|
||||
FilledButton(
|
||||
onPressed: () {
|
||||
final name = _name.text.trim();
|
||||
if (name.isEmpty) return;
|
||||
Navigator.pop(
|
||||
context,
|
||||
Supermarket(
|
||||
id: widget.store?.id,
|
||||
name: name,
|
||||
colorValue: _color,
|
||||
sortOrder: widget.store?.sortOrder ?? 0,
|
||||
),
|
||||
);
|
||||
},
|
||||
child: const Text('Save'),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,119 @@
|
||||
/// Dialog for adding or editing a supermarket name and color.
|
||||
library;
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../models/supermarket.dart';
|
||||
|
||||
Future<Supermarket?> showStoreEditDialog(
|
||||
BuildContext context, {
|
||||
Supermarket? store,
|
||||
}) {
|
||||
return showDialog<Supermarket>(
|
||||
context: context,
|
||||
builder: (context) => _StoreEditDialog(store: store),
|
||||
);
|
||||
}
|
||||
|
||||
class _StoreEditDialog extends StatefulWidget {
|
||||
const _StoreEditDialog({this.store});
|
||||
|
||||
final Supermarket? store;
|
||||
|
||||
@override
|
||||
State<_StoreEditDialog> createState() => _StoreEditDialogState();
|
||||
}
|
||||
|
||||
class _StoreEditDialogState extends State<_StoreEditDialog> {
|
||||
late final TextEditingController _name;
|
||||
late int _color;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_name = TextEditingController(text: widget.store?.name ?? '');
|
||||
_color = widget.store?.colorValue ?? kStoreColorPalette.first;
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_name.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return AlertDialog(
|
||||
title: Text(
|
||||
widget.store == null ? 'Add supermarket' : 'Edit supermarket',
|
||||
),
|
||||
content: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
TextField(
|
||||
controller: _name,
|
||||
textCapitalization: TextCapitalization.words,
|
||||
decoration: const InputDecoration(labelText: 'Name'),
|
||||
autofocus: widget.store == null,
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
Align(
|
||||
alignment: Alignment.centerLeft,
|
||||
child: Text(
|
||||
'Color',
|
||||
style: Theme.of(context).textTheme.titleMedium,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Wrap(
|
||||
spacing: 8,
|
||||
runSpacing: 8,
|
||||
children: [
|
||||
for (final value in kStoreColorPalette)
|
||||
GestureDetector(
|
||||
onTap: () => setState(() => _color = value),
|
||||
child: Container(
|
||||
width: 32,
|
||||
height: 32,
|
||||
decoration: BoxDecoration(
|
||||
color: Color(value),
|
||||
shape: BoxShape.circle,
|
||||
border: Border.all(
|
||||
color: _color == value
|
||||
? Theme.of(context).colorScheme.onSurface
|
||||
: Colors.transparent,
|
||||
width: 2,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(context),
|
||||
child: const Text('Cancel'),
|
||||
),
|
||||
FilledButton(
|
||||
onPressed: () {
|
||||
final name = _name.text.trim();
|
||||
if (name.isEmpty) return;
|
||||
Navigator.pop(
|
||||
context,
|
||||
Supermarket(
|
||||
id: widget.store?.id,
|
||||
name: name,
|
||||
colorValue: _color,
|
||||
sortOrder: widget.store?.sortOrder ?? 0,
|
||||
bonusImagePath: widget.store?.bonusImagePath,
|
||||
),
|
||||
);
|
||||
},
|
||||
child: const Text('Save'),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user