50a2305f63
Modify the music loader to use the normal artist name when using song titles while still retaining album artist functionality. Oftentimes music files will be tagged as to use the artist tag to specify performers, collaborators, and others, and then use the album artist tag to group them up into a single artist. Previously, Auxio would only use the album artist tag, which flattened the collaborator information out for consistency. Resolve this by implementing a sort of "resolved artist name" for songs that is used in the UI and nowhere else. This seems to work well, but at the same time further ruins the API surface for handling music objects. An acceptable price to pay for a better UX.
185 lines
No EOL
8.7 KiB
XML
185 lines
No EOL
8.7 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
tools:context=".playback.PlaybackFragment">
|
|
|
|
<data>
|
|
|
|
<variable
|
|
name="song"
|
|
type="org.oxycblt.auxio.music.Song" />
|
|
|
|
<variable
|
|
name="playbackModel"
|
|
type="org.oxycblt.auxio.playback.PlaybackViewModel" />
|
|
|
|
<variable
|
|
name="detailModel"
|
|
type="org.oxycblt.auxio.detail.DetailViewModel" />
|
|
</data>
|
|
|
|
|
|
<androidx.constraintlayout.widget.ConstraintLayout
|
|
android:id="@+id/playback_layout"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:clipToPadding="false">
|
|
|
|
<com.google.android.material.appbar.MaterialToolbar
|
|
android:id="@+id/playback_toolbar"
|
|
style="@style/Widget.Auxio.Toolbar.Icon.Down"
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
app:title="@string/lbl_playback"
|
|
tools:subtitle="@string/lbl_all_songs"
|
|
app:layout_constraintTop_toTopOf="parent"
|
|
app:menu="@menu/menu_playback" />
|
|
|
|
<ImageView
|
|
android:id="@+id/playback_cover"
|
|
style="@style/Widget.Auxio.Image.Full"
|
|
android:layout_margin="@dimen/spacing_mid_large"
|
|
android:contentDescription="@{@string/desc_album_cover(song.name)}"
|
|
app:albumArt="@{song}"
|
|
app:layout_constraintBottom_toBottomOf="parent"
|
|
app:layout_constraintEnd_toStartOf="@+id/playback_song_container"
|
|
app:layout_constraintHorizontal_bias="0.5"
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
app:layout_constraintTop_toBottomOf="@+id/playback_toolbar"
|
|
tools:src="@drawable/ic_album" />
|
|
|
|
<!-- TextView is wrapped in a container so that marquee doesn't break -->
|
|
|
|
<FrameLayout
|
|
android:id="@+id/playback_song_container"
|
|
android:layout_width="0dp"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginEnd="@dimen/spacing_mid_large"
|
|
app:layout_constraintBottom_toTopOf="@+id/playback_artist"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
app:layout_constraintHorizontal_bias="0.5"
|
|
app:layout_constraintStart_toEndOf="@+id/playback_cover"
|
|
app:layout_constraintTop_toBottomOf="@+id/playback_toolbar"
|
|
app:layout_constraintVertical_chainStyle="packed">
|
|
|
|
<TextView
|
|
android:id="@+id/playback_song"
|
|
style="@style/Widget.Auxio.TextView.Primary"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:onClick="@{() -> detailModel.navToItem(playbackModel.song)}"
|
|
android:text="@{song.name}"
|
|
tools:text="Song Name" />
|
|
|
|
</FrameLayout>
|
|
|
|
<TextView
|
|
android:id="@+id/playback_artist"
|
|
style="@style/Widget.Auxio.TextView.Secondary"
|
|
android:layout_width="0dp"
|
|
android:layout_height="wrap_content"
|
|
android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album.artist)}"
|
|
android:text="@{song.resolvedArtistName}"
|
|
app:layout_constraintBottom_toTopOf="@+id/playback_album"
|
|
app:layout_constraintStart_toStartOf="@+id/playback_song_container"
|
|
app:layout_constraintEnd_toEndOf="@+id/playback_song_container"
|
|
app:layout_constraintHorizontal_bias="0.0"
|
|
app:layout_constraintTop_toBottomOf="@+id/playback_song_container"
|
|
tools:text="Artist Name" />
|
|
|
|
<TextView
|
|
android:id="@+id/playback_album"
|
|
style="@style/Widget.Auxio.TextView.Secondary"
|
|
android:layout_width="0dp"
|
|
android:layout_height="wrap_content"
|
|
android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album)}"
|
|
android:text="@{song.resolvedAlbumName}"
|
|
app:layout_constraintBottom_toTopOf="@+id/playback_seek_bar"
|
|
app:layout_constraintHorizontal_bias="0.5"
|
|
app:layout_constraintStart_toStartOf="@+id/playback_song_container"
|
|
app:layout_constraintEnd_toEndOf="@+id/playback_song_container"
|
|
app:layout_constraintTop_toBottomOf="@+id/playback_artist"
|
|
tools:text="Album Name" />
|
|
|
|
<org.oxycblt.auxio.playback.PlaybackSeekBar
|
|
android:id="@+id/playback_seek_bar"
|
|
android:layout_width="0dp"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginStart="-16dp"
|
|
android:layout_marginEnd="-16dp"
|
|
app:layout_constraintBottom_toTopOf="@+id/playback_play_pause"
|
|
app:layout_constraintHorizontal_bias="0.5"
|
|
app:layout_constraintStart_toStartOf="@+id/playback_song_container"
|
|
app:layout_constraintEnd_toEndOf="@+id/playback_song_container"
|
|
app:layout_constraintTop_toBottomOf="@+id/playback_album" />
|
|
|
|
<ImageButton
|
|
android:id="@+id/playback_loop"
|
|
style="@style/Widget.Auxio.Button.Unbounded"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginEnd="@dimen/spacing_large"
|
|
android:contentDescription="@string/desc_change_loop"
|
|
android:onClick="@{() -> playbackModel.incrementLoopStatus()}"
|
|
android:src="@drawable/ic_loop"
|
|
app:layout_constraintBottom_toBottomOf="@+id/playback_skip_prev"
|
|
app:layout_constraintEnd_toStartOf="@+id/playback_skip_prev"
|
|
app:layout_constraintHorizontal_chainStyle="packed"
|
|
app:layout_constraintTop_toTopOf="@+id/playback_skip_prev" />
|
|
|
|
<ImageButton
|
|
android:id="@+id/playback_skip_prev"
|
|
style="@style/Widget.Auxio.Button.Unbounded"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginEnd="@dimen/spacing_large"
|
|
android:contentDescription="@string/desc_skip_prev"
|
|
android:onClick="@{() -> playbackModel.skipPrev()}"
|
|
android:src="@drawable/ic_skip_prev"
|
|
app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
|
|
app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
|
|
app:layout_constraintTop_toTopOf="@+id/playback_play_pause" />
|
|
|
|
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
|
android:id="@+id/playback_play_pause"
|
|
style="@style/Widget.Auxio.FloatingActionButton.PlayPause"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:contentDescription="@string/desc_play_pause"
|
|
android:onClick="@{() -> playbackModel.invertPlayingStatus()}"
|
|
android:src="@drawable/sel_playing_state"
|
|
app:layout_constraintBottom_toBottomOf="parent"
|
|
app:layout_constraintEnd_toEndOf="@+id/playback_seek_bar"
|
|
app:layout_constraintStart_toStartOf="@+id/playback_seek_bar"
|
|
app:layout_constraintTop_toBottomOf="@+id/playback_seek_bar"
|
|
tools:src="@drawable/ic_pause" />
|
|
|
|
<ImageButton
|
|
android:id="@+id/playback_skip_next"
|
|
style="@style/Widget.Auxio.Button.Unbounded"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginStart="@dimen/spacing_large"
|
|
android:contentDescription="@string/desc_skip_next"
|
|
android:onClick="@{() -> playbackModel.skipNext()}"
|
|
android:src="@drawable/ic_skip_next"
|
|
app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
|
|
app:layout_constraintStart_toEndOf="@+id/playback_play_pause"
|
|
app:layout_constraintTop_toTopOf="@+id/playback_play_pause" />
|
|
|
|
<ImageButton
|
|
android:id="@+id/playback_shuffle"
|
|
style="@style/Widget.Auxio.Button.Unbounded"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginStart="@dimen/spacing_large"
|
|
android:contentDescription="@string/desc_shuffle"
|
|
android:onClick="@{() -> playbackModel.invertShuffleStatus()}"
|
|
android:src="@drawable/ic_shuffle"
|
|
app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"
|
|
app:layout_constraintStart_toEndOf="@+id/playback_skip_next"
|
|
app:layout_constraintTop_toTopOf="@+id/playback_skip_next"
|
|
app:tint="@color/sel_accented" />
|
|
|
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
</layout> |