diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt index d7b2a511..88b9ce4f 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt @@ -90,7 +90,7 @@ fun MusicWidget() { ) { IconButton( onClick = { - viewModel.onPreviousClick() + viewModel.skipPrevious() }) { Icon( imageVector = Icons.Rounded.SkipPrevious, @@ -98,14 +98,14 @@ fun MusicWidget() { ) } val playPauseIcon = AnimatedImageVector.animatedVectorResource(R.drawable.anim_ic_play_pause) - IconButton(onClick = { viewModel.onPlayClick() }) { + IconButton(onClick = { viewModel.togglePause() }) { Icon( painter = rememberAnimatedVectorPainter(playPauseIcon, atEnd = playbackState == PlaybackState.Playing), contentDescription = "" ) } IconButton(onClick = { - viewModel.onNextClick() + viewModel.skipNext() }) { Icon( imageVector = Icons.Rounded.SkipNext, @@ -119,10 +119,10 @@ fun MusicWidget() { .size(144.dp) .combinedClickable( onClick = { - viewModel.onAlbumArtClick() + viewModel.openPlayer() }, onLongClick = { - viewModel.onAlbumArtLongClick(context) + viewModel.openPlayerSelector(context) } ) .conditional( diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidgetVM.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidgetVM.kt index 565bac20..629f32d4 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidgetVM.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidgetVM.kt @@ -21,19 +21,19 @@ class MusicWidgetVM: ViewModel(), KoinComponent { val albumArt: LiveData = musicRepository.albumArt.asLiveData() val playbackState: LiveData = musicRepository.playbackState.asLiveData() - fun onPreviousClick() { + fun skipPrevious() { musicRepository.previous() } - fun onNextClick() { + fun skipNext() { musicRepository.next() } - fun onPlayClick() { + fun togglePause() { musicRepository.togglePause() } - fun onAlbumArtClick() { + fun openPlayer() { try { musicRepository.getLaunchIntent().send() } catch (e: PendingIntent.CanceledException) { @@ -41,7 +41,7 @@ class MusicWidgetVM: ViewModel(), KoinComponent { } } - fun onAlbumArtLongClick(context: Context) { + fun openPlayerSelector(context: Context) { musicRepository.openPlayerChooser(context) } } \ No newline at end of file