Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Semantic rename

This commit is contained in:
tzugen 2021-10-13 20:59:28 +02:00
parent 0bcf51a409
commit 9bc19ec044
No known key found for this signature in database
GPG Key ID: 61E9C34BC10EC930
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ultrasonic/src/main/java/org/moire/ultrasonic/view/SongListAdapter.java
View File

@ -24,7 +24,7 @@ public class SongListAdapter extends ArrayAdapter<DownloadFile>
public View getView(final int position, final View convertView, final ViewGroup parent)
{
DownloadFile downloadFile = getItem(position);
MusicDirectory.Entry entry = downloadFile.getSong();
MusicDirectory.Entry entry = downloadFile.getSong();
SongView view;

14
ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt
View File

@ -317,7 +317,7 @@ class PlayerFragment : Fragment(), GestureDetector.OnGestureListener, KoinCompon
repeatButton.setOnClickListener {
val repeatMode = mediaPlayerController.repeatMode.next()
mediaPlayerController.repeatMode = repeatMode
onDownloadListChanged()
onPlaylistChanged()
when (repeatMode) {
RepeatMode.OFF -> Util.toast(
context, R.string.download_repeat_off
@ -435,7 +435,7 @@ class PlayerFragment : Fragment(), GestureDetector.OnGestureListener, KoinCompon
playlistFlipper.displayedChild = 1
} else {
// Download list and Album art must be updated when Resumed
onDownloadListChanged()
onPlaylistChanged()
onCurrentChanged()
}
val handler = Handler()
@ -642,7 +642,7 @@ class PlayerFragment : Fragment(), GestureDetector.OnGestureListener, KoinCompon
}
R.id.menu_remove -> {
mediaPlayerController.removeFromPlaylist(song!!)
onDownloadListChanged()
onPlaylistChanged()
return true
}
R.id.menu_item_screen_on_off -> {
@ -697,7 +697,7 @@ class PlayerFragment : Fragment(), GestureDetector.OnGestureListener, KoinCompon
R.id.menu_item_clear_playlist -> {
mediaPlayerController.isShufflePlayEnabled = false
mediaPlayerController.clear()
onDownloadListChanged()
onPlaylistChanged()
return true
}
R.id.menu_item_save_playlist -> {
@ -798,7 +798,7 @@ class PlayerFragment : Fragment(), GestureDetector.OnGestureListener, KoinCompon
if (cancel!!.isCancellationRequested) return
val mediaPlayerController = mediaPlayerController
if (currentRevision != mediaPlayerController.playListUpdateRevision) {
onDownloadListChanged()
onPlaylistChanged()
}
if (currentPlaying != mediaPlayerController.currentPlaying) {
onCurrentChanged()
@ -874,7 +874,7 @@ class PlayerFragment : Fragment(), GestureDetector.OnGestureListener, KoinCompon
}
}
private fun onDownloadListChanged() {
private fun onPlaylistChanged() {
val mediaPlayerController = mediaPlayerController
val list = mediaPlayerController.playList
emptyTextView.setText(R.string.download_empty)
@ -907,7 +907,7 @@ class PlayerFragment : Fragment(), GestureDetector.OnGestureListener, KoinCompon
item.song.title
)
Util.toast(context, songRemoved)
onDownloadListChanged()
onPlaylistChanged()
onCurrentChanged()
}
})