Generalized the song and podcastEpisode field to Media

This commit is contained in:
CappielloAntonio 2022-02-07 17:34:46 +01:00
parent ae941ad769
commit bf09a581b9
13 changed files with 154 additions and 136 deletions

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.media3.ui.PlayerControlView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/now_playing_song_controller_view"
android:id="@+id/now_playing_media_controller_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:controller_layout_id="@layout/inner_fragment_player_controller_layout"

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/now_playing_song_controller_layout"
android:id="@+id/now_playing_media_controller_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -44,7 +44,7 @@
</com.google.android.material.appbar.AppBarLayout>
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/player_song_cover_view_pager"
android:id="@+id/player_media_cover_view_pager"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/guideline"
@ -60,7 +60,7 @@
app:layout_constraintGuide_percent="0.60" />
<TextView
android:id="@+id/player_song_title_label"
android:id="@+id/player_media_title_label"
style="@style/HeadlineLarge"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -84,9 +84,9 @@
android:text=""
android:textOff=""
android:textOn=""
app:layout_constraintBottom_toBottomOf="@+id/player_song_title_label"
app:layout_constraintBottom_toBottomOf="@+id/player_media_title_label"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/player_song_title_label" />
app:layout_constraintTop_toTopOf="@+id/player_media_title_label" />
<TextView
android:id="@+id/player_artist_name_label"
@ -99,7 +99,7 @@
android:maxLines="2"
android:text="@string/label_placeholder"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/player_song_title_label" />
app:layout_constraintTop_toBottomOf="@+id/player_media_title_label" />
<TextView
android:id="@+id/exo_position"

View file

@ -7,7 +7,7 @@
android:clipChildren="false">
<ImageView
android:id="@+id/player_header_song_cover_image"
android:id="@+id/player_header_media_cover_image"
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_gravity="center"
@ -17,7 +17,7 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/player_header_song_title_label"
android:id="@+id/player_header_media_title_label"
style="@style/LabelMedium"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -27,11 +27,11 @@
android:paddingStart="8dp"
android:paddingEnd="8dp"
app:layout_constraintEnd_toStartOf="@+id/player_header_button"
app:layout_constraintStart_toEndOf="@+id/player_header_song_cover_image"
app:layout_constraintStart_toEndOf="@+id/player_header_media_cover_image"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/player_header_song_artist_label"
android:id="@+id/player_header_media_artist_label"
style="@style/LabelSmall"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -40,8 +40,8 @@
android:paddingStart="8dp"
android:paddingEnd="8dp"
app:layout_constraintEnd_toStartOf="@+id/player_header_button"
app:layout_constraintStart_toEndOf="@+id/player_header_song_cover_image"
app:layout_constraintTop_toBottomOf="@+id/player_header_song_title_label" />
app:layout_constraintStart_toEndOf="@+id/player_header_media_cover_image"
app:layout_constraintTop_toBottomOf="@+id/player_header_media_title_label" />
<ToggleButton
android:id="@+id/player_header_button"
@ -56,11 +56,11 @@
android:textOff=""
android:textOn=""
app:layout_constraintBottom_toTopOf="@+id/player_header_seek_bar"
app:layout_constraintEnd_toStartOf="@+id/player_header_next_song_button"
app:layout_constraintEnd_toStartOf="@+id/player_header_next_media_button"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/player_header_next_song_button"
android:id="@+id/player_header_next_media_button"
android:layout_width="28dp"
android:layout_height="28dp"
android:layout_marginStart="12dp"