diff --git a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt index c70033f28..db6741d63 100644 --- a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt +++ b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt @@ -164,6 +164,10 @@ class MainActivity : AppCompatActivity() { } } + /** + * Apply blind padding to accommodate left/right window insets. This is done because + * implementing insets on *phone* landscape mode is pretty impractical. + */ private fun WindowInsets.applyLeftRightInsets(contentView: View): WindowInsets { val bars = systemBarInsetsCompat contentView.updatePadding(left = bars.left, right = bars.right) diff --git a/app/src/main/java/org/oxycblt/auxio/widgets/Forms.kt b/app/src/main/java/org/oxycblt/auxio/widgets/Forms.kt index 5f73c4e20..bb79b4a2d 100644 --- a/app/src/main/java/org/oxycblt/auxio/widgets/Forms.kt +++ b/app/src/main/java/org/oxycblt/auxio/widgets/Forms.kt @@ -33,14 +33,13 @@ import org.oxycblt.auxio.util.newMainIntent fun createDefaultWidget(context: Context) = createViews(context, R.layout.widget_default) /** - * The thin widget is a weird outlier widget intended to work well on strange launchers or - * landscape grid launchers that allow really thin widget sizing. + * The thin widget is a weird outlier widget intended to work well on strange launchers or landscape + * grid launchers that allow really thin widget sizing. */ fun createThinWidget(context: Context, state: WidgetComponent.WidgetState) = createViews(context, R.layout.widget_thin) .applyMeta(context, state) .applyBasicControls(context, state) - /** * The small widget is for 2x2 widgets and just shows the cover art and playback controls. This is * generally because a Medium widget is too large for this widget size and a text-only widget is too @@ -107,7 +106,7 @@ private fun RemoteViews.applyCover( return this } -private fun RemoteViews.applyBasicControls( +private fun RemoteViews.applyPlayPauseControls( context: Context, state: WidgetComponent.WidgetState ): RemoteViews { @@ -122,6 +121,15 @@ private fun RemoteViews.applyBasicControls( R.drawable.ic_play }) + return this +} + +private fun RemoteViews.applyBasicControls( + context: Context, + state: WidgetComponent.WidgetState +): RemoteViews { + applyPlayPauseControls(context, state) + setOnClickPendingIntent( R.id.widget_skip_prev, context.newBroadcastIntent(PlaybackService.ACTION_SKIP_PREV)) diff --git a/app/src/main/res/layout/widget_thin.xml b/app/src/main/res/layout/widget_thin.xml index d35a278d9..1f363ad2d 100644 --- a/app/src/main/res/layout/widget_thin.xml +++ b/app/src/main/res/layout/widget_thin.xml @@ -54,7 +54,6 @@ - - + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 8894c76f5..8c18e2e8e 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -49,6 +49,8 @@ Lizenzen Entwickelt von OxygenCobalt + Aus + Einstellungen @@ -74,7 +76,9 @@ Kopfhörer automatische Wiedergabe Beginne die Wiedergabe immer, wenn Kopfhörer verbunden sind (funktioniert nicht auf allen Geräten) ReplayGain - Aus + Während Musikwiedergabe, Die Prälautverstärkung trifft zu dem aktuellem Abgleich + Abgleich mit Metadaten + Abgleich ohne Metadaten Titel bevorzugen Album bevorzugen @@ -175,4 +179,20 @@ Lied in der Warteschlange löschen Tab versetzen Unbekannter Künstler + Dauer + Liedermenge + Schallplatte + Titel + OK + Bibliotheke-statistiken + Dynamik + Dynamiche farbe + Schallplatte %d + +%.1f dB + -%.1f dB + Geladene Alben: %d + Geladene Künstler: %d + Geladene Genres: %d + Gesamt + ReplayGain prälautverstärkung