mirror of
https://github.com/antebudimir/tempus.git
synced 2026-01-01 09:53:33 +00:00
Implementation of the display of song lyrics where present
This commit is contained in:
parent
12ce97836d
commit
40cbf289af
8 changed files with 148 additions and 14 deletions
|
|
@ -33,8 +33,8 @@
|
|||
android:layout_height="32dp"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:foreground="?android:attr/selectableItemBackgroundBorderless"
|
||||
android:background="@drawable/ic_bottom_sheet_down" />
|
||||
android:background="@drawable/ic_bottom_sheet_down"
|
||||
android:foreground="?android:attr/selectableItemBackgroundBorderless" />
|
||||
|
||||
<TextView
|
||||
style="@style/ToolbarTextView"
|
||||
|
|
@ -51,8 +51,8 @@
|
|||
android:id="@+id/player_song_cover_view_pager"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_marginStart="24dp"
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_marginEnd="24dp"
|
||||
app:layout_constraintDimensionRatio="H,1:1"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
|
|
@ -63,8 +63,8 @@
|
|||
android:id="@+id/player_big_timer"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:layout_marginTop="12dp"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/player_song_cover_view_pager">
|
||||
|
|
@ -148,7 +148,7 @@
|
|||
app:layout_constraintTop_toBottomOf="@+id/player_song_title_label" />
|
||||
|
||||
<View
|
||||
android:id="@+id/player_divider"
|
||||
android:id="@+id/player_divider_top"
|
||||
style="@style/Divider"
|
||||
android:layout_marginStart="18dp"
|
||||
android:layout_marginEnd="18dp"
|
||||
|
|
@ -156,6 +156,70 @@
|
|||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/player_artist_name_label" />
|
||||
|
||||
<androidx.cardview.widget.CardView
|
||||
android:id="@+id/player_song_lyrics_cardview"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
app:cardElevation="0dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/player_divider_top">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:animateLayoutChanges="true">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/player_song_lyrics_label"
|
||||
style="@style/HeadlineTextView"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="12dp"
|
||||
android:paddingStart="24dp"
|
||||
android:paddingEnd="24dp"
|
||||
android:text="@string/player_song_lyrics_label"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"/>
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/player_song_lyrics_label_clickable"
|
||||
style="@style/SubheadTextView"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="8dp"
|
||||
android:paddingEnd="20dp"
|
||||
android:text="@string/player_show_lyrics_button"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/player_song_lyrics_label"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/player_song_lyrics_text_view"
|
||||
style="@style/SubheadTextView"
|
||||
android:visibility="gone"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="24dp"
|
||||
android:paddingEnd="24dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/player_song_lyrics_label"/>
|
||||
|
||||
<View
|
||||
android:id="@+id/player_divider_bottom"
|
||||
style="@style/Divider"
|
||||
android:layout_marginTop="12dp"
|
||||
android:layout_marginStart="18dp"
|
||||
android:layout_marginEnd="18dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/player_song_lyrics_text_view" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</androidx.cardview.widget.CardView>
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/player_queue_recycler_view"
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -165,5 +229,5 @@
|
|||
android:paddingBottom="18dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/player_divider" />
|
||||
app:layout_constraintTop_toBottomOf="@+id/player_song_lyrics_cardview" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
|
@ -111,6 +111,9 @@
|
|||
<string name="menu_settings_button">Settings</string>
|
||||
<string name="menu_unpin_button">Unpin</string>
|
||||
<string name="player_bottom_sheet_title">Now playing</string>
|
||||
<string name="player_hide_lyrics_button">Hide</string>
|
||||
<string name="player_show_lyrics_button">Show</string>
|
||||
<string name="player_song_lyrics_label">Lyrics</string>
|
||||
<string name="playing_notification_description">The playing notification provides actions for play/pause etc.</string>
|
||||
<string name="playing_notification_name">Playing Notification</string>
|
||||
<string name="playlist_catalogue_title">Playlist Catalogue</string>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue