apoloz/eatvio_app
1
0
Fork 0
forked from eatvio/eatvio_app
Code Pull Requests Activity

feat: settings (data save) + new fields

Browse Source
This commit is contained in:
mso7nueh
2024-10-02 13:10:21 +03:00
parent 5442a3f2e2
commit de30b93fa6
11 changed files with 338 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/app_router.dart
View File

@@ -17,12 +17,13 @@ import 'package:eatvio_app/features/menu/presentation/pages/menu_screen.dart';
import 'package:eatvio_app/features/notifications/presentation/pages/notifications_screen.dart';
import 'package:eatvio_app/features/plans/models/plan_pagination_model.dart';
import 'package:eatvio_app/features/plans/presentation/pages/about_plan_screen.dart';
import 'package:eatvio_app/features/profile/models/profile_model.dart';
import 'package:eatvio_app/features/profile/presentation/pages/profile_screen.dart';
import 'package:eatvio_app/features/recipes/presentation/pages/about_recipes_screen.dart';
import 'package:eatvio_app/features/recipes/presentation/pages/recipe_create_screen.dart';
import 'package:eatvio_app/features/recipes/presentation/pages/recipe_edit_screen.dart';
import 'package:eatvio_app/features/registration/presentation/pages/registration_screen.dart';
import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
import 'package:eatvio_app/features/settings/presentation/pages/change_password_screen.dart';
import 'package:eatvio_app/features/settings/presentation/pages/general_info_screen.dart';
import 'package:eatvio_app/features/settings/presentation/pages/other_info_screen.dart';
import 'package:eatvio_app/features/settings/presentation/pages/physical_activity_screen.dart';
@@ -172,39 +173,45 @@ class AppRouter {
builder: (context, state) => SettingsScreen(),
routes: [
GoRoute(
path: 'general-info-screen/:isPublicProfile',
path: 'general-info-screen',
name: 'generalInfoScreen',
builder: (context, state) => GeneralInfoScreen(
profileDetailsModel: state.extra as ProfileDetailsModel,
isPublicProfile: bool.parse(state.pathParameters['isPublicProfile']!),
settingsEntity: state.extra as SettingsEntity,
),
),
GoRoute(
path: 'other-info-screen',
name: 'otherInfoScreen',
builder: (context, state) => OtherInfoScreen(
profileDetailsModel: state.extra as ProfileDetailsModel,
settingsEntity: state.extra as SettingsEntity,
),
),
GoRoute(
path: 'physical-activity-screen',
name: 'physicalActivityScreen',
builder: (context, state) => PhysicalActivityScreen(
profileDetailsModel: state.extra as ProfileDetailsModel,
settingsEntity: state.extra as SettingsEntity,
),
),
GoRoute(
path: 'physical-form-screen',
name: 'physicalFormScreen',
builder: (context, state) => PhysicalFormScreen(
profileDetailsModel: state.extra as ProfileDetailsModel,
settingsEntity: state.extra as SettingsEntity,
),
),
GoRoute(
path: 'pressure-screen',
name: 'pressureScreen',
builder: (context, state) => PressureScreen(
profileDetailsModel: state.extra as ProfileDetailsModel,
settingsEntity: state.extra as SettingsEntity,
),
),
GoRoute(
path: 'change-password-screen',
name: 'changePasswordScreen',
builder: (context, state) => ChangePasswordScreen(
settingsEntity: state.extra as SettingsEntity,
),
),
],

15
lib/features/settings/entities/settings_entity.dart Normal file
View File

@@ -0,0 +1,15 @@
import 'package:eatvio_app/features/profile/models/profile_model.dart';
import 'package:eatvio_app/features/settings/models/profile_settings_model.dart';
import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart';
class SettingsEntity {
final ProfileSettingsModel profileSettingsModel;
final ProfileDetailsModel profileDetailsModel;
final SettingsCubit settingsCubit;
SettingsEntity({
required this.profileSettingsModel,
required this.profileDetailsModel,
required this.settingsCubit,
});
}

12
lib/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart
View File

@@ -12,9 +12,9 @@ class SettingsCubit extends Cubit<SettingsState> {
SettingsCubit({
required this.profileRepository,
required this.settingsRepository,
}) : super(SettingsState.loading());
}) : super(const SettingsState.loading());
init() async {
Future<void> init() async {
try {
emit(SettingsState.loaded(
profileSettings: await settingsRepository.getProfileSettings(),
@@ -26,7 +26,7 @@ class SettingsCubit extends Cubit<SettingsState> {
}
updateProfileDetails({
required ProfileDetailsModel profileDetailsModel
required ProfileDetailsModel profileDetailsModel,
}) async {
try {
await settingsRepository.updateProfileDetails(
@@ -35,11 +35,13 @@ class SettingsCubit extends Cubit<SettingsState> {
} catch (e) {
print(e);
rethrow;
} finally {
await init();
}
}
updateProfileSettings({
required ProfileSettingsModel profileSettingsModel
required ProfileSettingsModel profileSettingsModel,
}) async {
try {
await settingsRepository.updateProfileSettings(
@@ -48,6 +50,8 @@ class SettingsCubit extends Cubit<SettingsState> {
} catch (e) {
print(e);
rethrow;
} finally {
await init();
}
}
}

28
lib/features/settings/presentation/pages/change_password_screen.dart Normal file
View File

@@ -0,0 +1,28 @@
import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
import 'package:flutter/material.dart';
class ChangePasswordScreen extends StatefulWidget {
final SettingsEntity settingsEntity;
const ChangePasswordScreen({
super.key,
required this.settingsEntity,
});
@override
State<ChangePasswordScreen> createState() => _ChangePasswordScreenState();
}
class _ChangePasswordScreenState extends State<ChangePasswordScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text('Смена пароля'),
),
body: Center(
child: Text('Coming soon...'),
),
);
}
}

105
lib/features/settings/presentation/pages/general_info_screen.dart
View File

@@ -1,20 +1,21 @@
import 'package:eatvio_app/core/utils/date_time_utils.dart';
import 'package:eatvio_app/features/profile/models/profile_model.dart';
import 'package:eatvio_app/data/models/selectionPopupModel/selection_popup_model.dart';
import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/theme/theme_helper.dart';
import 'package:eatvio_app/widgets/custom_drop_down.dart';
import 'package:eatvio_app/widgets/custom_text_form_field.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
class GeneralInfoScreen extends StatefulWidget {
final ProfileDetailsModel profileDetailsModel;
final bool isPublicProfile;
final SettingsEntity settingsEntity;
const GeneralInfoScreen({
super.key,
required this.profileDetailsModel,
required this.isPublicProfile,
required this.settingsEntity,
});
@override
@@ -24,25 +25,36 @@ class GeneralInfoScreen extends StatefulWidget {
class _GeneralInfoScreenState extends State<GeneralInfoScreen> {
final firstNameController = TextEditingController();
final lastNameController = TextEditingController();
final genderController = TextEditingController();
late DateTime selectedDate;
late SelectionPopupModel gender;
final countryController = TextEditingController();
final cityController = TextEditingController();
final languageController = TextEditingController();
late DateTime selectedDate;
late bool isPublicProfile;
late SelectionPopupModel isPublicProfile;
final List<SelectionPopupModel> genderSelectionPopupList = [
SelectionPopupModel(id: 0, title: 'Женский', value: 'female'),
SelectionPopupModel(id: 1, title: 'Мужской', value: 'male'),
];
final List<SelectionPopupModel> isPublicProfileSelectionPopupList = [
SelectionPopupModel(id: 0, title: 'Только зарегистрированным', value: false),
SelectionPopupModel(id: 1, title: 'Всем', value: true),
];
@override
void initState() {
super.initState();
selectedDate = DateTime.now();
firstNameController.text = widget.profileDetailsModel.firstName;
lastNameController.text = widget.profileDetailsModel.lastName;
selectedDate = DateTime.parse(widget.profileDetailsModel.birthdate);
genderController.text = widget.profileDetailsModel.gender;
countryController.text = widget.profileDetailsModel.country;
cityController.text = widget.profileDetailsModel.city;
languageController.text = widget.profileDetailsModel.lang;
isPublicProfile = widget.isPublicProfile;
firstNameController.text = widget.settingsEntity.profileDetailsModel.firstName;
lastNameController.text = widget.settingsEntity.profileDetailsModel.lastName;
selectedDate = DateTime.parse(widget.settingsEntity.profileDetailsModel.birthdate);
gender = widget.settingsEntity.profileDetailsModel.gender == 'male' ? genderSelectionPopupList[1] : genderSelectionPopupList[0];
countryController.text = widget.settingsEntity.profileDetailsModel.country;
cityController.text = widget.settingsEntity.profileDetailsModel.city;
languageController.text = widget.settingsEntity.profileDetailsModel.lang;
isPublicProfile =
widget.settingsEntity.profileSettingsModel.isPublicProfile == true ? isPublicProfileSelectionPopupList[1] : isPublicProfileSelectionPopupList[0];
}
@override
@@ -78,43 +90,60 @@ class _GeneralInfoScreenState extends State<GeneralInfoScreen> {
SizedBox(height: 16),
Text(s.date_of_birth),
SizedBox(height: 4),
CustomTextFormField(
initialValue: selectedDate.format('dd MMMM yyyy', 'ru'),
ListTile(
onTap: onTapCalendar(context),
trailing: Icon(
Icons.keyboard_arrow_down_rounded,
color: Colors.grey.shade700,
),
contentPadding: EdgeInsets.symmetric(horizontal: 12),
title: Text(selectedDate.format('dd MMMM yyyy', 'ru')),
tileColor: Color(0xFFF6F6F6),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(20),
),
),
SizedBox(height: 16),
Text('Пол'),
SizedBox(height: 4),
CustomTextFormField(
controller: genderController,
onChanged: (newValue) {},
CustomDropDown(
items: genderSelectionPopupList,
value: gender,
onChanged: (newValue) {
setState(() {
gender = newValue;
});
},
),
SizedBox(height: 16),
Text('Страна'),
SizedBox(height: 4),
CustomTextFormField(
controller: countryController,
onChanged: (newValue) {},
),
SizedBox(height: 16),
Text('Город'),
SizedBox(height: 4),
CustomTextFormField(
controller: cityController,
onChanged: (newValue) {},
),
SizedBox(height: 16),
Text('Предпочтительный язык общения'),
SizedBox(height: 4),
CustomTextFormField(
controller: languageController,
onChanged: (newValue) {},
),
SizedBox(height: 16),
Text('Показывать анкету'),
SizedBox(height: 4),
CustomTextFormField(
initialValue: isPublicProfile ? 'Всем' : 'Только зарегистрированным',
onChanged: (newValue) {},
CustomDropDown(
items: isPublicProfileSelectionPopupList,
value: isPublicProfile,
onChanged: (newValue) {
setState(() {
isPublicProfile = newValue;
});
},
),
],
),
@@ -133,8 +162,6 @@ class _GeneralInfoScreenState extends State<GeneralInfoScreen> {
onDateTimeChanged: (DateTime newDateTime) {
setState(() {
selectedDate = newDateTime;
// final registrationCubit = context.read<RegistrationCubit>();
// registrationCubit.updateSheet(registrationCubit.state.sheet.copyWith(birthdate: selectedDate.toString()));
});
},
),
@@ -162,7 +189,25 @@ class _GeneralInfoScreenState extends State<GeneralInfoScreen> {
_saveButton() {
return InkWell(
onTap: () => GoRouter.of(context).pop(),
onTap: () {
widget.settingsEntity.settingsCubit.updateProfileDetails(
profileDetailsModel: (widget.settingsEntity.settingsCubit.state as SettingsStateLoaded).profileDetails.copyWith(
firstName: firstNameController.text,
lastName: lastNameController.text,
birthdate: selectedDate.toString(),
gender: gender.value,
country: countryController.text,
city: cityController.text,
lang: languageController.text,
),
);
widget.settingsEntity.settingsCubit.updateProfileSettings(
profileSettingsModel: (widget.settingsEntity.settingsCubit.state as SettingsStateLoaded).profileSettings.copyWith(
isPublicProfile: isPublicProfile.value,
),
);
GoRouter.of(context).pop();
},
borderRadius: BorderRadius.circular(20),
child: Ink(
height: 52,

37
lib/features/settings/presentation/pages/other_info_screen.dart
View File

@@ -1,4 +1,5 @@
import 'package:eatvio_app/features/profile/models/profile_model.dart';
import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/theme/theme_helper.dart';
import 'package:eatvio_app/widgets/custom_text_form_field.dart';
@@ -6,11 +7,11 @@ import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
class OtherInfoScreen extends StatefulWidget {
final ProfileDetailsModel profileDetailsModel;
final SettingsEntity settingsEntity;
const OtherInfoScreen({
super.key,
required this.profileDetailsModel,
required this.settingsEntity,
});
@override
@@ -22,18 +23,18 @@ class _OtherInfoScreenState extends State<OtherInfoScreen> {
final aboutTakingPillsController = TextEditingController();
final aboutSportHobbiesController = TextEditingController();
final favoriteFoodsController = TextEditingController();
final unfavouriteFoodsController = TextEditingController();
final unFavouriteFoodsController = TextEditingController();
final additionalInfoController = TextEditingController();
@override
void initState() {
super.initState();
aboutAllergyController.text = widget.profileDetailsModel.aboutAlergy;
aboutTakingPillsController.text = widget.profileDetailsModel.aboutTakingPils;
aboutSportHobbiesController.text = widget.profileDetailsModel.aboutSportHobbies;
favoriteFoodsController.text = widget.profileDetailsModel.favoriteFoods;
unfavouriteFoodsController.text = widget.profileDetailsModel.unfavoriteFoods;
additionalInfoController.text = widget.profileDetailsModel.additionalInfo;
aboutAllergyController.text = widget.settingsEntity.profileDetailsModel.aboutAlergy;
aboutTakingPillsController.text = widget.settingsEntity.profileDetailsModel.aboutTakingPils;
aboutSportHobbiesController.text = widget.settingsEntity.profileDetailsModel.aboutSportHobbies;
favoriteFoodsController.text = widget.settingsEntity.profileDetailsModel.favoriteFoods;
unFavouriteFoodsController.text = widget.settingsEntity.profileDetailsModel.unfavoriteFoods;
additionalInfoController.text = widget.settingsEntity.profileDetailsModel.additionalInfo;
}
@override
@@ -96,7 +97,7 @@ class _OtherInfoScreenState extends State<OtherInfoScreen> {
Text(s.unfavorite_foods),
SizedBox(height: 4),
CustomTextFormField(
controller: unfavouriteFoodsController,
controller: unFavouriteFoodsController,
hintText: s.enter_information,
maxLines: 7,
minLines: 2,
@@ -124,7 +125,19 @@ class _OtherInfoScreenState extends State<OtherInfoScreen> {
_saveButton() {
return InkWell(
onTap: () => GoRouter.of(context).pop(),
onTap: () {
widget.settingsEntity.settingsCubit.updateProfileDetails(
profileDetailsModel: (widget.settingsEntity.settingsCubit.state as SettingsStateLoaded).profileDetails.copyWith(
aboutAlergy: aboutAllergyController.text,
aboutTakingPils: aboutTakingPillsController.text,
aboutSportHobbies: aboutSportHobbiesController.text,
favoriteFoods: favoriteFoodsController.text,
unfavoriteFoods: unFavouriteFoodsController.text,
additionalInfo: additionalInfoController.text,
),
);
GoRouter.of(context).pop();
},
borderRadius: BorderRadius.circular(20),
child: Ink(
height: 52,

20
lib/features/settings/presentation/pages/physical_activity_screen.dart
View File

@@ -1,17 +1,15 @@
import 'package:eatvio_app/features/profile/models/profile_model.dart';
import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart';
import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
import 'package:eatvio_app/locator_service.dart';
import 'package:eatvio_app/theme/theme_helper.dart';
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
class PhysicalActivityScreen extends StatefulWidget {
final ProfileDetailsModel profileDetailsModel;
final SettingsEntity settingsEntity;
const PhysicalActivityScreen({
super.key,
required this.profileDetailsModel,
required this.settingsEntity,
});
@override
@@ -26,7 +24,7 @@ class _PhysicalActivityScreenState extends State<PhysicalActivityScreen> {
@override
void initState() {
super.initState();
switch (widget.profileDetailsModel.activityCoefficient) {
switch (widget.settingsEntity.profileDetailsModel.activityCoefficient) {
case 1.2:
_physicalActivity = PhysicalActivity.minimum;
break;
@@ -141,11 +139,11 @@ class _PhysicalActivityScreenState extends State<PhysicalActivityScreen> {
default:
break;
}
sl<SettingsCubit>().updateProfileDetails(
profileDetailsModel: (sl<SettingsCubit>().state as SettingsStateLoaded).profileDetails.copyWith(
activityCoefficient: activityCoefficient,
),
);
widget.settingsEntity.settingsCubit.updateProfileDetails(
profileDetailsModel: (widget.settingsEntity.settingsCubit.state as SettingsStateLoaded).profileDetails.copyWith(
activityCoefficient: activityCoefficient,
),
);
GoRouter.of(context).pop();
},
borderRadius: BorderRadius.circular(20),

27
lib/features/settings/presentation/pages/physical_form_screen.dart
View File

@@ -1,4 +1,5 @@
import 'package:eatvio_app/features/profile/models/profile_model.dart';
import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/theme/theme_helper.dart';
import 'package:eatvio_app/widgets/custom_text_form_field.dart';
@@ -7,11 +8,11 @@ import 'package:flutter/services.dart';
import 'package:go_router/go_router.dart';
class PhysicalFormScreen extends StatefulWidget {
final ProfileDetailsModel profileDetailsModel;
final SettingsEntity settingsEntity;
const PhysicalFormScreen({
super.key,
required this.profileDetailsModel,
required this.settingsEntity,
});
@override
@@ -28,10 +29,10 @@ class _PhysicalFormScreenState extends State<PhysicalFormScreen> {
@override
void initState() {
super.initState();
chestCircumferenceController.text = widget.profileDetailsModel.chestCircumference.toString();
waistCircumferenceController.text = widget.profileDetailsModel.waistCircumference.toString();
hipCircumferenceController.text = widget.profileDetailsModel.hipCircumference.toString();
heightController.text = widget.profileDetailsModel.height.toString();
chestCircumferenceController.text = widget.settingsEntity.profileDetailsModel.chestCircumference.toString();
waistCircumferenceController.text = widget.settingsEntity.profileDetailsModel.waistCircumference.toString();
hipCircumferenceController.text = widget.settingsEntity.profileDetailsModel.hipCircumference.toString();
heightController.text = widget.settingsEntity.profileDetailsModel.height.toString();
}
@override
@@ -90,7 +91,17 @@ class _PhysicalFormScreenState extends State<PhysicalFormScreen> {
_saveButton() {
return InkWell(
onTap: () => GoRouter.of(context).pop(),
onTap: () {
widget.settingsEntity.settingsCubit.updateProfileDetails(
profileDetailsModel: (widget.settingsEntity.settingsCubit.state as SettingsStateLoaded).profileDetails.copyWith(
chestCircumference: int.parse(chestCircumferenceController.text),
waistCircumference: int.parse(waistCircumferenceController.text),
hipCircumference: int.parse(hipCircumferenceController.text),
height: int.parse(heightController.text),
),
);
GoRouter.of(context).pop();
},
borderRadius: BorderRadius.circular(20),
child: Ink(
height: 52,

37
lib/features/settings/presentation/pages/pressure_screen.dart
View File

@@ -1,5 +1,6 @@
import 'package:eatvio_app/data/models/selectionPopupModel/selection_popup_model.dart';
import 'package:eatvio_app/features/profile/models/profile_model.dart';
import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/theme/theme_helper.dart';
import 'package:eatvio_app/widgets/custom_drop_down.dart';
@@ -9,11 +10,11 @@ import 'package:flutter/services.dart';
import 'package:go_router/go_router.dart';
class PressureScreen extends StatefulWidget {
final ProfileDetailsModel profileDetailsModel;
final SettingsEntity settingsEntity;
const PressureScreen({
super.key,
required this.profileDetailsModel,
required this.settingsEntity,
});
@override
@@ -30,21 +31,15 @@ class _PressureScreenState extends State<PressureScreen> {
@override
void initState() {
super.initState();
bloodPressureUpController.text = widget.profileDetailsModel.bloodPressureUp.toString();
bloodPressureDownController.text = widget.profileDetailsModel.bloodPressureDown.toString();
hypo = widget.profileDetailsModel.hasHypo ? selectionPopupList[0] : selectionPopupList[1];
hyper = widget.profileDetailsModel.hasHyper ? selectionPopupList[0] : selectionPopupList[1];
bloodPressureUpController.text = widget.settingsEntity.profileDetailsModel.bloodPressureUp.toString();
bloodPressureDownController.text = widget.settingsEntity.profileDetailsModel.bloodPressureDown.toString();
hypo = widget.settingsEntity.profileDetailsModel.hasHypo ? selectionPopupList[1] : selectionPopupList[0];
hyper = widget.settingsEntity.profileDetailsModel.hasHyper ? selectionPopupList[1] : selectionPopupList[0];
}
final List<SelectionPopupModel> selectionPopupList = [
SelectionPopupModel(
id: 1,
title: "Да",
),
SelectionPopupModel(
id: 0,
title: "Нет",
),
SelectionPopupModel(id: 0, title: 'Нет', value: false),
SelectionPopupModel(id: 1, title: 'Да', value: true),
];
@override
@@ -113,7 +108,17 @@ class _PressureScreenState extends State<PressureScreen> {
_saveButton() {
return InkWell(
onTap: () => GoRouter.of(context).pop(),
onTap: () {
widget.settingsEntity.settingsCubit.updateProfileDetails(
profileDetailsModel: (widget.settingsEntity.settingsCubit.state as SettingsStateLoaded).profileDetails.copyWith(
bloodPressureUp: int.parse(bloodPressureUpController.text),
bloodPressureDown: int.parse(bloodPressureDownController.text),
hasHyper: hyper.value,
hasHypo: hypo.value,
),
);
GoRouter.of(context).pop();
},
borderRadius: BorderRadius.circular(20),
child: Ink(
height: 52,

136
lib/features/settings/presentation/pages/settings_screen.dart
View File

@@ -1,4 +1,5 @@
import 'package:eatvio_app/core/const.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/locator_service.dart';
@@ -18,18 +19,24 @@ class SettingsScreen extends StatefulWidget {
}
class _SettingsScreenState extends State<SettingsScreen> {
final SettingsCubit settingsCubit = sl<SettingsCubit>()..init();
late bool updatesNotificationsSwitchState;
late bool fillDiaryNotificationsSwitchState;
late bool bedTimeSwitchState;
late bool moodSwitchState;
@override
Widget build(BuildContext context) {
return BlocProvider<SettingsCubit>(
create: (BuildContext context) => sl<SettingsCubit>()..init(),
create: (BuildContext context) => settingsCubit,
child: BlocConsumer<SettingsCubit, SettingsState>(
bloc: settingsCubit,
listener: (BuildContext context, SettingsState state) {
if (state is SettingsStateLoaded) {
updatesNotificationsSwitchState = state.profileSettings.newUpdatesNotifications == 1 ? true : false;
fillDiaryNotificationsSwitchState = state.profileSettings.diaryReminderNotifications == 1 ? true : false;
bedTimeSwitchState = state.profileSettings.isBedtimeFillable == 1 ? true : false;
moodSwitchState = state.profileSettings.isMoodFillable == 1 ? true : false;
}
},
builder: (BuildContext context, SettingsState state) {
@@ -100,10 +107,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
_tile(
onTap: () => GoRouter.of(context).pushNamed(
'generalInfoScreen',
extra: state.profileDetails,
pathParameters: {
'isPublicProfile': state.profileSettings.isPublicProfile.toString(),
},
extra: SettingsEntity(
profileSettingsModel: state.profileSettings,
profileDetailsModel: state.profileDetails,
settingsCubit: settingsCubit,
),
),
title: 'Общая информация',
),
@@ -111,7 +119,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
_tile(
onTap: () => GoRouter.of(context).pushNamed(
'physicalFormScreen',
extra: state.profileDetails,
extra: SettingsEntity(
profileSettingsModel: state.profileSettings,
profileDetailsModel: state.profileDetails,
settingsCubit: settingsCubit,
),
),
title: 'Физическая форма',
),
@@ -119,7 +131,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
_tile(
onTap: () => GoRouter.of(context).pushNamed(
'pressureScreen',
extra: state.profileDetails,
extra: SettingsEntity(
profileSettingsModel: state.profileSettings,
profileDetailsModel: state.profileDetails,
settingsCubit: settingsCubit,
),
),
title: 'Давление',
),
@@ -127,7 +143,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
_tile(
onTap: () => GoRouter.of(context).pushNamed(
'otherInfoScreen',
extra: state.profileDetails,
extra: SettingsEntity(
profileSettingsModel: state.profileSettings,
profileDetailsModel: state.profileDetails,
settingsCubit: settingsCubit,
),
),
title: 'Прочая информация',
),
@@ -135,10 +155,26 @@ class _SettingsScreenState extends State<SettingsScreen> {
_tile(
onTap: () => GoRouter.of(context).pushNamed(
'physicalActivityScreen',
extra: state.profileDetails,
extra: SettingsEntity(
profileSettingsModel: state.profileSettings,
profileDetailsModel: state.profileDetails,
settingsCubit: settingsCubit,
),
),
title: 'Физическая нагрузка',
),
_divider(context),
_tile(
onTap: () => GoRouter.of(context).pushNamed(
'changePasswordScreen',
extra: SettingsEntity(
profileSettingsModel: state.profileSettings,
profileDetailsModel: state.profileDetails,
settingsCubit: settingsCubit,
),
),
title: 'Сменить пароль',
),
],
);
}
@@ -163,11 +199,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
setState(() {
updatesNotificationsSwitchState = !updatesNotificationsSwitchState;
});
context.read<SettingsCubit>().updateProfileSettings(
profileSettingsModel: state.profileSettings.copyWith(
settingsCubit.updateProfileSettings(
profileSettingsModel: state.profileSettings.copyWith(
newUpdatesNotifications: updatesNotificationsSwitchState,
),
);
);
},
title: 'Уведомление о новых обновлениях',
trailing: CupertinoSwitch(
@@ -177,11 +213,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
setState(() {
updatesNotificationsSwitchState = newValue;
});
context.read<SettingsCubit>().updateProfileSettings(
profileSettingsModel: state.profileSettings.copyWith(
settingsCubit.updateProfileSettings(
profileSettingsModel: state.profileSettings.copyWith(
newUpdatesNotifications: updatesNotificationsSwitchState,
),
);
);
},
),
),
@@ -191,11 +227,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
setState(() {
fillDiaryNotificationsSwitchState = !fillDiaryNotificationsSwitchState;
});
context.read<SettingsCubit>().updateProfileSettings(
profileSettingsModel: state.profileSettings.copyWith(
settingsCubit.updateProfileSettings(
profileSettingsModel: state.profileSettings.copyWith(
diaryReminderNotifications: fillDiaryNotificationsSwitchState,
),
);
);
},
title: 'Напоминание о заполнении дневника',
trailing: CupertinoSwitch(
@@ -205,11 +241,67 @@ class _SettingsScreenState extends State<SettingsScreen> {
setState(() {
fillDiaryNotificationsSwitchState = newValue;
});
context.read<SettingsCubit>().updateProfileSettings(
profileSettingsModel: state.profileSettings.copyWith(
settingsCubit.updateProfileSettings(
profileSettingsModel: state.profileSettings.copyWith(
diaryReminderNotifications: fillDiaryNotificationsSwitchState,
),
);
);
},
),
),
_divider(context),
_tile(
onTap: () {
setState(() {
moodSwitchState = !moodSwitchState;
});
settingsCubit.updateProfileSettings(
profileSettingsModel: state.profileSettings.copyWith(
isMoodFillable: moodSwitchState,
),
);
},
title: 'Указывать “настроение” в заполнение дневника',
trailing: CupertinoSwitch(
value: moodSwitchState,
activeColor: appTheme.blueA400,
onChanged: (newValue) {
setState(() {
moodSwitchState = newValue;
});
settingsCubit.updateProfileSettings(
profileSettingsModel: state.profileSettings.copyWith(
isMoodFillable: moodSwitchState,
),
);
},
),
),
_divider(context),
_tile(
onTap: () {
setState(() {
bedTimeSwitchState = !bedTimeSwitchState;
});
settingsCubit.updateProfileSettings(
profileSettingsModel: state.profileSettings.copyWith(
isBedtimeFillable: bedTimeSwitchState,
),
);
},
title: 'Указывать “отход ко сну” в заполнение дневника',
trailing: CupertinoSwitch(
value: bedTimeSwitchState,
activeColor: appTheme.blueA400,
onChanged: (newValue) {
setState(() {
bedTimeSwitchState = newValue;
});
settingsCubit.updateProfileSettings(
profileSettingsModel: state.profileSettings.copyWith(
isBedtimeFillable: bedTimeSwitchState,
),
);
},
),
),
@@ -264,7 +356,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
style: TextStyle(
color: Colors.white,
height: 1,
fontWeight: FontWeight.w600,
fontSize: 18,
),
),
@@ -293,7 +384,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
style: TextStyle(
color: Colors.black,
height: 1,
fontWeight: FontWeight.w600,
fontSize: 18,
),
),

15
lib/widgets/custom_drop_down.dart
View File

@@ -64,11 +64,11 @@ class CustomDropDown extends StatelessWidget {
value: value,
isDense: true,
isExpanded: true,
style: textStyle ??
TextStyle(
fontSize: 16,
fontWeight: FontWeight.w400,
),
style: TextStyle(
fontSize: 16,
color: Colors.black,
fontWeight: FontWeight.w400,
),
items: items?.map((SelectionPopupModel item) {
return DropdownMenuItem<SelectionPopupModel>(
value: item,
@@ -95,6 +95,11 @@ class CustomDropDown extends StatelessWidget {
InputDecoration _buildInputDecoration(BuildContext context) {
return InputDecoration(
labelStyle: TextStyle(
fontSize: 16,
color: Colors.black,
fontWeight: FontWeight.w400,
),
hintText: hintText ?? "",
hintStyle: hintStyle ??
TextStyle(