84295dcf25
Completely rework the way Auxio handles icons. This is mostly two changes: 1. Removing ImageButton/StyledImageButton for MaterialButton. This is done by abusing MaterialButton's theming options to make it only show an icon. 2. Standardizing icon sizes into small, medium, and large categories. Small is the default, Medium and Large are for edge-cases like the playback icons which look horrible at 24dp. 3. Abusing the Toolbar to make it follow Material 3 guidelines. This mostly involved removing the strange icon sizing and correctly padding the view. 4. Reworking the playback bar to use more, smaller icons, making it more like a Toolbar in the process (which I like).
152 lines
7 KiB
XML
152 lines
7 KiB
XML
<?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"
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent">
|
|
|
|
<com.google.android.material.appbar.MaterialToolbar
|
|
android:id="@+id/playback_toolbar"
|
|
style="@style/Widget.Auxio.Toolbar.Icon.Down.Actions"
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
app:layout_constraintTop_toTopOf="parent"
|
|
app:menu="@menu/menu_playback"
|
|
app:title="@string/lbl_playback"
|
|
tools:subtitle="@string/lbl_all_songs" />
|
|
|
|
<org.oxycblt.auxio.ui.StyledImageView
|
|
android:id="@+id/playback_cover"
|
|
style="@style/Widget.Auxio.Image.Full"
|
|
android:layout_margin="@dimen/spacing_mid_large"
|
|
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"
|
|
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"
|
|
app:layout_constraintBottom_toTopOf="@+id/playback_album"
|
|
app:layout_constraintEnd_toEndOf="@+id/playback_song_container"
|
|
app:layout_constraintHorizontal_bias="0.0"
|
|
app:layout_constraintStart_toStartOf="@+id/playback_song_container"
|
|
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"
|
|
app:layout_constraintBottom_toTopOf="@+id/playback_seek_bar"
|
|
app:layout_constraintEnd_toEndOf="@+id/playback_song_container"
|
|
app:layout_constraintHorizontal_bias="0.5"
|
|
app:layout_constraintStart_toStartOf="@+id/playback_song_container"
|
|
app:layout_constraintTop_toBottomOf="@+id/playback_artist"
|
|
tools:text="Album Name" />
|
|
|
|
<org.oxycblt.auxio.playback.StyledSeekBar
|
|
android:id="@+id/playback_seek_bar"
|
|
android:layout_width="0dp"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginStart="@dimen/spacing_small"
|
|
android:layout_marginEnd="@dimen/spacing_small"
|
|
app:layout_constraintBottom_toTopOf="@+id/playback_play_pause"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
app:layout_constraintHorizontal_bias="0.5"
|
|
app:layout_constraintStart_toEndOf="@+id/playback_cover"
|
|
app:layout_constraintTop_toBottomOf="@+id/playback_album" />
|
|
|
|
<org.oxycblt.auxio.ui.IndicatorMaterialButton
|
|
android:id="@+id/playback_repeat"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/Widget.Auxio.Button.Icon.Large"
|
|
android:layout_marginEnd="@dimen/spacing_large"
|
|
android:contentDescription="@string/desc_change_repeat"
|
|
app:icon="@drawable/ic_repeat"
|
|
app:iconTint="@color/sel_accented"
|
|
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" />
|
|
|
|
<Button
|
|
android:id="@+id/playback_skip_prev"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:contentDescription="@string/desc_skip_prev"
|
|
style="@style/Widget.Auxio.Button.Icon.Large"
|
|
app:icon="@drawable/ic_skip_prev"
|
|
android:layout_marginEnd="@dimen/spacing_large"
|
|
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: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" />
|
|
|
|
<Button
|
|
android:id="@+id/playback_skip_next"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/Widget.Auxio.Button.Icon.Large"
|
|
app:icon="@drawable/ic_skip_next"
|
|
android:layout_marginStart="@dimen/spacing_large"
|
|
android:contentDescription="@string/desc_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" />
|
|
|
|
<org.oxycblt.auxio.ui.IndicatorMaterialButton
|
|
android:id="@+id/playback_shuffle"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/Widget.Auxio.Button.Icon.Large"
|
|
app:icon="@drawable/ic_shuffle"
|
|
app:iconTint="@color/sel_accented"
|
|
android:layout_marginStart="@dimen/spacing_large"
|
|
android:contentDescription="@string/desc_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>
|