Merge branch 'master' into feature/#55

monsieurtanuki · Jan 8, 2021 · de8de42 · de8de42
2 parents b8c6f42 + 8d4b943
commit de8de42
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 26 deletions.
diff --git a/packages/smooth_app/lib/main.dart b/packages/smooth_app/lib/main.dart
@@ -21,16 +21,18 @@ import 'package:provider/provider.dart';
 import 'package:smooth_app/temp/user_preferences.dart';
 import 'package:smooth_app/database/local_database.dart';
 
-final SentryClient sentry = SentryClient(
-    dsn:
-        'https://22ec5d0489534b91ba455462d3736680@o241488.ingest.sentry.io/5376745');
-
 Future<void> main() async {
+  await Sentry.init(
+    (dynamic options) {
+      options.dsn =
+          'https://22ec5d0489534b91ba455462d3736680@o241488.ingest.sentry.io/5376745';
+    },
+  );
   try {
     runApp(MyApp());
-  } catch (error, stackTrace) {
-    await sentry.captureException(
-      exception: error,
+  } catch (exception, stackTrace) {
+    await Sentry.captureException(
+      exception,
       stackTrace: stackTrace,
     );
   }

diff --git a/packages/smooth_app/lib/pages/personalized_ranking_page.dart b/packages/smooth_app/lib/pages/personalized_ranking_page.dart
@@ -215,9 +215,8 @@ class _PersonalizedRankingPageState extends State<PersonalizedRankingPage> {
                     backgroundColor: Colors.transparent,
                     bounce: true,
                     barrierColor: Colors.black45,
-                    builder: (BuildContext context,
-                            ScrollController scrollController) =>
-                        UserPreferencesView(scrollController, callback: () {
+                    builder: (BuildContext context) => UserPreferencesView(
+                        ModalScrollController.of(context), callback: () {
                       // TODO(monsieurtanuki): refresh??? personalizedRankingModel.processProductList(usercontext);
                       const SnackBar snackBar = SnackBar(
                         content: Text(

diff --git a/packages/smooth_app/lib/pages/profile_page.dart b/packages/smooth_app/lib/pages/profile_page.dart
@@ -92,9 +92,9 @@ class _ProfilePageState extends State<ProfilePage> {
               backgroundColor: Colors.transparent,
               bounce: true,
               barrierColor: Colors.black45,
-              builder:
-                  (BuildContext context, ScrollController scrollController) =>
-                      UserPreferencesView(scrollController),
+              builder: (BuildContext context) => UserPreferencesView(
+                ModalScrollController.of(context),
+              ),
             ),
           ),
 
@@ -107,9 +107,9 @@ class _ProfilePageState extends State<ProfilePage> {
               backgroundColor: Colors.transparent,
               bounce: true,
               barrierColor: Colors.black45,
-              builder:
-                  (BuildContext context, ScrollController scrollController) =>
-                      UserContributionView(scrollController),
+              builder: (BuildContext context) => UserContributionView(
+                ModalScrollController.of(context),
+              ),
             ),
           ),
 

diff --git a/packages/smooth_app/pubspec.yaml b/packages/smooth_app/pubspec.yaml
@@ -25,26 +25,26 @@ dependencies:
   cupertino_icons: ^1.0.0
   flutter_svg: ^0.18.0
   basic_utils: ^2.6.3
-  modal_bottom_sheet: ^0.2.0+1
+  modal_bottom_sheet: ^1.0.0+1
   provider: ^4.3.2+3
   openfoodfacts: ^0.3.14+1
-  flutter_qr_bar_scanner: ^1.0.1
+  flutter_qr_bar_scanner: ^1.0.2
   qr_code_scanner: ^0.0.13
   sqflite: ^1.3.2+1
-  path_provider: ^1.6.11
-  carousel_slider: ^2.2.1
-  flutter_staggered_grid_view: ^0.3.2
+  path_provider: ^1.6.24
+  carousel_slider: ^2.3.1
+  flutter_staggered_grid_view: ^0.3.3
   rubber: ^0.4.0
   shared_preferences: ^0.5.12+4
-  image_picker: ^0.6.7+4
-  image_cropper: ^1.2.3
+  image_picker: ^0.6.7+17
+  image_cropper: ^1.3.1
   url_launcher: ^5.7.10
   flutter_staggered_animations: ^0.1.2
   intl: ^0.16.1
-  sentry: ^3.0.1
-  sticky_grouped_list: ^0.3.0
+  sentry: ^4.0.1
+  sticky_grouped_list: ^1.3.0
   sticky_headers: ^0.1.8+1
-  flutter_sticky_header: ^0.4.5
+  flutter_sticky_header: ^0.5.0
   package_info_plus: ^0.6.3
 
   smooth_ui_library: