Error state added. Error display added for profile. Carousel in a separate function

This commit is contained in:
Anastasiia Reshetnik
2024-01-29 15:19:46 +03:00
parent 272d6785fb
commit e9b0ea19b2
3 changed files with 148 additions and 111 deletions

View File

@@ -17,9 +17,10 @@ class MyProfileBloc extends Bloc<MyProfileEvent, MyProfileState> {
} }
Future<void> _onInitialize( Future<void> _onInitialize(
MyProfileInitialEvent event, MyProfileInitialEvent event,
Emitter<MyProfileState> emit, Emitter<MyProfileState> emit,
) async { ) async {
try {
final box = await Hive.openBox('token'); final box = await Hive.openBox('token');
final token = box.get('token'); final token = box.get('token');
final response = await http.get( final response = await http.get(
@@ -28,36 +29,58 @@ class MyProfileBloc extends Bloc<MyProfileEvent, MyProfileState> {
'Authorization': 'Bearer $token', 'Authorization': 'Bearer $token',
}, },
); );
final data = jsonDecode(response.body);
if (state is MyProfileLoadedState) { if (response.statusCode == 200) {
// Если текущее состояние уже загружено, обновляем его final data = jsonDecode(response.body);
emit((state as MyProfileLoadedState).copyWith(
user: data['user'], // Проверка наличия ключевых полей в JSON
userDetails: data['userDetails'], if (data is Map<String, dynamic> &&
token: token, data.containsKey('user') &&
chartPoints: data['chartPoints'], data.containsKey('userDetails') &&
plans: data['plans'], data.containsKey('chartPoints') &&
chestCircumferenceController: TextEditingController(), data.containsKey('plans') &&
waistCircumferenceController: TextEditingController(), data.containsKey('circumferences')) {
hipCircumferenceController: TextEditingController(), // Все ключевые поля присутствуют, продолжаем обработку
weightController: TextEditingController(), if (state is MyProfileLoadedState) {
circumferences: data['circumferences'], // Если текущее состояние уже загружено, обновляем его
)); emit((state as MyProfileLoadedState).copyWith(
user: data['user'],
userDetails: data['userDetails'],
token: token,
chartPoints: data['chartPoints'],
plans: data['plans'],
chestCircumferenceController: TextEditingController(),
waistCircumferenceController: TextEditingController(),
hipCircumferenceController: TextEditingController(),
weightController: TextEditingController(),
circumferences: data['circumferences'],
));
} else {
// Если текущее состояние - начальное, создаем новое загруженное состояние
emit(MyProfileLoadedState(
user: data['user'],
userDetails: data['userDetails'],
token: token,
chartPoints: data['chartPoints'],
plans: data['plans'],
chestCircumferenceController: TextEditingController(),
waistCircumferenceController: TextEditingController(),
hipCircumferenceController: TextEditingController(),
weightController: TextEditingController(),
circumferences: data['circumferences'],
));
}
} else {
// Один или несколько ключевых полей отсутствуют, обрабатываем ошибку
emit(MyProfileErrorState('Некоторые необходимые данные отсутствуют.'));
}
} else { } else {
// Если текущее состояние - начальное, создаем новое загруженное состояние // Статус ответа не равен 200, обрабатываем ошибку
emit(MyProfileLoadedState( emit(MyProfileErrorState('Ошибка сервера: ${response.statusCode}'));
user: data['user'],
userDetails: data['userDetails'],
token: token,
chartPoints: data['chartPoints'],
plans: data['plans'],
chestCircumferenceController: TextEditingController(),
waistCircumferenceController: TextEditingController(),
hipCircumferenceController: TextEditingController(),
weightController: TextEditingController(),
circumferences: data['circumferences'],
));
} }
} catch (e) {
// Ошибка при декодировании JSON или другая ошибка выполнения
emit(MyProfileErrorState('Ошибка при получении данных профиля: $e'));
} }
}
} }

View File

@@ -85,3 +85,11 @@ class MyProfileLoadedState extends MyProfileState {
} }
} }
class MyProfileErrorState extends MyProfileState {
final String errorMessage;
const MyProfileErrorState(this.errorMessage);
@override
List<Object> get props => [errorMessage];
}

View File

@@ -38,6 +38,10 @@ class MyProfileScreen extends StatelessWidget {
} else if (state is MyProfileLoadedState) { } else if (state is MyProfileLoadedState) {
// Данные загружены, можно строить экран. // Данные загружены, можно строить экран.
return _buildMyProfileScreen(context, state); return _buildMyProfileScreen(context, state);
}
else if (state is MyProfileErrorState) {
// Произошла ошибка при загрузке данных.
return Center(child: Text(state.errorMessage));
} else { } else {
// Другие состояния, если они есть. // Другие состояния, если они есть.
return Container(); // Пустой контейнер для необработанных состояний. return Container(); // Пустой контейнер для необработанных состояний.
@@ -65,7 +69,85 @@ class MyProfileScreen extends StatelessWidget {
SizedBox(height: 15.v), SizedBox(height: 15.v),
_buildSettings(context), _buildSettings(context),
SizedBox(height: 30.v), SizedBox(height: 30.v),
CarouselSlider( _buildCarousel(context, state),
SizedBox(height: 15.v),
_buildPlans(
context,
state.plans?.map((plan) => plan['name']).toList(),
state.plans?.map((plan) => plan['image']).toList(),
state.plans?.map((plan) => plan['state']).toList(),
),
SizedBox(height: 5.v),
])),
bottomNavigationBar: _buildBottomBar(context)));
}
/// Section Widget
PreferredSizeWidget _buildAppBar(BuildContext context, String username) {
return CustomAppBar(
height: 54.v,
leadingWidth: 28.h,
title: Padding(
padding: EdgeInsets.only(left: 20.h),
child: Row(children: [
AppbarTitleCircleimage(imagePath: ImageConstant.imgEllipse1),
AppbarSubtitle(
text: username,
margin: EdgeInsets.only(left: 35.h, top: 12.v, bottom: 9.v))
])),
actions: [
ExitButton(
text: "exit".tr,
margin: EdgeInsets.symmetric(horizontal: 16.h, vertical: 17.v),
onTap: () {},
)
]);
}
/// Section Widget
Widget _buildMyBlog(BuildContext context) {
return Padding(
padding: EdgeInsets.symmetric(horizontal: 7.h),
child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [
CustomImageView(
imagePath: ImageConstant.imgGrid,
height: 24.adaptSize,
width: 24.adaptSize,
margin: EdgeInsets.symmetric(vertical: 3.v)),
Expanded(
child: NextStepButton(
buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
text: "my_blog".tr.toUpperCase(),
margin: EdgeInsets.only(left: 10.h)))
]));
}
/// Section Widget
Widget _buildSettings(BuildContext context) {
return Padding(
padding: EdgeInsets.symmetric(horizontal: 7.h),
child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [
CustomImageView(
imagePath: ImageConstant.imgSearch,
height: 24.adaptSize,
width: 24.adaptSize,
margin: EdgeInsets.symmetric(vertical: 3.v)),
Expanded(
child: NextStepButton(
buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
onPressed: () {
Navigator.pushNamed(context, AppRoutes.mySettings);
},
text: "my_settings".tr.toUpperCase(),
margin: EdgeInsets.only(left: 10.h))),
]));
}
Widget _buildBottomBar(BuildContext context) {
return CustomBottomBar(onChanged: (BottomBarEnum type) {});
}
Widget _buildCarousel(BuildContext contex, MyProfileLoadedState state){
return CarouselSlider(
options: CarouselOptions(height: 375.0), options: CarouselOptions(height: 375.0),
items: [1, 2, 3].map((chartType) { items: [1, 2, 3].map((chartType) {
return Builder( return Builder(
@@ -154,84 +236,8 @@ class MyProfileScreen extends StatelessWidget {
}, },
); );
}).toList(), }).toList(),
), );
SizedBox(height: 15.v),
_buildPlans(
context,
state.plans?.map((plan) => plan['name']).toList(),
state.plans?.map((plan) => plan['image']).toList(),
state.plans?.map((plan) => plan['state']).toList(),
),
SizedBox(height: 5.v),
])),
bottomNavigationBar: _buildBottomBar(context)));
} }
/// Section Widget
PreferredSizeWidget _buildAppBar(BuildContext context, String username) {
return CustomAppBar(
height: 54.v,
leadingWidth: 28.h,
title: Padding(
padding: EdgeInsets.only(left: 20.h),
child: Row(children: [
AppbarTitleCircleimage(imagePath: ImageConstant.imgEllipse1),
AppbarSubtitle(
text: username,
margin: EdgeInsets.only(left: 35.h, top: 12.v, bottom: 9.v))
])),
actions: [
ExitButton(
text: "exit".tr,
margin: EdgeInsets.symmetric(horizontal: 16.h, vertical: 17.v),
onTap: () {},
)
]);
}
/// Section Widget
Widget _buildMyBlog(BuildContext context) {
return Padding(
padding: EdgeInsets.symmetric(horizontal: 7.h),
child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [
CustomImageView(
imagePath: ImageConstant.imgGrid,
height: 24.adaptSize,
width: 24.adaptSize,
margin: EdgeInsets.symmetric(vertical: 3.v)),
Expanded(
child: NextStepButton(
buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
text: "my_blog".tr.toUpperCase(),
margin: EdgeInsets.only(left: 10.h)))
]));
}
/// Section Widget
Widget _buildSettings(BuildContext context) {
return Padding(
padding: EdgeInsets.symmetric(horizontal: 7.h),
child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [
CustomImageView(
imagePath: ImageConstant.imgSearch,
height: 24.adaptSize,
width: 24.adaptSize,
margin: EdgeInsets.symmetric(vertical: 3.v)),
Expanded(
child: NextStepButton(
buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
onPressed: () {
Navigator.pushNamed(context, AppRoutes.mySettings);
},
text: "my_settings".tr.toUpperCase(),
margin: EdgeInsets.only(left: 10.h))),
]));
}
Widget _buildBottomBar(BuildContext context) {
return CustomBottomBar(onChanged: (BottomBarEnum type) {});
}
Widget _buildChartLegend() { Widget _buildChartLegend() {
final colors = [Colors.pink, Colors.green, Colors.purple]; final colors = [Colors.pink, Colors.green, Colors.purple];
final titles = ["chest".tr, "waist".tr, "hips".tr]; final titles = ["chest".tr, "waist".tr, "hips".tr];
@@ -666,13 +672,13 @@ class MyProfileScreen extends StatelessWidget {
case 'active': case 'active':
boxColor = appTheme.greenA700; boxColor = appTheme.greenA700;
break; break;
case 'archived': case 'archived': // График ИМТ
boxColor = appTheme.gray400; boxColor = appTheme.gray400;
break; break;
case 'draft': case 'draft':
boxColor = appTheme.deepOrange900; boxColor = appTheme.deepOrange900;
break; break;
case 'in_progress': case 'in_progress': //График обхватов
boxColor = appTheme.lightGreen300; boxColor = appTheme.lightGreen300;
break; break;
} }