From 29f833792bede138fe5e5998e5078177b517a88b Mon Sep 17 00:00:00 2001 From: maxxkim Date: Wed, 21 Aug 2024 13:07:45 +0300 Subject: [PATCH] feat(app): New lines for localization and new asset icons --- assets/images/icn_bell.svg | 18 +++++ assets/images/icn_ccal.svg | 18 +++++ assets/images/icn_chat.svg | 18 +++++ assets/images/icn_clock.svg | 18 +++++ assets/images/icn_comment.svg | 18 +++++ assets/images/icn_consultation.svg | 18 +++++ assets/images/icn_copy.svg | 19 +++++ assets/images/icn_diary.svg | 18 +++++ assets/images/icn_diet_carbs.svg | 18 +++++ assets/images/icn_diet_light.svg | 18 +++++ assets/images/icn_exit.svg | 18 +++++ assets/images/icn_eye.svg | 23 ++++++ assets/images/icn_face_happy.svg | 18 +++++ assets/images/icn_face_sad.svg | 18 +++++ assets/images/icn_favorite_posts.svg | 22 ++++++ assets/images/icn_favorite_recipes.svg | 18 +++++ assets/images/icn_feed.svg | 19 +++++ assets/images/icn_finance.svg | 18 +++++ assets/images/icn_gloassary.svg | 18 +++++ assets/images/icn_gym.svg | 18 +++++ assets/images/icn_like.svg | 22 ++++++ assets/images/icn_like_filled.svg | 22 ++++++ assets/images/icn_like_plus.svg | 18 +++++ assets/images/icn_meat.svg | 20 +++++ assets/images/icn_paste.svg | 18 +++++ assets/images/icn_plans.svg | 35 ++++++++ assets/images/icn_posts.svg | 18 +++++ assets/images/icn_profile_settings.svg | 18 +++++ assets/images/icn_rating.svg | 18 +++++ assets/images/icn_recipes.svg | 18 +++++ assets/images/icn_scale.svg | 18 +++++ assets/images/icn_send.svg | 18 +++++ assets/images/icn_share.svg | 18 +++++ assets/images/icn_spoon_fork.svg | 18 +++++ assets/images/icn_steps.svg | 18 +++++ assets/images/icn_steps_graph.svg | 18 +++++ assets/images/icn_subscribers.svg | 18 +++++ assets/images/icn_support.svg | 18 +++++ assets/images/icn_veggies.svg | 18 +++++ lib/core/utils/image_constant.dart | 79 +++++++++++++++++++ .../diary/presentation/bloc/diary_bloc.dart | 4 +- .../presentation/pages/diary_screen.dart | 2 +- lib/localization/ru/ru_translations.dart | 3 +- 43 files changed, 824 insertions(+), 4 deletions(-) create mode 100644 assets/images/icn_bell.svg create mode 100644 assets/images/icn_ccal.svg create mode 100644 assets/images/icn_chat.svg create mode 100644 assets/images/icn_clock.svg create mode 100644 assets/images/icn_comment.svg create mode 100644 assets/images/icn_consultation.svg create mode 100644 assets/images/icn_copy.svg create mode 100644 assets/images/icn_diary.svg create mode 100644 assets/images/icn_diet_carbs.svg create mode 100644 assets/images/icn_diet_light.svg create mode 100644 assets/images/icn_exit.svg create mode 100644 assets/images/icn_eye.svg create mode 100644 assets/images/icn_face_happy.svg create mode 100644 assets/images/icn_face_sad.svg create mode 100644 assets/images/icn_favorite_posts.svg create mode 100644 assets/images/icn_favorite_recipes.svg create mode 100644 assets/images/icn_feed.svg create mode 100644 assets/images/icn_finance.svg create mode 100644 assets/images/icn_gloassary.svg create mode 100644 assets/images/icn_gym.svg create mode 100644 assets/images/icn_like.svg create mode 100644 assets/images/icn_like_filled.svg create mode 100644 assets/images/icn_like_plus.svg create mode 100644 assets/images/icn_meat.svg create mode 100644 assets/images/icn_paste.svg create mode 100644 assets/images/icn_plans.svg create mode 100644 assets/images/icn_posts.svg create mode 100644 assets/images/icn_profile_settings.svg create mode 100644 assets/images/icn_rating.svg create mode 100644 assets/images/icn_recipes.svg create mode 100644 assets/images/icn_scale.svg create mode 100644 assets/images/icn_send.svg create mode 100644 assets/images/icn_share.svg create mode 100644 assets/images/icn_spoon_fork.svg create mode 100644 assets/images/icn_steps.svg create mode 100644 assets/images/icn_steps_graph.svg create mode 100644 assets/images/icn_subscribers.svg create mode 100644 assets/images/icn_support.svg create mode 100644 assets/images/icn_veggies.svg diff --git a/assets/images/icn_bell.svg b/assets/images/icn_bell.svg new file mode 100644 index 00000000..d8f7401c --- /dev/null +++ b/assets/images/icn_bell.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_ccal.svg b/assets/images/icn_ccal.svg new file mode 100644 index 00000000..e44de673 --- /dev/null +++ b/assets/images/icn_ccal.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_chat.svg b/assets/images/icn_chat.svg new file mode 100644 index 00000000..90e59cba --- /dev/null +++ b/assets/images/icn_chat.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_clock.svg b/assets/images/icn_clock.svg new file mode 100644 index 00000000..c1cc79ba --- /dev/null +++ b/assets/images/icn_clock.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_comment.svg b/assets/images/icn_comment.svg new file mode 100644 index 00000000..0e773089 --- /dev/null +++ b/assets/images/icn_comment.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_consultation.svg b/assets/images/icn_consultation.svg new file mode 100644 index 00000000..dd7868b0 --- /dev/null +++ b/assets/images/icn_consultation.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_copy.svg b/assets/images/icn_copy.svg new file mode 100644 index 00000000..041fe5ce --- /dev/null +++ b/assets/images/icn_copy.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + diff --git a/assets/images/icn_diary.svg b/assets/images/icn_diary.svg new file mode 100644 index 00000000..3acb9dab --- /dev/null +++ b/assets/images/icn_diary.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_diet_carbs.svg b/assets/images/icn_diet_carbs.svg new file mode 100644 index 00000000..8a1d23fe --- /dev/null +++ b/assets/images/icn_diet_carbs.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_diet_light.svg b/assets/images/icn_diet_light.svg new file mode 100644 index 00000000..07854783 --- /dev/null +++ b/assets/images/icn_diet_light.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_exit.svg b/assets/images/icn_exit.svg new file mode 100644 index 00000000..24d111cb --- /dev/null +++ b/assets/images/icn_exit.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_eye.svg b/assets/images/icn_eye.svg new file mode 100644 index 00000000..9ea592c4 --- /dev/null +++ b/assets/images/icn_eye.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + diff --git a/assets/images/icn_face_happy.svg b/assets/images/icn_face_happy.svg new file mode 100644 index 00000000..8d8ae960 --- /dev/null +++ b/assets/images/icn_face_happy.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_face_sad.svg b/assets/images/icn_face_sad.svg new file mode 100644 index 00000000..c17defd6 --- /dev/null +++ b/assets/images/icn_face_sad.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_favorite_posts.svg b/assets/images/icn_favorite_posts.svg new file mode 100644 index 00000000..61896a5d --- /dev/null +++ b/assets/images/icn_favorite_posts.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + diff --git a/assets/images/icn_favorite_recipes.svg b/assets/images/icn_favorite_recipes.svg new file mode 100644 index 00000000..e7ef48bd --- /dev/null +++ b/assets/images/icn_favorite_recipes.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_feed.svg b/assets/images/icn_feed.svg new file mode 100644 index 00000000..837649a2 --- /dev/null +++ b/assets/images/icn_feed.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + diff --git a/assets/images/icn_finance.svg b/assets/images/icn_finance.svg new file mode 100644 index 00000000..076d4c11 --- /dev/null +++ b/assets/images/icn_finance.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_gloassary.svg b/assets/images/icn_gloassary.svg new file mode 100644 index 00000000..1816b852 --- /dev/null +++ b/assets/images/icn_gloassary.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_gym.svg b/assets/images/icn_gym.svg new file mode 100644 index 00000000..20c28ce8 --- /dev/null +++ b/assets/images/icn_gym.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_like.svg b/assets/images/icn_like.svg new file mode 100644 index 00000000..847b4757 --- /dev/null +++ b/assets/images/icn_like.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + diff --git a/assets/images/icn_like_filled.svg b/assets/images/icn_like_filled.svg new file mode 100644 index 00000000..19b316c4 --- /dev/null +++ b/assets/images/icn_like_filled.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + diff --git a/assets/images/icn_like_plus.svg b/assets/images/icn_like_plus.svg new file mode 100644 index 00000000..32f91c87 --- /dev/null +++ b/assets/images/icn_like_plus.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_meat.svg b/assets/images/icn_meat.svg new file mode 100644 index 00000000..d4f99cff --- /dev/null +++ b/assets/images/icn_meat.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + diff --git a/assets/images/icn_paste.svg b/assets/images/icn_paste.svg new file mode 100644 index 00000000..e67eb527 --- /dev/null +++ b/assets/images/icn_paste.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_plans.svg b/assets/images/icn_plans.svg new file mode 100644 index 00000000..43ae5233 --- /dev/null +++ b/assets/images/icn_plans.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/icn_posts.svg b/assets/images/icn_posts.svg new file mode 100644 index 00000000..8dabc856 --- /dev/null +++ b/assets/images/icn_posts.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_profile_settings.svg b/assets/images/icn_profile_settings.svg new file mode 100644 index 00000000..f673b1eb --- /dev/null +++ b/assets/images/icn_profile_settings.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_rating.svg b/assets/images/icn_rating.svg new file mode 100644 index 00000000..0a11a2c4 --- /dev/null +++ b/assets/images/icn_rating.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_recipes.svg b/assets/images/icn_recipes.svg new file mode 100644 index 00000000..00921b07 --- /dev/null +++ b/assets/images/icn_recipes.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_scale.svg b/assets/images/icn_scale.svg new file mode 100644 index 00000000..972cab14 --- /dev/null +++ b/assets/images/icn_scale.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_send.svg b/assets/images/icn_send.svg new file mode 100644 index 00000000..5c9b05fc --- /dev/null +++ b/assets/images/icn_send.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_share.svg b/assets/images/icn_share.svg new file mode 100644 index 00000000..6e2c970a --- /dev/null +++ b/assets/images/icn_share.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_spoon_fork.svg b/assets/images/icn_spoon_fork.svg new file mode 100644 index 00000000..ccc9f3a4 --- /dev/null +++ b/assets/images/icn_spoon_fork.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_steps.svg b/assets/images/icn_steps.svg new file mode 100644 index 00000000..c97b7b8f --- /dev/null +++ b/assets/images/icn_steps.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_steps_graph.svg b/assets/images/icn_steps_graph.svg new file mode 100644 index 00000000..3398fb98 --- /dev/null +++ b/assets/images/icn_steps_graph.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_subscribers.svg b/assets/images/icn_subscribers.svg new file mode 100644 index 00000000..822d43c0 --- /dev/null +++ b/assets/images/icn_subscribers.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_support.svg b/assets/images/icn_support.svg new file mode 100644 index 00000000..8d4ff6ee --- /dev/null +++ b/assets/images/icn_support.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/assets/images/icn_veggies.svg b/assets/images/icn_veggies.svg new file mode 100644 index 00000000..e9f06f47 --- /dev/null +++ b/assets/images/icn_veggies.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/lib/core/utils/image_constant.dart b/lib/core/utils/image_constant.dart index 791dacca..1353a5cf 100644 --- a/lib/core/utils/image_constant.dart +++ b/lib/core/utils/image_constant.dart @@ -140,4 +140,83 @@ class ImageConstant { static String imgIconHeart = '$imagePath/img_icon_heart.svg'; static String imgIconShare2 = '$imagePath/img_icon_share_2.svg'; + + //-------------------Иконки от 21 08 2024------------------------------------ + static String icnBell = '$imagePath/icn_bell.svg'; + + static String icnCcal = '$imagePath/icn_ccal.svg'; + + static String icnChat = '$imagePath/icn_chat.svg'; + + static String icnClock = '$imagePath/icn_clock.svg'; + + static String icnComment = '$imagePath/icn_comment.svg'; + + static String icnConsultation = '$imagePath/icn_consultation.svg'; + + static String icnCopy = '$imagePath/icn_copy.svg'; + + static String icnDiary = '$imagePath/icn_diary.svg'; + + static String icnDietCarbs = '$imagePath/icn_diet_carbs.svg'; + + static String icnDietLight = '$imagePath/icn_diet_light.svg'; + + static String icnExit = '$imagePath/icn_exit.svg'; + + static String icnEye = '$imagePath/icn_eye.svg'; + + static String icnFaceHappy = '$imagePath/icn_face_happy.svg'; + + static String icnFaceSad = '$imagePath/icn_face_sad.svg'; + + static String icnFavoritePosts = '$imagePath/icn_favorite_posts.svg'; + + static String icnFavoriteRecipes = '$imagePath/icn_favorite_recipes.svg'; + + static String icnFeed = '$imagePath/icn_feed.svg'; + + static String icnFinance = '$imagePath/icn_finance.svg'; + + static String icnGlossary = '$imagePath/icn_gloassary.svg'; + + static String icnGym = '$imagePath/icn_gym.svg'; + + static String icnLikeFilled = '$imagePath/icn_like_filled.svg'; + + static String icnLikePlus = '$imagePath/icn_like_plus.svg'; + + static String icnLike = '$imagePath/icn_like.svg'; + + static String icnMeat = '$imagePath/icn_meat.svg'; + + static String icnPaste = '$imagePath/icn_paste.svg'; + + static String icnPlans = '$imagePath/icn_plans.svg'; + + static String icnPosts = '$imagePath/icn_posts.svg'; + + static String icnProfileSettings = '$imagePath/icn_profile_settings.svg'; + + static String icnRating = '$imagePath/icn_rating.svg'; + + static String icnRecipes = '$imagePath/icn_recipes.svg'; + + static String icnScale = '$imagePath/icn_scale.svg'; + + static String icnSend = '$imagePath/icn_send.svg'; + + static String icnShare = '$imagePath/icn_share.svg'; + + static String icnSpoonFork = '$imagePath/icn_spoon_fork.svg'; + + static String icnStepsGraph = '$imagePath/icn_steps_graph.svg'; + + static String icnSteps = '$imagePath/icn_steps.svg'; + + static String icnSubscribers = '$imagePath/icn_subscribers.svg'; + + static String icnSupport = '$imagePath/icn_support.svg'; + + static String icnVeggies = '$imagePath/icn_veggies.svg'; } diff --git a/lib/features/diary/presentation/bloc/diary_bloc.dart b/lib/features/diary/presentation/bloc/diary_bloc.dart index ad146936..747f9ee8 100644 --- a/lib/features/diary/presentation/bloc/diary_bloc.dart +++ b/lib/features/diary/presentation/bloc/diary_bloc.dart @@ -57,7 +57,7 @@ class DiaryBloc extends Bloc { final DiaryModel diary = await diaryRepository.getDiary(diaryID ?? 45); final Meal currentMeal = diary.meals[0]; - List portionList = [SelectionPopupModel(title: "gr"), SelectionPopupModel(title: "pcs")]; + List portionList = [SelectionPopupModel(title: "грамм", value: "gr"), SelectionPopupModel(title: "порций", value: "pcs")]; final Map chartData = await diaryRepository.getChartData(diaryID ?? 45); final Map dailyNutritionIntake = chartData['dailyNutritionIntake']!; @@ -334,7 +334,7 @@ class DiaryBloc extends Bloc { currentState.diary.id, currentState.currentMeal.id, currentState.product_nameController.text, - currentState.portionController.title, + currentState.portionController.value, int.parse(currentState.productQuantityController.text), ); add(LoadDiary()); diff --git a/lib/features/diary/presentation/pages/diary_screen.dart b/lib/features/diary/presentation/pages/diary_screen.dart index b3ac700c..b5a33aa0 100644 --- a/lib/features/diary/presentation/pages/diary_screen.dart +++ b/lib/features/diary/presentation/pages/diary_screen.dart @@ -155,7 +155,7 @@ class DiaryScreen extends StatelessWidget { gap: "8%", radius: "110%", innerRadius: '20%', // Измените значение по вашему усмотрению - ) + ), ], ), ), diff --git a/lib/localization/ru/ru_translations.dart b/lib/localization/ru/ru_translations.dart index faf5359f..aff8f268 100644 --- a/lib/localization/ru/ru_translations.dart +++ b/lib/localization/ru/ru_translations.dart @@ -131,6 +131,7 @@ final Map ru = { "admin": "Админ", "diary": "Дневник", "save": "Сохранить", - "pcs": "порций", + "pcs": "шт", "gr": "гр", + "grams": "гр", };