diff --git a/CHANGELOG.md b/CHANGELOG.md index 107d01e47..9f6987771 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## dev +#### What's New +- Detail UI now displays the type of item shown (ex. the release type) + #### What's Fixed - Fixed incorrect font being used in the queue title - Fixed missing fast scroll indicator with date added scrolling diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt index bc0ad89b4..778682314 100644 --- a/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt @@ -77,14 +77,17 @@ class AlbumListFragment : HomeListFragment() { is Sort.Mode.ByCount -> album.songs.size.toString() // Last added -> Format as date - is Sort.Mode.ByDateAdded -> - (album.songs.minOf { it.dateAdded } * 1000).let { - // Emulate formatDateTime with our own formatter instance to save memory. - formatterSb.setLength(0) - DateUtils.formatDateRange( - context, formatter, it, it, DateUtils.FORMAT_ABBREV_ALL) - .toString() - } + is Sort.Mode.ByDateAdded -> { + val dateAddedMillis = album.dateAdded * 1000 + formatterSb.setLength(0) + DateUtils.formatDateRange( + context, + formatter, + dateAddedMillis, + dateAddedMillis, + DateUtils.FORMAT_ABBREV_ALL) + .toString() + } // Unsupported sort, error gracefully else -> null diff --git a/app/src/main/java/org/oxycblt/auxio/ui/AuxioSheetBehavior.kt b/app/src/main/java/org/oxycblt/auxio/ui/AuxioSheetBehavior.kt index 581aa5e9b..b730c5a8f 100644 --- a/app/src/main/java/org/oxycblt/auxio/ui/AuxioSheetBehavior.kt +++ b/app/src/main/java/org/oxycblt/auxio/ui/AuxioSheetBehavior.kt @@ -19,7 +19,6 @@ package org.oxycblt.auxio.ui import android.content.Context import android.graphics.drawable.Drawable -import android.os.Build import android.util.AttributeSet import android.view.View import android.view.ViewGroup @@ -67,16 +66,8 @@ abstract class AuxioSheetBehavior(context: Context, attributeSet: Attr if (!setup) { child.apply { + translationZ = context.getDimen(R.dimen.elevation_normal) background = createBackground(context) - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { - // Shadows aren't disabled by default, do that. - val transparent = - context.getColorCompat(android.R.color.transparent).defaultColor - outlineAmbientShadowColor = transparent - outlineSpotShadowColor = transparent - } - setOnApplyWindowInsetsListener(::applyWindowInsets) } diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 1ca09facd..92ca0e5d0 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -21,6 +21,7 @@ android:id="@+id/playback_sheet" android:layout_width="match_parent" android:layout_height="match_parent" + style="@style/Widget.Auxio.DisableDropShadows" app:layout_behavior="org.oxycblt.auxio.playback.PlaybackSheetBehavior"> diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml index 5d4e3a1ea..4d68565af 100644 --- a/app/src/main/res/values/styles_ui.xml +++ b/app/src/main/res/values/styles_ui.xml @@ -93,6 +93,12 @@ @dimen/recycler_fab_space_normal + +