App state banner tweaks (#8746)

* Move download indexing notification to this banner group
* Animate state changes
This commit is contained in:
Ivan Iskandar
2022-12-17 10:18:17 +07:00
committed by GitHub
parent 5f4825465e
commit e20c66b156
5 changed files with 212 additions and 132 deletions

View File

@@ -1,28 +1,45 @@
package eu.kanade.presentation.components
import androidx.annotation.StringRes
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.expandVertically
import androidx.compose.animation.shrinkVertically
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.WindowInsetsSides
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.only
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.systemBars
import androidx.compose.foundation.layout.requiredSize
import androidx.compose.foundation.layout.statusBars
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.windowInsetsPadding
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.SubcomposeLayout
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.compose.ui.util.fastForEach
import androidx.compose.ui.util.fastMap
import androidx.compose.ui.util.fastMaxBy
import eu.kanade.tachiyomi.R
val DownloadedOnlyBannerBackgroundColor
@Composable get() = MaterialTheme.colorScheme.tertiary
val IncognitoModeBannerBackgroundColor
@Composable get() = MaterialTheme.colorScheme.primary
val IndexingBannerBackgroundColor
@Composable get() = MaterialTheme.colorScheme.secondary
@Composable
fun WarningBanner(
@@ -45,23 +62,64 @@ fun WarningBanner(
fun AppStateBanners(
downloadedOnlyMode: Boolean,
incognitoMode: Boolean,
indexing: Boolean,
modifier: Modifier = Modifier,
) {
val insets = WindowInsets.systemBars.only(WindowInsetsSides.Top + WindowInsetsSides.Horizontal)
Column(modifier = modifier) {
if (downloadedOnlyMode) {
DownloadedOnlyModeBanner(
modifier = Modifier.windowInsetsPadding(insets),
)
}
if (incognitoMode) {
IncognitoModeBanner(
modifier = if (!downloadedOnlyMode) {
Modifier.windowInsetsPadding(insets)
} else {
Modifier
},
)
val density = LocalDensity.current
val mainInsets = WindowInsets.statusBars
val mainInsetsTop = mainInsets.getTop(density)
SubcomposeLayout(modifier = modifier) { constraints ->
val indexingPlaceable = subcompose(0) {
AnimatedVisibility(
visible = indexing,
enter = expandVertically(),
exit = shrinkVertically(),
) {
IndexingDownloadBanner(
modifier = Modifier.windowInsetsPadding(mainInsets),
)
}
}.fastMap { it.measure(constraints) }
val indexingHeight = indexingPlaceable.fastMaxBy { it.height }?.height ?: 0
val downloadedOnlyPlaceable = subcompose(1) {
AnimatedVisibility(
visible = downloadedOnlyMode,
enter = expandVertically(),
exit = shrinkVertically(),
) {
val top = (mainInsetsTop - indexingHeight).coerceAtLeast(0)
DownloadedOnlyModeBanner(
modifier = Modifier.windowInsetsPadding(WindowInsets(top = top)),
)
}
}.fastMap { it.measure(constraints) }
val downloadedOnlyHeight = downloadedOnlyPlaceable.fastMaxBy { it.height }?.height ?: 0
val incognitoPlaceable = subcompose(2) {
AnimatedVisibility(
visible = incognitoMode,
enter = expandVertically(),
exit = shrinkVertically(),
) {
val top = (mainInsetsTop - indexingHeight - downloadedOnlyHeight).coerceAtLeast(0)
IncognitoModeBanner(
modifier = Modifier.windowInsetsPadding(WindowInsets(top = top)),
)
}
}.fastMap { it.measure(constraints) }
val incognitoHeight = incognitoPlaceable.fastMaxBy { it.height }?.height ?: 0
layout(constraints.maxWidth, indexingHeight + downloadedOnlyHeight + incognitoHeight) {
indexingPlaceable.fastForEach {
it.place(0, 0)
}
downloadedOnlyPlaceable.fastForEach {
it.place(0, indexingHeight)
}
incognitoPlaceable.fastForEach {
it.place(0, indexingHeight + downloadedOnlyHeight)
}
}
}
}
@@ -95,3 +153,35 @@ private fun IncognitoModeBanner(modifier: Modifier = Modifier) {
style = MaterialTheme.typography.labelMedium,
)
}
@Composable
private fun IndexingDownloadBanner(modifier: Modifier = Modifier) {
val density = LocalDensity.current
Row(
modifier = Modifier
.background(color = IndexingBannerBackgroundColor)
.fillMaxWidth()
.padding(8.dp)
.then(modifier),
horizontalArrangement = Arrangement.Center,
) {
var textHeight by remember { mutableStateOf(0.dp) }
CircularProgressIndicator(
modifier = Modifier.requiredSize(textHeight),
color = MaterialTheme.colorScheme.onSecondary,
strokeWidth = textHeight / 8,
)
Spacer(modifier = Modifier.width(8.dp))
Text(
text = stringResource(R.string.download_notifier_cache_renewal),
color = MaterialTheme.colorScheme.onSecondary,
textAlign = TextAlign.Center,
style = MaterialTheme.typography.labelMedium,
onTextLayout = {
with(density) {
textHeight = it.size.height.toDp()
}
},
)
}
}