show only an in-flight ring on the library surfaces

A finished download no longer draws anything on album covers, artist rows or
playlist rows: the badge is the progress ring alone, so a fully downloaded tile
looks like any other. The ring takes the theme's primary for the arc over a
theme track, with the one soft shadow, instead of the white glyph and its
outline.

app/src/main/kotlin/com/subtracks/ui/components/DownloadIndicator.kt

@@ -1,35 +1,27 @@
 package com.subtracks.ui.components
 
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.DownloadDone
 import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.blur
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
 import com.subtracks.data.model.ListDownloadStatus
 
-const val DOWNLOADED_INDICATOR_TAG = "Downloaded"
 const val DOWNLOADING_INDICATOR_TAG = "Downloading"
 
-enum class DownloadIndicator { Hidden, InProgress, Complete }
+enum class DownloadIndicator { Hidden, InProgress }
 
 fun ListDownloadStatus.indicator(): DownloadIndicator =
-    when {
+    if (total > 0 && downloading > 0) DownloadIndicator.InProgress else DownloadIndicator.Hidden
-        total == 0L -> DownloadIndicator.Hidden
-        complete -> DownloadIndicator.Complete
-        downloading > 0 -> DownloadIndicator.InProgress
-        else -> DownloadIndicator.Hidden
-    }
 
 @Composable
 fun ListDownloadIndicator(
@@ -37,50 +29,22 @@ fun ListDownloadIndicator(
     modifier: Modifier = Modifier,
 ) {
     val current = status ?: return
-    val kind = current.indicator()
+    if (current.indicator() == DownloadIndicator.Hidden) return
-    if (kind == DownloadIndicator.Hidden) return
+    val progress = { current.downloaded.toFloat() / current.total }
-    Box(modifier = modifier.size(26.dp), contentAlignment = Alignment.Center) {
+    Box(modifier = modifier.size(20.dp), contentAlignment = Alignment.Center) {
-        when (kind) {
+        CircularProgressIndicator(
-            DownloadIndicator.Complete -> {
+            progress = progress,
-                Icon(
+            color = Color.Black.copy(alpha = 0.5f),
-                    imageVector = Icons.Rounded.DownloadDone,
+            trackColor = Color.Transparent,
-                    contentDescription = null,
+            strokeWidth = 2.5.dp,
-                    tint = Color.Black.copy(alpha = 0.5f),
+            modifier = Modifier.fillMaxSize().blur(2.dp).offset(y = 1.dp),
-                    modifier = Modifier.size(22.dp).blur(4.dp).offset(y = 1.dp),
+        )
-                )
+        CircularProgressIndicator(
-                Icon(
+            progress = progress,
-                    imageVector = Icons.Rounded.DownloadDone,
+            color = MaterialTheme.colorScheme.primary,
-                    contentDescription = null,
+            trackColor = MaterialTheme.colorScheme.surfaceContainerHighest,
-                    tint = Color.Black.copy(alpha = 0.85f),
+            strokeWidth = 2.5.dp,
-                    modifier =
+            modifier = Modifier.fillMaxSize().semantics { contentDescription = DOWNLOADING_INDICATOR_TAG },
-                        Modifier
+        )
-                            .size(22.dp)
-                            .graphicsLayer {
-                                scaleX = 1.18f
-                                scaleY = 1.18f
-                            }.blur(1.dp),
-                )
-                Icon(
-                    imageVector = Icons.Rounded.DownloadDone,
-                    contentDescription = DOWNLOADED_INDICATOR_TAG,
-                    tint = Color.White,
-                    modifier = Modifier.size(22.dp),
-                )
-            }
-
-            DownloadIndicator.InProgress -> {
-                CircularProgressIndicator(
-                    progress = { current.downloaded.toFloat() / current.total },
-                    color = Color.White,
-                    trackColor = Color.Black.copy(alpha = 0.45f),
-                    strokeWidth = 2.5.dp,
-                    modifier = Modifier.size(20.dp).semantics { contentDescription = DOWNLOADING_INDICATOR_TAG },
-                )
-            }
-
-            DownloadIndicator.Hidden -> {
-                Unit
-            }
-        }
     }
 }

app/src/test/kotlin/com/subtracks/ui/components/DownloadIndicatorTest.kt

@@ -11,7 +11,7 @@ class DownloadIndicatorTest {
     }
 
     @Test
-    fun aListWithNothingStartedButNoSongsShowsNothing() {
+    fun aPopulatedButUnstartedListShowsNothing() {
         assertEquals(DownloadIndicator.Hidden, ListDownloadStatus(total = 4).indicator())
     }
 
@@ -31,7 +31,7 @@ class DownloadIndicatorTest {
     }
 
     @Test
-    fun aFullyDownloadedListShowsDone() {
+    fun aFullyDownloadedListShowsNothing() {
-        assertEquals(DownloadIndicator.Complete, ListDownloadStatus(total = 4, downloaded = 4).indicator())
+        assertEquals(DownloadIndicator.Hidden, ListDownloadStatus(total = 4, downloaded = 4).indicator())
     }
 }