diff --git a/lib/presentation/profile/my_profile_screen/admin.dart b/lib/presentation/profile/my_profile_screen/admin.dart deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart b/lib/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart index 8c3db0f2..26d8d916 100644 --- a/lib/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart +++ b/lib/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart @@ -44,30 +44,30 @@ class MyProfileBloc extends Bloc { if (state is MyProfileLoadedState) { // Если текущее состояние уже загружено, обновляем его emit((state as MyProfileLoadedState).copyWith( + chartPoints: data['chartPoints'], + circumferences: data['circumferences'], user: data['user'], userDetails: data['userDetails'], - token: token, - chartPoints: data['chartPoints'], plans: data['plans'], + token: token, chestCircumferenceController: TextEditingController(), waistCircumferenceController: TextEditingController(), hipCircumferenceController: TextEditingController(), weightController: TextEditingController(), - circumferences: data['circumferences'], )); } else { // Если текущее состояние - начальное, создаем новое загруженное состояние emit(MyProfileLoadedState( + chartPoints: data['chartPoints'], + circumferences: data['circumferences'], user: data['user'], userDetails: data['userDetails'], - token: token, - chartPoints: data['chartPoints'], plans: data['plans'], + token: token, chestCircumferenceController: TextEditingController(), waistCircumferenceController: TextEditingController(), hipCircumferenceController: TextEditingController(), weightController: TextEditingController(), - circumferences: data['circumferences'], )); } } else { diff --git a/lib/presentation/profile/my_profile_screen/my_blog.dart b/lib/presentation/profile/my_profile_screen/my_blog.dart deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/presentation/profile/my_profile_screen/my_diary.dart b/lib/presentation/profile/my_profile_screen/my_diary.dart deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/presentation/profile/my_profile_screen/my_profile_screen.dart b/lib/presentation/profile/my_profile_screen/my_profile_screen.dart index a8be04d5..a8d89708 100644 --- a/lib/presentation/profile/my_profile_screen/my_profile_screen.dart +++ b/lib/presentation/profile/my_profile_screen/my_profile_screen.dart @@ -643,7 +643,9 @@ class MyProfileScreen extends StatelessWidget { Padding( padding: EdgeInsets.only(left: 15.h), child: Text("plans_complete".tr, - style: CustomTextStyles.titleSmallBluegray800)), + style: CustomTextStyles.titleMediumBlack.copyWith( + color: appTheme.black900))), + SizedBox(height: 5.v), Container( decoration: AppDecoration.outlineBlueGray .copyWith(borderRadius: BorderRadiusStyle.roundedBorder5),