Merge pull request #587 from namehillsoftware/feature/specific-now-playing-file-details-menu

[Feature] Add ability to remove now playing file in file details menu

Author: davidvedvick

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/HandheldApplication.kt

@@ -227,12 +227,13 @@ fun LibraryDestination.Navigate(
 			}
 
 			is FileDetailsFromNowPlayingScreen -> {
-				val viewModel = fileDetailsFromNowPlayingViewModel
+				val viewModel = nowPlayingFileDetailsViewModel
 
 				FileDetailsView(
 					viewModel = viewModel,
 					navigateApplication = applicationNavigation,
 					bitmapProducer = bitmapProducer,
+					nowPlayingFileDetailsSate = viewModel,
 					playableFileDetailsState = viewModel,
 				)
 

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

@@ -1,9 +1,9 @@
 package com.lasthopesoftware.bluewater.client.browsing
 
 import com.lasthopesoftware.bluewater.client.browsing.files.details.FileDetailsFromItemViewModel
-import com.lasthopesoftware.bluewater.client.browsing.files.details.FileDetailsFromNowPlayingViewModel
 import com.lasthopesoftware.bluewater.client.browsing.files.details.FileDetailsViewModel
 import com.lasthopesoftware.bluewater.client.browsing.files.details.ListedFileDetailsViewModel
+import com.lasthopesoftware.bluewater.client.browsing.files.details.NowPlayingFileDetailsViewModel
 import com.lasthopesoftware.bluewater.client.browsing.files.list.FileListViewModel
 import com.lasthopesoftware.bluewater.client.browsing.files.list.search.SearchFilesViewModel
 import com.lasthopesoftware.bluewater.client.browsing.items.LoadItemData
@@ -25,6 +25,6 @@ interface ScopedViewModelDependencies : ReusedViewModelDependencies {
 	val fileDetailsViewModel: FileDetailsViewModel
 	val fileDetailsFromItemViewModel: FileDetailsFromItemViewModel
 	val listedFileDetailsViewModel: ListedFileDetailsViewModel
-	val fileDetailsFromNowPlayingViewModel: FileDetailsFromNowPlayingViewModel
+	val nowPlayingFileDetailsViewModel: NowPlayingFileDetailsViewModel
 	val undoBackStackBuilder: UndoStack
 }

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

@@ -2,9 +2,9 @@ package com.lasthopesoftware.bluewater.client.browsing
 
 import androidx.lifecycle.ViewModelStoreOwner
 import com.lasthopesoftware.bluewater.client.browsing.files.details.FileDetailsFromItemViewModel
-import com.lasthopesoftware.bluewater.client.browsing.files.details.FileDetailsFromNowPlayingViewModel
 import com.lasthopesoftware.bluewater.client.browsing.files.details.FileDetailsViewModel
 import com.lasthopesoftware.bluewater.client.browsing.files.details.ListedFileDetailsViewModel
+import com.lasthopesoftware.bluewater.client.browsing.files.details.NowPlayingFileDetailsViewModel
 import com.lasthopesoftware.bluewater.client.browsing.files.list.FileListViewModel
 import com.lasthopesoftware.bluewater.client.browsing.files.list.search.SearchFilesViewModel
 import com.lasthopesoftware.bluewater.client.browsing.items.AggregateItemViewModel
@@ -97,8 +97,8 @@ class ScopedViewModelRegistry(
 		)
 	}
 
-	override val fileDetailsFromNowPlayingViewModel by viewModelStoreOwner.buildViewModelLazily {
-		FileDetailsFromNowPlayingViewModel(
+	override val nowPlayingFileDetailsViewModel by viewModelStoreOwner.buildViewModelLazily {
+		NowPlayingFileDetailsViewModel(
 			playbackServiceController,
 			fileDetailsViewModel,
 			fileDetailsViewModel,