Keep the last update time on an empty Updates screen (#3790)

Closes #3790
Closes #4052
Fixes #3647

Co-authored-by: AMendoza <allanmaleman@gmail.com>
This commit is contained in:
AntsyLich
2026-10-10 01:57:02 +06:00
parent d3f10772f2
commit 287cbbb986
2 changed files with 52 additions and 26 deletions
@@ -1,6 +1,8 @@
package eu.kanade.presentation.updates package eu.kanade.presentation.updates
import androidx.activity.compose.BackHandler import androidx.activity.compose.BackHandler
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.material3.LocalContentColor import androidx.compose.material3.LocalContentColor
@@ -93,10 +95,6 @@ fun UpdateScreen(
) { contentPadding -> ) { contentPadding ->
when { when {
state.isLoading -> LoadingScreen(Modifier.padding(contentPadding)) state.isLoading -> LoadingScreen(Modifier.padding(contentPadding))
state.items.isEmpty() -> EmptyScreen(
stringRes = MR.strings.information_no_recent,
modifier = Modifier.padding(contentPadding),
)
else -> { else -> {
val scope = rememberCoroutineScope() val scope = rememberCoroutineScope()
var isRefreshing by remember { mutableStateOf(false) } var isRefreshing by remember { mutableStateOf(false) }
@@ -116,6 +114,23 @@ fun UpdateScreen(
enabled = !state.selectionMode, enabled = !state.selectionMode,
indicatorPadding = contentPadding, indicatorPadding = contentPadding,
) { ) {
if (state.items.isEmpty()) {
Column(
modifier = Modifier
.padding(contentPadding)
.fillMaxSize(),
) {
UpdatesLastUpdatedHeader(lastUpdated = lastUpdated)
EmptyScreen(
stringRes = if (hasActiveFilters) {
MR.strings.error_no_match
} else {
MR.strings.information_no_recent
},
modifier = Modifier.weight(1f),
)
}
} else {
FastScrollLazyColumn( FastScrollLazyColumn(
contentPadding = contentPadding, contentPadding = contentPadding,
) { ) {
@@ -134,6 +149,7 @@ fun UpdateScreen(
} }
} }
} }
}
} }
@Composable @Composable
@@ -52,9 +52,20 @@ internal fun LazyListScope.updatesLastUpdatedItem(
lastUpdated: Long, lastUpdated: Long,
) { ) {
item(key = "updates-lastUpdated") { item(key = "updates-lastUpdated") {
UpdatesLastUpdatedHeader(
lastUpdated = lastUpdated,
modifier = Modifier.animateItem(fadeInSpec = null, fadeOutSpec = null),
)
}
}
@Composable
internal fun UpdatesLastUpdatedHeader(
lastUpdated: Long,
modifier: Modifier = Modifier,
) {
Box( Box(
modifier = Modifier modifier = modifier
.animateItem(fadeInSpec = null, fadeOutSpec = null)
.padding(horizontal = MaterialTheme.padding.medium, vertical = MaterialTheme.padding.small), .padding(horizontal = MaterialTheme.padding.medium, vertical = MaterialTheme.padding.small),
) { ) {
Text( Text(
@@ -62,7 +73,6 @@ internal fun LazyListScope.updatesLastUpdatedItem(
fontStyle = FontStyle.Italic, fontStyle = FontStyle.Italic,
) )
} }
}
} }
internal fun LazyListScope.updatesUiItems( internal fun LazyListScope.updatesUiItems(