Twelve: NowPlayingViewModel: Missed a nullable state flow (33b49f71) · Commits · e / os / android_packages_apps_Twelve

app/src/main/java/org/lineageos/twelve/fragments/NowPlayingFragment.kt

+8 −15

Original line number	Diff line number	Diff line
		@@ -234,23 +234,16 @@ class NowPlayingFragment : Fragment(R.layout.fragment_now_playing) {
		}

		audioInformationMaterialButton.setOnClickListener {
		when (val value = viewModel.audio.value) {
		is Result.Success -> {
		val audio = value.data
		viewModel.audio.value.getOrNull()?.let {
		findNavController().navigateSafe(
		R.id.action_nowPlayingFragment_to_fragment_media_item_bottom_sheet_dialog,
		MediaItemBottomSheetDialogFragment.createBundle(
		audio.uri,
		it.uri,
		MediaType.AUDIO,
		fromNowPlaying = true,
		)
		)
		}

		else -> {
		// Do nothing
		}
		}
		}

		equalizerMaterialButton.setOnClickListener {

+4 −1

Original line number	Diff line number	Diff line
		@@ -49,6 +49,8 @@ import org.lineageos.twelve.ext.shuffleModeFlow
		import org.lineageos.twelve.ext.toThumbnail
		import org.lineageos.twelve.ext.tracksFlow
		import org.lineageos.twelve.models.Error
		import org.lineageos.twelve.models.FlowResult
		import org.lineageos.twelve.models.FlowResult.Companion.asFlowResult
		import org.lineageos.twelve.models.PlaybackProgress
		import org.lineageos.twelve.models.PlaybackState
		import org.lineageos.twelve.models.RepeatMode
		@@ -132,11 +134,12 @@ open class NowPlayingViewModel(application: Application) : TwelveViewModel(appli
		mediaRepository.audio(it)
		} ?: flowOf(Result.Error(Error.NOT_FOUND))
		}
		.asFlowResult()
		.flowOn(Dispatchers.IO)
		.stateIn(
		viewModelScope,
		started = SharingStarted.WhileSubscribed(),
		initialValue = null
		initialValue = FlowResult.Loading()
		)

		@OptIn(ExperimentalCoroutinesApi::class)