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

widgets: simplify layouts

Browse source 
Simplify the layouts used by widgets, moving the more version-specific
attributes into settings.
This commit is contained in:
OxygenCobalt 2021-08-05 17:00:59 -06:00
parent 8c07f8cd8c
commit b51ec756de
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
20 changed files with 100 additions and 299 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View file

@ -57,7 +57,7 @@
android:roundIcon="@mipmap/ic_launcher_round" /> android:roundIcon="@mipmap/ic_launcher_round" />
<receiver <receiver
android:label="@string/info_channel_name" android:label="@string/info_widget_name"
android:name=".widgets.WidgetProvider" android:name=".widgets.WidgetProvider"
android:exported="false"> android:exported="false">

2
app/src/main/java/org/oxycblt/auxio/widgets/forms/FullWidgetForm.kt
View file

@ -70,7 +70,7 @@ class FullWidgetForm : WidgetForm(R.layout.widget_full) {
views.setCharSequence( views.setCharSequence(
R.id.widget_cover, R.id.widget_cover,
"setContentDescription", "setContentDescription",
context.getString(R.string.description_placeholder_cover) context.getString(R.string.description_no_cover)
) )
} }

2
app/src/main/java/org/oxycblt/auxio/widgets/forms/SmallWidgetForm.kt
View file

@ -55,7 +55,7 @@ class SmallWidgetForm : WidgetForm(R.layout.widget_small) {
views.setCharSequence( views.setCharSequence(
R.id.widget_cover, R.id.widget_cover,
"setContentDescription", "setContentDescription",
context.getString(R.string.description_placeholder_cover) context.getString(R.string.description_no_cover)
) )
} }

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

@ -148,7 +148,6 @@
<ImageButton <ImageButton
android:id="@+id/playback_skip_prev" android:id="@+id/playback_skip_prev"
style="@style/Widget.Button.Unbounded" style="@style/Widget.Button.Unbounded"
android:background="@drawable/ui_unbounded_ripple"
android:contentDescription="@string/description_skip_prev" android:contentDescription="@string/description_skip_prev"
android:onClick="@{() -> playbackModel.skipPrev()}" android:onClick="@{() -> playbackModel.skipPrev()}"
android:src="@drawable/ic_skip_prev" android:src="@drawable/ic_skip_prev"
@ -170,7 +169,6 @@
<ImageButton <ImageButton
android:id="@+id/playback_skip_next" android:id="@+id/playback_skip_next"
style="@style/Widget.Button.Unbounded" style="@style/Widget.Button.Unbounded"
android:background="@drawable/ui_unbounded_ripple"
android:contentDescription="@string/description_skip_next" android:contentDescription="@string/description_skip_next"
android:onClick="@{() -> playbackModel.skipNext()}" android:onClick="@{() -> playbackModel.skipNext()}"
android:src="@drawable/ic_skip_next" android:src="@drawable/ic_skip_next"
@ -183,8 +181,7 @@
android:id="@+id/playback_shuffle" android:id="@+id/playback_shuffle"
style="@style/Widget.Button.Unbounded" style="@style/Widget.Button.Unbounded"
android:layout_marginEnd="@dimen/spacing_small" android:layout_marginEnd="@dimen/spacing_small"
android:background="@drawable/ui_unbounded_ripple" android:contentDescription="@string/description_shuffle"
android:contentDescription="@{playbackModel.isShuffling() ? @string/description_shuffle_off : @string/description_shuffle_on"
android:onClick="@{() -> playbackModel.invertShuffleStatus()}" android:onClick="@{() -> playbackModel.invertShuffleStatus()}"
android:src="@drawable/ic_shuffle" android:src="@drawable/ic_shuffle"
app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next" app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"

101
app/src/main/res/layout-v31/widget_full.xml
View file

@ -1,101 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@android:id/background"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:theme="@style/Theme.Widget">
<ImageView
android:id="@+id/widget_cover"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="?attr/colorSurface"
android:scaleType="centerCrop"
tools:ignore="contentDescription"
android:src="@drawable/ic_song" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="?attr/colorSurface"
android:orientation="vertical"
android:padding="@dimen/spacing_medium">
<TextView
android:id="@+id/widget_song"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:fontFamily="@font/inter"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
android:text="@string/placeholder_widget_song" />
<TextView
android:id="@+id/widget_artist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:fontFamily="@font/inter"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
android:textColor="?android:attr/textColorSecondary"
android:text="@string/placeholder_widget_artist" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_medium"
android:orientation="horizontal">
<ImageButton
android:id="@+id/widget_loop"
style="@style/Widget.Button.Unbounded.Widget.V31"
android:layout_width="0dp"
android:layout_weight="1"
android:contentDescription="@string/description_change_loop"
android:src="@drawable/ic_loop" />
<ImageButton
android:id="@+id/widget_skip_prev"
style="@style/Widget.Button.Unbounded.Widget.V31"
android:layout_width="0dp"
android:layout_weight="1"
android:contentDescription="@string/description_skip_prev"
android:src="@drawable/ic_skip_prev" />
<ImageButton
android:id="@+id/widget_play_pause"
style="@style/Widget.Button.Unbounded.Widget.V31"
android:layout_width="0dp"
android:layout_weight="1"
android:contentDescription="@string/description_play_pause"
android:src="@drawable/ic_play" />
<ImageButton
android:id="@+id/widget_skip_next"
style="@style/Widget.Button.Unbounded.Widget.V31"
android:layout_width="0dp"
android:layout_weight="1"
android:contentDescription="@string/description_skip_next"
android:src="@drawable/ic_skip_next" />
<ImageButton
android:id="@+id/widget_shuffle"
style="@style/Widget.Button.Unbounded.Widget.V31"
android:layout_width="0dp"
android:layout_weight="1"
android:contentDescription="@string/description_shuffle_off"
android:src="@drawable/ic_shuffle" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

85
app/src/main/res/layout-v31/widget_small.xml
View file

@ -1,85 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@android:id/background"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:theme="@style/Theme.Widget">
<ImageView
android:id="@+id/widget_cover"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="?attr/colorSurface"
android:scaleType="centerCrop"
tools:ignore="contentDescription"
android:src="@drawable/ic_song" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="?attr/colorSurface"
android:orientation="vertical"
android:padding="@dimen/spacing_medium">
<TextView
android:id="@+id/widget_song"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:fontFamily="@font/inter"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
android:text="@string/placeholder_widget_song" />
<TextView
android:id="@+id/widget_artist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:fontFamily="@font/inter"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
android:textColor="?android:attr/textColorSecondary"
android:text="@string/placeholder_widget_artist" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_medium"
android:orientation="horizontal">
<ImageButton
android:id="@+id/widget_skip_prev"
style="@style/Widget.Button.Unbounded.Widget.V31"
android:layout_width="0dp"
android:layout_weight="1"
android:contentDescription="@string/description_skip_prev"
android:src="@drawable/ic_skip_prev" />
<ImageButton
android:id="@+id/widget_play_pause"
style="@style/Widget.Button.Unbounded.Widget.V31"
android:layout_width="0dp"
android:layout_weight="1"
android:contentDescription="@string/description_play_pause"
android:src="@drawable/ic_play" />
<ImageButton
android:id="@+id/widget_skip_next"
style="@style/Widget.Button.Unbounded.Widget.V31"
android:layout_width="0dp"
android:layout_weight="1"
android:contentDescription="@string/description_skip_next"
android:src="@drawable/ic_skip_next" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

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

@ -103,9 +103,9 @@
<SeekBar <SeekBar
android:id="@+id/playback_seek_bar" android:id="@+id/playback_seek_bar"
style="@style/Widget.SeekBar.Full"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/Widget.SeekBar.Full"
android:layout_marginTop="@dimen/spacing_medium" android:layout_marginTop="@dimen/spacing_medium"
app:layout_constraintBottom_toTopOf="@+id/playback_duration_current" app:layout_constraintBottom_toTopOf="@+id/playback_duration_current"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -182,7 +182,7 @@
android:id="@+id/playback_shuffle" android:id="@+id/playback_shuffle"
style="@style/Widget.Button.Unbounded" style="@style/Widget.Button.Unbounded"
android:layout_marginStart="@dimen/spacing_large" android:layout_marginStart="@dimen/spacing_large"
android:contentDescription="@{playbackModel.isShuffling() ? @string/description_shuffle_off : @string/description_shuffle_on" android:contentDescription="@string/description_shuffle"
android:onClick="@{() -> playbackModel.invertShuffleStatus()}" android:onClick="@{() -> playbackModel.invertShuffleStatus()}"
android:src="@drawable/ic_shuffle" android:src="@drawable/ic_shuffle"
app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next" app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"

7
app/src/main/res/layout-xlarge/fragment_playback.xml
View file

@ -89,9 +89,9 @@
<SeekBar <SeekBar
android:id="@+id/playback_seek_bar" android:id="@+id/playback_seek_bar"
style="@style/Widget.SeekBar.Full"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/Widget.SeekBar.Full"
android:paddingStart="@dimen/spacing_mid_huge" android:paddingStart="@dimen/spacing_mid_huge"
android:paddingEnd="@dimen/spacing_mid_huge" android:paddingEnd="@dimen/spacing_mid_huge"
app:layout_constraintBottom_toTopOf="@+id/playback_duration_current" app:layout_constraintBottom_toTopOf="@+id/playback_duration_current"
@ -137,7 +137,6 @@
android:id="@+id/playback_skip_prev" android:id="@+id/playback_skip_prev"
style="@style/Widget.Button.Unbounded" style="@style/Widget.Button.Unbounded"
android:layout_marginEnd="@dimen/spacing_large" android:layout_marginEnd="@dimen/spacing_large"
android:background="@drawable/ui_unbounded_ripple"
android:contentDescription="@string/description_skip_prev" android:contentDescription="@string/description_skip_prev"
android:onClick="@{() -> playbackModel.skipPrev()}" android:onClick="@{() -> playbackModel.skipPrev()}"
android:src="@drawable/ic_skip_prev" android:src="@drawable/ic_skip_prev"
@ -159,7 +158,6 @@
android:id="@+id/playback_skip_next" android:id="@+id/playback_skip_next"
style="@style/Widget.Button.Unbounded" style="@style/Widget.Button.Unbounded"
android:layout_marginStart="@dimen/spacing_large" android:layout_marginStart="@dimen/spacing_large"
android:background="@drawable/ui_unbounded_ripple"
android:contentDescription="@string/description_skip_next" android:contentDescription="@string/description_skip_next"
android:onClick="@{() -> playbackModel.skipNext()}" android:onClick="@{() -> playbackModel.skipNext()}"
android:src="@drawable/ic_skip_next" android:src="@drawable/ic_skip_next"
@ -171,8 +169,7 @@
android:id="@+id/playback_shuffle" android:id="@+id/playback_shuffle"
style="@style/Widget.Button.Unbounded" style="@style/Widget.Button.Unbounded"
android:layout_marginStart="@dimen/spacing_large" android:layout_marginStart="@dimen/spacing_large"
android:background="@drawable/ui_unbounded_ripple" android:contentDescription="@string/description_shuffle"
android:contentDescription="@{playbackModel.isShuffling() ? @string/description_shuffle_off : @string/description_shuffle_on"
android:onClick="@{() -> playbackModel.invertShuffleStatus()}" android:onClick="@{() -> playbackModel.invertShuffleStatus()}"
android:src="@drawable/ic_shuffle" android:src="@drawable/ic_shuffle"
app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next" app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"

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

@ -165,7 +165,7 @@
android:id="@+id/playback_shuffle" android:id="@+id/playback_shuffle"
style="@style/Widget.Button.Unbounded" style="@style/Widget.Button.Unbounded"
android:layout_marginEnd="@dimen/spacing_small" android:layout_marginEnd="@dimen/spacing_small"
android:contentDescription="@{playbackModel.isShuffling() ? @string/description_shuffle_off : @string/description_shuffle_on" android:contentDescription="@string/description_shuffle"
android:onClick="@{() -> playbackModel.invertShuffleStatus()}" android:onClick="@{() -> playbackModel.invertShuffleStatus()}"
android:src="@drawable/ic_shuffle" android:src="@drawable/ic_shuffle"
app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next" app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"

2
app/src/main/res/layout/widget_default.xml
View file

@ -10,7 +10,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:alpha="0.3" android:alpha="0.3"
android:contentDescription="@string/description_placeholder_cover" android:contentDescription="@string/description_no_cover"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/ic_song" /> android:src="@drawable/ic_song" />

45
app/src/main/res/layout/widget_full.xml
View file

@ -9,44 +9,21 @@
<ImageView <ImageView
android:id="@+id/widget_cover" android:id="@+id/widget_cover"
android:layout_width="match_parent" style="@style/FluidImageView"
android:layout_height="0dp" android:contentDescription="@string/description_no_cover"
android:layout_weight="1"
android:background="?attr/colorSurface"
android:scaleType="centerCrop"
tools:ignore="contentDescription"
android:src="@drawable/ic_song" /> android:src="@drawable/ic_song" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" style="@style/WidgetPanel">
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:elevation="@dimen/elevation_normal"
android:background="?attr/colorSurface"
android:orientation="vertical"
android:padding="@dimen/spacing_medium">
<TextView <TextView
android:id="@+id/widget_song" android:id="@+id/widget_song"
android:layout_width="match_parent" style="@style/Widget.TextView.Widget.Primary"
android:layout_height="wrap_content"
android:ellipsize="end"
android:fontFamily="@font/inter"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
android:text="@string/placeholder_widget_song" /> android:text="@string/placeholder_widget_song" />
<TextView <TextView
android:id="@+id/widget_artist" android:id="@+id/widget_artist"
android:layout_width="match_parent" style="@style/Widget.TextView.Widget.Secondary"
android:layout_height="wrap_content"
android:ellipsize="end"
android:fontFamily="@font/inter"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
android:textColor="?android:attr/textColorSecondary"
android:text="@string/placeholder_widget_artist" /> android:text="@string/placeholder_widget_artist" />
<LinearLayout <LinearLayout
@ -58,41 +35,31 @@
<ImageButton <ImageButton
android:id="@+id/widget_loop" android:id="@+id/widget_loop"
style="@style/Widget.Button.Unbounded.Widget" style="@style/Widget.Button.Unbounded.Widget"
android:layout_width="0dp"
android:layout_weight="1"
android:contentDescription="@string/description_change_loop" android:contentDescription="@string/description_change_loop"
android:src="@drawable/ic_loop" /> android:src="@drawable/ic_loop" />
<ImageButton <ImageButton
android:id="@+id/widget_skip_prev" android:id="@+id/widget_skip_prev"
style="@style/Widget.Button.Unbounded.Widget" style="@style/Widget.Button.Unbounded.Widget"
android:layout_width="0dp"
android:layout_weight="1"
android:contentDescription="@string/description_skip_prev" android:contentDescription="@string/description_skip_prev"
android:src="@drawable/ic_skip_prev" /> android:src="@drawable/ic_skip_prev" />
<ImageButton <ImageButton
android:id="@+id/widget_play_pause" android:id="@+id/widget_play_pause"
style="@style/Widget.Button.Unbounded.Widget" style="@style/Widget.Button.Unbounded.Widget"
android:layout_width="0dp"
android:layout_weight="1"
android:contentDescription="@string/description_play_pause" android:contentDescription="@string/description_play_pause"
android:src="@drawable/ic_play" /> android:src="@drawable/ic_play" />
<ImageButton <ImageButton
android:id="@+id/widget_skip_next" android:id="@+id/widget_skip_next"
style="@style/Widget.Button.Unbounded.Widget" style="@style/Widget.Button.Unbounded.Widget"
android:layout_width="0dp"
android:layout_weight="1"
android:contentDescription="@string/description_skip_next" android:contentDescription="@string/description_skip_next"
android:src="@drawable/ic_skip_next" /> android:src="@drawable/ic_skip_next" />
<ImageButton <ImageButton
android:id="@+id/widget_shuffle" android:id="@+id/widget_shuffle"
style="@style/Widget.Button.Unbounded.Widget" style="@style/Widget.Button.Unbounded.Widget"
android:layout_width="0dp" android:contentDescription="@string/description_shuffle"
android:layout_weight="1"
android:contentDescription="@string/description_shuffle_off"
android:src="@drawable/ic_shuffle" /> android:src="@drawable/ic_shuffle" />
</LinearLayout> </LinearLayout>

45
app/src/main/res/layout/widget_small.xml
View file

@ -9,44 +9,21 @@
<ImageView <ImageView
android:id="@+id/widget_cover" android:id="@+id/widget_cover"
android:layout_width="match_parent" style="@style/FluidImageView"
android:layout_height="0dp" android:contentDescription="@string/description_no_cover"
android:layout_weight="1"
android:background="?attr/colorSurface"
android:scaleType="centerCrop"
tools:ignore="contentDescription"
android:src="@drawable/ic_song" /> android:src="@drawable/ic_song" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" style="@style/WidgetPanel">
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="?attr/colorSurface"
android:elevation="@dimen/elevation_normal"
android:orientation="vertical"
android:padding="@dimen/spacing_medium">
<TextView <TextView
android:id="@+id/widget_song" android:id="@+id/widget_song"
android:layout_width="match_parent" style="@style/Widget.TextView.Widget.Primary"
android:layout_height="wrap_content"
android:ellipsize="end"
android:fontFamily="@font/inter"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
android:text="@string/placeholder_widget_song" /> android:text="@string/placeholder_widget_song" />
<TextView <TextView
android:id="@+id/widget_artist" android:id="@+id/widget_artist"
android:layout_width="match_parent" style="@style/Widget.TextView.Widget.Secondary"
android:layout_height="wrap_content"
android:ellipsize="end"
android:fontFamily="@font/inter"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
android:textColor="?android:attr/textColorSecondary"
android:text="@string/placeholder_widget_artist" /> android:text="@string/placeholder_widget_artist" />
<LinearLayout <LinearLayout
@ -54,33 +31,21 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_medium"> android:layout_marginTop="@dimen/spacing_medium">
<!--
Can't use a normal unbounded ripple here since it causes a weird bug
where the ripples will have a fixed starting size. Default to the
uglier system ripple instead.
-->
<ImageButton <ImageButton
android:id="@+id/widget_skip_prev" android:id="@+id/widget_skip_prev"
style="@style/Widget.Button.Unbounded.Widget" style="@style/Widget.Button.Unbounded.Widget"
android:layout_width="0dp"
android:layout_weight="1"
android:contentDescription="@string/description_skip_prev" android:contentDescription="@string/description_skip_prev"
android:src="@drawable/ic_skip_prev" /> android:src="@drawable/ic_skip_prev" />
<ImageButton <ImageButton
android:id="@+id/widget_play_pause" android:id="@+id/widget_play_pause"
style="@style/Widget.Button.Unbounded.Widget" style="@style/Widget.Button.Unbounded.Widget"
android:layout_width="0dp"
android:layout_weight="1"
android:contentDescription="@string/description_play_pause" android:contentDescription="@string/description_play_pause"
android:src="@drawable/ic_play" /> android:src="@drawable/ic_play" />
<ImageButton <ImageButton
android:id="@+id/widget_skip_next" android:id="@+id/widget_skip_next"
style="@style/Widget.Button.Unbounded.Widget" style="@style/Widget.Button.Unbounded.Widget"
android:layout_width="0dp"
android:layout_weight="1"
android:contentDescription="@string/description_skip_next" android:contentDescription="@string/description_skip_next"
android:src="@drawable/ic_skip_next" /> android:src="@drawable/ic_skip_next" />

2
app/src/main/res/values-de/strings.xml
View file

@ -109,8 +109,6 @@
<string name="description_play_pause">Abspielen oder Pausieren</string> <string name="description_play_pause">Abspielen oder Pausieren</string>
<string name="description_skip_prev">Zu letzter Lied springen</string> <string name="description_skip_prev">Zu letzter Lied springen</string>
<string name="description_skip_next">Zu nächster Lied springen</string> <string name="description_skip_next">Zu nächster Lied springen</string>
<string name="description_shuffle_on">Zufällig anschalten</string>
<string name="description_shuffle_off">Zufällig ausschalten</string>
<string name="description_change_loop">Art die Wiederholung ändern</string> <string name="description_change_loop">Art die Wiederholung ändern</string>
<string name="description_clear_search">Suchanfrage löschen</string> <string name="description_clear_search">Suchanfrage löschen</string>

2
app/src/main/res/values-es/strings.xml
View file

@ -112,8 +112,6 @@
<string name="description_play_pause">Reproducir o Pausar</string> <string name="description_play_pause">Reproducir o Pausar</string>
<string name="description_skip_next">Saltar a la siguiente canción</string> <string name="description_skip_next">Saltar a la siguiente canción</string>
<string name="description_skip_prev">Saltar a la última canción</string> <string name="description_skip_prev">Saltar a la última canción</string>
<string name="description_shuffle_on">Activar la reproducción aleatoria</string>
<string name="description_shuffle_off">Desactivar la reproducción aleatoria</string>
<string name="description_change_loop">Cambiar el modo de repetición</string> <string name="description_change_loop">Cambiar el modo de repetición</string>
<string name="description_clear_user_queue">Limpiar cola</string> <string name="description_clear_user_queue">Limpiar cola</string>

2
app/src/main/res/values-nl/strings.xml
View file

@ -110,8 +110,6 @@
<string name="description_play_pause">Afspelen/Pauzeren</string> <string name="description_play_pause">Afspelen/Pauzeren</string>
<string name="description_skip_next">Naar volgend nummer gaan</string> <string name="description_skip_next">Naar volgend nummer gaan</string>
<string name="description_skip_prev">Naar het laatste nummer gaan</string> <string name="description_skip_prev">Naar het laatste nummer gaan</string>
<string name="description_shuffle_on">Zet shuffle aan</string>
<string name="description_shuffle_off">Zet shuffle uit</string>
<string name="description_change_loop">Herhaalfunctie wijzigen</string> <string name="description_change_loop">Herhaalfunctie wijzigen</string>
<string name="description_clear_user_queue">Wachtrij wissen</string> <string name="description_clear_user_queue">Wachtrij wissen</string>

8
app/src/main/res/values-v31/styles_ui.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Widget.Button.Unbounded.Widget" parent="Widget.Button.Unbounded.Widget.Base">
<item name="android:background">@drawable/ui_unbounded_ripple</item>
</style>
<style name="WidgetPanel" parent="WidgetPanel.Base" />
</resources>

1
app/src/main/res/values/dimens.xml
View file

@ -12,6 +12,7 @@
<!-- Height Namespace | Height for UI elements --> <!-- Height Namespace | Height for UI elements -->
<dimen name="height_compact_progress">2dp</dimen> <dimen name="height_compact_progress">2dp</dimen>
<dimen name="height_widget_button">32dp</dimen>
<!-- Width Namespace | Width for UI elements --> <!-- Width Namespace | Width for UI elements -->
<dimen name="width_track_number">32dp</dimen> <dimen name="width_track_number">32dp</dimen>

10
app/src/main/res/values/strings.xml
View file

@ -4,8 +4,9 @@
<!-- Info namespace | App labels --> <!-- Info namespace | App labels -->
<string name="info_app_desc">A simple, rational music player for android.</string> <string name="info_app_desc">A simple, rational music player for android.</string>
<string name="info_channel_name">Now Playing</string> <string name="info_channel_name">Music Playback</string>
<string name="info_widget_desc">See and control playing music</string> <string name="info_widget_name">Now Playing</string>
<string name="info_widget_desc">View and control music playback</string>
<!-- Label Namespace | Static Labels --> <!-- Label Namespace | Static Labels -->
<string name="label_retry">Retry</string> <string name="label_retry">Retry</string>
@ -117,9 +118,8 @@
<string name="description_play_pause">Play or Pause</string> <string name="description_play_pause">Play or Pause</string>
<string name="description_skip_next">Skip to next song</string> <string name="description_skip_next">Skip to next song</string>
<string name="description_skip_prev">Skip to last song</string> <string name="description_skip_prev">Skip to last song</string>
<string name="description_shuffle_on">Turn shuffle on</string>
<string name="description_shuffle_off">Turn shuffle off</string>
<string name="description_change_loop">Change Repeat Mode</string> <string name="description_change_loop">Change Repeat Mode</string>
<string name="description_shuffle">Turn shuffle on or off</string>
<string name="description_clear_user_queue">Clear queue</string> <string name="description_clear_user_queue">Clear queue</string>
<string name="description_clear_search">Clear search query</string> <string name="description_clear_search">Clear search query</string>
@ -127,7 +127,7 @@
<string name="description_error">Error</string> <string name="description_error">Error</string>
<string name="description_auxio_icon">Auxio icon</string> <string name="description_auxio_icon">Auxio icon</string>
<string name="description_placeholder_cover">Album cover</string> <string name="description_no_cover">Album cover</string>
<string name="description_album_cover">Album Cover for %s</string> <string name="description_album_cover">Album Cover for %s</string>
<string name="description_artist_image">Artist Image for %s</string> <string name="description_artist_image">Artist Image for %s</string>
<string name="description_genre_image">Genre Image for %s</string> <string name="description_genre_image">Genre Image for %s</string>

44
app/src/main/res/values/styles_component.xml
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!-- COMPONENT-SPECIFIC STYLES. NOT RE-USABLE. --> <!-- COMPONENT-SPECIFIC STYLES. NOT RE-USABLE. -->
<!-- TODO: Extract the component-specific and general styles into separate stylesheets -->
<!-- Title theme for Detail Fragments --> <!-- Title theme for Detail Fragments -->
<style name="DetailTitleText"> <style name="DetailTitleText">
@ -102,14 +103,41 @@
<item name="android:fontFamily">@font/inter_semibold</item> <item name="android:fontFamily">@font/inter_semibold</item>
<item name="android:ellipsize">marquee</item> <item name="android:ellipsize">marquee</item>
<item name="android:marqueeRepeatLimit">marquee_forever</item> <item name="android:marqueeRepeatLimit">marquee_forever</item>
<item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6</item> <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6
</item>
</style> </style>
<!-- Style for the album/artist text in PlaybackFragment --> <!-- Style for the album/artist text in PlaybackFragment -->
<style name="Widget.TextView.Playback.Secondary" parent="Widget.TextView.Playback.Base"> <style name="Widget.TextView.Playback.Secondary" parent="Widget.TextView.Playback.Base">
<item name="android:ellipsize">end</item> <item name="android:ellipsize">end</item>
<item name="android:textColor">?android:attr/textColorSecondary</item> <item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Subtitle1</item> <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Subtitle1
</item>
</style>
<!-- Style for text used in widgets -->
<style name="Widget.TextView.Widget.Base" parent="Widget.AppCompat.TextView">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:singleLine">true</item>
<item name="android:textAlignment">viewStart</item>
</style>
<!-- Style for the title text in PlaybackFragment -->
<style name="Widget.TextView.Widget.Primary" parent="Widget.TextView.Widget.Base">
<item name="android:fontFamily">@font/inter</item>
<item name="android:textStyle">bold</item>
<item name="android:ellipsize">end</item>
<item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6
</item>
</style>
<!-- Style for the album/artist text in PlaybackFragment -->
<style name="Widget.TextView.Widget.Secondary" parent="Widget.TextView.Widget.Base">
<item name="android:ellipsize">end</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Subtitle1
</item>
</style> </style>
<!-- Style for the play/pause circle button --> <!-- Style for the play/pause circle button -->
@ -144,6 +172,18 @@
<item name="android:outlineProvider">bounds</item> <item name="android:outlineProvider">bounds</item>
</style> </style>
<!--
Style for an ImageView that expands regardless of whether it can fit,
mostly used on widgets
-->
<style name="FluidImageView">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">0dp</item>
<item name="android:layout_weight">1</item>
<item name="android:background">?attr/colorSurface</item>
<item name="android:scaleType">centerCrop</item>
</style>
<!-- Style for the seekbar on PlaybackFragment --> <!-- Style for the seekbar on PlaybackFragment -->
<style name="Widget.SeekBar.Full" parent="@style/Widget.AppCompat.SeekBar"> <style name="Widget.SeekBar.Full" parent="@style/Widget.AppCompat.SeekBar">
<item name="android:clickable">true</item> <item name="android:clickable">true</item>

28
app/src/main/res/values/styles_ui.xml
View file

@ -88,14 +88,32 @@
<item name="android:textColor">?attr/colorPrimary</item> <item name="android:textColor">?attr/colorPrimary</item>
</style> </style>
<style name="Widget.Button.Unbounded.Widget" parent="Widget.AppCompat.Button.Borderless"> <style name="Widget.Button.Unbounded.Widget.Base" parent="Widget.AppCompat.Button.Borderless">
<item name="android:layout_height">32dp</item> <item name="android:layout_height">@dimen/height_widget_button</item>
<item name="android:background">?android:attr/selectableItemBackgroundBorderless</item> <item name="android:layout_width">0dp</item>
<item name="android:layout_weight">1</item>
<item name="android:scaleType">fitCenter</item> <item name="android:scaleType">fitCenter</item>
<item name="android:padding">@dimen/spacing_micro</item> <item name="android:padding">@dimen/spacing_micro</item>
</style> </style>
<style name="Widget.Button.Unbounded.Widget.V31" parent="Widget.Button.Unbounded.Widget"> <style name="Widget.Button.Unbounded.Widget" parent="Widget.Button.Unbounded.Widget.Base">
<item name="android:background">@drawable/ui_unbounded_ripple</item> <!--
Can't use a normal unbounded ripple here since it causes a weird bug
where the ripples will have a fixed starting size. Default to the
uglier system ripple instead.
-->
<item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
</style>
<style name="WidgetPanel.Base">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">match_parent</item>
<item name="android:padding">@dimen/spacing_medium</item>
<item name="android:orientation">vertical</item>
<item name="android:background">?attr/colorSurface</item>
</style>
<style name="WidgetPanel" parent="WidgetPanel.Base">
<item name="android:elevation">@dimen/elevation_normal</item>
</style> </style>
</resources> </resources>