mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2026-10-16 13:48:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Closes #3790
Closes #4052
Fixes #3647

Co-authored-by: AMendoza <allanmaleman@gmail.com>
This commit is contained in:
AntsyLich
2026-10-10 17:36:20 +06:00
co-authored by AMendoza
parent d3f10772f2
commit 287cbbb986
2 changed files with 52 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/presentation/updates/UpdatesScreen.kt
+32 -16
View File
@@ -1,6 +1,8 @@
package eu.kanade.presentation.updates
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.padding
import androidx.compose.material3.LocalContentColor
@@ -93,10 +95,6 @@ fun UpdateScreen(
) { contentPadding ->
when {
state.isLoading -> LoadingScreen(Modifier.padding(contentPadding))
state.items.isEmpty() -> EmptyScreen(
stringRes = MR.strings.information_no_recent,
modifier = Modifier.padding(contentPadding),
)
else -> {
val scope = rememberCoroutineScope()
var isRefreshing by remember { mutableStateOf(false) }
@@ -116,19 +114,37 @@ fun UpdateScreen(
enabled = !state.selectionMode,
indicatorPadding = contentPadding,
) {
FastScrollLazyColumn(
contentPadding = contentPadding,
) {
updatesLastUpdatedItem(lastUpdated)
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(
contentPadding = contentPadding,
) {
updatesLastUpdatedItem(lastUpdated)
updatesUiItems(
uiModels = state.getUiModel(),
selectionMode = state.selectionMode,
onUpdateSelected = onUpdateSelected,
onClickCover = onClickCover,
onClickUpdate = onOpenChapter,
onDownloadChapter = onDownloadChapter,
)
updatesUiItems(
uiModels = state.getUiModel(),
selectionMode = state.selectionMode,
onUpdateSelected = onUpdateSelected,
onClickCover = onClickCover,
onClickUpdate = onOpenChapter,
onDownloadChapter = onDownloadChapter,
)
}
}
}
}
app/src/main/java/eu/kanade/presentation/updates/UpdatesUiItem.kt
+20 -10
View File
@@ -52,16 +52,26 @@ internal fun LazyListScope.updatesLastUpdatedItem(
lastUpdated: Long,
) {
item(key = "updates-lastUpdated") {
Box(
modifier = Modifier
.animateItem(fadeInSpec = null, fadeOutSpec = null)
.padding(horizontal = MaterialTheme.padding.medium, vertical = MaterialTheme.padding.small),
) {
Text(
text = stringResource(MR.strings.updates_last_update_info, relativeTimeSpanString(lastUpdated)),
fontStyle = FontStyle.Italic,
)
}
UpdatesLastUpdatedHeader(
lastUpdated = lastUpdated,
modifier = Modifier.animateItem(fadeInSpec = null, fadeOutSpec = null),
)
}
}
@Composable
internal fun UpdatesLastUpdatedHeader(
lastUpdated: Long,
modifier: Modifier = Modifier,
) {
Box(
modifier = modifier
.padding(horizontal = MaterialTheme.padding.medium, vertical = MaterialTheme.padding.small),
) {
Text(
text = stringResource(MR.strings.updates_last_update_info, relativeTimeSpanString(lastUpdated)),
fontStyle = FontStyle.Italic,
)
}
}