Merge pull request #588 from namehillsoftware/feature/add-files-from-now-playing-file-details

[Feature] Restore Adding Files From Now Playing File Details

Author: davidvedvick

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/ScopedViewModelRegistry.kt

@@ -102,6 +102,8 @@ class ScopedViewModelRegistry(
 			playbackServiceController,
 			fileDetailsViewModel,
 			fileDetailsViewModel,
+			nowPlayingState,
+			registerForApplicationMessages,
 		)
 	}
 

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

@@ -1,20 +1,20 @@
 package com.lasthopesoftware.bluewater.client.browsing.files.details
 
+import com.lasthopesoftware.bluewater.client.browsing.TrackLoadedViewState
 import com.lasthopesoftware.bluewater.client.browsing.files.ServiceFile
 import com.lasthopesoftware.bluewater.client.browsing.library.repository.LibraryId
 import com.lasthopesoftware.bluewater.shared.observables.InteractionState
 import com.lasthopesoftware.bluewater.shared.observables.LiftedInteractionState
 import com.namehillsoftware.handoff.promises.Promise
 
-interface FileDetailsState {
+interface FileDetailsState : TrackLoadedViewState {
 	val activeLibraryId: LibraryId?
 	val activeServiceFile: ServiceFile?
 
 	val fileName: InteractionState<String>
 	val artist: InteractionState<String>
 	val album: InteractionState<String>
 	val fileProperties: InteractionState<List<FileDetailsViewModel.FilePropertyViewModel>>
-	val isLoading: InteractionState<Boolean>
 	val coverArt: LiftedInteractionState<ByteArray>
 	val rating: InteractionState<Int>
 	val highlightedProperty: InteractionState<FileDetailsViewModel.FilePropertyViewModel?>

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

@@ -24,7 +24,6 @@ import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.requiredHeight
 import androidx.compose.foundation.layout.requiredWidth
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
@@ -113,124 +112,118 @@ private val viewPadding = viewPaddingUnit
 private val maxMenuHeight = topMenuHeight + rowPadding
 
 @Composable
-private fun PlayableFileMenu(
+private fun PlayLastButton(
 	fileDetailsState: FileDetailsState,
-	mediaStylePalette: MediaStylePalette,
-	playableFileDetailsState: PlayableFileDetailsState?,
+	modifier: Modifier = Modifier,
 ) {
-	val modifier = Modifier.requiredWidth(topMenuIconWidth)
-
-	LabelledRefreshButton(
-		onClick = {
-			fileDetailsState.promiseLoadedActiveFile()
-		},
-		modifier = modifier,
-	)
-
 	val addFileToPlaybackLabel = stringResource(id = R.string.btn_add_file_to_playback)
 	ColumnMenuIcon(
 		onClick = { fileDetailsState.addToNowPlaying() },
-		icon = {
-			Image(
-				painter = painterResource(id = R.drawable.playlist_plus),
-				colorFilter = ColorFilter.tint(mediaStylePalette.secondaryTextColor),
-				contentDescription = addFileToPlaybackLabel,
-				modifier = Modifier.size(topMenuIconSize),
-			)
-		},
+		iconPainter = painterResource(id = R.drawable.playlist_plus),
+		contentDescription = addFileToPlaybackLabel,
 		label = addFileToPlaybackLabel,
 		labelMaxLines = 1,
 		modifier = modifier,
 	)
+}
 
+@Composable
+private fun PlayNextButton(
+	fileDetailsState: FileDetailsState,
+	modifier: Modifier = Modifier,
+) {
 	val playFileNextPlaybackLabel = stringResource(id = R.string.btn_play_file_next)
 	ColumnMenuIcon(
 		onClick = { fileDetailsState.playNext() },
-		icon = {
-			Image(
-				painter = painterResource(id = R.drawable.playlist_inner_plus),
-				colorFilter = ColorFilter.tint(mediaStylePalette.secondaryTextColor),
-				contentDescription = playFileNextPlaybackLabel,
-				modifier = Modifier.size(topMenuIconSize),
-			)
-		},
+		iconPainter = painterResource(id = R.drawable.playlist_inner_plus),
+		contentDescription = playFileNextPlaybackLabel,
 		label = playFileNextPlaybackLabel,
 		labelMaxLines = 1,
 		modifier = modifier,
 	)
+}
+
+@Composable
+private fun PlayableFileMenu(
+	fileDetailsState: FileDetailsState,
+	playableFileDetailsState: PlayableFileDetailsState?,
+) {
+	val modifier = Modifier.requiredWidth(topMenuIconWidth)
+	val isLoading by fileDetailsState.isLoading.subscribeAsState()
+
+	LabelledRefreshButton(
+		onClick = {
+			fileDetailsState.promiseLoadedActiveFile()
+		},
+		modifier = modifier,
+		enabled = !isLoading,
+	)
+
+	PlayLastButton(fileDetailsState, modifier)
+
+	PlayNextButton(fileDetailsState, modifier)
 
 	if (playableFileDetailsState != null) {
 		val playLabel = stringResource(id = R.string.btn_play)
 		ColumnMenuIcon(
 			onClick = { playableFileDetailsState.play() },
-			icon = {
-				Image(
-					painter = painterResource(id = R.drawable.av_play_white),
-					colorFilter = ColorFilter.tint(mediaStylePalette.secondaryTextColor),
-					contentDescription = playLabel,
-					modifier = Modifier.size(topMenuIconSize),
-				)
-			},
+			iconPainter = painterResource(id = R.drawable.av_next_white),
+			contentDescription = playLabel,
 			label = playLabel,
 			labelMaxLines = 1,
-			modifier = Modifier.requiredWidth(topMenuIconWidth)
+			modifier = Modifier.requiredWidth(topMenuIconWidth),
+			enabled = !isLoading
 		)
 	}
 }
 
 @Composable
 private fun NowPlayingFileMenu(
 	fileDetailsState: FileDetailsState,
-	mediaStylePalette: MediaStylePalette,
 	nowPlayingFileDetailsState: NowPlayingFileDetailsState,
-	playableFileDetailsState: PlayableFileDetailsState?,
+	playableFileDetailsState: PlayableFileDetailsState,
 ) {
 	val modifier = Modifier.requiredWidth(topMenuIconWidth)
+	val isLoading by fileDetailsState.isLoading.subscribeAsState()
 
 	LabelledRefreshButton(
 		onClick = {
 			fileDetailsState.promiseLoadedActiveFile()
 		},
 		modifier = modifier,
+		enabled = !isLoading,
 	)
 
+	val isInPosition by nowPlayingFileDetailsState.isInPosition.subscribeAsState()
 	val removeFileLabel = stringResource(id = R.string.btn_remove_file)
 	ColumnMenuIcon(
 		onClick = { nowPlayingFileDetailsState.removeFile() },
-		icon = {
-			Image(
-				painter = painterResource(id = R.drawable.ic_remove_item_white_36dp),
-				colorFilter = ColorFilter.tint(mediaStylePalette.secondaryTextColor),
-				contentDescription = removeFileLabel,
-				modifier = Modifier.size(topMenuIconSize),
-			)
-		},
+		iconPainter = painterResource(id = R.drawable.ic_remove_item_white_36dp),
+		contentDescription = removeFileLabel,
 		label = removeFileLabel,
 		labelMaxLines = 1,
 		modifier = modifier,
+		enabled = !isLoading && isInPosition
 	)
 
-	if (playableFileDetailsState != null) {
-		val playLabel = stringResource(id = R.string.skip_to)
-		ColumnMenuIcon(
-			onClick = { playableFileDetailsState.play() },
-			icon = {
-				Image(
-					painter = painterResource(id = R.drawable.av_next_white),
-					colorFilter = ColorFilter.tint(mediaStylePalette.secondaryTextColor),
-					contentDescription = playLabel,
-					modifier = Modifier.size(topMenuIconSize),
-				)
-			},
-			label = playLabel,
-			labelMaxLines = 1,
-			modifier = Modifier.requiredWidth(topMenuIconWidth)
-		)
-	}
+	val playLabel = stringResource(id = R.string.skip_to)
+	ColumnMenuIcon(
+		onClick = { playableFileDetailsState.play() },
+		iconPainter = painterResource(id = R.drawable.av_next_white),
+		contentDescription = playLabel,
+		label = playLabel,
+		labelMaxLines = 1,
+		modifier = Modifier.requiredWidth(topMenuIconWidth),
+		enabled = isInPosition
+	)
+
+	PlayLastButton(fileDetailsState, modifier)
+
+	PlayNextButton(fileDetailsState, modifier)
 }
 
 @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(
@@ -242,7 +235,7 @@ fun FileRating(viewModel: FileDetailsState, mediaStylePalette: MediaStylePalette
 }
 
 @Composable
-fun rememberComputedColorPalette(
+private fun rememberComputedColorPalette(
 	paletteProvider: MediaStylePaletteProvider,
 	coverArt: Bitmap?
 ): State<MediaStylePalette> {
@@ -265,7 +258,7 @@ fun rememberComputedColorPalette(
 }
 
 @Composable
-fun FilePropertyHeader(
+private fun FilePropertyHeader(
 	viewModel: FileDetailsState,
 	palette: MediaStylePalette,
 	modifier: Modifier = Modifier,
@@ -304,7 +297,7 @@ fun FilePropertyHeader(
 }
 
 @Composable
-fun FilePropertyRow(
+private fun FilePropertyRow(
 	viewModel: FileDetailsState,
 	property: FileDetailsViewModel.FilePropertyViewModel,
 	palette: MediaStylePalette
@@ -549,7 +542,7 @@ private fun FileDetailsEditor(
 }
 
 @Composable
-fun FileDetailsSingleColumn(
+private fun FileDetailsSingleColumn(
 	viewModel: FileDetailsState,
 	navigateApplication: NavigateApplication,
 	coverArtBitmap: Bitmap?,
@@ -771,7 +764,7 @@ fun FileDetailsSingleColumn(
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
-fun BoxWithConstraintsScope.FileDetailsTwoColumn(
+private fun BoxWithConstraintsScope.FileDetailsTwoColumn(
 	viewModel: FileDetailsState,
 	navigateApplication: NavigateApplication,
 	coverArtBitmap: Bitmap?,
@@ -924,7 +917,6 @@ fun FileDetailsView(
 					menuIcons = {
 						PlayableFileMenu(
 							viewModel,
-							coverArtColorState,
 							playableFileDetailsState
 						)
 					}
@@ -936,7 +928,6 @@ fun FileDetailsView(
 					menuIcons = {
 						PlayableFileMenu(
 							viewModel,
-							coverArtColorState,
 							playableFileDetailsState,
 						)
 					}
@@ -992,7 +983,6 @@ fun FileDetailsView(
 					menuIcons = {
 						NowPlayingFileMenu(
 							viewModel,
-							coverArtColorState,
 							nowPlayingFileDetailsSate,
 							playableFileDetailsState,
 						)
@@ -1005,7 +995,6 @@ fun FileDetailsView(
 					menuIcons = {
 						NowPlayingFileMenu(
 							viewModel,
-							coverArtColorState,
 							nowPlayingFileDetailsSate,
 							playableFileDetailsState,
 						)

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

@@ -1,5 +1,9 @@
 package com.lasthopesoftware.bluewater.client.browsing.files.details
 
+import com.lasthopesoftware.bluewater.shared.observables.InteractionState
+import com.namehillsoftware.handoff.promises.Promise
+
 interface NowPlayingFileDetailsState {
-	fun removeFile()
+	val isInPosition: InteractionState<Boolean>
+	fun removeFile(): Promise<Unit>
 }