From faf04393493683434217d39920d599295fef6294 Mon Sep 17 00:00:00 2001 From: maxxkim Date: Fri, 16 Feb 2024 15:15:26 +0300 Subject: [PATCH] feat(diary) Image upload package and logic --- .../bloc/diary_edit_bloc.dart | 25 +++++++ .../bloc/diary_edit_event.dart | 7 ++ .../diary_edit_screen/diary_edit_screen.dart | 73 +++++++++++++------ lib/theme/custom_button_style.dart | 2 +- lib/widgets/custom_edit_drop_down.dart | 9 +-- pubspec.yaml | 1 + 6 files changed, 85 insertions(+), 32 deletions(-) diff --git a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart b/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart index 04ea8ccd..efdde2ef 100644 --- a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart +++ b/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart @@ -3,6 +3,7 @@ import 'dart:async'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import '/core/app_export.dart'; +import 'package:image_picker/image_picker.dart'; import 'package:eatvio_app/presentation/diary/diary_edit_screen/models/diary_edit_model.dart'; import 'package:http/http.dart' as http; import 'dart:convert'; @@ -25,6 +26,7 @@ class DiaryEditBloc extends Bloc { on(_addPortion); //пользователь нажимает "Добавить продукт" on( _removePortion); // пользователь нажимает на крестик около продукта + on(_uploadImages); //пользователь нажимает "Добавить продукт" } Future _onInitialize( @@ -169,4 +171,27 @@ class DiaryEditBloc extends Bloc { FutureOr _removePortion( RemovePortionEvent event, Emitter emit) {} + + Future> _uploadImages( + UploadImages event, Emitter emit) async { + String imageUrl = await uploadImageToServer(event.image.path); + print(imageUrl); + } +} + +Future uploadImageToServer(String imagePath) async { + var request = http.MultipartRequest( + 'POST', + Uri.parse('http://your-api-url.com/upload'), // Замените на ваш маршрут API + ); + + request.files.add(await http.MultipartFile.fromPath('image', imagePath)); + + var response = await request.send(); + if (response.statusCode == 200) { + var responseData = await response.stream.bytesToString(); + return responseData; + } else { + throw Exception('Ошибка при загрузке изображения'); + } } diff --git a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_event.dart b/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_event.dart index e91d1c99..fcc57c64 100644 --- a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_event.dart +++ b/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_event.dart @@ -73,3 +73,10 @@ class RemovePortionEvent extends DiaryEditEvent { @override List get props => [portionId]; } + +class UploadImages extends DiaryEditEvent { + UploadImages(this.image); + final XFile image; + @override + List get props => [image]; +} diff --git a/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart b/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart index 14685a2f..6308623a 100644 --- a/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart +++ b/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart @@ -3,6 +3,7 @@ import 'models/diary_edit_model.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_form_builder/flutter_form_builder.dart'; +import 'package:image_picker/image_picker.dart'; import 'package:eatvio_app/core/app_export.dart'; import 'package:eatvio_app/widgets/custom_edit_text_form_field.dart'; import 'package:eatvio_app/widgets/custom_edit_drop_down.dart'; @@ -162,19 +163,47 @@ class DiaryEditScreen extends StatelessWidget { /// Section Widget Widget _buildAddPhoto(BuildContext context) { - return CustomOutlinedButton( - width: 195.h, - text: "Добавить фото", - rightIcon: Container( - margin: EdgeInsets.only(left: 14.h), - child: CustomImageView( - imagePath: ImageConstant.imgVector, - height: 30.v, - width: 34.h, + return GestureDetector( + onTap: () async { + final picker = ImagePicker(); + List? images = await picker.pickMultiImage(); + if (images.isNotEmpty) { + for (var image in images) { + context.read().add(UploadImages(image)); + } + } + }, + child: Container( + margin: EdgeInsets.symmetric(horizontal: 10.h), + padding: EdgeInsets.symmetric( + horizontal: 40.h, + vertical: 80.v, + ), + decoration: AppDecoration.fillGray.copyWith( + borderRadius: BorderRadiusStyle.roundedBorder5, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + mainAxisSize: MainAxisSize.min, + children: [ + Padding( + padding: EdgeInsets.only( + left: 7.h, + top: 5.v, + ), + child: Text( + "Добавить фото", + selectionColor: appTheme.blueA400, + ), + ), + Spacer(), + Icon( + Icons.photo_library, + color: appTheme.blueGray300, + ) + ], ), ), - buttonStyle: CustomButtonStyles.outlinePrimaryTL15, - buttonTextStyle: theme.textTheme.bodyMedium!, ); } @@ -277,6 +306,7 @@ class DiaryEditScreen extends StatelessWidget { _buildProduct(context), SizedBox(height: 30.v), _buildAddPhoto(context), + SizedBox(height: 30.v), Text( "Ваша сытость после приёма пищи", style: CustomTextStyles.bodyMediumBlack900, @@ -365,7 +395,7 @@ class DiaryEditScreen extends StatelessWidget { top: 5.v, ), child: Text( - "Omelette", + "Сырный суп", style: CustomTextStyles.titleMedium16, ), ), @@ -377,21 +407,16 @@ class DiaryEditScreen extends StatelessWidget { ), child: Text( "15гр", - style: CustomTextStyles.titleMedium16, ), ), Spacer(), - CustomImageView( - imagePath: ImageConstant.imgSearch, - height: 24.adaptSize, - width: 24.adaptSize, - ), - CustomImageView( - imagePath: ImageConstant.imgClose, - height: 28.adaptSize, - width: 28.adaptSize, - margin: EdgeInsets.only(left: 10.h), - ), + Padding( + padding: const EdgeInsets.only(right: 10), + child: Icon( + Icons.close, + color: appTheme.blueGray300, + ), + ) ], ), ); diff --git a/lib/theme/custom_button_style.dart b/lib/theme/custom_button_style.dart index 95a5581e..bdd84d93 100644 --- a/lib/theme/custom_button_style.dart +++ b/lib/theme/custom_button_style.dart @@ -8,7 +8,7 @@ class CustomButtonStyles { backgroundColor: appTheme.blueA400, side: BorderSide( color: theme.colorScheme.primary, - width: 1, + width: 0, ), shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(15.h), diff --git a/lib/widgets/custom_edit_drop_down.dart b/lib/widgets/custom_edit_drop_down.dart index e1ac863e..eecbea59 100644 --- a/lib/widgets/custom_edit_drop_down.dart +++ b/lib/widgets/custom_edit_drop_down.dart @@ -99,18 +99,13 @@ class CustomDropDown extends StatelessWidget { ); InputDecoration get decoration => InputDecoration( hintText: hintText ?? "", - hintStyle: hintStyle, + hintStyle: hintStyle ?? theme.textTheme.bodyLarge, prefixIcon: prefix, prefixIconConstraints: prefixConstraints, suffixIcon: suffix, suffixIconConstraints: suffixConstraints, isDense: true, - contentPadding: contentPadding ?? - EdgeInsets.only( - left: 17, - top: 17, - bottom: 17, - ), + contentPadding: contentPadding ?? EdgeInsets.all(6.h), fillColor: fillColor, filled: filled, border: borderDecoration ?? diff --git a/pubspec.yaml b/pubspec.yaml index 756e9229..711ce10f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -24,6 +24,7 @@ dependencies: flutter_dotenv: ^5.1.0 carousel_slider: ^4.2.1 flutter_form_builder: ^9.2.1 + image_picker: ^1.0.7 dev_dependencies: flutter_test: