Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

playback: add playing from indicator to fragment

Browse source 
Add the "Playing From" indicator that used be on the queue to the
main playback view.
This commit is contained in:
OxygenCobalt 2022-01-08 09:26:26 -07:00
parent 13730c303c
commit 049b279e1f
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
7 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/oxycblt/auxio/music/Models.kt
View file

@ -84,7 +84,7 @@ data class Song(
val album: Album get() = requireNotNull(mAlbum) val album: Album get() = requireNotNull(mAlbum)
val seconds: Long get() = duration / 1000 val seconds: Long get() = duration / 1000
val formattedDuration: String get() = (duration / 1000).toDuration(false) val formattedDuration: String get() = seconds.toDuration(false)
override val hash: Long get() { override val hash: Long get() {
var result = name.hashCode().toLong() var result = name.hashCode().toLong()

4
app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt
View file

@ -111,6 +111,10 @@ class PlaybackFragment : Fragment() {
} }
} }
playbackModel.parent.observe(viewLifecycleOwner) { parent ->
binding.playbackToolbar.subtitle = parent?.name ?: getString(R.string.lbl_all_songs)
}
playbackModel.isShuffling.observe(viewLifecycleOwner) { isShuffling -> playbackModel.isShuffling.observe(viewLifecycleOwner) { isShuffling ->
binding.playbackShuffle.isActivated = isShuffling binding.playbackShuffle.isActivated = isShuffling
} }

1
app/src/main/res/layout-land/fragment_playback.xml
View file

@ -32,6 +32,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:menu="@menu/menu_playback" app:menu="@menu/menu_playback"
tools:subtitle="@string/lbl_all_songs"
app:title="@string/lbl_playback" /> app:title="@string/lbl_playback" />
<ImageView <ImageView

1
app/src/main/res/layout-sw600dp-land/fragment_playback.xml
View file

@ -31,6 +31,7 @@
style="@style/Widget.Auxio.Toolbar.Icon.Down" style="@style/Widget.Auxio.Toolbar.Icon.Down"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:title="@string/lbl_playback" app:title="@string/lbl_playback"
tools:subtitle="@string/lbl_all_songs"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:menu="@menu/menu_playback" /> app:menu="@menu/menu_playback" />

1
app/src/main/res/layout-sw600dp/fragment_playback.xml
View file

@ -32,6 +32,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:title="@string/lbl_playback" app:title="@string/lbl_playback"
tools:subtitle="@string/lbl_all_songs"
app:menu="@menu/menu_playback" /> app:menu="@menu/menu_playback" />
<ImageView <ImageView

1
app/src/main/res/layout-w600dp-land/fragment_playback.xml
View file

@ -32,6 +32,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:title="@string/lbl_playback" app:title="@string/lbl_playback"
tools:subtitle="@string/lbl_all_songs"
app:menu="@menu/menu_playback" /> app:menu="@menu/menu_playback" />
<ImageView <ImageView

1
app/src/main/res/layout/fragment_playback.xml
View file

@ -31,6 +31,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:title="@string/lbl_playback" app:title="@string/lbl_playback"
tools:subtitle="@string/lbl_all_songs"
app:menu="@menu/menu_playback" /> app:menu="@menu/menu_playback" />
<ImageView <ImageView