From 43547c301b657ac7cf9a3c995d43f1e7987f10c6 Mon Sep 17 00:00:00 2001 From: maxxkim Date: Wed, 21 Aug 2024 17:38:08 +0300 Subject: [PATCH] feat(recipe): Multiple FloatingActionButtons fixed --- .../calendar/services/calendar_service.g.dart | 41 ++- .../chat/services/chat_service.g.dart | 112 +++--- .../diary/services/diary_service.g.dart | 346 +++++++++++------- .../feed/services/feed_service.g.dart | 105 +++--- .../profile/services/profile_service.g.dart | 37 +- .../pages/recipe_create_screen.dart | 76 ++-- .../pages/recipe_edit_screen.dart | 70 ++-- .../recipes/services/recipe_service.g.dart | 147 +++++--- .../services/registration_service.g.dart | 105 +++--- 9 files changed, 607 insertions(+), 432 deletions(-) diff --git a/lib/features/calendar/services/calendar_service.g.dart b/lib/features/calendar/services/calendar_service.g.dart index 4dec81f0..903145dc 100644 --- a/lib/features/calendar/services/calendar_service.g.dart +++ b/lib/features/calendar/services/calendar_service.g.dart @@ -12,38 +12,47 @@ class _CalendarService implements CalendarService { _CalendarService( this._dio, { this.baseUrl, + this.errorLogger, }); final Dio _dio; String? baseUrl; + final ParseErrorLogger? errorLogger; + @override Future> getCalendar() async { final _extra = {}; final queryParameters = {}; final _headers = {}; const Map? _data = null; - final _result = await _dio - .fetch>(_setStreamType>(Options( + final _options = _setStreamType>(Options( method: 'GET', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/calendar/index', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - var _value = _result.data! - .map((dynamic i) => CalendarModel.fromJson(i as Map)) - .toList(); + .compose( + _dio.options, + '/api/calendar/index', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late List _value; + try { + _value = _result.data! + .map((dynamic i) => CalendarModel.fromJson(i as Map)) + .toList(); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; } diff --git a/lib/features/chat/services/chat_service.g.dart b/lib/features/chat/services/chat_service.g.dart index 0a789118..4e84a7b3 100644 --- a/lib/features/chat/services/chat_service.g.dart +++ b/lib/features/chat/services/chat_service.g.dart @@ -12,12 +12,15 @@ class _ChatService implements ChatService { _ChatService( this._dio, { this.baseUrl, + this.errorLogger, }); final Dio _dio; String? baseUrl; + final ParseErrorLogger? errorLogger; + @override Future getChatRoomPreviews({String? query}) async { final _extra = {}; @@ -58,25 +61,31 @@ class _ChatService implements ChatService { final queryParameters = {}; final _headers = {}; const Map? _data = null; - final _result = await _dio.fetch>( - _setStreamType>(Options( + final _options = _setStreamType>(Options( method: 'GET', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/chat/show/${id}', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - var _value = _result.data!.map((k, dynamic v) => - MapEntry(k, ChatRoomModel.fromJson(v as Map))); + .compose( + _dio.options, + '/api/chat/show/${id}', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late Map _value; + try { + _value = _result.data!.map((k, dynamic v) => + MapEntry(k, ChatRoomModel.fromJson(v as Map))); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; } @@ -100,7 +109,7 @@ class _ChatService implements ChatService { if (media_data != null) { _data.files.addAll(media_data.map((i) => MapEntry('media_data[]', i))); } - await _dio.fetch(_setStreamType(Options( + final _options = _setStreamType(Options( method: 'POST', headers: _headers, extra: _extra, @@ -116,7 +125,8 @@ class _ChatService implements ChatService { baseUrl: _combineBaseUrls( _dio.options.baseUrl, baseUrl, - )))); + ))); + await _dio.fetch(_options); } @override @@ -128,24 +138,30 @@ class _ChatService implements ChatService { final queryParameters = {}; final _headers = {}; const Map? _data = null; - final _result = await _dio - .fetch>(_setStreamType(Options( + final _options = _setStreamType(Options( method: 'GET', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/chat/show/${id}/messages?page=${page}', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - final _value = ChatMessagesModel.fromJson(_result.data!); + .compose( + _dio.options, + '/api/chat/show/${id}/messages?page=${page}', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late ChatMessagesModel _value; + try { + _value = ChatMessagesModel.fromJson(_result.data!); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; } @@ -155,24 +171,30 @@ class _ChatService implements ChatService { final queryParameters = {}; final _headers = {}; const Map? _data = null; - final _result = await _dio - .fetch>(_setStreamType(Options( + final _options = _setStreamType(Options( method: 'GET', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/profile/ws/params', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - final _value = WebsocketInfoModel.fromJson(_result.data!); + .compose( + _dio.options, + '/api/profile/ws/params', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late WebsocketInfoModel _value; + try { + _value = WebsocketInfoModel.fromJson(_result.data!); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; } diff --git a/lib/features/diary/services/diary_service.g.dart b/lib/features/diary/services/diary_service.g.dart index aba060cd..8c1039c0 100644 --- a/lib/features/diary/services/diary_service.g.dart +++ b/lib/features/diary/services/diary_service.g.dart @@ -12,36 +12,45 @@ class _DiaryService implements DiaryService { _DiaryService( this._dio, { this.baseUrl, + this.errorLogger, }); final Dio _dio; String? baseUrl; + final ParseErrorLogger? errorLogger; + @override Future> getDiaryID() async { final _extra = {}; final queryParameters = {}; final _headers = {}; const Map? _data = null; - final _result = await _dio - .fetch>(_setStreamType>(Options( + final _options = _setStreamType>(Options( method: 'GET', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/diary/index', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - final _value = _result.data!.cast(); + .compose( + _dio.options, + '/api/diary/index', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late Map _value; + try { + _value = _result.data!.cast(); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; } @@ -51,25 +60,31 @@ class _DiaryService implements DiaryService { final queryParameters = {}; final _headers = {}; const Map? _data = null; - final _result = await _dio.fetch>( - _setStreamType>(Options( + final _options = _setStreamType>(Options( method: 'GET', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/diary/${id}/show/', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - var _value = _result.data!.map((k, dynamic v) => - MapEntry(k, DiaryModel.fromJson(v as Map))); + .compose( + _dio.options, + '/api/diary/${id}/show/', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late Map _value; + try { + _value = _result.data!.map((k, dynamic v) => + MapEntry(k, DiaryModel.fromJson(v as Map))); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; } @@ -79,7 +94,7 @@ class _DiaryService implements DiaryService { final queryParameters = {}; final _headers = {}; const Map? _data = null; - final _result = await _dio.fetch(_setStreamType(Options( + final _options = _setStreamType(Options( method: 'GET', headers: _headers, extra: _extra, @@ -94,7 +109,8 @@ class _DiaryService implements DiaryService { baseUrl: _combineBaseUrls( _dio.options.baseUrl, baseUrl, - )))); + ))); + final _result = await _dio.fetch(_options); final _value = _result.data; return _value; } @@ -105,28 +121,34 @@ class _DiaryService implements DiaryService { final queryParameters = {r'name': name}; final _headers = {}; const Map? _data = null; - final _result = await _dio.fetch>( - _setStreamType>>(Options( + final _options = _setStreamType>>(Options( method: 'GET', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/diary/product_nutritional_values/filter', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - var _value = _result.data!.map((k, dynamic v) => MapEntry( - k, - (v as List) - .map((i) => Product.fromJson(i as Map)) - .toList())); + .compose( + _dio.options, + '/api/diary/product_nutritional_values/filter', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late Map> _value; + try { + _value = _result.data!.map((k, dynamic v) => MapEntry( + k, + (v as List) + .map((i) => Product.fromJson(i as Map)) + .toList())); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; } @@ -140,24 +162,30 @@ class _DiaryService implements DiaryService { final queryParameters = {r'satiety': satiety}; final _headers = {}; const Map? _data = null; - final _result = await _dio - .fetch>(_setStreamType>(Options( + final _options = _setStreamType>(Options( method: 'POST', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/diary/${diary_id}/meal/${meal_id}/satiety/fill', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - final _value = _result.data!.cast(); + .compose( + _dio.options, + '/api/diary/${diary_id}/meal/${meal_id}/satiety/fill', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late Map _value; + try { + _value = _result.data!.cast(); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; } @@ -171,24 +199,30 @@ class _DiaryService implements DiaryService { final queryParameters = {r'mood': mood}; final _headers = {}; const Map? _data = null; - final _result = await _dio - .fetch>(_setStreamType>(Options( + final _options = _setStreamType>(Options( method: 'POST', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/diary/${diary_id}/meal/${meal_id}/mood/fill', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - final _value = _result.data!.cast(); + .compose( + _dio.options, + '/api/diary/${diary_id}/meal/${meal_id}/mood/fill', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late Map _value; + try { + _value = _result.data!.cast(); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; } @@ -201,24 +235,30 @@ class _DiaryService implements DiaryService { final queryParameters = {r'wakeup': wakeup}; final _headers = {}; const Map? _data = null; - final _result = await _dio - .fetch>(_setStreamType(Options( + final _options = _setStreamType(Options( method: 'POST', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/diary/${diary_id}/wakeup/fill', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - final _value = DiaryModel.fromJson(_result.data!); + .compose( + _dio.options, + '/api/diary/${diary_id}/wakeup/fill', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late DiaryModel _value; + try { + _value = DiaryModel.fromJson(_result.data!); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; } @@ -231,24 +271,30 @@ class _DiaryService implements DiaryService { final queryParameters = {r'retire': retire}; final _headers = {}; const Map? _data = null; - final _result = await _dio - .fetch>(_setStreamType(Options( + final _options = _setStreamType(Options( method: 'POST', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/diary/${diary_id}/retire/fill', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - final _value = DiaryModel.fromJson(_result.data!); + .compose( + _dio.options, + '/api/diary/${diary_id}/retire/fill', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late DiaryModel _value; + try { + _value = DiaryModel.fromJson(_result.data!); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; } @@ -268,25 +314,31 @@ class _DiaryService implements DiaryService { }; final _headers = {}; const Map? _data = null; - final _result = await _dio.fetch>( - _setStreamType>(Options( + final _options = _setStreamType>(Options( method: 'POST', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/diary/${diary_id}/meal/${meal_id}/portions/create', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - var _value = _result.data!.map((k, dynamic v) => - MapEntry(k, Portion.fromJson(v as Map))); + .compose( + _dio.options, + '/api/diary/${diary_id}/meal/${meal_id}/portions/create', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late Map _value; + try { + _value = _result.data!.map((k, dynamic v) => + MapEntry(k, Portion.fromJson(v as Map))); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; } @@ -307,7 +359,7 @@ class _DiaryService implements DiaryService { filename: photo.path.split(Platform.pathSeparator).last, ), )); - await _dio.fetch(_setStreamType(Options( + final _options = _setStreamType(Options( method: 'POST', headers: _headers, extra: _extra, @@ -322,7 +374,8 @@ class _DiaryService implements DiaryService { baseUrl: _combineBaseUrls( _dio.options.baseUrl, baseUrl, - )))); + ))); + await _dio.fetch(_options); } @override @@ -343,24 +396,30 @@ class _DiaryService implements DiaryService { }; final _headers = {}; const Map? _data = null; - final _result = await _dio.fetch>( - _setStreamType>(Options( + final _options = _setStreamType>(Options( method: 'POST', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/diary/product_nutritional_values/sendToModeration', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - final _value = _result.data!.cast(); + .compose( + _dio.options, + '/api/diary/product_nutritional_values/sendToModeration', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late Map _value; + try { + _value = _result.data!.cast(); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; } @@ -370,7 +429,7 @@ class _DiaryService implements DiaryService { final queryParameters = {}; final _headers = {}; const Map? _data = null; - await _dio.fetch(_setStreamType(Options( + final _options = _setStreamType(Options( method: 'POST', headers: _headers, extra: _extra, @@ -385,7 +444,8 @@ class _DiaryService implements DiaryService { baseUrl: _combineBaseUrls( _dio.options.baseUrl, baseUrl, - )))); + ))); + await _dio.fetch(_options); } @override @@ -398,7 +458,7 @@ class _DiaryService implements DiaryService { final queryParameters = {}; final _headers = {}; const Map? _data = null; - await _dio.fetch(_setStreamType(Options( + final _options = _setStreamType(Options( method: 'DELETE', headers: _headers, extra: _extra, @@ -413,7 +473,8 @@ class _DiaryService implements DiaryService { baseUrl: _combineBaseUrls( _dio.options.baseUrl, baseUrl, - )))); + ))); + await _dio.fetch(_options); } @override @@ -430,7 +491,7 @@ class _DiaryService implements DiaryService { }; final _headers = {}; const Map? _data = null; - await _dio.fetch(_setStreamType(Options( + final _options = _setStreamType(Options( method: 'DELETE', headers: _headers, extra: _extra, @@ -445,7 +506,8 @@ class _DiaryService implements DiaryService { baseUrl: _combineBaseUrls( _dio.options.baseUrl, baseUrl, - )))); + ))); + await _dio.fetch(_options); } RequestOptions _setStreamType(RequestOptions requestOptions) { diff --git a/lib/features/feed/services/feed_service.g.dart b/lib/features/feed/services/feed_service.g.dart index 39dec4e4..f401da59 100644 --- a/lib/features/feed/services/feed_service.g.dart +++ b/lib/features/feed/services/feed_service.g.dart @@ -12,36 +12,45 @@ class _FeedService implements FeedService { _FeedService( this._dio, { this.baseUrl, + this.errorLogger, }); final Dio _dio; String? baseUrl; + final ParseErrorLogger? errorLogger; + @override Future getBlocPostList({required int page}) async { final _extra = {}; final queryParameters = {}; final _headers = {}; const Map? _data = null; - final _result = await _dio.fetch>( - _setStreamType(Options( + final _options = _setStreamType(Options( method: 'GET', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/blogPosts/index?page=${page}', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - final _value = FeedBlogPostSettingsModel.fromJson(_result.data!); + .compose( + _dio.options, + '/api/blogPosts/index?page=${page}', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late FeedBlogPostSettingsModel _value; + try { + _value = FeedBlogPostSettingsModel.fromJson(_result.data!); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; } @@ -51,24 +60,30 @@ class _FeedService implements FeedService { final queryParameters = {}; final _headers = {}; const Map? _data = null; - final _result = await _dio - .fetch>(_setStreamType(Options( + final _options = _setStreamType(Options( method: 'GET', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/recipes/index', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - final _value = RecipesPagination.fromJson(_result.data!); + .compose( + _dio.options, + '/api/recipes/index', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late RecipesPagination _value; + try { + _value = RecipesPagination.fromJson(_result.data!); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; } @@ -78,24 +93,30 @@ class _FeedService implements FeedService { final queryParameters = {}; final _headers = {}; const Map? _data = null; - final _result = await _dio - .fetch>(_setStreamType(Options( + final _options = _setStreamType(Options( method: 'GET', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/diets/index', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - final _value = DietsPagination.fromJson(_result.data!); + .compose( + _dio.options, + '/api/diets/index', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late DietsPagination _value; + try { + _value = DietsPagination.fromJson(_result.data!); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; } diff --git a/lib/features/profile/services/profile_service.g.dart b/lib/features/profile/services/profile_service.g.dart index 83b66e99..79ebdb24 100644 --- a/lib/features/profile/services/profile_service.g.dart +++ b/lib/features/profile/services/profile_service.g.dart @@ -12,36 +12,45 @@ class _ProfileService implements ProfileService { _ProfileService( this._dio, { this.baseUrl, + this.errorLogger, }); final Dio _dio; String? baseUrl; + final ParseErrorLogger? errorLogger; + @override Future getProfileBySlug({required String slug}) async { final _extra = {}; final queryParameters = {}; final _headers = {}; const Map? _data = null; - final _result = - await _dio.fetch>(_setStreamType(Options( + final _options = _setStreamType(Options( method: 'GET', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/profile/show/${slug}', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - final _value = Profile.fromJson(_result.data!); + .compose( + _dio.options, + '/api/profile/show/${slug}', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late Profile _value; + try { + _value = Profile.fromJson(_result.data!); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; } diff --git a/lib/features/recipes/presentation/pages/recipe_create_screen.dart b/lib/features/recipes/presentation/pages/recipe_create_screen.dart index 79b159b7..f40bfc1e 100644 --- a/lib/features/recipes/presentation/pages/recipe_create_screen.dart +++ b/lib/features/recipes/presentation/pages/recipe_create_screen.dart @@ -232,22 +232,26 @@ class RecipeCreateScreen extends StatelessWidget { Container( height: 48, width: MediaQuery.of(context).size.width, - child: FloatingActionButton.extended( - highlightElevation: 0, + child: ElevatedButton( + style: ElevatedButton.styleFrom( elevation: 0, - focusElevation: 0, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(8), ), backgroundColor: appTheme.blueA400, - label: Text( - '+', - style: theme.textTheme.titleSmall, - ), - onPressed: () => context.read().addIngredient(new Ingredient( - name: state.productNameController.text, - portion: state.ingredientController.text, - unit: state.ingredientAsItems ? 'pcs' : 'gr'))), + ), + onPressed: () => context.read().addIngredient( + Ingredient( + name: state.productNameController.text, + portion: state.ingredientController.text, + unit: state.ingredientAsItems ? 'pcs' : 'gr', + ), + ), + child: Text( + '+', + style: theme.textTheme.titleSmall, + ), + ), ), SizedBox(height: 24), Text('Описание рецепта'), @@ -263,16 +267,16 @@ class RecipeCreateScreen extends StatelessWidget { Container( height: 48, width: MediaQuery.of(context).size.width, - child: FloatingActionButton.extended( - highlightElevation: 0, - elevation: 0, - focusElevation: 0, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(8), + child: ElevatedButton( + style: ElevatedButton.styleFrom( + elevation: 0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8), + ), + backgroundColor: appTheme.blueA400, ), - backgroundColor: appTheme.blueA400, onPressed: () => context.read().addStep(), - label: Text( + child: Text( '+', style: theme.textTheme.titleSmall, ), @@ -282,16 +286,16 @@ class RecipeCreateScreen extends StatelessWidget { Container( height: 48, width: MediaQuery.of(context).size.width, - child: FloatingActionButton.extended( - highlightElevation: 0, - elevation: 0, - focusElevation: 0, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(8), + child: ElevatedButton( + style: ElevatedButton.styleFrom( + elevation: 0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8), + ), + backgroundColor: Colors.grey, ), - backgroundColor: Colors.grey, onPressed: () => context.read().removeStep(), - label: Text( + child: Text( '-', style: theme.textTheme.titleSmall, ), @@ -309,19 +313,19 @@ class RecipeCreateScreen extends StatelessWidget { Container( height: 48, width: MediaQuery.of(context).size.width, - child: FloatingActionButton.extended( - highlightElevation: 0, - elevation: 0, - focusElevation: 0, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(8), + child: ElevatedButton( + style: ElevatedButton.styleFrom( + elevation: 0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8), + ), + backgroundColor: appTheme.blueA400, ), - backgroundColor: appTheme.blueA400, - onPressed: () => context.read().publishRecipe(createRecipeFromState(state)), - label: Text( + child: Text( 'Опубликовать', style: theme.textTheme.titleSmall, ), + onPressed: () => context.read().publishRecipe(createRecipeFromState(state)), ), ), ], diff --git a/lib/features/recipes/presentation/pages/recipe_edit_screen.dart b/lib/features/recipes/presentation/pages/recipe_edit_screen.dart index 584a8e79..62aa362e 100644 --- a/lib/features/recipes/presentation/pages/recipe_edit_screen.dart +++ b/lib/features/recipes/presentation/pages/recipe_edit_screen.dart @@ -240,15 +240,15 @@ class RecipeEditScreen extends StatelessWidget { Container( height: 48, width: MediaQuery.of(context).size.width, - child: FloatingActionButton.extended( - highlightElevation: 0, - elevation: 0, - focusElevation: 0, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(8), + child: ElevatedButton( + style: ElevatedButton.styleFrom( + elevation: 0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8), + ), + backgroundColor: appTheme.blueA400, ), - backgroundColor: appTheme.blueA400, - label: Text( + child: Text( '+', style: theme.textTheme.titleSmall, ), @@ -271,38 +271,38 @@ class RecipeEditScreen extends StatelessWidget { Container( height: 48, width: MediaQuery.of(context).size.width, - child: FloatingActionButton.extended( - highlightElevation: 0, - elevation: 0, - focusElevation: 0, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(8), + child: ElevatedButton( + style: ElevatedButton.styleFrom( + elevation: 0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8), + ), + backgroundColor: appTheme.blueA400, ), - backgroundColor: appTheme.blueA400, - onPressed: () => context.read().addStep(), - label: Text( + child: Text( '+', style: theme.textTheme.titleSmall, ), + onPressed: () => context.read().addStep(), ), ), SizedBox(height: 8), Container( height: 48, width: MediaQuery.of(context).size.width, - child: FloatingActionButton.extended( - highlightElevation: 0, - elevation: 0, - focusElevation: 0, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(8), + child: ElevatedButton( + style: ElevatedButton.styleFrom( + elevation: 0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8), + ), + backgroundColor: appTheme.blueA400, ), - backgroundColor: Colors.grey, - onPressed: () => context.read().removeStep(), - label: Text( + child: Text( '-', style: theme.textTheme.titleSmall, ), + onPressed: () => context.read().removeStep(), ), ), SizedBox(height: 24), @@ -317,19 +317,19 @@ class RecipeEditScreen extends StatelessWidget { Container( height: 48, width: MediaQuery.of(context).size.width, - child: FloatingActionButton.extended( - highlightElevation: 0, - elevation: 0, - focusElevation: 0, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(8), + child: ElevatedButton( + style: ElevatedButton.styleFrom( + elevation: 0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8), + ), + backgroundColor: appTheme.blueA400, ), - backgroundColor: appTheme.blueA400, - onPressed: () => context.read().editRecipe(createRecipeFromState(state), recipeID), - label: Text( + child: Text( 'Опубликовать', style: theme.textTheme.titleSmall, ), + onPressed: () => context.read().editRecipe(createRecipeFromState(state), recipeID), ), ), ], diff --git a/lib/features/recipes/services/recipe_service.g.dart b/lib/features/recipes/services/recipe_service.g.dart index a1fb1eb5..43cb10a8 100644 --- a/lib/features/recipes/services/recipe_service.g.dart +++ b/lib/features/recipes/services/recipe_service.g.dart @@ -12,36 +12,45 @@ class _RecipeService implements RecipeService { _RecipeService( this._dio, { this.baseUrl, + this.errorLogger, }); final Dio _dio; String? baseUrl; + final ParseErrorLogger? errorLogger; + @override Future getRecipe(String id) async { final _extra = {}; final queryParameters = {}; final _headers = {}; const Map? _data = null; - final _result = await _dio - .fetch>(_setStreamType(Options( + final _options = _setStreamType(Options( method: 'GET', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/recipes/show/${id}', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - final _value = RecipeModel.fromJson(_result.data!); + .compose( + _dio.options, + '/api/recipes/show/${id}', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late RecipeModel _value; + try { + _value = RecipeModel.fromJson(_result.data!); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; } @@ -51,28 +60,34 @@ class _RecipeService implements RecipeService { final queryParameters = {r'name': name}; final _headers = {}; const Map? _data = null; - final _result = await _dio.fetch>( - _setStreamType>>(Options( + final _options = _setStreamType>>(Options( method: 'GET', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/diary/product_nutritional_values/filter', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - var _value = _result.data!.map((k, dynamic v) => MapEntry( - k, - (v as List) - .map((i) => Product.fromJson(i as Map)) - .toList())); + .compose( + _dio.options, + '/api/diary/product_nutritional_values/filter', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late Map> _value; + try { + _value = _result.data!.map((k, dynamic v) => MapEntry( + k, + (v as List) + .map((i) => Product.fromJson(i as Map)) + .toList())); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; } @@ -142,24 +157,30 @@ class _RecipeService implements RecipeService { filename: image.path.split(Platform.pathSeparator).last, ), )); - final _result = await _dio - .fetch>(_setStreamType(Options( + final _options = _setStreamType(Options( method: 'POST', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/recipes/create', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - final _value = RecipeModel.fromJson(_result.data!); + .compose( + _dio.options, + '/api/recipes/create', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late RecipeModel _value; + try { + _value = RecipeModel.fromJson(_result.data!); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; } @@ -172,24 +193,30 @@ class _RecipeService implements RecipeService { final queryParameters = {}; final _headers = {}; final _data = FormData.fromMap(recipe); - final _result = await _dio - .fetch>(_setStreamType(Options( + final _options = _setStreamType(Options( method: 'POST', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/recipes/update/{id}', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - final _value = RecipeModel.fromJson(_result.data!); + .compose( + _dio.options, + '/api/recipes/update/{id}', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late RecipeModel _value; + try { + _value = RecipeModel.fromJson(_result.data!); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; } diff --git a/lib/features/registration/services/registration_service.g.dart b/lib/features/registration/services/registration_service.g.dart index 9820fd33..4aaccede 100644 --- a/lib/features/registration/services/registration_service.g.dart +++ b/lib/features/registration/services/registration_service.g.dart @@ -12,12 +12,15 @@ class _RegistrationService implements RegistrationService { _RegistrationService( this._dio, { this.baseUrl, + this.errorLogger, }); final Dio _dio; String? baseUrl; + final ParseErrorLogger? errorLogger; + @override Future> register( {required Map sheet}) async { @@ -26,24 +29,30 @@ class _RegistrationService implements RegistrationService { final _headers = {}; final _data = {}; _data.addAll(sheet); - final _result = await _dio.fetch>( - _setStreamType>(Options( + final _options = _setStreamType>(Options( method: 'POST', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/register', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - final _value = _result.data!.cast(); + .compose( + _dio.options, + '/api/register', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late Map _value; + try { + _value = _result.data!.cast(); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; } @@ -53,24 +62,30 @@ class _RegistrationService implements RegistrationService { final queryParameters = {r'user_address': query}; final _headers = {}; const Map? _data = null; - final _result = await _dio - .fetch>(_setStreamType(Options( + final _options = _setStreamType(Options( method: 'GET', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/location_by_address', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - final _value = LocationModel.fromJson(_result.data!); + .compose( + _dio.options, + '/api/location_by_address', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late LocationModel _value; + try { + _value = LocationModel.fromJson(_result.data!); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; } @@ -86,24 +101,30 @@ class _RegistrationService implements RegistrationService { }; final _headers = {}; const Map? _data = null; - final _result = await _dio - .fetch>(_setStreamType(Options( + final _options = _setStreamType(Options( method: 'GET', headers: _headers, extra: _extra, ) - .compose( - _dio.options, - '/api/location_by_coordinate', - queryParameters: queryParameters, - data: _data, - ) - .copyWith( - baseUrl: _combineBaseUrls( - _dio.options.baseUrl, - baseUrl, - )))); - final _value = LocationModel.fromJson(_result.data!); + .compose( + _dio.options, + '/api/location_by_coordinate', + queryParameters: queryParameters, + data: _data, + ) + .copyWith( + baseUrl: _combineBaseUrls( + _dio.options.baseUrl, + baseUrl, + ))); + final _result = await _dio.fetch>(_options); + late LocationModel _value; + try { + _value = LocationModel.fromJson(_result.data!); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } return _value; }