Skip to content

Commit

Permalink
feat: openfoodfacts#1070 - refactored, in order to be closer to the p…
Browse files Browse the repository at this point in the history 
…revious version

Impacted files:
* `edit_ingredients_page.dart`
* `ocr_helper.dart`
  • Loading branch information
@monsieurtanuki
monsieurtanuki committed Jun 25, 2022
1 parent 52c87b6 commit 1f3a666
Show file tree
Hide file tree
Showing 2 changed files with 119 additions and 137 deletions.
121 changes: 119 additions & 2 deletions packages/smooth_app/lib/pages/product/edit_ingredients_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import 'package:openfoodfacts/openfoodfacts.dart';
import 'package:provider/provider.dart';
import 'package:smooth_app/data_models/up_to_date_product_provider.dart';
import 'package:smooth_app/database/local_database.dart';
import 'package:smooth_app/generic_lib/design_constants.dart';
import 'package:smooth_app/generic_lib/dialogs/smooth_alert_dialog.dart';
import 'package:smooth_app/helpers/picture_capture_helper.dart';
import 'package:smooth_app/pages/image_crop_page.dart';
import 'package:smooth_app/pages/product/common/product_refresher.dart';
Expand Down Expand Up @@ -171,13 +173,14 @@ class _EditOcrPageState extends State<EditOcrPage> {
);
} else {
children.add(
_helper.getOcrWidget(
_OcrWidget(
controller: _controller,
onTapGetImage: _onTapGetImage,
onSubmitField: _onSubmitField,
updatingText: _updatingText,
imageProvider: _imageProvider,
hasImageProvider: _imageProvider != null,
product: _product,
helper: _helper,
),
);
}
Expand Down Expand Up @@ -228,3 +231,117 @@ class _EditOcrPageState extends State<EditOcrPage> {
);
}
}

class _OcrWidget extends StatelessWidget {
const _OcrWidget({
required this.controller,
required this.onSubmitField,
required this.onTapGetImage,
required this.updatingText,
required this.hasImageProvider,
required this.product,
required this.helper,
});

final TextEditingController controller;
final bool updatingText;
final Future<void> Function(bool) onTapGetImage;
final Future<void> Function() onSubmitField;
final bool hasImageProvider;
final Product product;
final OcrHelper helper;

@override
Widget build(BuildContext context) {
final AppLocalizations appLocalizations = AppLocalizations.of(context);
return Align(
alignment: Alignment.bottomLeft,
child: Column(
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
Flexible(
flex: 1,
child: Align(
alignment: Alignment.bottomRight,
child: Padding(
padding: const EdgeInsets.only(
bottom: LARGE_SPACE,
right: LARGE_SPACE,
left: LARGE_SPACE,
),
child: SmoothActionButtonsBar(
positiveAction: SmoothActionButton(
text: helper.getActionRefreshPhoto(appLocalizations),
onPressed: () => onTapGetImage(true),
),
),
),
),
),
Flexible(
flex: 1,
child: SingleChildScrollView(
child: Container(
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.background,
borderRadius: const BorderRadius.only(
topLeft: ANGULAR_RADIUS,
topRight: ANGULAR_RADIUS,
)),
child: Padding(
padding: const EdgeInsets.all(LARGE_SPACE),
child: Column(
children: <Widget>[
if (hasImageProvider ||
helper.getImageUrl(product) != null)
SmoothActionButtonsBar.single(
action: SmoothActionButton(
text: helper.getActionExtractText(appLocalizations),
onPressed: () => onTapGetImage(false),
),
),
const SizedBox(height: MEDIUM_SPACE),
TextField(
enabled: !updatingText,
controller: controller,
decoration: const InputDecoration(
enabledBorder: OutlineInputBorder(
borderRadius: ANGULAR_BORDER_RADIUS,
),
),
maxLines: null,
textInputAction: TextInputAction.done,
onSubmitted: (_) => onSubmitField,
),
const SizedBox(height: SMALL_SPACE),
Text(
helper.getInstructions(appLocalizations),
style: Theme.of(context).textTheme.caption,
),
const SizedBox(height: MEDIUM_SPACE),
SmoothActionButtonsBar(
negativeAction: SmoothActionButton(
text: appLocalizations.cancel,
onPressed: () => Navigator.pop(context),
),
positiveAction: SmoothActionButton(
text: appLocalizations.save,
onPressed: () async {
await onSubmitField();
//ignore: use_build_context_synchronously
Navigator.pop(context, product);
},
),
),
const SizedBox(height: MEDIUM_SPACE),
],
),
),
),
),
),
],
),
);
}
}
135 changes: 0 additions & 135 deletions packages/smooth_app/lib/pages/product/ocr_helper.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:openfoodfacts/openfoodfacts.dart';
import 'package:smooth_app/database/product_query.dart';
import 'package:smooth_app/generic_lib/design_constants.dart';
import 'package:smooth_app/generic_lib/dialogs/smooth_alert_dialog.dart';

/// OCR Helper, to be implemented for ingredients and packaging for instance.
abstract class OcrHelper {
Expand Down Expand Up @@ -44,142 +42,9 @@ abstract class OcrHelper {
/// Returns the text that the server OCR managed to extract from the image.
Future<String?> getExtractedText(final Product product);

/// Returns the OCR widget with input and buttons.
Widget getOcrWidget({
required final TextEditingController controller,
required final bool updatingText,
required final Future<void> Function(bool) onTapGetImage,
required final Future<void> Function() onSubmitField,
required final ImageProvider? imageProvider,
required final Product product,
}) =>
_OcrWidget(
controller: controller,
onTapGetImage: onTapGetImage,
onSubmitField: onSubmitField,
updatingText: updatingText,
hasImageProvider: imageProvider != null,
product: product,
helper: this,
);

@protected
OpenFoodFactsLanguage getLanguage() => ProductQuery.getLanguage()!;

@protected
User getUser() => ProductQuery.getUser();
}

class _OcrWidget extends StatelessWidget {
const _OcrWidget({
required this.controller,
required this.onSubmitField,
required this.onTapGetImage,
required this.updatingText,
required this.hasImageProvider,
required this.product,
required this.helper,
});

final TextEditingController controller;
final bool updatingText;
final Future<void> Function(bool) onTapGetImage;
final Future<void> Function() onSubmitField;
final bool hasImageProvider;
final Product product;
final OcrHelper helper;

@override
Widget build(BuildContext context) {
final AppLocalizations appLocalizations = AppLocalizations.of(context);
return Align(
alignment: Alignment.bottomLeft,
child: Column(
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
Flexible(
flex: 1,
child: Align(
alignment: Alignment.bottomRight,
child: Padding(
padding: const EdgeInsets.only(
bottom: LARGE_SPACE,
right: LARGE_SPACE,
left: LARGE_SPACE,
),
child: SmoothActionButtonsBar(
positiveAction: SmoothActionButton(
text: helper.getActionRefreshPhoto(appLocalizations),
onPressed: () => onTapGetImage(true),
),
),
),
),
),
Flexible(
flex: 1,
child: SingleChildScrollView(
child: Container(
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.background,
borderRadius: const BorderRadius.only(
topLeft: ANGULAR_RADIUS,
topRight: ANGULAR_RADIUS,
)),
child: Padding(
padding: const EdgeInsets.all(LARGE_SPACE),
child: Column(
children: <Widget>[
if (hasImageProvider ||
helper.getImageUrl(product) != null)
SmoothActionButtonsBar.single(
action: SmoothActionButton(
text: helper.getActionExtractText(appLocalizations),
onPressed: () => onTapGetImage(false),
),
),
const SizedBox(height: MEDIUM_SPACE),
TextField(
enabled: !updatingText,
controller: controller,
decoration: const InputDecoration(
enabledBorder: OutlineInputBorder(
borderRadius: ANGULAR_BORDER_RADIUS,
),
),
maxLines: null,
textInputAction: TextInputAction.done,
onSubmitted: (_) => onSubmitField,
),
const SizedBox(height: SMALL_SPACE),
Text(
helper.getInstructions(appLocalizations),
style: Theme.of(context).textTheme.caption,
),
const SizedBox(height: MEDIUM_SPACE),
SmoothActionButtonsBar(
negativeAction: SmoothActionButton(
text: appLocalizations.cancel,
onPressed: () => Navigator.pop(context),
),
positiveAction: SmoothActionButton(
text: appLocalizations.save,
onPressed: () async {
await onSubmitField();
//ignore: use_build_context_synchronously
Navigator.pop(context, product);
},
),
),
const SizedBox(height: MEDIUM_SPACE),
],
),
),
),
),
),
],
),
);
}
}

0 comments on commit 1f3a666

Please sign in to comment.