From b59190e4e843dd03cf3082d9c7df0ad0510ebbd2 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Fri, 23 May 2025 12:03:04 +0300 Subject: [PATCH] fix: analyzer --- lib/core/app_router.dart | 1 - lib/core/const.dart | 3 +-- lib/core/widgets/custom_popup.dart | 23 +++++++++++-------- .../presentation/pages/blog_post_screen.dart | 8 ++++--- .../presentation/widgets/more_options.dart | 8 +++---- .../widgets/blog_post_widget.dart | 8 +++---- .../presentation/widgets/diets_widget.dart | 8 +++---- .../presentation/widgets/plan_widget.dart | 8 +++---- .../presentation/widgets/recipes_widget.dart | 8 +++---- .../presentation/widgets/my_diet_widget.dart | 11 +++++---- .../presentation/widgets/my_plan_widget.dart | 8 +++---- .../presentation/pages/profile_screen.dart | 18 ++++----------- .../widgets/profile_blog_post_widget.dart | 8 +++---- .../presentation/pages/verify_screen.dart | 1 - 14 files changed, 58 insertions(+), 63 deletions(-) diff --git a/lib/core/app_router.dart b/lib/core/app_router.dart index bd3688a6..8ae1696e 100644 --- a/lib/core/app_router.dart +++ b/lib/core/app_router.dart @@ -44,7 +44,6 @@ import 'package:eatvio_app/features/recipe/presentation/about_recipe_screen.dart import 'package:eatvio_app/features/create_recipe/presentation/pages/recipe_create_screen.dart'; import 'package:eatvio_app/features/registration/presentation/pages/registration_screen.dart'; import 'package:eatvio_app/features/registration/presentation/pages/verify_screen.dart'; -import 'package:eatvio_app/features/registration/presentation/pages/webview_registration_screen.dart'; import 'package:eatvio_app/features/settings/entities/settings_entity.dart'; import 'package:eatvio_app/features/settings/presentation/pages/change_email_screen.dart'; import 'package:eatvio_app/features/settings/presentation/pages/change_password_screen.dart'; diff --git a/lib/core/const.dart b/lib/core/const.dart index 4022dfbe..31c47e9c 100644 --- a/lib/core/const.dart +++ b/lib/core/const.dart @@ -1,5 +1,4 @@ -String baseUrl = 'https://apoloz-nauch-vei9nieng5er.eatv.io'; -// String baseUrl = 'https://eatvio.ru'; +String baseUrl = 'https://eatvio.ru'; // String baseUrl = 'https://dev2.eatvio.com'; const List durationValues = [7, 14, 21]; diff --git a/lib/core/widgets/custom_popup.dart b/lib/core/widgets/custom_popup.dart index 011de1cd..67d87da5 100644 --- a/lib/core/widgets/custom_popup.dart +++ b/lib/core/widgets/custom_popup.dart @@ -91,11 +91,13 @@ class CustomPopup extends StatelessWidget { }); addItem('assets/icons/share2.svg', 'Поделиться', () { 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, ); }); addItem('assets/icons/edit_paint.svg', 'Редактировать', () async { @@ -104,7 +106,8 @@ class CustomPopup extends StatelessWidget { } else if (complainedContentType == ComplainedContent.recipe) { GoRouter.of(context).pushNamed(RecipeCreateScreen.name, extra: recipe); } else if (complainedContentType == ComplainedContent.diet) { - await showErrorDialog(context, title: 'Предупреждение', description: 'Диета будет перенесена в архив. Вы создаете новую диету на основе существующей.'); + await showErrorDialog(context, + title: 'Предупреждение', description: 'Диета будет перенесена в архив. Вы создаете новую диету на основе существующей.'); await sl().unpublishDiet(id!); GoRouter.of(context).pushNamed(CreateDietScreen.name, extra: diet); } else { @@ -169,11 +172,13 @@ class CustomPopup extends StatelessWidget { }); addItem('assets/icons/share2.svg', 'Поделиться', () { 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, ); }); addItem('assets/icons/complain.svg', 'Пожаловаться', () { diff --git a/lib/features/blog_post/presentation/pages/blog_post_screen.dart b/lib/features/blog_post/presentation/pages/blog_post_screen.dart index e963a812..fe3e7bda 100644 --- 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 { 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, + ), ); }, ), diff --git a/lib/features/diets/presentation/widgets/more_options.dart b/lib/features/diets/presentation/widgets/more_options.dart index 63494590..4c28e5c9 100644 --- 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( diff --git a/lib/features/feed/presentation/widgets/blog_post_widget.dart b/lib/features/feed/presentation/widgets/blog_post_widget.dart index f5b8dd2d..c5f6ff5f 100644 --- 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 { ), 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, ); }, ), diff --git a/lib/features/feed/presentation/widgets/diets_widget.dart b/lib/features/feed/presentation/widgets/diets_widget.dart index bcf1056a..e857e979 100644 --- 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 { 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: diff --git a/lib/features/feed/presentation/widgets/plan_widget.dart b/lib/features/feed/presentation/widgets/plan_widget.dart index 608d647b..849549e8 100644 --- 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 { 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: diff --git a/lib/features/feed/presentation/widgets/recipes_widget.dart b/lib/features/feed/presentation/widgets/recipes_widget.dart index 53022a92..47a8ab0f 100644 --- 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 { ), 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, ); }, ), diff --git a/lib/features/my_diets/presentation/widgets/my_diet_widget.dart b/lib/features/my_diets/presentation/widgets/my_diet_widget.dart index 99489f9d..7eb7f15c 100644 --- 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 { 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 { } } 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) { diff --git a/lib/features/my_plans/presentation/widgets/my_plan_widget.dart b/lib/features/my_plans/presentation/widgets/my_plan_widget.dart index f9594340..baea0c01 100644 --- 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 { 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, diff --git a/lib/features/profile/presentation/pages/profile_screen.dart b/lib/features/profile/presentation/pages/profile_screen.dart index f9a3961c..79c41c54 100644 --- 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 { child: Column( crossAxisAlignment: CrossAxisAlignment.center, children: [ - ElevatedButton(onPressed: () async { - await sl().sendEmailCode(); - }, child: Text('send email verify code')), - TextFormField( - controller: controller, - ), - ElevatedButton(onPressed: () async { - await sl().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 { 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( diff --git a/lib/features/profile/presentation/widgets/profile_blog_post_widget.dart b/lib/features/profile/presentation/widgets/profile_blog_post_widget.dart index ab920ea2..43ade18c 100644 --- 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 { ), 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, ); }, ), diff --git a/lib/features/registration/presentation/pages/verify_screen.dart b/lib/features/registration/presentation/pages/verify_screen.dart index 4fecd1e1..69fa009c 100644 --- 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 { @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}'));