github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Count the downloads under each header instead of count the number of headers (#7990)

Browse source
This commit is contained in:
Andreas 2022-09-11 19:11:50 +02:00 committed by GitHub
parent 3dea10bcb9
commit 0215b66098
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadController.kt
View file

@ -25,6 +25,7 @@ import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.rememberTopAppBarState import androidx.compose.material3.rememberTopAppBarState
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
@ -106,6 +107,9 @@ class DownloadController :
override fun ComposeContent() { override fun ComposeContent() {
val context = LocalContext.current val context = LocalContext.current
val downloadList by presenter.state.collectAsState() val downloadList by presenter.state.collectAsState()
val downloadCount by remember {
derivedStateOf { downloadList.sumOf { it.subItems.size } }
}
val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState()) val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
var fabExpanded by remember { mutableStateOf(true) } var fabExpanded by remember { mutableStateOf(true) }
@ -142,10 +146,10 @@ class DownloadController :
modifier = Modifier.weight(1f, false), modifier = Modifier.weight(1f, false),
overflow = TextOverflow.Ellipsis, overflow = TextOverflow.Ellipsis,
) )
if (downloadList.isNotEmpty()) { if (downloadCount > 0) {
val pillAlpha = if (isSystemInDarkTheme()) 0.12f else 0.08f val pillAlpha = if (isSystemInDarkTheme()) 0.12f else 0.08f
Pill( Pill(
text = "${downloadList.size}", text = "$downloadCount",
modifier = Modifier.padding(start = 4.dp), modifier = Modifier.padding(start = 4.dp),
color = MaterialTheme.colorScheme.onBackground color = MaterialTheme.colorScheme.onBackground
.copy(alpha = pillAlpha), .copy(alpha = pillAlpha),