From 04e879cc9d82e9412192443d09c260876294537d Mon Sep 17 00:00:00 2001 From: monsieurtanuki Date: Tue, 18 Jan 2022 17:31:02 +0100 Subject: [PATCH 1/4] feat: #931 - displaying the history in dialog instead of log print Impacted files: * `smooth_app/pubspec.yaml`: upgraded * `smooth_ui_library/pubspec.yaml`: upgraded * `smooth_app/pubspec.lock`: impacted by yaml upgrade * `smooth_ui_library/pubspec.lock`: impacted by yaml upgrade * `smooth_ui_library/example/pubspec.lock`: impacted by yaml upgrade * `user_preferences_dev_mode.dart`: displaying the history in dialog instead of log print --- .../lib/pages/user_preferences_dev_mode.dart | 37 +++++- packages/smooth_app/pubspec.lock | 120 +++++++++++++----- packages/smooth_app/pubspec.yaml | 4 +- .../smooth_ui_library/example/pubspec.lock | 12 +- packages/smooth_ui_library/pubspec.lock | 16 +-- packages/smooth_ui_library/pubspec.yaml | 2 +- 6 files changed, 141 insertions(+), 50 deletions(-) diff --git a/packages/smooth_app/lib/pages/user_preferences_dev_mode.dart b/packages/smooth_app/lib/pages/user_preferences_dev_mode.dart index 4849a3ab638..a6a170cf68e 100644 --- a/packages/smooth_app/lib/pages/user_preferences_dev_mode.dart +++ b/packages/smooth_app/lib/pages/user_preferences_dev_mode.dart @@ -109,7 +109,42 @@ class UserPreferencesDevMode extends AbstractUserPreferences { await DaoProductList(localDatabase).export( ProductList.history(), ); - debugPrint('exported history: $export', wrapWidth: 80); + final List children = []; + for (final String barcode in export.keys) { + final bool? exists = export[barcode] as bool?; + children.add( + ListTile( + leading: Icon(exists == null + ? Icons.error + : exists + ? Icons.check + : Icons.help_outline), + title: Text(barcode), + subtitle: Text(exists == null + ? 'exception' + : exists + ? 'product found' + : 'product NOT found'), + ), + ); + } + showDialog( + context: context, + builder: (BuildContext context) => AlertDialog( + title: const Text('export history'), + content: SizedBox( + height: 400, + width: 300, + child: ListView(children: children), + ), + actions: [ + ElevatedButton( + child: Text(AppLocalizations.of(context)!.okay), + onPressed: () => Navigator.pop(context), + ), + ], + ), + ); }, ), ]; diff --git a/packages/smooth_app/pubspec.lock b/packages/smooth_app/pubspec.lock index 4c8ae287a96..17d5a760f2e 100644 --- a/packages/smooth_app/pubspec.lock +++ b/packages/smooth_app/pubspec.lock @@ -7,7 +7,7 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "32.0.0" + version: "33.0.0" after_layout: dependency: transitive description: @@ -21,7 +21,7 @@ packages: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.1.0" archive: dependency: transitive description: @@ -42,7 +42,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.1" + version: "2.8.2" boolean_selector: dependency: transitive description: @@ -70,7 +70,7 @@ packages: name: built_value url: "https://pub.dartlang.org" source: hosted - version: "8.1.3" + version: "8.1.4" camera: dependency: "direct main" description: @@ -84,7 +84,7 @@ packages: name: camera_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.1.3" + version: "2.1.4" camera_web: dependency: transitive description: @@ -105,7 +105,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" charcode: dependency: transitive description: @@ -190,6 +190,48 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.0" + device_info_plus: + dependency: "direct main" + description: + name: device_info_plus + url: "https://pub.dartlang.org" + source: hosted + version: "3.2.1" + device_info_plus_linux: + dependency: transitive + description: + name: device_info_plus_linux + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.1" + device_info_plus_macos: + dependency: transitive + description: + name: device_info_plus_macos + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.1" + device_info_plus_platform_interface: + dependency: transitive + description: + name: device_info_plus_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "2.3.0+1" + device_info_plus_web: + dependency: transitive + description: + name: device_info_plus_web + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + device_info_plus_windows: + dependency: transitive + description: + name: device_info_plus_windows + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.1" device_preview: dependency: "direct main" description: @@ -269,7 +311,7 @@ packages: name: flutter_native_splash url: "https://pub.dartlang.org" source: hosted - version: "1.3.2" + version: "1.3.3" flutter_plugin_android_lifecycle: dependency: transitive description: @@ -356,7 +398,7 @@ packages: name: fwfh_text_style url: "https://pub.dartlang.org" source: hosted - version: "2.5.1" + version: "2.7.2" glob: dependency: transitive description: @@ -412,7 +454,7 @@ packages: name: image url: "https://pub.dartlang.org" source: hosted - version: "3.1.0" + version: "3.1.1" image_cropper: dependency: "direct main" description: @@ -433,14 +475,14 @@ packages: name: image_picker_for_web url: "https://pub.dartlang.org" source: hosted - version: "2.1.4" + version: "2.1.5" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.4.2" + version: "2.4.3" intl: dependency: transitive description: @@ -503,7 +545,7 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10" + version: "0.12.11" matomo: dependency: "direct main" description: @@ -552,7 +594,7 @@ packages: name: openfoodfacts url: "https://pub.dartlang.org" source: hosted - version: "1.10.0" + version: "1.11.1" package_config: dependency: transitive description: @@ -650,28 +692,28 @@ packages: name: path_provider_linux url: "https://pub.dartlang.org" source: hosted - version: "2.1.4" + version: "2.1.5" path_provider_macos: dependency: transitive description: name: path_provider_macos url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.0.5" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" path_provider_windows: dependency: transitive description: name: path_provider_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.0.5" pedantic: dependency: transitive description: @@ -686,6 +728,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.4.0" + permission_handler: + dependency: "direct main" + description: + name: permission_handler + url: "https://pub.dartlang.org" + source: hosted + version: "8.3.0" + permission_handler_platform_interface: + dependency: transitive + description: + name: permission_handler_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "3.7.0" petitparser: dependency: transitive description: @@ -790,28 +846,28 @@ packages: name: shared_preferences url: "https://pub.dartlang.org" source: hosted - version: "2.0.11" + version: "2.0.12" shared_preferences_android: dependency: transitive description: name: shared_preferences_android url: "https://pub.dartlang.org" source: hosted - version: "2.0.9" + version: "2.0.10" shared_preferences_ios: dependency: transitive description: name: shared_preferences_ios url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.0.9" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.0.4" shared_preferences_macos: dependency: transitive description: @@ -832,14 +888,14 @@ packages: name: shared_preferences_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.0.4" sky_engine: dependency: transitive description: flutter @@ -907,7 +963,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.2" + version: "0.4.3" transparent_image: dependency: transitive description: @@ -963,21 +1019,21 @@ packages: name: url_launcher_android url: "https://pub.dartlang.org" source: hosted - version: "6.0.13" + version: "6.0.14" url_launcher_ios: dependency: transitive description: name: url_launcher_ios url: "https://pub.dartlang.org" source: hosted - version: "6.0.13" + version: "6.0.14" url_launcher_linux: dependency: transitive description: name: url_launcher_linux url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" url_launcher_macos: dependency: transitive description: @@ -998,7 +1054,7 @@ packages: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.6" url_launcher_windows: dependency: transitive description: @@ -1019,7 +1075,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" visibility_detector: dependency: "direct main" description: @@ -1040,7 +1096,7 @@ packages: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.3.3" + version: "2.3.6" wkt_parser: dependency: transitive description: @@ -1070,5 +1126,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.14.0 <3.0.0" - flutter: ">=2.5.0" + dart: ">=2.15.1 <3.0.0" + flutter: ">=2.6.0-0" diff --git a/packages/smooth_app/pubspec.yaml b/packages/smooth_app/pubspec.yaml index c08b79f0c77..867a80cf0ed 100644 --- a/packages/smooth_app/pubspec.yaml +++ b/packages/smooth_app/pubspec.yaml @@ -29,7 +29,7 @@ dependencies: latlong2: ^0.8.1 matomo: ^1.1.0 modal_bottom_sheet: ^2.0.0 - openfoodfacts: ^1.10.0 + openfoodfacts: ^1.11.1 # openfoodfacts: # path: ../../../openfoodfacts-dart package_info_plus: ^1.3.0 @@ -50,7 +50,7 @@ dependencies: dev_dependencies: flutter_launcher_icons: ^0.9.2 - flutter_native_splash: ^1.3.2 + flutter_native_splash: ^1.3.3 flutter_test: sdk: flutter mockito: ^5.0.17 diff --git a/packages/smooth_ui_library/example/pubspec.lock b/packages/smooth_ui_library/example/pubspec.lock index 9cfc2970056..88a3b404e32 100644 --- a/packages/smooth_ui_library/example/pubspec.lock +++ b/packages/smooth_ui_library/example/pubspec.lock @@ -14,7 +14,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.1" + version: "2.8.2" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" charcode: dependency: transitive description: @@ -136,7 +136,7 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10" + version: "0.12.11" meta: dependency: transitive description: @@ -157,7 +157,7 @@ packages: name: openfoodfacts url: "https://pub.dartlang.org" source: hosted - version: "1.10.0" + version: "1.11.1" path: dependency: transitive description: @@ -253,7 +253,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.2" + version: "0.4.3" typed_data: dependency: transitive description: @@ -267,7 +267,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" xml: dependency: transitive description: diff --git a/packages/smooth_ui_library/pubspec.lock b/packages/smooth_ui_library/pubspec.lock index 247f38e8a7a..4929f0ce9cf 100644 --- a/packages/smooth_ui_library/pubspec.lock +++ b/packages/smooth_ui_library/pubspec.lock @@ -7,14 +7,14 @@ packages: name: archive url: "https://pub.dartlang.org" source: hosted - version: "3.1.6" + version: "3.1.8" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.1" + version: "2.8.2" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" charcode: dependency: transitive description: @@ -108,7 +108,7 @@ packages: name: image url: "https://pub.dartlang.org" source: hosted - version: "3.1.0" + version: "3.1.1" json_annotation: dependency: transitive description: @@ -129,7 +129,7 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10" + version: "0.12.11" meta: dependency: transitive description: @@ -143,7 +143,7 @@ packages: name: openfoodfacts url: "https://pub.dartlang.org" source: hosted - version: "1.10.0" + version: "1.11.1" path: dependency: transitive description: @@ -225,7 +225,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.2" + version: "0.4.3" typed_data: dependency: transitive description: @@ -239,7 +239,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" xml: dependency: transitive description: diff --git a/packages/smooth_ui_library/pubspec.yaml b/packages/smooth_ui_library/pubspec.yaml index dd326bdaeee..f708552665a 100644 --- a/packages/smooth_ui_library/pubspec.yaml +++ b/packages/smooth_ui_library/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: flutter: sdk: flutter flutter_svg: ^1.0.1 - openfoodfacts: ^1.10.0 + openfoodfacts: ^1.11.1 # Uncomment those lines if you want to use a local version of the openfoodfacts package # openfoodfacts: # path: ../../../openfoodfacts-dart From eb8e5d1edecda2dfd033047ea7c04c408ed60e88 Mon Sep 17 00:00:00 2001 From: monsieurtanuki Date: Tue, 18 Jan 2022 19:20:58 +0100 Subject: [PATCH 2/4] feat: #931 - some desperate fixes --- packages/smooth_app/pubspec.yaml | 2 +- packages/smooth_ui_library/pubspec.lock | 2 +- packages/smooth_ui_library/pubspec.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/smooth_app/pubspec.yaml b/packages/smooth_app/pubspec.yaml index 867a80cf0ed..fc970239b56 100644 --- a/packages/smooth_app/pubspec.yaml +++ b/packages/smooth_app/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.0.1+6 publish_to: "none" environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.15.1 <3.0.0" dependencies: flutter_lints: ^1.0.4 diff --git a/packages/smooth_ui_library/pubspec.lock b/packages/smooth_ui_library/pubspec.lock index 4929f0ce9cf..02d5bf2a590 100644 --- a/packages/smooth_ui_library/pubspec.lock +++ b/packages/smooth_ui_library/pubspec.lock @@ -248,5 +248,5 @@ packages: source: hosted version: "5.3.1" sdks: - dart: ">=2.14.0 <3.0.0" + dart: ">=2.15.1 <3.0.0" flutter: ">=2.4.0-0.0.pre" diff --git a/packages/smooth_ui_library/pubspec.yaml b/packages/smooth_ui_library/pubspec.yaml index f708552665a..3b981e84b0c 100644 --- a/packages/smooth_ui_library/pubspec.yaml +++ b/packages/smooth_ui_library/pubspec.yaml @@ -3,7 +3,7 @@ description: The official UI library for smooth_app. version: 0.0.1 environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.15.1 <3.0.0" dependencies: flutter_lints: ^1.0.4 From 3117be758a325a675840c0e034fa942d791127e7 Mon Sep 17 00:00:00 2001 From: monsieurtanuki Date: Tue, 18 Jan 2022 19:21:16 +0100 Subject: [PATCH 3/4] feat: #931 - some desperate fixes --- packages/smooth_ui_library/example/pubspec.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/smooth_ui_library/example/pubspec.lock b/packages/smooth_ui_library/example/pubspec.lock index 88a3b404e32..1f679513063 100644 --- a/packages/smooth_ui_library/example/pubspec.lock +++ b/packages/smooth_ui_library/example/pubspec.lock @@ -276,5 +276,5 @@ packages: source: hosted version: "5.3.1" sdks: - dart: ">=2.14.0 <3.0.0" + dart: ">=2.15.1 <3.0.0" flutter: ">=2.4.0-0.0.pre" From c4da83d4b868e298b3e35f5e18201914ce260b88 Mon Sep 17 00:00:00 2001 From: monsieurtanuki Date: Wed, 19 Jan 2022 10:04:18 +0100 Subject: [PATCH 4/4] feat: #931 - pubspec tap dancing --- packages/smooth_app/pubspec.lock | 2 +- packages/smooth_app/pubspec.yaml | 6 +++--- packages/smooth_ui_library/example/pubspec.lock | 4 ++-- packages/smooth_ui_library/pubspec.lock | 4 ++-- packages/smooth_ui_library/pubspec.yaml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/smooth_app/pubspec.lock b/packages/smooth_app/pubspec.lock index 17d5a760f2e..de3f0cfa989 100644 --- a/packages/smooth_app/pubspec.lock +++ b/packages/smooth_app/pubspec.lock @@ -367,7 +367,7 @@ packages: name: flutter_svg url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.2" flutter_test: dependency: "direct dev" description: flutter diff --git a/packages/smooth_app/pubspec.yaml b/packages/smooth_app/pubspec.yaml index fc970239b56..8132698e7ab 100644 --- a/packages/smooth_app/pubspec.yaml +++ b/packages/smooth_app/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.0.1+6 publish_to: "none" environment: - sdk: ">=2.15.1 <3.0.0" + sdk: ">=2.12.0 <3.0.0" dependencies: flutter_lints: ^1.0.4 @@ -16,7 +16,7 @@ dependencies: sdk: flutter flutter_localizations: sdk: flutter - flutter_svg: ^1.0.1 + flutter_svg: ^1.0.2 flutter_map: ^0.14.0 flutter_widget_from_html_core: ^0.8.4 flutter_secure_storage: ^5.0.2 @@ -50,7 +50,7 @@ dependencies: dev_dependencies: flutter_launcher_icons: ^0.9.2 - flutter_native_splash: ^1.3.3 + flutter_native_splash: ^1.3.2 # careful with 1.3.3 because it needs dart 2.15.1 min flutter_test: sdk: flutter mockito: ^5.0.17 diff --git a/packages/smooth_ui_library/example/pubspec.lock b/packages/smooth_ui_library/example/pubspec.lock index 1f679513063..6178fd34e71 100644 --- a/packages/smooth_ui_library/example/pubspec.lock +++ b/packages/smooth_ui_library/example/pubspec.lock @@ -89,7 +89,7 @@ packages: name: flutter_svg url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.2" flutter_test: dependency: "direct dev" description: flutter @@ -276,5 +276,5 @@ packages: source: hosted version: "5.3.1" sdks: - dart: ">=2.15.1 <3.0.0" + dart: ">=2.14.0 <3.0.0" flutter: ">=2.4.0-0.0.pre" diff --git a/packages/smooth_ui_library/pubspec.lock b/packages/smooth_ui_library/pubspec.lock index 02d5bf2a590..51e04b3596e 100644 --- a/packages/smooth_ui_library/pubspec.lock +++ b/packages/smooth_ui_library/pubspec.lock @@ -82,7 +82,7 @@ packages: name: flutter_svg url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.2" flutter_test: dependency: "direct dev" description: flutter @@ -248,5 +248,5 @@ packages: source: hosted version: "5.3.1" sdks: - dart: ">=2.15.1 <3.0.0" + dart: ">=2.14.0 <3.0.0" flutter: ">=2.4.0-0.0.pre" diff --git a/packages/smooth_ui_library/pubspec.yaml b/packages/smooth_ui_library/pubspec.yaml index 3b981e84b0c..aa225a6fe80 100644 --- a/packages/smooth_ui_library/pubspec.yaml +++ b/packages/smooth_ui_library/pubspec.yaml @@ -3,13 +3,13 @@ description: The official UI library for smooth_app. version: 0.0.1 environment: - sdk: ">=2.15.1 <3.0.0" + sdk: ">=2.12.0 <3.0.0" dependencies: flutter_lints: ^1.0.4 flutter: sdk: flutter - flutter_svg: ^1.0.1 + flutter_svg: ^1.0.2 openfoodfacts: ^1.11.1 # Uncomment those lines if you want to use a local version of the openfoodfacts package # openfoodfacts: