From 12f51d49ea46b1ee38315eb7cd5c8338feb602c9 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Fri, 31 Oct 2025 12:59:02 +0300 Subject: [PATCH 1/2] fix(profile): subs screen and blog post padding --- lib/core/routing/other_routes.dart | 8 ++++++-- .../presentation/widgets/profile_blog_post_widget.dart | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/core/routing/other_routes.dart b/lib/core/routing/other_routes.dart index a5809c8f..fd669e34 100644 --- a/lib/core/routing/other_routes.dart +++ b/lib/core/routing/other_routes.dart @@ -156,7 +156,7 @@ class OtherRoutes { }, ), GoRoute( - path: RouteConstants.subsScreen, + path: '${RouteConstants.subsScreen}/:slug', name: 'subsScreen', builder: (context, state) => SubsScreen(slug: state.pathParameters['slug']!, subType: state.extra as SubType), ), @@ -194,7 +194,11 @@ class OtherRoutes { ), // Other routes - GoRoute(path: RouteConstants.glossaryScreen, name: 'glossaryScreen', builder: (context, state) => GlossaryScreen(passKey: state.extra as String)), + GoRoute( + path: RouteConstants.glossaryScreen, + name: 'glossaryScreen', + builder: (context, state) => GlossaryScreen(passKey: state.extra as String), + ), GoRoute(path: RouteConstants.blockedUsersScreen, name: 'blockedUsersScreen', builder: (context, state) => const BlockedUsersScreen()), GoRoute( path: RouteConstants.notificationsSettingsScreen, 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 7163179f..d0714314 100644 --- a/lib/features/profile/presentation/widgets/profile_blog_post_widget.dart +++ b/lib/features/profile/presentation/widgets/profile_blog_post_widget.dart @@ -106,7 +106,7 @@ class _ProfileBlogPostWidgetState extends State { if (state.blogPosts[widget.index].title.isNotEmpty && state.blogPosts[widget.index].description.isNotEmpty) const SizedBox(height: 8), if (state.blogPosts[widget.index].description.isNotEmpty) Padding( - padding: const EdgeInsets.symmetric(horizontal: 4), + padding: const EdgeInsets.symmetric(horizontal: 12), child: Html( data: md.markdownToHtml( state.blogPosts[widget.index].description.length > 200 From bbc99ec9f4c99e763f6b374ca744030e5ec2ef40 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Wed, 5 Nov 2025 23:55:48 +0300 Subject: [PATCH 2/2] fix(settings): Issue-757 --- .../pages/physical_activity_screen.dart | 276 ++++++++++-------- 1 file changed, 158 insertions(+), 118 deletions(-) diff --git a/lib/features/settings/presentation/pages/physical_activity_screen.dart b/lib/features/settings/presentation/pages/physical_activity_screen.dart index df91a4f6..1aa9e1bb 100644 --- a/lib/features/settings/presentation/pages/physical_activity_screen.dart +++ b/lib/features/settings/presentation/pages/physical_activity_screen.dart @@ -1,7 +1,9 @@ import 'package:eatvio_app/features/settings/entities/settings_entity.dart'; +import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart'; import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart'; import 'package:eatvio_app/core/theme/theme_helper.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; class PhysicalActivityScreen extends StatefulWidget { @@ -16,138 +18,176 @@ class PhysicalActivityScreen extends StatefulWidget { enum PhysicalActivity { minimum, low, medium, high, extreme } class _PhysicalActivityScreenState extends State { - late PhysicalActivity? _physicalActivity; + PhysicalActivity? _physicalActivity; - @override - void initState() { - super.initState(); - switch (widget.settingsEntity.profileDetailsModel.activityCoefficient) { + PhysicalActivity? _getPhysicalActivityFromCoefficient(double coefficient) { + switch (coefficient) { case 1.2: - _physicalActivity = PhysicalActivity.minimum; - break; + return PhysicalActivity.minimum; case 1.375: - _physicalActivity = PhysicalActivity.low; - break; + return PhysicalActivity.low; case 1.55: - _physicalActivity = PhysicalActivity.medium; - break; + return PhysicalActivity.medium; case 1.7: - _physicalActivity = PhysicalActivity.high; - break; + return PhysicalActivity.high; case 1.9: - _physicalActivity = PhysicalActivity.extreme; - break; + return PhysicalActivity.extreme; + default: + return null; + } + } + + void _updatePhysicalActivityFromState() { + final state = widget.settingsEntity.settingsCubit.state; + if (state is SettingsStateLoaded) { + final newActivity = _getPhysicalActivityFromCoefficient(state.profileDetails.activityCoefficient); + if (newActivity != _physicalActivity) { + setState(() { + _physicalActivity = newActivity; + }); + } } } + @override + void initState() { + super.initState(); + _updatePhysicalActivityFromState(); + _physicalActivity ??= _getPhysicalActivityFromCoefficient(widget.settingsEntity.profileDetailsModel.activityCoefficient); + } + + @override + void didChangeDependencies() { + super.didChangeDependencies(); + // Update when returning to this screen + _updatePhysicalActivityFromState(); + } + @override Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar(title: const Text('Физическая нагрузка')), - bottomSheet: _saveButton(), - body: SingleChildScrollView( - physics: const BouncingScrollPhysics(), - padding: const EdgeInsets.only(top: 16, bottom: 80), - child: Column( - children: [ - Row( - children: [ - Radio( - value: PhysicalActivity.minimum, - // ignore: deprecated_member_use - groupValue: _physicalActivity, - // ignore: deprecated_member_use - onChanged: (PhysicalActivity? value) { - setState(() { - _physicalActivity = value; - }); - }, - ), - const Expanded( - child: Padding( - padding: EdgeInsets.only(left: 8, right: 16), - child: Text('1,2 — минимальный (сидячая работа, отсутствие физических нагрузок);'), + return BlocListener( + bloc: widget.settingsEntity.settingsCubit, + listener: (context, state) { + _updatePhysicalActivityFromState(); + }, + child: BlocBuilder( + bloc: widget.settingsEntity.settingsCubit, + builder: (context, state) { + return Scaffold( + appBar: AppBar(title: const Text('Физическая нагрузка')), + bottomSheet: _saveButton(), + body: SingleChildScrollView( + physics: const BouncingScrollPhysics(), + padding: const EdgeInsets.only(top: 16, bottom: 80), + child: Column( + children: [ + Row( + children: [ + Radio( + value: PhysicalActivity.minimum, + // ignore: deprecated_member_use + groupValue: _physicalActivity, + // ignore: deprecated_member_use + onChanged: (PhysicalActivity? value) { + setState(() { + _physicalActivity = value; + }); + }, + ), + const Expanded( + child: Padding( + padding: EdgeInsets.only(left: 8, right: 16), + child: Text('1,2 — минимальный (сидячая работа, отсутствие физических нагрузок);'), + ), + ), + ], ), - ), - ], - ), - Row( - children: [ - Radio( - value: PhysicalActivity.low, - // ignore: deprecated_member_use - groupValue: _physicalActivity, - // ignore: deprecated_member_use - onChanged: (PhysicalActivity? value) { - setState(() { - _physicalActivity = value; - }); - }, - ), - const Expanded( - child: Padding(padding: EdgeInsets.only(left: 8, right: 16), child: Text('1,375 — низкий (тренировки не менее 20 мин 1–3 раза в неделю);')), - ), - ], - ), - Row( - children: [ - Radio( - value: PhysicalActivity.medium, - // ignore: deprecated_member_use - groupValue: _physicalActivity, - // ignore: deprecated_member_use - onChanged: (PhysicalActivity? value) { - setState(() { - _physicalActivity = value; - }); - }, - ), - const Expanded( - child: Padding(padding: EdgeInsets.only(left: 8, right: 16), child: Text('1,55 — умеренный (тренировки 30–60 мин 3–4 раза в неделю);')), - ), - ], - ), - Row( - children: [ - Radio( - value: PhysicalActivity.high, - // ignore: deprecated_member_use - groupValue: _physicalActivity, - // ignore: deprecated_member_use - onChanged: (PhysicalActivity? value) { - setState(() { - _physicalActivity = value; - }); - }, - ), - const Expanded( - child: Padding( - padding: EdgeInsets.only(left: 8, right: 16), - child: Text('1,7 — высокий (тренировки 30–60 мин 5–7 раза в неделю; тяжёлая физическая работа);'), + Row( + children: [ + Radio( + value: PhysicalActivity.low, + // ignore: deprecated_member_use + groupValue: _physicalActivity, + // ignore: deprecated_member_use + onChanged: (PhysicalActivity? value) { + setState(() { + _physicalActivity = value; + }); + }, + ), + const Expanded( + child: Padding( + padding: EdgeInsets.only(left: 8, right: 16), + child: Text('1,375 — низкий (тренировки не менее 20 мин 1–3 раза в неделю);'), + ), + ), + ], ), - ), - ], + Row( + children: [ + Radio( + value: PhysicalActivity.medium, + // ignore: deprecated_member_use + groupValue: _physicalActivity, + // ignore: deprecated_member_use + onChanged: (PhysicalActivity? value) { + setState(() { + _physicalActivity = value; + }); + }, + ), + const Expanded( + child: Padding(padding: EdgeInsets.only(left: 8, right: 16), child: Text('1,55 — умеренный (тренировки 30–60 мин 3–4 раза в неделю);')), + ), + ], + ), + Row( + children: [ + Radio( + value: PhysicalActivity.high, + // ignore: deprecated_member_use + groupValue: _physicalActivity, + // ignore: deprecated_member_use + onChanged: (PhysicalActivity? value) { + setState(() { + _physicalActivity = value; + }); + }, + ), + const Expanded( + child: Padding( + padding: EdgeInsets.only(left: 8, right: 16), + child: Text('1,7 — высокий (тренировки 30–60 мин 5–7 раза в неделю; тяжёлая физическая работа);'), + ), + ), + ], + ), + Row( + children: [ + Radio( + value: PhysicalActivity.extreme, + // ignore: deprecated_member_use + groupValue: _physicalActivity, + // ignore: deprecated_member_use + onChanged: (PhysicalActivity? value) { + setState(() { + _physicalActivity = value; + }); + }, + ), + const Expanded( + child: Padding( + padding: EdgeInsets.only(left: 8, right: 16), + child: Text('1,9 — экстремальный (несколько интенсивных тренировок в день'), + ), + ), + ], + ), + ], + ), ), - Row( - children: [ - Radio( - value: PhysicalActivity.extreme, - // ignore: deprecated_member_use - groupValue: _physicalActivity, - // ignore: deprecated_member_use - onChanged: (PhysicalActivity? value) { - setState(() { - _physicalActivity = value; - }); - }, - ), - const Expanded( - child: Padding(padding: EdgeInsets.only(left: 8, right: 16), child: Text('1,9 — экстремальный (несколько интенсивных тренировок в день')), - ), - ], - ), - ], - ), + ); + }, ), ); }