fix(settings): Issue-757

This commit is contained in:
mso7nueh
2025-11-05 23:55:48 +03:00
parent 12f51d49ea
commit bbc99ec9f4

View File

@@ -1,7 +1,9 @@
import 'package:eatvio_app/features/settings/entities/settings_entity.dart'; 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/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart'; import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
class PhysicalActivityScreen extends StatefulWidget { class PhysicalActivityScreen extends StatefulWidget {
@@ -16,138 +18,176 @@ class PhysicalActivityScreen extends StatefulWidget {
enum PhysicalActivity { minimum, low, medium, high, extreme } enum PhysicalActivity { minimum, low, medium, high, extreme }
class _PhysicalActivityScreenState extends State<PhysicalActivityScreen> { class _PhysicalActivityScreenState extends State<PhysicalActivityScreen> {
late PhysicalActivity? _physicalActivity; PhysicalActivity? _physicalActivity;
@override PhysicalActivity? _getPhysicalActivityFromCoefficient(double coefficient) {
void initState() { switch (coefficient) {
super.initState();
switch (widget.settingsEntity.profileDetailsModel.activityCoefficient) {
case 1.2: case 1.2:
_physicalActivity = PhysicalActivity.minimum; return PhysicalActivity.minimum;
break;
case 1.375: case 1.375:
_physicalActivity = PhysicalActivity.low; return PhysicalActivity.low;
break;
case 1.55: case 1.55:
_physicalActivity = PhysicalActivity.medium; return PhysicalActivity.medium;
break;
case 1.7: case 1.7:
_physicalActivity = PhysicalActivity.high; return PhysicalActivity.high;
break;
case 1.9: case 1.9:
_physicalActivity = PhysicalActivity.extreme; return PhysicalActivity.extreme;
break; 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 @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return BlocListener<SettingsCubit, SettingsState>(
appBar: AppBar(title: const Text('Физическая нагрузка')), bloc: widget.settingsEntity.settingsCubit,
bottomSheet: _saveButton(), listener: (context, state) {
body: SingleChildScrollView( _updatePhysicalActivityFromState();
physics: const BouncingScrollPhysics(), },
padding: const EdgeInsets.only(top: 16, bottom: 80), child: BlocBuilder<SettingsCubit, SettingsState>(
child: Column( bloc: widget.settingsEntity.settingsCubit,
children: [ builder: (context, state) {
Row( return Scaffold(
children: [ appBar: AppBar(title: const Text('Физическая нагрузка')),
Radio<PhysicalActivity>( bottomSheet: _saveButton(),
value: PhysicalActivity.minimum, body: SingleChildScrollView(
// ignore: deprecated_member_use physics: const BouncingScrollPhysics(),
groupValue: _physicalActivity, padding: const EdgeInsets.only(top: 16, bottom: 80),
// ignore: deprecated_member_use child: Column(
onChanged: (PhysicalActivity? value) { children: [
setState(() { Row(
_physicalActivity = value; children: [
}); Radio<PhysicalActivity>(
}, value: PhysicalActivity.minimum,
), // ignore: deprecated_member_use
const Expanded( groupValue: _physicalActivity,
child: Padding( // ignore: deprecated_member_use
padding: EdgeInsets.only(left: 8, right: 16), onChanged: (PhysicalActivity? value) {
child: Text('1,2 — минимальный (сидячая работа, отсутствие физических нагрузок);'), setState(() {
_physicalActivity = value;
});
},
),
const Expanded(
child: Padding(
padding: EdgeInsets.only(left: 8, right: 16),
child: Text('1,2 — минимальный (сидячая работа, отсутствие физических нагрузок);'),
),
),
],
), ),
), Row(
], children: [
), Radio<PhysicalActivity>(
Row( value: PhysicalActivity.low,
children: [ // ignore: deprecated_member_use
Radio<PhysicalActivity>( groupValue: _physicalActivity,
value: PhysicalActivity.low, // ignore: deprecated_member_use
// ignore: deprecated_member_use onChanged: (PhysicalActivity? value) {
groupValue: _physicalActivity, setState(() {
// ignore: deprecated_member_use _physicalActivity = value;
onChanged: (PhysicalActivity? value) { });
setState(() { },
_physicalActivity = value; ),
}); const Expanded(
}, child: Padding(
), padding: EdgeInsets.only(left: 8, right: 16),
const Expanded( child: Text('1,375 — низкий (тренировки не менее 20 мин 1–3 раза в неделю);'),
child: Padding(padding: EdgeInsets.only(left: 8, right: 16), child: Text('1,375 — низкий (тренировки не менее 20 мин 1–3 раза в неделю);')), ),
), ),
], ],
),
Row(
children: [
Radio<PhysicalActivity>(
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<PhysicalActivity>(
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<PhysicalActivity>(
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<PhysicalActivity>(
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<PhysicalActivity>(
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<PhysicalActivity>(
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 — экстремальный (несколько интенсивных тренировок в день')),
),
],
),
],
),
), ),
); );
} }