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

all: cleanup

Browse source 
Clean up the project after the previous changes and update some
dependencies.
This commit is contained in:
OxygenCobalt 2022-03-23 12:27:49 -06:00
parent d79592e029
commit 595a982d59
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
50 changed files with 1749 additions and 1749 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/build.gradle
View file

@ -97,10 +97,13 @@ dependencies {
implementation fileTree(dir: "libs", include: ["extension-*.aar"])
// Image loading
implementation "io.coil-kt:coil:2.0.0-rc01"
implementation "io.coil-kt:coil:2.0.0-rc02"
// Material
implementation "com.google.android.material:material:1.6.0-alpha03"
implementation "com.google.android.material:material:1.6.0-beta01"
// LeakCanary
debugImplementation "com.squareup.leakcanary:leakcanary-android:2.8.1"
}
spotless {

8
app/src/main/java/org/oxycblt/auxio/coil/CoilUtils.kt
View file

@ -38,19 +38,19 @@ import org.oxycblt.auxio.music.Song
// --- BINDING ADAPTERS ---
/** Bind the album cover for a [song]. */
fun ImageView.applyAlbumCover(song: Song?) =
fun ImageView.bindAlbumCover(song: Song?) =
load(song, R.drawable.ic_album, R.string.desc_album_cover)
/** Bind the album cover for an [album]. */
fun ImageView.applyAlbumCover(album: Album?) =
fun ImageView.bindAlbumCover(album: Album?) =
load(album, R.drawable.ic_album, R.string.desc_album_cover)
/** Bind the image for an [artist] */
fun ImageView.applyArtistImage(artist: Artist?) =
fun ImageView.bindArtistImage(artist: Artist?) =
load(artist, R.drawable.ic_artist, R.string.desc_artist_image)
/** Bind the image for a [genre] */
fun ImageView.applyGenreImage(genre: Genre?) =
fun ImageView.bindGenreImage(genre: Genre?) =
load(genre, R.drawable.ic_genre, R.string.desc_genre_image)
fun <T : Music> ImageView.load(music: T?, @DrawableRes error: Int, @StringRes desc: Int) {

4
app/src/main/java/org/oxycblt/auxio/detail/recycler/AlbumDetailAdapter.kt
View file

@ -24,7 +24,7 @@ import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import org.oxycblt.auxio.IntegerTable
import org.oxycblt.auxio.R
import org.oxycblt.auxio.coil.applyAlbumCover
import org.oxycblt.auxio.coil.bindAlbumCover
import org.oxycblt.auxio.databinding.ItemAlbumSongBinding
import org.oxycblt.auxio.databinding.ItemDetailBinding
import org.oxycblt.auxio.detail.DetailViewModel
@ -129,7 +129,7 @@ class AlbumDetailAdapter(
override fun onBind(data: Album) {
binding.detailCover.apply {
applyAlbumCover(data)
bindAlbumCover(data)
contentDescription = context.getString(R.string.desc_album_cover, data.resolvedName)
}

10
app/src/main/java/org/oxycblt/auxio/detail/recycler/ArtistDetailAdapter.kt
View file

@ -23,8 +23,8 @@ import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import org.oxycblt.auxio.IntegerTable
import org.oxycblt.auxio.R
import org.oxycblt.auxio.coil.applyAlbumCover
import org.oxycblt.auxio.coil.applyArtistImage
import org.oxycblt.auxio.coil.bindAlbumCover
import org.oxycblt.auxio.coil.bindArtistImage
import org.oxycblt.auxio.databinding.ItemDetailBinding
import org.oxycblt.auxio.databinding.ItemParentBinding
import org.oxycblt.auxio.databinding.ItemSongBinding
@ -176,7 +176,7 @@ class ArtistDetailAdapter(
val context = binding.root.context
binding.detailCover.apply {
applyArtistImage(data)
bindArtistImage(data)
contentDescription =
context.getString(R.string.desc_artist_image, data.resolvedName)
}
@ -209,7 +209,7 @@ class ArtistDetailAdapter(
private val binding: ItemParentBinding,
) : BaseViewHolder<Album>(binding, doOnClick, doOnLongClick), Highlightable {
override fun onBind(data: Album) {
binding.parentImage.applyAlbumCover(data)
binding.parentImage.bindAlbumCover(data)
binding.parentName.textSafe = data.resolvedName
binding.parentInfo.textSafe = binding.context.getString(R.string.fmt_number, data.year)
}
@ -223,7 +223,7 @@ class ArtistDetailAdapter(
private val binding: ItemSongBinding,
) : BaseViewHolder<Song>(binding, doOnSongClick, doOnLongClick), Highlightable {
override fun onBind(data: Song) {
binding.songAlbumCover.applyAlbumCover(data)
binding.songAlbumCover.bindAlbumCover(data)
binding.songName.textSafe = data.resolvedName
binding.songInfo.textSafe = data.resolvedAlbumName
}

8
app/src/main/java/org/oxycblt/auxio/detail/recycler/GenreDetailAdapter.kt
View file

@ -23,8 +23,8 @@ import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import org.oxycblt.auxio.IntegerTable
import org.oxycblt.auxio.R
import org.oxycblt.auxio.coil.applyAlbumCover
import org.oxycblt.auxio.coil.applyGenreImage
import org.oxycblt.auxio.coil.bindAlbumCover
import org.oxycblt.auxio.coil.bindGenreImage
import org.oxycblt.auxio.databinding.ItemDetailBinding
import org.oxycblt.auxio.databinding.ItemSongBinding
import org.oxycblt.auxio.music.ActionHeader
@ -128,7 +128,7 @@ class GenreDetailAdapter(
val context = binding.root.context
binding.detailCover.apply {
applyGenreImage(data)
bindGenreImage(data)
contentDescription = context.getString(R.string.desc_genre_image, data.resolvedName)
}
@ -150,7 +150,7 @@ class GenreDetailAdapter(
) : BaseViewHolder<Song>(binding, doOnClick, doOnLongClick), Highlightable {
override fun onBind(data: Song) {
binding.songAlbumCover.applyAlbumCover(data)
binding.songAlbumCover.bindAlbumCover(data)
binding.songName.textSafe = data.resolvedName
binding.songInfo.textSafe = data.resolvedArtistName
}

1
app/src/main/java/org/oxycblt/auxio/home/list/GenreListFragment.kt
View file

@ -28,6 +28,7 @@ import org.oxycblt.auxio.music.Genre
import org.oxycblt.auxio.ui.GenreViewHolder
import org.oxycblt.auxio.ui.newMenu
import org.oxycblt.auxio.ui.sliceArticle
import org.oxycblt.auxio.util.context
/**
* A [HomeListFragment] for showing a list of [Genre]s.

4
app/src/main/java/org/oxycblt/auxio/playback/PlaybackBarFragment.kt
View file

@ -25,7 +25,7 @@ import androidx.core.view.updatePadding
import androidx.fragment.app.activityViewModels
import com.google.android.material.color.MaterialColors
import org.oxycblt.auxio.R
import org.oxycblt.auxio.coil.applyAlbumCover
import org.oxycblt.auxio.coil.bindAlbumCover
import org.oxycblt.auxio.databinding.FragmentPlaybackBarBinding
import org.oxycblt.auxio.detail.DetailViewModel
import org.oxycblt.auxio.ui.BottomSheetLayout
@ -99,7 +99,7 @@ class PlaybackBarFragment : ViewBindingFragment<FragmentPlaybackBarBinding>() {
playbackModel.song.observe(viewLifecycleOwner) { song ->
if (song != null) {
binding.playbackCover.applyAlbumCover(song)
binding.playbackCover.bindAlbumCover(song)
binding.playbackSong.textSafe = song.resolvedName
binding.playbackInfo.textSafe =
getString(R.string.fmt_two, song.resolvedArtistName, song.resolvedAlbumName)

4
app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt
View file

@ -29,7 +29,7 @@ import com.google.android.material.slider.Slider
import kotlin.math.max
import org.oxycblt.auxio.MainFragmentDirections
import org.oxycblt.auxio.R
import org.oxycblt.auxio.coil.applyAlbumCover
import org.oxycblt.auxio.coil.bindAlbumCover
import org.oxycblt.auxio.databinding.FragmentPlaybackPanelBinding
import org.oxycblt.auxio.detail.DetailViewModel
import org.oxycblt.auxio.music.MusicParent
@ -175,7 +175,7 @@ class PlaybackPanelFragment :
if (song == null) return
val binding = requireBinding()
binding.playbackCover.applyAlbumCover(song)
binding.playbackCover.bindAlbumCover(song)
binding.playbackSong.textSafe = song.resolvedName
binding.playbackArtist.textSafe = song.resolvedArtistName
binding.playbackAlbum.textSafe = song.resolvedAlbumName

4
app/src/main/java/org/oxycblt/auxio/playback/queue/QueueAdapter.kt
View file

@ -28,7 +28,7 @@ import androidx.recyclerview.widget.ItemTouchHelper
import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.shape.MaterialShapeDrawable
import org.oxycblt.auxio.IntegerTable
import org.oxycblt.auxio.coil.applyAlbumCover
import org.oxycblt.auxio.coil.bindAlbumCover
import org.oxycblt.auxio.databinding.ItemQueueSongBinding
import org.oxycblt.auxio.music.ActionHeader
import org.oxycblt.auxio.music.Header
@ -127,7 +127,7 @@ class QueueAdapter(private val touchHelper: ItemTouchHelper) :
@SuppressLint("ClickableViewAccessibility")
override fun onBind(data: Song) {
binding.songAlbumCover.applyAlbumCover(data)
binding.songAlbumCover.bindAlbumCover(data)
binding.songName.textSafe = data.resolvedName
binding.songInfo.textSafe = data.resolvedArtistName

20
app/src/main/java/org/oxycblt/auxio/ui/ViewHolders.kt
View file

@ -23,9 +23,9 @@ import androidx.appcompat.widget.TooltipCompat
import androidx.recyclerview.widget.RecyclerView
import androidx.viewbinding.ViewBinding
import org.oxycblt.auxio.R
import org.oxycblt.auxio.coil.applyAlbumCover
import org.oxycblt.auxio.coil.applyArtistImage
import org.oxycblt.auxio.coil.applyGenreImage
import org.oxycblt.auxio.coil.bindAlbumCover
import org.oxycblt.auxio.coil.bindArtistImage
import org.oxycblt.auxio.coil.bindGenreImage
import org.oxycblt.auxio.databinding.ItemActionHeaderBinding
import org.oxycblt.auxio.databinding.ItemHeaderBinding
import org.oxycblt.auxio.databinding.ItemParentBinding
@ -96,7 +96,7 @@ private constructor(
) : BaseViewHolder<Song>(binding, doOnClick, doOnLongClick) {
override fun onBind(data: Song) {
binding.songAlbumCover.applyAlbumCover(data)
binding.songAlbumCover.bindAlbumCover(data)
binding.songName.textSafe = data.resolvedName
binding.songInfo.textSafe = data.resolvedArtistName
}
@ -123,13 +123,9 @@ private constructor(
) : BaseViewHolder<Album>(binding, doOnClick, doOnLongClick) {
override fun onBind(data: Album) {
binding.parentImage.applyAlbumCover(data)
binding.parentImage.bindAlbumCover(data)
binding.parentName.textSafe = data.resolvedName
binding.parentInfo.textSafe =
binding.context.getString(
R.string.fmt_two,
data.resolvedArtistName,
binding.context.getPluralSafe(R.plurals.fmt_song_count, data.songs.size))
binding.parentInfo.textSafe = data.resolvedArtistName
}
companion object {
@ -154,7 +150,7 @@ private constructor(
) : BaseViewHolder<Artist>(binding, doOnClick, doOnLongClick) {
override fun onBind(data: Artist) {
binding.parentImage.applyArtistImage(data)
binding.parentImage.bindArtistImage(data)
binding.parentName.textSafe = data.resolvedName
binding.parentInfo.textSafe =
binding.context.getString(
@ -185,7 +181,7 @@ private constructor(
) : BaseViewHolder<Genre>(binding, doOnClick, doOnLongClick) {
override fun onBind(data: Genre) {
binding.parentImage.applyGenreImage(data)
binding.parentImage.bindGenreImage(data)
binding.parentName.textSafe = data.resolvedName
binding.parentInfo.textSafe =
binding.context.getPluralSafe(R.plurals.fmt_song_count, data.songs.size)

2
app/src/main/res/color/sel_m3_switch_thumb.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorOnSurface" android:alpha="0.12" android:state_enabled="false" />
<item android:alpha="0.12" android:color="?attr/colorOnSurface" android:state_enabled="false" />
<item android:color="?attr/colorOnPrimary" android:state_checked="true" />
<item android:color="?attr/colorSurfaceVariant" />
</selector>

2
app/src/main/res/color/sel_m3_switch_track.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorOnSurface" android:alpha="0.38" android:state_enabled="false" />
<item android:alpha="0.38" android:color="?attr/colorOnSurface" android:state_enabled="false" />
<item android:color="?attr/colorPrimary" android:state_checked="true" />
<item android:color="?attr/colorOnSurfaceVariant" />
</selector>

4
app/src/main/res/drawable/ic_song.xml
View file

@ -2,9 +2,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorPrimary"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorPrimary">
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M12,3v10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55 -2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4V7h4V3h-6z" />

4
app/src/main/res/drawable/ui_indicator.xml
View file

@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<size
android:height="4dp"
android:width="4dp" />
android:width="4dp"
android:height="4dp" />
<solid android:color="?attr/colorPrimary" />
</shape>

18
app/src/main/res/layout-sw600dp-land/fragment_playback_panel.xml
View file

@ -10,10 +10,10 @@
android:id="@+id/playback_toolbar"
style="@style/Widget.Auxio.Toolbar.Icon.Down"
app:layout_constraintStart_toStartOf="parent"
app:title="@string/lbl_playback"
tools:subtitle="@string/lbl_all_songs"
app:layout_constraintTop_toTopOf="parent"
app:menu="@menu/menu_playback" />
app:menu="@menu/menu_playback"
app:title="@string/lbl_playback"
tools:subtitle="@string/lbl_all_songs" />
<org.oxycblt.auxio.coil.RoundableImageView
android:id="@+id/playback_cover"
@ -55,9 +55,9 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@+id/playback_album"
app:layout_constraintStart_toStartOf="@+id/playback_song_container"
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" />
@ -67,9 +67,9 @@
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_constraintEnd_toEndOf="@+id/playback_song_container"
app:layout_constraintTop_toBottomOf="@+id/playback_artist"
tools:text="Album Name" />
@ -77,13 +77,13 @@
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"
android:layout_marginBottom="@dimen/spacing_medium"
android:valueFrom="0"
android:valueTo="1"
app:haloRadius="@dimen/slider_halo_radius"
app:labelBehavior="gone"
android:layout_marginStart="@dimen/spacing_small"
android:layout_marginEnd="@dimen/spacing_small"
app:labelStyle="@style/TextAppearance.Auxio.BodySmall"
app:layout_constraintBottom_toTopOf="@+id/playback_play_pause"
app:layout_constraintEnd_toEndOf="parent"
@ -108,8 +108,8 @@
android:id="@+id/playback_duration"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/spacing_medium"
android:layout_marginTop="@dimen/spacing_small_inv"
android:layout_marginEnd="@dimen/spacing_medium"
android:textAppearance="@style/TextAppearance.Auxio.BodyMedium"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintEnd_toEndOf="@+id/playback_seek_bar"
@ -169,9 +169,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_large"
app:hasIndicator="true"
android:contentDescription="@string/desc_shuffle"
android:src="@drawable/ic_shuffle"
app:hasIndicator="true"
app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"
app:layout_constraintStart_toEndOf="@+id/playback_skip_next"
app:layout_constraintTop_toTopOf="@+id/playback_skip_next"

12
app/src/main/res/layout-sw600dp/fragment_playback_panel.xml
View file

@ -12,9 +12,9 @@
style="@style/Widget.Auxio.Toolbar.Icon.Down"
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"
app:menu="@menu/menu_playback" />
tools:subtitle="@string/lbl_all_songs" />
<org.oxycblt.auxio.coil.RoundableImageView
android:id="@+id/playback_cover"
@ -67,14 +67,14 @@
android:id="@+id/playback_seek_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_medium"
android:layout_marginEnd="@dimen/spacing_medium"
android:layout_marginBottom="@dimen/spacing_medium"
android:valueFrom="0"
android:valueTo="1"
app:haloRadius="@dimen/slider_halo_radius"
app:labelBehavior="gone"
app:labelStyle="@style/TextAppearance.Auxio.BodySmall"
android:layout_marginBottom="@dimen/spacing_medium"
android:layout_marginStart="@dimen/spacing_medium"
android:layout_marginEnd="@dimen/spacing_medium"
app:layout_constraintBottom_toTopOf="@+id/playback_play_pause"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
@ -97,8 +97,8 @@
android:id="@+id/playback_duration"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/spacing_medium"
android:layout_marginTop="@dimen/spacing_small_inv"
android:layout_marginEnd="@dimen/spacing_medium"
android:textAppearance="@style/TextAppearance.Auxio.BodyMedium"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintEnd_toEndOf="@+id/playback_seek_bar"

2
app/src/main/res/layout-sw600dp/item_detail.xml
View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
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"
android:padding="@dimen/spacing_medium">
<org.oxycblt.auxio.coil.RoundableImageView

4
app/src/main/res/layout-sw640dp/fragment_playback_bar.xml
View file

@ -17,12 +17,12 @@
<TextView
android:id="@+id/playback_song"
android:textAppearance="@style/TextAppearance.Auxio.LabelLarger"
style="@style/Widget.Auxio.TextView.Primary.Compact"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_small"
android:layout_marginEnd="@dimen/spacing_small"
android:textAppearance="@style/TextAppearance.Auxio.LabelLarger"
app:layout_constraintBottom_toTopOf="@+id/playback_info"
app:layout_constraintEnd_toStartOf="@+id/playback_skip_prev"
app:layout_constraintStart_toEndOf="@+id/playback_cover"
@ -33,11 +33,11 @@
<TextView
android:id="@+id/playback_info"
style="@style/Widget.Auxio.TextView.Secondary.Compact"
android:textAppearance="@style/TextAppearance.Auxio.LabelLarge"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_small"
android:ellipsize="end"
android:textAppearance="@style/TextAppearance.Auxio.LabelLarge"
app:layout_constraintBottom_toBottomOf="@+id/playback_cover"
app:layout_constraintEnd_toEndOf="@+id/playback_song"
app:layout_constraintStart_toEndOf="@+id/playback_cover"

4
app/src/main/res/layout-sw840dp/item_detail.xml
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
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"
android:padding="@dimen/spacing_medium">
<org.oxycblt.auxio.coil.RoundableImageView
@ -50,10 +50,10 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_medium"
app:layout_constraintBottom_toTopOf="@+id/detail_play_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/detail_cover"
app:layout_constraintTop_toBottomOf="@+id/detail_subhead"
app:layout_constraintBottom_toTopOf="@+id/detail_play_button"
tools:text="Info B" />
<Button

10
app/src/main/res/layout-w600dp-land/fragment_playback_panel.xml
View file

@ -12,9 +12,9 @@
style="@style/Widget.Auxio.Toolbar.Icon.Down"
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"
app:menu="@menu/menu_playback" />
tools:subtitle="@string/lbl_all_songs" />
<org.oxycblt.auxio.coil.RoundableImageView
android:id="@+id/playback_cover"
@ -110,8 +110,8 @@
android:id="@+id/playback_duration"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/spacing_medium"
android:layout_marginTop="@dimen/spacing_small_inv"
android:layout_marginEnd="@dimen/spacing_medium"
android:textAppearance="@style/TextAppearance.Auxio.BodyMedium"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintEnd_toEndOf="@+id/playback_seek_bar"
@ -124,8 +124,8 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_medium"
android:contentDescription="@string/desc_change_loop"
app:hasIndicator="true"
android:src="@drawable/ic_loop"
app:hasIndicator="true"
app:layout_constraintBottom_toBottomOf="@+id/playback_skip_prev"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="@+id/playback_seek_bar"
@ -173,8 +173,8 @@
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/spacing_medium"
android:contentDescription="@string/desc_shuffle"
app:hasIndicator="true"
android:src="@drawable/ic_shuffle"
app:hasIndicator="true"
app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"
app:layout_constraintEnd_toEndOf="@+id/playback_seek_bar"
app:layout_constraintTop_toTopOf="@+id/playback_skip_next"

8
app/src/main/res/layout/fragment_main.xml
View file

@ -20,15 +20,15 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playback_bar_fragment"
android:name="org.oxycblt.auxio.playback.PlaybackBarFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:name="org.oxycblt.auxio.playback.PlaybackBarFragment" />
android:layout_height="wrap_content" />
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playback_panel_fragment"
android:name="org.oxycblt.auxio.playback.PlaybackPanelFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:name="org.oxycblt.auxio.playback.PlaybackPanelFragment" />
android:layout_height="match_parent" />
</org.oxycblt.auxio.ui.BottomSheetLayout>

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

@ -58,10 +58,10 @@
android:id="@+id/playback_progress_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:trackColor="?attr/colorPrimary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:trackColor="?attr/colorPrimary"
tools:progress="70" />
</androidx.constraintlayout.widget.ConstraintLayout>

12
app/src/main/res/layout/fragment_playback_panel.xml
View file

@ -11,16 +11,16 @@
style="@style/Widget.Auxio.Toolbar.Icon.Down"
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"
app:menu="@menu/menu_playback" />
tools:subtitle="@string/lbl_all_songs" />
<org.oxycblt.auxio.coil.RoundableImageView
android:id="@+id/playback_cover"
style="@style/Widget.Auxio.Image.Full"
android:layout_margin="@dimen/spacing_medium"
app:layout_constraintBottom_toTopOf="@+id/playback_song"
app:layout_constraintEnd_toEndOf="parent"
android:layout_margin="@dimen/spacing_medium"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/playback_toolbar"
tools:src="@drawable/ic_album" />
@ -66,12 +66,12 @@
android:id="@+id/playback_seek_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/spacing_medium"
android:valueFrom="0"
android:valueTo="1"
app:haloRadius="@dimen/slider_halo_radius"
app:labelBehavior="gone"
app:labelStyle="@style/TextAppearance.Auxio.BodySmall"
android:layout_marginBottom="@dimen/spacing_medium"
app:layout_constraintBottom_toTopOf="@+id/playback_play_pause"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
@ -106,10 +106,10 @@
android:id="@+id/playback_loop"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_medium"
android:contentDescription="@string/desc_change_loop"
android:src="@drawable/ic_loop"
app:hasIndicator="true"
android:layout_marginStart="@dimen/spacing_medium"
app:layout_constraintBottom_toBottomOf="@+id/playback_skip_prev"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/playback_skip_prev" />
@ -155,11 +155,11 @@
android:id="@+id/playback_shuffle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/spacing_medium"
android:contentDescription="@string/desc_shuffle"
android:minWidth="@dimen/size_btn_small"
android:minHeight="@dimen/size_btn_small"
android:src="@drawable/ic_shuffle"
android:layout_marginEnd="@dimen/spacing_medium"
app:hasIndicator="true"
app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"
app:layout_constraintEnd_toEndOf="parent"

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

@ -21,9 +21,9 @@
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@drawable/ui_unbounded_ripple"
android:minWidth="@dimen/size_btn_small"
android:minHeight="@dimen/size_btn_small"
android:background="@drawable/ui_unbounded_ripple"
android:paddingStart="@dimen/spacing_medium"
android:paddingEnd="@dimen/spacing_medium"
app:layout_constraintBottom_toTopOf="@id/header_divider"

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

@ -13,11 +13,11 @@
android:contentDescription="@string/def_track"
android:src="@drawable/ic_song"
android:visibility="invisible"
app:tint="@color/sel_accented"
app:layout_constraintBottom_toBottomOf="@+id/song_track"
app:layout_constraintEnd_toEndOf="@+id/song_track"
app:layout_constraintStart_toStartOf="@+id/song_track"
app:layout_constraintTop_toTopOf="@+id/song_track"
app:tint="@color/sel_accented"
tools:text="1" />
<TextView

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

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/Widget.Auxio.ItemLayout">
<org.oxycblt.auxio.coil.RoundableImageView

12
app/src/main/res/layout/item_excluded_dir.xml
View file

@ -1,24 +1,24 @@
<?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"
style="@style/Widget.Auxio.ItemLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="false"
android:focusable="false"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/Widget.Auxio.ItemLayout"
android:padding="0dp">
<TextView
android:id="@+id/excluded_path"
style="@style/Widget.Auxio.TextView.Item.Primary"
android:layout_width="0dp"
android:textAppearance="@style/TextAppearance.Auxio.BodyLarge"
android:layout_height="wrap_content"
android:layout_margin="@dimen/spacing_medium"
android:gravity="center"
android:maxLines="@null"
android:textAppearance="@style/TextAppearance.Auxio.BodyLarge"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/excluded_clear"
app:layout_constraintStart_toStartOf="parent"
@ -30,10 +30,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/spacing_small"
android:minHeight="@dimen/size_btn_small"
android:minWidth="@dimen/size_btn_small"
android:background="@drawable/ui_unbounded_ripple"
android:contentDescription="@string/desc_blacklist_delete"
android:minWidth="@dimen/size_btn_small"
android:minHeight="@dimen/size_btn_small"
android:src="@drawable/ic_clear"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

2
app/src/main/res/layout/item_song.xml
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:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/Widget.Auxio.ItemLayout">
<org.oxycblt.auxio.coil.RoundableImageView

4
app/src/main/res/layout/item_tab.xml
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/Widget.Auxio.ItemLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="0dp">
<com.google.android.material.checkbox.MaterialCheckBox

10
app/src/main/res/layout/view_seek_bar.xml
View file

@ -13,15 +13,15 @@
android:layout_marginBottom="@dimen/spacing_medium"
android:paddingStart="@dimen/spacing_small"
android:paddingEnd="@dimen/spacing_small"
app:labelBehavior="gone"
app:labelStyle="@style/TextAppearance.Auxio.BodySmall"
android:valueFrom="0"
android:valueTo="1"
app:thumbRadius="@dimen/slider_thumb_radius"
app:haloRadius="@dimen/slider_halo_radius"
app:labelBehavior="gone"
app:labelStyle="@style/TextAppearance.Auxio.BodySmall"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintStart_toStartOf="parent"
app:thumbRadius="@dimen/slider_thumb_radius" />
<TextView
android:id="@+id/playback_position"
@ -41,8 +41,8 @@
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/spacing_medium"
android:layout_marginBottom="@dimen/spacing_small"
android:textColor="?android:attr/textColorSecondary"
android:textAppearance="@style/TextAppearance.Auxio.BodyMedium"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
tools:text="16:16" />

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

@ -18,15 +18,15 @@
android:tint="?attr/colorPrimary" />
<android.widget.TextView
android:layout_width="match_parent"
style="@style/Widget.Auxio.TextView.Primary.AppWidget"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="none"
android:singleLine="false"
android:textAlignment="center"
android:gravity="center"
android:padding="@dimen/spacing_medium"
android:text="@string/def_playback" />
android:singleLine="false"
android:text="@string/def_playback"
android:textAlignment="center" />
</FrameLayout>

4
app/src/main/res/layout/widget_large.xml
View file

@ -51,9 +51,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:padding="@dimen/spacing_medium"
android:layout_gravity="center"
android:orientation="vertical"
android:layout_gravity="center">
android:padding="@dimen/spacing_medium">
<android.widget.TextView
android:id="@+id/widget_song"

4
app/src/main/res/layout/widget_medium.xml
View file

@ -51,9 +51,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:padding="@dimen/spacing_medium"
android:layout_gravity="center"
android:orientation="vertical"
android:layout_gravity="center">
android:padding="@dimen/spacing_medium">
<android.widget.TextView
android:id="@+id/widget_song"

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

@ -53,13 +53,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:paddingTop="@dimen/spacing_small"
android:paddingBottom="@dimen/spacing_small"
android:paddingStart="@dimen/spacing_small"
android:paddingEnd="@dimen/spacing_small"
android:orientation="horizontal"
android:layout_gravity="center"
android:background="@drawable/ui_widget_panel"
android:layout_gravity="center">
android:orientation="horizontal"
android:paddingStart="@dimen/spacing_small"
android:paddingTop="@dimen/spacing_small"
android:paddingEnd="@dimen/spacing_small"
android:paddingBottom="@dimen/spacing_small">
<android.widget.ImageButton
android:id="@+id/widget_skip_prev"

6
app/src/main/res/layout/widget_wide.xml
View file

@ -56,10 +56,10 @@
android:layout_gravity="center"
android:background="@drawable/ui_widget_panel"
android:orientation="horizontal"
android:paddingTop="@dimen/spacing_small"
android:paddingBottom="@dimen/spacing_small"
android:paddingStart="@dimen/spacing_small"
android:paddingEnd="@dimen/spacing_small">
android:paddingTop="@dimen/spacing_small"
android:paddingEnd="@dimen/spacing_small"
android:paddingBottom="@dimen/spacing_small">
<android.widget.ImageButton
android:id="@+id/widget_loop"

12
app/src/main/res/xml/prefs_main.xml
View file

@ -6,17 +6,17 @@
<org.oxycblt.auxio.settings.pref.IntListPreference
app:defaultValue="@integer/theme_auto"
app:isPreferenceVisible="@bool/enable_theme_settings"
app:entries="@array/entries_theme"
app:entryValues="@array/values_theme"
app:icon="@drawable/ic_day"
app:iconSpaceReserved="false"
app:isPreferenceVisible="@bool/enable_theme_settings"
app:key="KEY_THEME2"
app:title="@string/set_theme" />
<Preference
app:isPreferenceVisible="@bool/enable_theme_settings"
app:icon="@drawable/ic_accent"
app:isPreferenceVisible="@bool/enable_theme_settings"
app:key="auxio_accent"
app:title="@string/set_accent" />
@ -81,8 +81,8 @@
<org.oxycblt.auxio.settings.pref.M3SwitchPreference
app:defaultValue="true"
app:iconSpaceReserved="false"
app:key="KEY_AUDIO_FOCUS"
app:isPreferenceVisible="@bool/enable_audio_focus_setting"
app:key="KEY_AUDIO_FOCUS"
app:summary="@string/set_focus_desc"
app:title="@string/set_focus" />
@ -94,12 +94,12 @@
app:title="@string/set_headset_autoplay" />
<org.oxycblt.auxio.settings.pref.IntListPreference
app:defaultValue="@integer/replay_gain_off"
app:key="auxio_replay_gain"
app:allowDividerBelow="false"
app:iconSpaceReserved="false"
app:defaultValue="@integer/replay_gain_off"
app:entries="@array/entries_replay_gain"
app:entryValues="@array/values_replay_gain"
app:iconSpaceReserved="false"
app:key="auxio_replay_gain"
app:title="@string/set_replay_gain" />
</PreferenceCategory>