Merge pull request 'Issues: 416+675' (#699) from mso7nueh/eatvio_app:main into main

Reviewed-on: eatvio/eatvio_app#699

lib/features/diary/presentation/widgets/meal_summary_widget.dart

@@ -82,6 +82,11 @@ class MealSummaryWidget extends StatelessWidget {
         continue;
       }
 
+      // Для продуктов из диеты учитываем только съеденные (с галочкой)
+      if (portion.fromDiet && portion.portionState != PortionState.eatenFromDiet) {
+        continue;
+      }
+
       final caloriesInfo = portion.productCaloriesInfo;
       if (caloriesInfo == null) {
         continue;

lib/features/profile/presentation/pages/profile_screen.dart

@@ -1,3 +1,4 @@
+import 'dart:developer';
 import 'dart:io';
 
 import 'package:cached_network_image/cached_network_image.dart';
@@ -93,7 +94,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
               }
               isFirstFetch = false;
             }
-            
+
             // Проверяем, заблокировал ли пользователь меня
             if (state.profile.isBlockedByUser) {
               return Scaffold(
@@ -104,20 +105,12 @@ class _ProfileScreenState extends State<ProfileScreen> {
                     child: Column(
                       mainAxisAlignment: MainAxisAlignment.center,
                       children: [
-                        Icon(
-                          Icons.block,
-                          size: 64,
-                          color: Colors.grey[400],
-                        ),
+                        Icon(Icons.block, size: 64, color: Colors.grey[400]),
                         const SizedBox(height: 16),
                         Text(
                           'Пользователь ограничил доступ к своей странице',
                           textAlign: TextAlign.center,
-                          style: TextStyle(
-                            fontSize: 18,
-                            fontWeight: FontWeight.w500,
-                            color: Colors.grey[600],
-                          ),
+                          style: TextStyle(fontSize: 18, fontWeight: FontWeight.w500, color: Colors.grey[600]),
                         ),
                       ],
                     ),
@@ -125,7 +118,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
                 ),
               );
             }
-            
+
             return widget.author == null || widget.author!.authorIsMe ? _myProfileScreen(state) : _profileScreen(state);
           } else if (state is ProfileStateError) {
             return Scaffold(
@@ -211,6 +204,14 @@ class _ProfileScreenState extends State<ProfileScreen> {
             if (state.profile.roles.contains('consultant') && state.consultantInfo != null && !state.profile.isBlockedByMe) _education(state),
             if (state.profile.roles.contains('consultant') && state.consultantInfo != null && !state.profile.isBlockedByMe) _diplomasAndCertificates(state),
             if (state.profile.roles.contains('consultant') && state.consultantInfo != null && !hidePlans && !state.profile.isBlockedByMe) _activePlans(state),
+            if (state.blogPosts.isNotEmpty)
+              const Padding(
+                padding: EdgeInsets.only(left: 8, top: 16, bottom: 8),
+                child: Text(
+                  'Блог',
+                  style: TextStyle(color: Color(0xFF323F4B), fontSize: 24, fontWeight: FontWeight.w600),
+                ),
+              ),
             _blogPosts(state),
           ],
         ),
@@ -277,9 +278,9 @@ class _ProfileScreenState extends State<ProfileScreen> {
             _subscriptionsAndSubscribers(state),
             if (state.profile.badges.isNotEmpty) Padding(padding: const EdgeInsets.only(bottom: 16), child: _badges(state)),
             if (state.profile.roles.contains('consultant')) _socialLinks(state),
+            Padding(padding: const EdgeInsets.only(bottom: 16), child: _charts()),
             if (state.profile.roles.contains('consultant')) _education(state),
             if (state.profile.roles.contains('consultant')) _diplomasAndCertificates(state),
-            Padding(padding: const EdgeInsets.only(bottom: 16), child: _charts()),
             if (state.profile.roles.contains('consultant') && !hidePlans) _activePlans(state),
             _newBlogPostButton(),
             _blogPosts(state),
@@ -512,6 +513,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
                   children: [
                     ListView.separated(
                       shrinkWrap: true,
+                      padding: const EdgeInsets.all(0),
                       physics: const NeverScrollableScrollPhysics(),
                       itemBuilder: (context, index) => _educationBlock(
                         state.consultantInfo!.educationModel.completedCourses![index].values.first.title,
@@ -766,7 +768,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
 
   ListView _blogPosts(ProfileStateLoaded state) {
     return ListView.separated(
-      padding: const EdgeInsets.symmetric(vertical: 16),
+      padding: const EdgeInsets.only(bottom: 16),
       shrinkWrap: true,
       physics: const NeverScrollableScrollPhysics(),
       itemBuilder: (context, index) => ProfileBlogPostWidget(index: index, profileCubit: profileCubit),