diff --git a/lib/app_router.dart b/lib/app_router.dart index 0b8c0972..dada8252 100644 --- a/lib/app_router.dart +++ b/lib/app_router.dart @@ -5,7 +5,7 @@ import 'package:eatvio_app/presentation/auth/auth_screen/auth_screen.dart'; import 'package:eatvio_app/presentation/diary/diary_edit_screen/diary_edit_screen.dart'; import 'package:eatvio_app/presentation/diets/diet_create_screen/diet_create_screen.dart'; import 'package:eatvio_app/presentation/diets/diet_select_screen/diet_select_screen.dart'; -import 'package:eatvio_app/presentation/feed/blog_post_create_screen/blog_post_create_screen.dart'; +import 'package:eatvio_app/features/blog_post_create/presentation/pages/blog_post_create_screen.dart'; import 'package:eatvio_app/presentation/feed/blog_post_edit_screen/blog_post_edit_screen.dart'; import 'package:eatvio_app/features/blog_post/presentation/pages/blog_post_screen.dart'; import 'package:eatvio_app/features/feed/presentation/pages/feed_screen.dart'; diff --git a/lib/core/initialization_cubit/initialization_cubit.dart b/lib/core/initialization_cubit/initialization_cubit.dart index 57544ae5..89385689 100644 --- a/lib/core/initialization_cubit/initialization_cubit.dart +++ b/lib/core/initialization_cubit/initialization_cubit.dart @@ -15,37 +15,6 @@ class InitializationCubit extends Cubit { final wsUrl = await chatRepository.getWebsocket(); - PusherOptions options = PusherOptions( - host: 'socket.mobile-stage.eatvio.ru', - wsPort: 443, - encrypted: true, - auth: PusherAuth( - 'wss://' + wsUrl.host + '/app/' + wsUrl.key, - headers: { - 'Authorization': 'Bearer ${TokenStorage.getTokenFromStorage()}', - }, - ), - ); - - PusherClient pusherClient = PusherClient( - wsUrl.key, - options, - autoConnect: true, - enableLogging: true, - ); - - await pusherClient.connect(); - - emit(const InitializationState.success()); - - Channel channel = pusherClient.subscribe('private-direct-chat.' + '7909ea56-7822-4d5f-8892-134bc937127f'); - - channel.bind("pusher_internal:subscription_succeeded", (PusherEvent? event) { - channel.trigger("pusher_internal:subscription_succeeded", {}); - }); - - channel.registerListener('pusher:subscribe', (data) => print(data.toString())); - } catch (e) { print(e); emit(InitializationState.error(errorMessage: e.toString())); diff --git a/lib/core/token_storage.dart b/lib/core/token_storage.dart index 01ac6064..1179241b 100644 --- a/lib/core/token_storage.dart +++ b/lib/core/token_storage.dart @@ -18,14 +18,12 @@ abstract class TokenStorage { } } - static Future getTokenFromStorage() async => - (await Hive.openBox('token')).get('token'); + static Future getTokenFromStorage() async => (await Hive.openBox('token')).get('token'); static saveTokenInStorage(String token) async { (await Hive.openBox('token')).put('token', token); _addTokenToDioHeader(token); } - static removeTokenInStorage() async => - (await Hive.openBox('token')).delete('token'); + static removeTokenInStorage() async => (await Hive.openBox('token')).delete('token'); } diff --git a/lib/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.dart b/lib/features/blog_post_create/models/blog_post_create_credentials_model.dart similarity index 70% rename from lib/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.dart rename to lib/features/blog_post_create/models/blog_post_create_credentials_model.dart index 1464eb07..71c84d3c 100644 --- a/lib/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.dart +++ b/lib/features/blog_post_create/models/blog_post_create_credentials_model.dart @@ -1,6 +1,6 @@ import 'package:freezed_annotation/freezed_annotation.dart'; -part 'blog_post_create_credentials_model.freezed.dart'; -part 'blog_post_create_credentials_model.g.dart'; +part '../../../presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.freezed.dart'; +part '../../../presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.g.dart'; @freezed class BlogPostCreateCredentialsModel with _$BlogPostCreateCredentialsModel { diff --git a/lib/presentation/feed/blog_post_create_screen/blog_post_create_screen.dart b/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart similarity index 97% rename from lib/presentation/feed/blog_post_create_screen/blog_post_create_screen.dart rename to lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart index 225a771a..4bedcf52 100644 --- a/lib/presentation/feed/blog_post_create_screen/blog_post_create_screen.dart +++ b/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart @@ -1,5 +1,5 @@ -import 'bloc/blog_post_create_bloc.dart'; -import 'models/blog_post_create_model.dart'; +import '../../../../presentation/feed/blog_post_create_screen/bloc/blog_post_create_bloc.dart'; +import '../../../../presentation/feed/blog_post_create_screen/models/blog_post_create_model.dart'; import 'package:eatvio_app/core/app_export.dart'; import 'package:flutter/material.dart'; import 'package:image_picker/image_picker.dart'; diff --git a/lib/presentation/feed/blog_post_create_screen/repositories/blog_repository.dart b/lib/features/blog_post_create/repositories/blog_repository.dart similarity index 62% rename from lib/presentation/feed/blog_post_create_screen/repositories/blog_repository.dart rename to lib/features/blog_post_create/repositories/blog_repository.dart index 74f79cd2..e11bce9e 100644 --- a/lib/presentation/feed/blog_post_create_screen/repositories/blog_repository.dart +++ b/lib/features/blog_post_create/repositories/blog_repository.dart @@ -1,5 +1,5 @@ -import 'package:eatvio_app/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.dart'; -import 'package:eatvio_app/presentation/feed/blog_post_create_screen/services/blog_service.dart'; +import 'package:eatvio_app/features/blog_post_create/models/blog_post_create_credentials_model.dart'; +import 'package:eatvio_app/features/blog_post_create/services/blog_service.dart'; class BlogRepository { final BlogService blogService; diff --git a/lib/presentation/feed/blog_post_create_screen/services/blog_service.dart b/lib/features/blog_post_create/services/blog_service.dart similarity index 74% rename from lib/presentation/feed/blog_post_create_screen/services/blog_service.dart rename to lib/features/blog_post_create/services/blog_service.dart index e5593831..1291c9a9 100644 --- a/lib/presentation/feed/blog_post_create_screen/services/blog_service.dart +++ b/lib/features/blog_post_create/services/blog_service.dart @@ -1,4 +1,4 @@ -import 'package:eatvio_app/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.dart'; +import 'package:eatvio_app/features/blog_post_create/models/blog_post_create_credentials_model.dart'; import 'package:dio/dio.dart'; import 'package:retrofit/retrofit.dart'; diff --git a/lib/presentation/feed/blog_post_create_screen/services/blog_service.g.dart b/lib/features/blog_post_create/services/blog_service.g.dart similarity index 100% rename from lib/presentation/feed/blog_post_create_screen/services/blog_service.g.dart rename to lib/features/blog_post_create/services/blog_service.g.dart 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 591cad6f..d279105a 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 @@ -190,12 +190,12 @@ class DiaryEditBloc extends Bloc { final recommendedChartValues = jsonDecode(responseChart.body)['dailyNutritionRecommendation'] .values - .map((value) => value as int) + .map((value) => value as double) .toList(); final consumedChartValues = jsonDecode(responseChart.body)['dailyNutritionIntake'] .values - .map((value) => value as int) + .map((value) => value as double) .toList(); return [recommendedChartValues, consumedChartValues]; } else { @@ -275,10 +275,10 @@ class DiaryEditBloc extends Bloc { moderationExpanded: false, token: token, recommendedChartValues: recommendedChartValues.values - .map((value) => value as int) + .map((value) => value as double) .toList(), consumedChartValues: consumedChartValues.values - .map((value) => value as int) + .map((value) => value as double) .toList(), meals: diary['meals'], portions: diary['meals'][0]['portions'], diff --git a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_state.dart b/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_state.dart index fc8e1979..6486b03c 100644 --- a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_state.dart +++ b/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_state.dart @@ -57,8 +57,8 @@ class DiaryEditLoadedState extends DiaryEditState { List? portions; List? photos; List? autocompleteList; - List recommendedChartValues; - List consumedChartValues; + List recommendedChartValues; + List consumedChartValues; SelectionPopupModel? currentMeal; SelectionPopupModel? portionController; TimeOfDay? wakeupController; @@ -117,8 +117,8 @@ class DiaryEditLoadedState extends DiaryEditState { SelectionPopupModel? portionController, String? diaryDate, String? token, - List? recommendedChartValues, - List? consumedChartValues, + List? recommendedChartValues, + List? consumedChartValues, List? meals, List? portions, List? photos, 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 77aa77f5..5f94a189 100644 --- a/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart +++ b/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart @@ -720,8 +720,8 @@ class DiaryEditScreen extends StatelessWidget { } _buildNutritionChart(BuildContext context, DiaryEditLoadedState state) { - final List recommendedValues = state.recommendedChartValues; // Рекомендуемые значения: калории, жиры, белки, углеводы - final List consumedValues = state.consumedChartValues; // + final List recommendedValues = state.recommendedChartValues; // Рекомендуемые значения: калории, жиры, белки, углеводы + final List consumedValues = state.consumedChartValues; // return Container( margin: EdgeInsets.symmetric(horizontal: 16.h), padding: EdgeInsets.symmetric( @@ -1196,7 +1196,7 @@ class DiaryEditScreen extends StatelessWidget { } } -bool checkConsumedValues(List recommendedValues, List consumedValues) { +bool checkConsumedValues(List recommendedValues, List consumedValues) { for (int i = 0; i < recommendedValues.length; i++) { if (consumedValues[i] > recommendedValues[i]) { // Если хотя бы одно потребленное значение превышает рекомендованное diff --git a/lib/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.freezed.dart b/lib/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.freezed.dart index 87eb9e1d..d403e452 100644 --- a/lib/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.freezed.dart +++ b/lib/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.freezed.dart @@ -3,7 +3,7 @@ // ignore_for_file: type=lint // ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark -part of 'blog_post_create_credentials_model.dart'; +part of '../../../../features/blog_post_create/models/blog_post_create_credentials_model.dart'; // ************************************************************************** // FreezedGenerator diff --git a/lib/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.g.dart b/lib/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.g.dart index bf339e97..5dec0301 100644 --- a/lib/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.g.dart +++ b/lib/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of 'blog_post_create_credentials_model.dart'; +part of '../../../../features/blog_post_create/models/blog_post_create_credentials_model.dart'; // ************************************************************************** // JsonSerializableGenerator