From 3980f1f851cf222f8bafb826f5c0c16ab340b9f2 Mon Sep 17 00:00:00 2001
From: zarzet <42882290+zarzet@users.noreply.github.com>
Date: Sun, 27 Sep 2026 17:51:45 +0700
Subject: [PATCH] fix(player): move Material audio output to bottom right

---
 lib/screens/now_playing_screen.dart | 40 ++++++++++++++++-------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/lib/screens/now_playing_screen.dart b/lib/screens/now_playing_screen.dart
index 84757187..a3361685 100644
--- a/lib/screens/now_playing_screen.dart
+++ b/lib/screens/now_playing_screen.dart
@@ -696,7 +696,6 @@ class _NowPlayingScreenState extends ConsumerState<NowPlayingScreen> {
           actions: mornye
               ? null
               : [
-                  const AudioOutputButton(),
                   IconButton(
                     tooltip: context.l10n.nowPlayingUpNext,
                     icon: const Icon(Icons.queue_music),
@@ -787,23 +786,28 @@ class _NowPlayingScreenState extends ConsumerState<NowPlayingScreen> {
                       else if (!mornye)
                         Padding(
                           padding: const EdgeInsets.symmetric(horizontal: 28),
-                          child: Align(
-                            alignment: Alignment.centerLeft,
-                            child: ExpressiveIconButton(
-                              key: const ValueKey('material-lyrics-toggle'),
-                              tooltip: _currentPage == 1
-                                  ? context.l10n.nowPlayingTabPlayer
-                                  : context.l10n.nowPlayingTabLyrics,
-                              selected: _currentPage == 1,
-                              foregroundColor: _currentPage == 1
-                                  ? colorScheme.onPrimaryContainer
-                                  : colorScheme.onSurfaceVariant,
-                              backgroundColor: _currentPage == 1
-                                  ? colorScheme.primaryContainer
-                                  : null,
-                              icon: const Icon(Icons.lyrics_outlined),
-                              onPressed: _toggleMaterialLyrics,
-                            ),
+                          child: Row(
+                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                            children: [
+                              ExpressiveIconButton(
+                                key: const ValueKey('material-lyrics-toggle'),
+                                tooltip: _currentPage == 1
+                                    ? context.l10n.nowPlayingTabPlayer
+                                    : context.l10n.nowPlayingTabLyrics,
+                                selected: _currentPage == 1,
+                                foregroundColor: _currentPage == 1
+                                    ? colorScheme.onPrimaryContainer
+                                    : colorScheme.onSurfaceVariant,
+                                backgroundColor: _currentPage == 1
+                                    ? colorScheme.primaryContainer
+                                    : null,
+                                icon: const Icon(Icons.lyrics_outlined),
+                                onPressed: _toggleMaterialLyrics,
+                              ),
+                              AudioOutputButton(
+                                color: colorScheme.onSurfaceVariant,
+                              ),
+                            ],
                           ),
                         ),
                       if (!_landscape) const SizedBox(height: 8),