Undo eager audio back handler

Author: jocmp

app/src/main/java/com/capyreader/app/ui/articles/ArticleScreen.kt

@@ -4,8 +4,6 @@ import androidx.activity.compose.BackHandler
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
-import androidx.compose.animation.slideInVertically
-import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.DrawerValue
@@ -45,18 +43,17 @@ import androidx.core.net.toUri
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.paging.compose.collectAsLazyPagingItems
 import com.capyreader.app.R
-import com.capyreader.app.common.AudioEnclosure
 import com.capyreader.app.common.Media
 import com.capyreader.app.common.Saver
-import com.capyreader.app.ui.articles.audio.AudioPlayerController
-import com.capyreader.app.ui.articles.audio.FloatingAudioPlayer
 import com.capyreader.app.preferences.AfterReadAllBehavior
 import com.capyreader.app.preferences.AppPreferences
 import com.capyreader.app.refresher.RefreshInterval
 import com.capyreader.app.ui.LocalConnectivity
 import com.capyreader.app.ui.LocalLinkOpener
 import com.capyreader.app.ui.LocalMarkAllReadButtonPosition
 import com.capyreader.app.ui.LocalUnreadCount
+import com.capyreader.app.ui.articles.audio.AudioPlayerController
+import com.capyreader.app.ui.articles.audio.FloatingAudioPlayer
 import com.capyreader.app.ui.articles.detail.ArticleView
 import com.capyreader.app.ui.articles.detail.CapyPlaceholder
 import com.capyreader.app.ui.articles.feeds.AngleRefreshState
@@ -544,20 +541,14 @@ fun ArticleScreen(
                         }
                     },
                     bottomBar = {
-                        AnimatedVisibility(
-                            enter = slideInVertically(initialOffsetY = { it }) + fadeIn(),
-                            exit = slideOutVertically(targetOffsetY = { it }) + fadeOut(),
-                            visible = audioEnclosure != null,
-                        ) {
-                            audioEnclosure?.let { audio ->
-                                FloatingAudioPlayer(
-                                    audio = audio,
-                                    controller = audioController,
-                                    onDismiss = {
-                                        audioController.dismiss()
-                                    },
-                                )
-                            }
+                        audioEnclosure?.let { audio ->
+                            FloatingAudioPlayer(
+                                audio = audio,
+                                controller = audioController,
+                                onDismiss = {
+                                    audioController.dismiss()
+                                },
+                            )
                         }
                     }
                 ) { innerPadding ->
@@ -709,11 +700,7 @@ fun ArticleScreen(
             media = null
         }
 
-        BackHandler(audioEnclosure != null && media == null) {
-            audioController.dismiss()
-        }
-
-        BackHandler(media == null && audioEnclosure == null && search.isActive && article == null) {
+        BackHandler(media == null && search.isActive && article == null) {
             search.clear()
         }