fix artist page, codec info fade

AkaneTan · Jan 3, 2025 · b15a76e · b15a76e
1 parent a3f11ea
commit b15a76e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/app/src/main/kotlin/org/akanework/gramophone/logic/utils/AudioFormatDetector.kt b/app/src/main/kotlin/org/akanework/gramophone/logic/utils/AudioFormatDetector.kt
@@ -46,13 +46,14 @@ class AudioFormatDetector {
             val isLossless: Boolean,
             val sourceChannels: Int,
             val deviceChannels: Int,
-            val isDownMixing: Boolean,
             val bitrate: Int?,
             val mimeType: String?,
             val spatialFormat: SpatialFormat,
             val encoderPadding: Int?,
             val encoderDelay: Int?
         ) : Parcelable {
+            val isDownMixing: Boolean
+                get() = sourceChannels > deviceChannels
             override fun toString(): String {
                 val outputStr = if (isDownMixing) {
                     "(Down mixed to $deviceChannels channels)"
@@ -102,8 +103,6 @@ class AudioFormatDetector {
                         val spatialFormat = detectSpatialFormat(format)
                         val sourceChannels = format.channelCount
 
-                        val isDownMixing = sourceChannels > deviceChannels
-
                         val quality = determineQualityTier(
                             sampleRate = sampleRate,
                             bitDepth = bitDepth,
@@ -117,7 +116,6 @@ class AudioFormatDetector {
                             isLossless = isLossless,
                             sourceChannels = sourceChannels,
                             deviceChannels = deviceChannels,
-                            isDownMixing = isDownMixing,
                             bitrate = bitrate,
                             mimeType = format.sampleMimeType,
                             spatialFormat = spatialFormat,

diff --git a/app/src/main/kotlin/org/akanework/gramophone/ui/components/FullBottomSheet.kt b/app/src/main/kotlin/org/akanework/gramophone/ui/components/FullBottomSheet.kt
@@ -17,6 +17,7 @@ import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewPropertyAnimator
 import android.view.WindowInsets
 import android.widget.ImageView
 import android.widget.SeekBar
@@ -74,6 +75,7 @@ import org.akanework.gramophone.logic.GramophonePlaybackService
 import org.akanework.gramophone.logic.clone
 import org.akanework.gramophone.logic.dpToPx
 import org.akanework.gramophone.logic.fadInAnimation
+import org.akanework.gramophone.logic.fadOutAnimation
 import org.akanework.gramophone.logic.getAudioFormat
 import org.akanework.gramophone.logic.getBooleanStrict
 import org.akanework.gramophone.logic.getFile
@@ -657,12 +659,24 @@ class FullBottomSheet
     }
 
     private fun updateQualityIndicators(info: AudioFormatInfo?) {
-        if (info == null) {
-            bottomSheetFullQualityDetails.visibility = View.GONE
-            return
+        (bottomSheetFullQualityDetails.getTag(R.id.fade_in_animation) as ViewPropertyAnimator?)?.cancel()
+        (bottomSheetFullQualityDetails.getTag(R.id.fade_out_animation) as ViewPropertyAnimator?)?.cancel()
+        if (info == null && bottomSheetFullQualityDetails.visibility == INVISIBLE) return
+        val oldInfo = (bottomSheetFullQualityDetails.getTag(R.id.quality_details) as AudioFormatInfo?)
+        if (oldInfo != null)
+            applyQualityInfo(oldInfo)
+        if (oldInfo != null || info != null)
+            bottomSheetFullQualityDetails.setTag(R.id.quality_details, info)
+        bottomSheetFullQualityDetails.fadOutAnimation(300) {
+            bottomSheetFullQualityDetails.setTag(R.id.quality_details, null)
+            if (info == null)
+                return@fadOutAnimation
+            applyQualityInfo(info)
+            bottomSheetFullQualityDetails.fadInAnimation(300)
         }
-        bottomSheetFullQualityDetails.visibility = View.VISIBLE
+    }
 
+    private fun applyQualityInfo(info: AudioFormatInfo) {
         val icon = when (info.spatialFormat) {
             SpatialFormat.SURROUND_5_0,
             SpatialFormat.SURROUND_5_1,

diff --git a/app/src/main/kotlin/org/akanework/gramophone/ui/fragments/ArtistSubFragment.kt b/app/src/main/kotlin/org/akanework/gramophone/ui/fragments/ArtistSubFragment.kt
@@ -92,7 +92,7 @@ class ArtistSubFragment : BaseFragment(true), PopupTextProvider {
             == Configuration.ORIENTATION_PORTRAIT
         ) 2 else 4
         albumAdapter = AlbumAdapter(
-            this, item.map { it.albumList }, true,
+            this, item.map { it.albumList }, ownsView = false, isSubFragment = true,
             fallbackSpans = spans
         )
         albumAdapter.decorAdapter.jumpDownPos = albumAdapter.concatAdapter.itemCount