fix: analyzer

2025-05-23 12:03:04 +03:00
parent 8dcfa6ee6a
commit b59190e4e8
14 changed files with 58 additions and 63 deletions
--- a/lib/features/blog_post/presentation/pages/blog_post_screen.dart
+++ b/lib/features/blog_post/presentation/pages/blog_post_screen.dart
@@ -242,9 +242,11 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
                          icon: Icons.reply_rounded,
                          onTap: () {
                            final box = context.findRenderObject() as RenderBox?;
-                            Share.shareUri(
-                              Uri.parse('$baseUrl/ru/blog_post/${widget.blogPost.id}'),
-                              sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
+                            SharePlus.instance.share(
+                              ShareParams(
+                                uri: Uri.parse('$baseUrl/ru/blog_post/${widget.blogPost.id}'),
+                                sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
+                              ),
                            );
                          },
                        ),
--- a/lib/features/diets/presentation/widgets/more_options.dart
+++ b/lib/features/diets/presentation/widgets/more_options.dart
@@ -60,11 +60,11 @@ class MoreOptions extends StatelessWidget {
                  ? null
                  : () {
                      final box = context.findRenderObject() as RenderBox?;
-                      Share.shareUri(
-                        Uri.parse(
-                          '$baseUrl/ru/$path',
+                      SharePlus.instance.share(
+                        ShareParams(
+                          uri: Uri.parse('$baseUrl/ru/$path',),
+                          sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
                        ),
-                        sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
                      );
                    },
              child: Row(
--- a/lib/features/feed/presentation/widgets/blog_post_widget.dart
+++ b/lib/features/feed/presentation/widgets/blog_post_widget.dart
@@ -243,11 +243,11 @@ class _BlogPostWidgetState extends State<BlogPostWidget> {
                          ),
                          onTap: () {
                            final box = context.findRenderObject() as RenderBox?;
-                            Share.shareUri(
-                              Uri.parse(
-                                '$baseUrl/ru/blog_post/${state.feedBlogPostList[widget.index].id}',
+                            SharePlus.instance.share(
+                              ShareParams(
+                                uri: Uri.parse('$baseUrl/ru/blog_post/${state.feedBlogPostList[widget.index].id}',),
+                                sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
                              ),
-                              sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
                            );
                          },
                        ),
--- a/lib/features/feed/presentation/widgets/diets_widget.dart
+++ b/lib/features/feed/presentation/widgets/diets_widget.dart
@@ -186,11 +186,11 @@ class _DietsWidgetState extends State<DietsWidget> {
                    svgIcon: SvgPicture.asset('assets/icons/repost.svg'),
                    onTap: () async {
                      final box = context.findRenderObject() as RenderBox?;
-                      final result = await Share.shareUri(
-                        Uri.parse(
-                          '$baseUrl/ru/diet/${widget.diet.id}',
+                      final result = await SharePlus.instance.share(
+                        ShareParams(
+                          uri: Uri.parse('$baseUrl/ru/diet/${widget.diet.id}'),
+                          sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
                        ),
-                        sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
                      );
                      switch (result.status) {
                        case ShareResultStatus.success:
--- a/lib/features/feed/presentation/widgets/plan_widget.dart
+++ b/lib/features/feed/presentation/widgets/plan_widget.dart
@@ -257,11 +257,11 @@ class _PlanWidgetState extends State<PlanWidget> {
                    svgIcon: SvgPicture.asset('assets/icons/repost.svg'),
                    onTap: () async {
                      final box = context.findRenderObject() as RenderBox?;
-                      final result = await Share.shareUri(
-                        Uri.parse(
-                          '$baseUrl/ru/diet/${widget.plan.id}',
+                      final result = await SharePlus.instance.share(
+                        ShareParams(
+                          uri: Uri.parse('$baseUrl/ru/diet/${widget.plan.id}'),
+                          sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
                        ),
-                        sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
                      );
                      switch (result.status) {
                        case ShareResultStatus.success:
--- a/lib/features/feed/presentation/widgets/recipes_widget.dart
+++ b/lib/features/feed/presentation/widgets/recipes_widget.dart
@@ -226,11 +226,11 @@ class _RecipesWidgetState extends State<RecipesWidget> {
                        ),
                        onTap: () {
                          final box = context.findRenderObject() as RenderBox?;
-                          Share.shareUri(
-                            Uri.parse(
-                              '$baseUrl/ru/blog_post/${widget.recipe.id}',
+                          SharePlus.instance.share(
+                            ShareParams(
+                              uri: Uri.parse('$baseUrl/ru/blog_post/${widget.recipe.id}'),
+                              sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
                            ),
-                            sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
                          );
                        },
                      ),
--- a/lib/features/my_diets/presentation/widgets/my_diet_widget.dart
+++ b/lib/features/my_diets/presentation/widgets/my_diet_widget.dart
@@ -1,4 +1,5 @@
 import 'package:cached_network_image/cached_network_image.dart';
+import 'package:eatvio_app/core/app_router.dart';
 import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
@@ -149,11 +150,11 @@ class _MyDietWidgetState extends State<MyDietWidget> {
                          CustomOutlinedButton(
                            onPressed: () async {
                              final box = context.findRenderObject() as RenderBox?;
-                              await Share.shareUri(
-                                Uri.parse(
-                                  '$baseUrl/ru/diet/${widget.diet.id}',
+                              await SharePlus.instance.share(
+                                ShareParams(
+                                  uri: Uri.parse('$baseUrl/ru/diet/${widget.diet.id}'),
+                                  sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
                                ),
-                                sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
                              );
                            },
                            height: 52,
@@ -196,7 +197,7 @@ class _MyDietWidgetState extends State<MyDietWidget> {
                                }
                              } else {
                                await showErrorDialog(context, title: 'Предупреждение', description: 'Вы можете создать новую диету на основе существующей.');
-                                GoRouter.of(context).pushNamed(CreateDietScreen.name, extra: widget.diet);
+                                AppRouter.navigatorKey.currentContext?.pushNamed(CreateDietScreen.name, extra: widget.diet);
                              }
                            },
                            text: switch (state.selectedStateIndex) {
--- a/lib/features/my_plans/presentation/widgets/my_plan_widget.dart
+++ b/lib/features/my_plans/presentation/widgets/my_plan_widget.dart
@@ -138,11 +138,11 @@ class _MyPlanWidgetState extends State<MyPlanWidget> {
                          CustomOutlinedButton(
                            onPressed: () async {
                              final box = context.findRenderObject() as RenderBox?;
-                              await Share.shareUri(
-                                Uri.parse(
-                                  '$baseUrl/ru/plan/${widget.plan.id}',
+                              await SharePlus.instance.share(
+                                ShareParams(
+                                  uri: Uri.parse('$baseUrl/ru/plan/${widget.plan.id}'),
+                                  sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
                                ),
-                                sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
                              );
                            },
                            height: 52,
--- a/lib/features/profile/presentation/pages/profile_screen.dart
+++ b/lib/features/profile/presentation/pages/profile_screen.dart
@@ -26,7 +26,6 @@ import 'package:eatvio_app/features/profile/presentation/widgets/profile_blog_po
 import 'package:eatvio_app/features/profile/presentation/widgets/weight_chart_widget.dart';
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -223,15 +222,6 @@ class _ProfileScreenState extends State<ProfileScreen> {
              child: Column(
                crossAxisAlignment: CrossAxisAlignment.center,
                children: [
-                  ElevatedButton(onPressed: () async {
-                    await sl<ProfileRepository>().sendEmailCode();
-                  }, child: Text('send email verify code')),
-                  TextFormField(
-                    controller: controller,
-                  ),
-                  ElevatedButton(onPressed: () async {
-                    await sl<ProfileRepository>().tryVerifyEmailByCode(controller.text);
-                  }, child: Text('try verify email by code')),
                  _header(state),
                  if (state.profile.roles.contains('consultant'))
                    Column(
@@ -1136,11 +1126,11 @@ class _ProfileScreenState extends State<ProfileScreen> {
            onSelected: (value) {
              if (value == 'share') {
                final box = context.findRenderObject() as RenderBox?;
-                Share.shareUri(
-                  Uri.parse(
-                    '$baseUrl/ru/profile/${state.profile.slug}',
+                SharePlus.instance.share(
+                  ShareParams(
+                    uri: Uri.parse('$baseUrl/ru/profile/${state.profile.slug}'),
+                    sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
                  ),
-                  sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
                );
              } else {
                showModalBottomSheet(
--- a/lib/features/profile/presentation/widgets/profile_blog_post_widget.dart
+++ b/lib/features/profile/presentation/widgets/profile_blog_post_widget.dart
@@ -214,11 +214,11 @@ class _ProfileBlogPostWidgetState extends State<ProfileBlogPostWidget> {
                          ),
                          onTap: () {
                            final box = context.findRenderObject() as RenderBox?;
-                            Share.shareUri(
-                              Uri.parse(
-                                '$baseUrl/ru/blog_post/${state.blogPosts[widget.index].id}',
+                            SharePlus.instance.share(
+                              ShareParams(
+                                uri: Uri.parse('$baseUrl/ru/blog_post/${state.blogPosts[widget.index].id}'),
+                                sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
                              ),
-                              sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
                            );
                          },
                        ),
--- a/lib/features/registration/presentation/pages/verify_screen.dart
+++ b/lib/features/registration/presentation/pages/verify_screen.dart
@@ -20,7 +20,6 @@ class _VerifyScreenState extends State<VerifyScreen> {
  @override
  void initState() {
    super.initState();
-    print('$baseUrl/login_with_pass_key?id=${widget.passKey}');
    _controller = WebViewController()
      ..setJavaScriptMode(JavaScriptMode.unrestricted)
      ..loadRequest(Uri.parse('$baseUrl/login_with_pass_key?id=${widget.passKey}'));