From 92963642a2fb947d662dc5ea5c56f469cf496219 Mon Sep 17 00:00:00 2001 From: vfsfitvnm Date: Tue, 14 Jun 2022 16:57:15 +0200 Subject: [PATCH] Do not show PlayerView in IntentUriScreen --- .../it/vfsfitvnm/vimusic/MainActivity.kt | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/MainActivity.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/MainActivity.kt index 13fc7a0..90ee02c 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/MainActivity.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/MainActivity.kt @@ -52,7 +52,7 @@ import it.vfsfitvnm.vimusic.utils.* class MainActivity : ComponentActivity() { private lateinit var mediaControllerFuture: ListenableFuture - private var uri by mutableStateOf(null) + private var uri by mutableStateOf(null, neverEqualPolicy()) override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -131,17 +131,20 @@ class MainActivity : ComponentActivity() { .fillMaxSize() .background(colorPalette.background) ) { - uri?.let { - IntentUriScreen(uri = it) - } ?: HomeScreen() + when (val uri = uri) { + null -> { + HomeScreen() - PlayerView( - layoutState = rememberBottomSheetState( - lowerBound = 64.dp, upperBound = maxHeight - ), - modifier = Modifier - .align(Alignment.BottomCenter) - ) + PlayerView( + layoutState = rememberBottomSheetState( + lowerBound = 64.dp, upperBound = maxHeight + ), + modifier = Modifier + .align(Alignment.BottomCenter) + ) + } + else -> IntentUriScreen(uri = uri) + } BottomSheetMenu( state = LocalMenuState.current,