починил плеер, добавил отступ для панели сообщений (ДИНАМИЧЕСКИЙ СУКА, ТОЛЬКО ПОПРЛБУЙТЕ ВОЗРАЗИТИТЬ)

lib/screens/chat_screen.dart

@@ -60,8 +60,10 @@ class ChatScreen extends StatefulWidget {
   final int chatId;
   final Contact contact;
   final int myId;
+
   /// Колбэк для мягких обновлений списка чатов (например, после редактирования сообщения).
   final VoidCallback? onChatUpdated;
+
   /// Колбэк, который вызывается, когда чат нужно убрать из списка (удаление / выход из группы).
   final VoidCallback? onChatRemoved;
   final bool isGroupChat;
@@ -382,7 +384,8 @@ class _ChatScreenState extends State<ChatScreen> {
       }
     } else if (_actualMyId == null) {
       final prefs = await SharedPreferences.getInstance();
-      _actualMyId = int.parse(await prefs.getString('userId')!);;
+      _actualMyId = int.parse(await prefs.getString('userId')!);
+      ;
       print(
         '⚠️ [_initializeChat] ID не найден, используется из виджета: $_actualMyId',
       );
@@ -1235,7 +1238,6 @@ class _ChatScreenState extends State<ChatScreen> {
   }
 
   void _testSlideAnimation() {
-
     final myMessage = Message(
       id: 'test_my_${DateTime.now().millisecondsSinceEpoch}',
       text: 'Тест моё сообщение (должно выехать справа)',
@@ -1789,8 +1791,9 @@ class _ChatScreenState extends State<ChatScreen> {
                         ScaffoldMessenger.of(context).showSnackBar(
                           SnackBar(
                             content: Text('Ошибка очистки истории: $e'),
-                            backgroundColor:
+                            backgroundColor: Theme.of(
-                                Theme.of(context).colorScheme.error,
+                              context,
+                            ).colorScheme.error,
                           ),
                         );
                       }
@@ -1889,8 +1892,9 @@ class _ChatScreenState extends State<ChatScreen> {
                         ScaffoldMessenger.of(context).showSnackBar(
                           SnackBar(
                             content: Text('Ошибка удаления чата: $e'),
-                            backgroundColor:
+                            backgroundColor: Theme.of(
-                                Theme.of(context).colorScheme.error,
+                              context,
+                            ).colorScheme.error,
                           ),
                         );
                       }
@@ -2522,7 +2526,10 @@ class _ChatScreenState extends State<ChatScreen> {
                       duration: const Duration(milliseconds: 100),
                       curve: Curves.easeOutQuad,
                       right: 16,
-                      bottom: MediaQuery.of(context).viewInsets.bottom + 100,
+                      bottom:
+                          MediaQuery.of(context).viewInsets.bottom +
+                          MediaQuery.of(context).padding.bottom +
+                          100,
                       child: AnimatedScale(
                         duration: const Duration(milliseconds: 200),
                         curve: Curves.easeOutBack,
@@ -2551,7 +2558,10 @@ class _ChatScreenState extends State<ChatScreen> {
             curve: Curves.easeOutQuad,
             left: 8,
             right: 8,
-            bottom: MediaQuery.of(context).viewInsets.bottom + 12,
+            bottom:
+                MediaQuery.of(context).viewInsets.bottom +
+                MediaQuery.of(context).padding.bottom +
+                12,
             child: _buildTextInput(),
           ),
         ],

lib/services/music_player_service.dart

@@ -40,6 +40,9 @@ class MusicTrack {
     final token = attach['token'] as String?;
     final name = attach['name'] as String? ?? 'Unknown';
 
+    final durationSeconds = preview?['duration'] as int?;
+    final duration = durationSeconds != null ? durationSeconds * 1000 : null;
+
     return MusicTrack(
       id:
           fileId?.toString() ??
@@ -48,7 +51,7 @@ class MusicTrack {
       artist: preview?['artistName'] as String? ?? 'Unknown Artist',
       album: preview?['albumName'] as String?,
       albumArtUrl: preview?['baseUrl'] as String?,
-      duration: preview?['duration'] as int?,
+      duration: duration,
       fileId: fileId,
       token: token,
     );

lib/widgets/bottom_sheet_music_player.dart

@@ -43,7 +43,9 @@ class _BottomSheetMusicPlayerState extends State<BottomSheetMusicPlayer>
       curve: Curves.easeInOut,
     );
     BottomSheetMusicPlayer.isExpandedNotifier.addListener(_onExpandedChanged);
-    BottomSheetMusicPlayer.isFullscreenNotifier.addListener(_onFullscreenChanged);
+    BottomSheetMusicPlayer.isFullscreenNotifier.addListener(
+      _onFullscreenChanged,
+    );
   }
 
   void _onExpandedChanged() {
@@ -63,7 +65,8 @@ class _BottomSheetMusicPlayerState extends State<BottomSheetMusicPlayer>
   }
 
   void _onFullscreenChanged() {
-    final shouldBeFullscreen = BottomSheetMusicPlayer.isFullscreenNotifier.value;
+    final shouldBeFullscreen =
+        BottomSheetMusicPlayer.isFullscreenNotifier.value;
     if (shouldBeFullscreen && _currentState != _PlayerState.fullscreen) {
       setState(() {
         _currentState = _PlayerState.fullscreen;
@@ -175,7 +178,8 @@ class _BottomSheetMusicPlayerState extends State<BottomSheetMusicPlayer>
         }
 
         // Interpolate between collapsed and target height
-        final currentHeight = collapsedHeight +
+        final currentHeight =
+            collapsedHeight +
             (targetHeight - collapsedHeight) * _heightAnimation.value;
 
         return Material(
@@ -251,7 +255,8 @@ class _BottomSheetMusicPlayerState extends State<BottomSheetMusicPlayer>
         return FadeTransition(
           opacity: animation,
           child: SlideTransition(
-            position: Tween<Offset>(
+            position:
+                Tween<Offset>(
                   begin: const Offset(0.0, 0.05),
                   end: Offset.zero,
                 ).animate(
@@ -285,7 +290,7 @@ class _BottomSheetMusicPlayerState extends State<BottomSheetMusicPlayer>
           onTap: _toggleExpand,
           borderRadius: BorderRadius.circular(28),
           child: Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
             child: Row(
               children: [
                 Hero(
@@ -300,9 +305,12 @@ class _BottomSheetMusicPlayerState extends State<BottomSheetMusicPlayer>
                           ? Image.network(
                               track.albumArtUrl!,
                               fit: BoxFit.cover,
-                              loadingBuilder: (context, child, loadingProgress) {
+                              loadingBuilder:
+                                  (context, child, loadingProgress) {
                                     if (loadingProgress == null) return child;
-                                return _buildAlbumArtPlaceholder(colorScheme);
+                                    return _buildAlbumArtPlaceholder(
+                                      colorScheme,
+                                    );
                                   },
                               errorBuilder: (context, error, stackTrace) =>
                                   _buildAlbumArtPlaceholder(colorScheme),
@@ -318,25 +326,31 @@ class _BottomSheetMusicPlayerState extends State<BottomSheetMusicPlayer>
                     mainAxisAlignment: MainAxisAlignment.center,
                     mainAxisSize: MainAxisSize.min,
                     children: [
-                      Text(
+                      Flexible(
+                        child: Text(
                           track.title,
-                        style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                          style: Theme.of(context).textTheme.titleMedium
+                              ?.copyWith(
                                 fontWeight: FontWeight.w600,
                                 letterSpacing: -0.2,
                               ),
                           maxLines: 1,
                           overflow: TextOverflow.ellipsis,
                         ),
-                      const SizedBox(height: 6),
+                      ),
-                      Text(
+                      const SizedBox(height: 3),
+                      Flexible(
+                        child: Text(
                           track.artist,
-                        style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                          style: Theme.of(context).textTheme.bodyMedium
+                              ?.copyWith(
                                 color: colorScheme.onSurface.withOpacity(0.65),
                                 fontSize: 13,
                               ),
                           maxLines: 1,
                           overflow: TextOverflow.ellipsis,
                         ),
+                      ),
                     ],
                   ),
                 ),
@@ -371,7 +385,9 @@ class _BottomSheetMusicPlayerState extends State<BottomSheetMusicPlayer>
                               ),
                             )
                           : Icon(
-                              musicPlayer.isPlaying ? Icons.pause : Icons.play_arrow,
+                              musicPlayer.isPlaying
+                                  ? Icons.pause
+                                  : Icons.play_arrow,
                               size: 26,
                               color: colorScheme.onPrimary,
                             ),
@@ -486,8 +502,7 @@ class _BottomSheetMusicPlayerState extends State<BottomSheetMusicPlayer>
                   // Track info
                   Text(
                     track.title,
-                        style: Theme.of(context).textTheme.headlineMedium
+                    style: Theme.of(context).textTheme.headlineMedium?.copyWith(
-                            ?.copyWith(
                       fontWeight: FontWeight.bold,
                       letterSpacing: -0.5,
                     ),
@@ -506,7 +521,7 @@ class _BottomSheetMusicPlayerState extends State<BottomSheetMusicPlayer>
                     maxLines: 1,
                     overflow: TextOverflow.ellipsis,
                   ),
-                      if (track.album != null) ...[
+                  if (track.album != null && track.album!.isNotEmpty) ...[
                     const SizedBox(height: 8),
                     Text(
                       track.album!,
@@ -518,6 +533,17 @@ class _BottomSheetMusicPlayerState extends State<BottomSheetMusicPlayer>
                       overflow: TextOverflow.ellipsis,
                     ),
                   ],
+                  if (track.duration != null) ...[
+                    const SizedBox(height: 8),
+                    Text(
+                      _formatDuration(Duration(milliseconds: track.duration!)),
+                      style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                        color: colorScheme.onSurface.withOpacity(0.55),
+                        fontWeight: FontWeight.w500,
+                      ),
+                      textAlign: TextAlign.center,
+                    ),
+                  ],
                   const SizedBox(height: 40),
                   // Progress slider
                   Column(
@@ -525,11 +551,9 @@ class _BottomSheetMusicPlayerState extends State<BottomSheetMusicPlayer>
                       SliderTheme(
                         data: SliderTheme.of(context).copyWith(
                           activeTrackColor: colorScheme.primary,
-                              inactiveTrackColor:
+                          inactiveTrackColor: colorScheme.surfaceContainerHigh,
-                                  colorScheme.surfaceContainerHigh,
                           thumbColor: colorScheme.primary,
-                              overlayColor:
+                          overlayColor: colorScheme.primary.withOpacity(0.1),
-                                  colorScheme.primary.withOpacity(0.1),
                           thumbShape: const RoundSliderThumbShape(
                             enabledThumbRadius: 8,
                           ),
@@ -544,8 +568,8 @@ class _BottomSheetMusicPlayerState extends State<BottomSheetMusicPlayer>
                           onChanged: (value) {
                             HapticFeedback.selectionClick();
                             final newPosition = Duration(
-                                  milliseconds: (value *
+                              milliseconds:
-                                          musicPlayer.duration.inMilliseconds)
+                                  (value * musicPlayer.duration.inMilliseconds)
                                       .round(),
                             );
                             musicPlayer.seek(newPosition);
@@ -559,24 +583,22 @@ class _BottomSheetMusicPlayerState extends State<BottomSheetMusicPlayer>
                           children: [
                             Text(
                               _formatDuration(musicPlayer.position),
-                                  style: Theme.of(context)
+                              style: Theme.of(context).textTheme.bodyMedium
-                                      .textTheme
-                                      .bodyMedium
                                   ?.copyWith(
-                                        color: colorScheme.onSurface
+                                    color: colorScheme.onSurface.withOpacity(
-                                            .withOpacity(0.7),
+                                      0.7,
+                                    ),
                                     fontWeight: FontWeight.w500,
                                     fontSize: 13,
                                   ),
                             ),
                             Text(
                               _formatDuration(musicPlayer.duration),
-                                  style: Theme.of(context)
+                              style: Theme.of(context).textTheme.bodyMedium
-                                      .textTheme
-                                      .bodyMedium
                                   ?.copyWith(
-                                        color: colorScheme.onSurface
+                                    color: colorScheme.onSurface.withOpacity(
-                                            .withOpacity(0.7),
+                                      0.7,
+                                    ),
                                     fontWeight: FontWeight.w500,
                                     fontSize: 13,
                                   ),
@@ -639,8 +661,7 @@ class _BottomSheetMusicPlayerState extends State<BottomSheetMusicPlayer>
                                     padding: const EdgeInsets.all(24),
                                     child: CircularProgressIndicator(
                                       strokeWidth: 3,
-                                          valueColor:
+                                      valueColor: AlwaysStoppedAnimation<Color>(
-                                              AlwaysStoppedAnimation<Color>(
                                         colorScheme.onPrimary,
                                       ),
                                     ),
@@ -681,13 +702,10 @@ class _BottomSheetMusicPlayerState extends State<BottomSheetMusicPlayer>
                       ),
                     ],
                   ),
-                      SizedBox(
+                  SizedBox(height: MediaQuery.of(context).padding.bottom + 24),
-                        height: MediaQuery.of(context).padding.bottom + 24,
-                      ),
                 ],
               ),
             ),
-              
           ),
         ],
       ),

lib/widgets/chat_message_bubble.dart

@@ -30,7 +30,8 @@ import 'package:platform_info/platform_info.dart';
 
 bool _currentIsDark = false;
 
-bool isMobile = Platform.instance.operatingSystem.iOS ||
+bool isMobile =
+    Platform.instance.operatingSystem.iOS ||
     Platform.instance.operatingSystem.android;
 
 enum MessageReadStatus {
@@ -1044,9 +1045,7 @@ class ChatMessageBubble extends StatelessWidget {
     // чтобы визуально не было "бабла" вокруг карточек файлов.
     BoxDecoration bubbleDecoration;
     if (isFileOnly) {
-      bubbleDecoration = const BoxDecoration(
+      bubbleDecoration = const BoxDecoration(color: Colors.transparent);
-        color: Colors.transparent,
-      );
     } else {
       bubbleDecoration = _createBubbleDecoration(
         bubbleColor,
@@ -1125,7 +1124,6 @@ class ChatMessageBubble extends StatelessWidget {
           child: messageContent,
         );
       }
-      
     }
 
     return Column(
@@ -2406,11 +2404,11 @@ class ChatMessageBubble extends StatelessWidget {
     final artist = preview?['artistName'] as String? ?? 'Unknown Artist';
     final album = preview?['albumName'] as String?;
     final albumArtUrl = preview?['baseUrl'] as String?;
-    final duration = preview?['duration'] as int?;
+    final durationSeconds = preview?['duration'] as int?;
+    final duration = durationSeconds != null ? durationSeconds * 1000 : null;
 
     String durationText = '';
-    if (duration != null) {
+    if (durationSeconds != null) {
-      final durationSeconds = (duration / 1000).round();
       final minutes = durationSeconds ~/ 60;
       final seconds = durationSeconds % 60;
       durationText = '$minutes:${seconds.toString().padLeft(2, '0')}';
@@ -2441,7 +2439,14 @@ class ChatMessageBubble extends StatelessWidget {
         }
 
         if (!isDownloaded) {
-          await _handleFileDownload(context, fileId, token, fileName, chatId);
+          await _handleFileDownload(
+            context,
+            fileId,
+            token,
+            fileName,
+            chatId,
+            preview: preview,
+          );
           await Future.delayed(const Duration(seconds: 1));
           if (fileIdString != null) {
             final updatedFileIdMap =
@@ -2708,6 +2713,7 @@ class ChatMessageBubble extends StatelessWidget {
                             token,
                             fileName,
                             chatId,
+                            preview: preview,
                           );
                           await Future.delayed(const Duration(seconds: 1));
                           final updatedFileIdMap =
@@ -2906,8 +2912,9 @@ class ChatMessageBubble extends StatelessWidget {
     int? fileId,
     String? token,
     String fileName,
-    int? chatId,
+    int? chatId, {
-  ) async {
+    Map<String, dynamic>? preview,
+  }) async {
     // 1. Проверяем fileId, он нужен в любом случае
     if (fileId == null) {
       if (context.mounted) {
@@ -3048,7 +3055,16 @@ class ChatMessageBubble extends StatelessWidget {
       }
 
       // Download file to Downloads folder with progress
-      await _downloadFile(downloadUrl, fileName, fileId.toString(), context);
+      await _downloadFile(
+        downloadUrl,
+        fileName,
+        fileId.toString(),
+        context,
+        preview: preview,
+        fileIdInt: fileId,
+        token: token,
+        chatId: chatId,
+      );
     } catch (e) {
       if (context.mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
@@ -3065,10 +3081,23 @@ class ChatMessageBubble extends StatelessWidget {
     String url,
     String fileName,
     String fileId,
-    BuildContext context,
+    BuildContext context, {
-  ) async {
+    Map<String, dynamic>? preview,
+    int? fileIdInt,
+    String? token,
+    int? chatId,
+  }) async {
     // Download in background without blocking dialog
-    _startBackgroundDownload(url, fileName, fileId, context);
+    _startBackgroundDownload(
+      url,
+      fileName,
+      fileId,
+      context,
+      preview: preview,
+      fileIdInt: fileIdInt,
+      token: token,
+      chatId: chatId,
+    );
 
     // Show immediate success snackbar
     if (context.mounted) {
@@ -3085,8 +3114,12 @@ class ChatMessageBubble extends StatelessWidget {
     String url,
     String fileName,
     String fileId,
-    BuildContext context,
+    BuildContext context, {
-  ) async {
+    Map<String, dynamic>? preview,
+    int? fileIdInt,
+    String? token,
+    int? chatId,
+  }) async {
     // Initialize progress
     FileDownloadProgressService().updateProgress(fileId, 0.0);
 
@@ -3167,6 +3200,40 @@ class ChatMessageBubble extends StatelessWidget {
         await prefs.setStringList('file_id_to_path_map', fileIdMap);
       }
 
+      // Save music metadata if preview is available and file is a music file
+      if (preview != null && fileIdInt != null) {
+        final extension = fileName.split('.').last.toLowerCase();
+        if (['mp3', 'wav', 'flac', 'm4a', 'aac', 'ogg'].contains(extension)) {
+          final title = preview['title'] as String? ?? fileName;
+          final artist = preview['artistName'] as String? ?? 'Unknown Artist';
+          final album = preview['albumName'] as String?;
+          final albumArtUrl = preview['baseUrl'] as String?;
+          final durationSeconds = preview['duration'] as int?;
+          final duration = durationSeconds != null
+              ? durationSeconds * 1000
+              : null;
+
+          final track = MusicTrack(
+            id: fileId,
+            title: title,
+            artist: artist,
+            album: album,
+            albumArtUrl: albumArtUrl,
+            duration: duration,
+            filePath: file.path,
+            fileId: fileIdInt,
+            token: token,
+            chatId: chatId,
+          );
+
+          final musicMetadataJson = prefs.getString('music_metadata') ?? '{}';
+          final musicMetadata =
+              jsonDecode(musicMetadataJson) as Map<String, dynamic>;
+          musicMetadata[fileId] = track.toJson();
+          await prefs.setString('music_metadata', jsonEncode(musicMetadata));
+        }
+      }
+
       // Show success message
       if (context.mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
@@ -3780,18 +3847,14 @@ class ChatMessageBubble extends StatelessWidget {
             Linkify(
               text:
                   'Привет! Это твои избранные. Все написанное сюда попадёт прямиком к дяде Майору.',
-              style:
+              style: TextStyle(color: textColor, fontStyle: FontStyle.italic),
-                  TextStyle(color: textColor, fontStyle: FontStyle.italic),
               linkStyle: linkStyle,
               onOpen: onOpenLink,
               options: const LinkifyOptions(humanize: false),
               textAlign: TextAlign.left,
             )
           else if (message.text.contains("komet.color_"))
-            _buildKometColorRichText(
+            _buildKometColorRichText(message.text, defaultTextStyle)
-              message.text,
-              defaultTextStyle,
-            )
           else
             Linkify(
               text: message.text,
@@ -3921,10 +3984,7 @@ class ChatMessageBubble extends StatelessWidget {
 
   /// Строит раскрашенный текст на основе синтаксиса komet.color_#HEX'текст'.
   /// Если цвет некорректный, используется красный.
-  Widget _buildKometColorRichText(
+  Widget _buildKometColorRichText(String rawText, TextStyle baseStyle) {
-    String rawText,
-    TextStyle baseStyle,
-  ) {
     final segments = _parseKometColorSegments(rawText, baseStyle.color);
 
     return RichText(
@@ -3956,25 +4016,19 @@ class ChatMessageBubble extends StatelessWidget {
     while (index < text.length) {
       final start = text.indexOf(marker, index);
       if (start == -1) {
-        segments.add(
+        segments.add(_KometColoredSegment(text.substring(index), null));
-          _KometColoredSegment(text.substring(index), null),
-        );
         break;
       }
 
       if (start > index) {
-        segments.add(
+        segments.add(_KometColoredSegment(text.substring(index, start), null));
-          _KometColoredSegment(text.substring(index, start), null),
-        );
       }
 
       final colorStart = start + marker.length;
       final firstQuote = text.indexOf("'", colorStart);
       if (firstQuote == -1) {
         // Кривой синтаксис — считаем всё остальное обычным текстом.
-        segments.add(
+        segments.add(_KometColoredSegment(text.substring(start), null));
-          _KometColoredSegment(text.substring(start), null),
-        );
         break;
       }
 
@@ -3982,9 +4036,7 @@ class ChatMessageBubble extends StatelessWidget {
       final textStart = firstQuote + 1;
       final secondQuote = text.indexOf("'", textStart);
       if (secondQuote == -1) {
-        segments.add(
+        segments.add(_KometColoredSegment(text.substring(start), null));
-          _KometColoredSegment(text.substring(start), null),
-        );
         break;
       }
 
@@ -5254,7 +5306,7 @@ class _AudioPlayerWidgetState extends State<_AudioPlayerWidget> {
     });
 
     _audioPlayer.durationStream.listen((duration) {
-      if (mounted && duration != null) {
+      if (mounted && duration != null && duration.inMilliseconds > 0) {
         setState(() {
           _totalDuration = duration;
         });
@@ -5515,7 +5567,9 @@ class _AudioPlayerWidgetState extends State<_AudioPlayerWidget> {
                         ),
                       ),
                       Text(
-                        widget.durationText,
+                        _totalDuration.inMilliseconds > 0
+                            ? _formatDuration(_totalDuration)
+                            : widget.durationText,
                         style: TextStyle(
                           color: widget.textColor.withOpacity(
                             0.7 * widget.messageTextOpacity,