Completely track file removal with isInPosition

Author: davidvedvick

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/files/details/FileDetailsView.kt

@@ -195,7 +195,6 @@ private fun NowPlayingFileMenu(
 	)
 
 	val isInPosition by nowPlayingFileDetailsState.isInPosition.subscribeAsState()
-	val isRemoving by nowPlayingFileDetailsState.isRemoving.subscribeAsState()
 	val removeFileLabel = stringResource(id = R.string.btn_remove_file)
 	ColumnMenuIcon(
 		onClick = { nowPlayingFileDetailsState.removeFile() },
@@ -204,7 +203,7 @@ private fun NowPlayingFileMenu(
 		label = removeFileLabel,
 		labelMaxLines = 1,
 		modifier = modifier,
-		enabled = !isLoading && !isRemoving && isInPosition
+		enabled = !isLoading && isInPosition
 	)
 
 	val playLabel = stringResource(id = R.string.skip_to)
@@ -224,7 +223,7 @@ private fun NowPlayingFileMenu(
 }
 
 @Composable
-fun FileRating(viewModel: FileDetailsState, mediaStylePalette: MediaStylePalette, modifier: Modifier) {
+private fun FileRating(viewModel: FileDetailsState, mediaStylePalette: MediaStylePalette, modifier: Modifier) {
 	val rating by viewModel.rating.subscribeAsState()
 
 	RatingBar(
@@ -236,7 +235,7 @@ fun FileRating(viewModel: FileDetailsState, mediaStylePalette: MediaStylePalette
 }
 
 @Composable
-fun rememberComputedColorPalette(
+private fun rememberComputedColorPalette(
 	paletteProvider: MediaStylePaletteProvider,
 	coverArt: Bitmap?
 ): State<MediaStylePalette> {
@@ -259,7 +258,7 @@ fun rememberComputedColorPalette(
 }
 
 @Composable
-fun FilePropertyHeader(
+private fun FilePropertyHeader(
 	viewModel: FileDetailsState,
 	palette: MediaStylePalette,
 	modifier: Modifier = Modifier,
@@ -298,7 +297,7 @@ fun FilePropertyHeader(
 }
 
 @Composable
-fun FilePropertyRow(
+private fun FilePropertyRow(
 	viewModel: FileDetailsState,
 	property: FileDetailsViewModel.FilePropertyViewModel,
 	palette: MediaStylePalette
@@ -543,7 +542,7 @@ private fun FileDetailsEditor(
 }
 
 @Composable
-fun FileDetailsSingleColumn(
+private fun FileDetailsSingleColumn(
 	viewModel: FileDetailsState,
 	navigateApplication: NavigateApplication,
 	coverArtBitmap: Bitmap?,
@@ -765,7 +764,7 @@ fun FileDetailsSingleColumn(
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
-fun BoxWithConstraintsScope.FileDetailsTwoColumn(
+private fun BoxWithConstraintsScope.FileDetailsTwoColumn(
 	viewModel: FileDetailsState,
 	navigateApplication: NavigateApplication,
 	coverArtBitmap: Bitmap?,

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/files/details/NowPlayingFileDetailsState.kt

@@ -6,5 +6,4 @@ import com.namehillsoftware.handoff.promises.Promise
 interface NowPlayingFileDetailsState {
 	val isInPosition: InteractionState<Boolean>
 	fun removeFile(): Promise<Unit>
-	val isRemoving: InteractionState<Boolean>
 }

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/files/details/NowPlayingFileDetailsViewModel.kt

@@ -13,12 +13,13 @@ import com.lasthopesoftware.bluewater.shared.observables.LiftedInteractionState
 import com.lasthopesoftware.bluewater.shared.observables.MutableInteractionState
 import com.lasthopesoftware.bluewater.shared.observables.asInteractionState
 import com.lasthopesoftware.bluewater.shared.observables.mapNotNull
+import com.lasthopesoftware.promises.extensions.keepPromise
 import com.lasthopesoftware.promises.extensions.toPromise
 import com.lasthopesoftware.resources.closables.AutoCloseableManager
 import com.namehillsoftware.handoff.promises.Promise
+import com.namehillsoftware.handoff.promises.response.EventualAction
 import com.namehillsoftware.handoff.promises.response.ImmediateAction
 import com.namehillsoftware.handoff.promises.response.ImmediateResponse
-import com.namehillsoftware.handoff.promises.response.PromisedResponse
 import io.reactivex.rxjava3.core.Observable
 
 class NowPlayingFileDetailsViewModel(
@@ -32,21 +33,19 @@ class NowPlayingFileDetailsViewModel(
 	NowPlayingFileDetailsState,
 	PlayableFileDetailsState,
 	FileDetailsState by fileDetailsState,
+	EventualAction,
 	ImmediateAction,
-	ImmediateResponse<NowPlaying?, Unit>,
-	PromisedResponse<Unit, Unit>
+	ImmediateResponse<NowPlaying?, Unit>
 {
 	private var activePositionedFile: PositionedFile? = null
 
 	private val autoCloseableManager by lazy {
 		AutoCloseableManager().also(::addCloseable)
 	}
 
-	private val mutableIsRemoving = MutableInteractionState(false)
 	private val mutableIsLoading = MutableInteractionState(false)
 	private val mutableIsInPosition = MutableInteractionState(false)
 
-	override val isRemoving = mutableIsRemoving.asInteractionState()
 	override val isInPosition = mutableIsInPosition.asInteractionState()
 	override val isLoading = autoCloseableManager.manage(LiftedInteractionState(
 		Observable.combineLatest(listOf(mutableIsLoading.mapNotNull(), fileDetailsState.isLoading.mapNotNull())) { source -> source.any { loading -> loading as Boolean } },
@@ -64,18 +63,18 @@ class NowPlayingFileDetailsViewModel(
 		activePositionedFile = positionedFile
 		return loadFileDetailsState
 			.load(libraryId, positionedFile.serviceFile)
-			.eventually(this)
+			.inevitably(this)
 			.must(this)
 	}
 
 	override fun removeFile(): Promise<Unit> {
 		val libraryId = activeLibraryId ?: return Unit.toPromise()
 		val positionedFile = activePositionedFile ?: return Unit.toPromise()
 
-		mutableIsRemoving.value = true
+		mutableIsInPosition.value = false
 		return controlPlayback
 			.removeFromPlaylistAtPosition(libraryId, positionedFile.playlistPosition)
-			.must { _ -> mutableIsRemoving.value = false }
+			.inevitably(this)
 	}
 
 	override fun play() {
@@ -89,10 +88,8 @@ class NowPlayingFileDetailsViewModel(
 		mutableIsLoading.value = false
 	}
 
-	override fun promiseResponse(resolution: Unit): Promise<Unit> {
-		val libraryId = activeLibraryId ?: return Unit.toPromise()
-		return loadIsInPosition(libraryId)
-	}
+	override fun promiseAction(): Promise<*>? =
+		activeLibraryId?.let(::loadIsInPosition).keepPromise()
 
 	override fun respond(nowPlaying: NowPlaying?) {
 		val currentLibraryId = activeLibraryId

projectBlueWater/src/test/java/com/lasthopesoftware/bluewater/client/browsing/files/details/GivenAFile/When removing the file from now playing.kt

@@ -52,7 +52,7 @@ class `When removing the file from now playing` {
 			mockk {
 				every { promiseNowPlaying(LibraryId(libraryId)) } returns NowPlaying(
 					libraryId = LibraryId(libraryId),
-					playlist = emptyList(),
+					playlist = listOf(ServiceFile(serviceFileId)),
 					playlistPosition = 0,
 					filePosition = 0,
 					isRepeating = false,
@@ -63,20 +63,17 @@ class `When removing the file from now playing` {
 	}
 
 	private var isLoadingStates = mutableListOf<Boolean>()
-	private var isRemovingStates = mutableListOf<Boolean>()
 	private var isInPositionStates = mutableListOf<Boolean>()
 
 	@BeforeAll
 	fun act() {
 		viewModel.isLoading.mapNotNull().subscribe(isLoadingStates::add).toCloseable().use {
-			viewModel.isRemoving.mapNotNull().subscribe(isRemovingStates::add).toCloseable().use {
-				viewModel.isInPosition.mapNotNull().subscribe(isInPositionStates::add).toCloseable().use {
-					viewModel
-						.load(LibraryId(libraryId), PositionedFile(501, ServiceFile(serviceFileId)))
-						.toExpiringFuture()
-						.get()
-					viewModel.removeFile().toExpiringFuture().get()
-				}
+			viewModel.isInPosition.mapNotNull().subscribe(isInPositionStates::add).toCloseable().use {
+				viewModel
+					.load(LibraryId(libraryId), PositionedFile(0, ServiceFile(serviceFileId)))
+					.toExpiringFuture()
+					.get()
+				viewModel.removeFile().toExpiringFuture().get()
 			}
 		}
 	}
@@ -87,28 +84,24 @@ class `When removing the file from now playing` {
 	}
 
 	@Test
-	fun `then is removing changes correctly`() {
-		assertThat(isRemovingStates).isEqualTo(
+	fun `then the file is in position changes correctly`() {
+		assertThat(isInPositionStates).isEqualTo(
 			listOf(
 				false,
 				true,
 				false,
+				true,
 			)
 		)
 	}
 
-	@Test
-	fun `then the file is in position changes correctly`() {
-		assertThat(isInPositionStates).isEqualTo(listOf(false))
-	}
-
 	@Test
 	fun `then the file is removed with the correct library id`() {
 		assertThat(removedLibraryId).isEqualTo(LibraryId(libraryId))
 	}
 
 	@Test
 	fun `then the file is removed to now playing`() {
-		assertThat(removedPosition).isEqualTo(501)
+		assertThat(removedPosition).isEqualTo(0)
 	}
 }