mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-10-31 06:17:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

sticky header

Browse Source
This commit is contained in:
Cuong-Tran
2024-10-24 00:41:35 +07:00
parent 8aa2eccfaa
commit 58d59a555d
3 changed files with 64 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/kanade/presentation/libraryUpdateError/LibraryUpdateErrorScreen.kt
View File

@@ -130,17 +130,18 @@ fun LibraryUpdateErrorScreen(
},
)
},
) { paddingValues ->
) { contentPadding ->
when {
state.isLoading -> LoadingScreen(modifier = Modifier.padding(paddingValues))
state.isLoading -> LoadingScreen(modifier = Modifier.padding(contentPadding))
state.items.isEmpty() -> EmptyScreen(
message = stringResource(MR.strings.info_empty_library_update_errors),
modifier = Modifier.padding(paddingValues),
modifier = Modifier.padding(contentPadding),
)
else -> {
FastScrollLazyColumn(
contentPadding = paddingValues,
// Using modifier instead of contentPadding so we can use stickyHeader
modifier = Modifier.padding(contentPadding),
state = listState,
) {
libraryUpdateErrorUiItems(

86
app/src/main/java/eu/kanade/presentation/libraryUpdateError/components/LibraryUpdateErrorUiItem.kt
View File

@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.foundation.lazy.items
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
@@ -17,10 +16,12 @@ import androidx.compose.ui.platform.LocalHapticFeedback
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import eu.kanade.presentation.manga.components.MangaCover
import eu.kanade.presentation.util.animateItemFastScroll
import eu.kanade.tachiyomi.ui.libraryUpdateError.LibraryUpdateErrorItem
import tachiyomi.domain.libraryUpdateError.model.LibraryUpdateErrorWithRelations
import tachiyomi.domain.source.service.SourceManager
import tachiyomi.presentation.core.components.ListGroupHeader
import tachiyomi.presentation.core.components.Scroller.STICKY_HEADER_KEY_PREFIX
import tachiyomi.presentation.core.components.material.padding
import tachiyomi.presentation.core.util.secondaryItemAlpha
import tachiyomi.presentation.core.util.selectedBackground
@@ -34,57 +35,52 @@ internal fun LazyListScope.libraryUpdateErrorUiItems(
onClick: (LibraryUpdateErrorItem) -> Unit,
onClickCover: (LibraryUpdateErrorItem) -> Unit,
) {
items(
items = uiModels,
contentType = {
when (it) {
is LibraryUpdateErrorUiModel.Header -> "header"
is LibraryUpdateErrorUiModel.Item -> "item"
}
},
key = {
when (it) {
is LibraryUpdateErrorUiModel.Header -> "sticky:errorHeader-${it.hashCode()}"
is LibraryUpdateErrorUiModel.Item -> "error-${it.item.error.errorId}-${it.item.error.mangaId}"
}
},
) { item ->
when (item) {
uiModels.forEach {
when (it) {
is LibraryUpdateErrorUiModel.Header -> {
ListGroupHeader(
modifier = Modifier.animateItemPlacement(),
text = item.errorMessage,
)
stickyHeader(
key = "$STICKY_HEADER_KEY_PREFIX-errorHeader-${it.hashCode()}",
contentType = "header",
) {
ListGroupHeader(
modifier = Modifier.animateItemFastScroll(),
text = it.errorMessage,
)
}
}
is LibraryUpdateErrorUiModel.Item -> {
val libraryUpdateErrorItem = item.item
LibraryUpdateErrorUiItem(
modifier = Modifier.animateItemPlacement(),
error = libraryUpdateErrorItem.error,
selected = libraryUpdateErrorItem.selected,
onClick = {
when {
selectionMode -> onErrorSelected(
item(
key = "error-${it.item.error.errorId}-${it.item.error.mangaId}",
contentType = "item",
) {
val libraryUpdateErrorItem = it.item
LibraryUpdateErrorUiItem(
modifier = Modifier.animateItemFastScroll(),
error = libraryUpdateErrorItem.error,
selected = libraryUpdateErrorItem.selected,
onClick = {
when {
selectionMode -> onErrorSelected(
libraryUpdateErrorItem,
!libraryUpdateErrorItem.selected,
true,
false,
)
else -> onClick(libraryUpdateErrorItem)
}
},
onLongClick = {
onErrorSelected(
libraryUpdateErrorItem,
!libraryUpdateErrorItem.selected,
true,
false,
true,
)
else -> onClick(libraryUpdateErrorItem)
}
},
onLongClick = {
onErrorSelected(
libraryUpdateErrorItem,
!libraryUpdateErrorItem.selected,
true,
true,
)
},
onClickCover = { onClickCover(libraryUpdateErrorItem) }.takeIf { !selectionMode },
)
},
onClickCover = { onClickCover(libraryUpdateErrorItem) }.takeIf { !selectionMode },
)
}
}
}
}

28
presentation-core/src/main/java/tachiyomi/presentation/core/components/ListGroupHeader.kt
View File

@@ -1,7 +1,9 @@
package tachiyomi.presentation.core.components
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
@@ -13,15 +15,21 @@ fun ListGroupHeader(
text: String,
modifier: Modifier = Modifier,
) {
Text(
text = text,
Surface(
modifier = modifier
.padding(
horizontal = MaterialTheme.padding.medium,
vertical = MaterialTheme.padding.small,
),
color = MaterialTheme.colorScheme.onSurfaceVariant,
fontWeight = FontWeight.SemiBold,
style = MaterialTheme.typography.bodyMedium,
)
.fillMaxWidth(),
color = MaterialTheme.colorScheme.surfaceContainerLow,
) {
Text(
text = text,
modifier = Modifier
.padding(
horizontal = MaterialTheme.padding.medium,
vertical = MaterialTheme.padding.small,
),
color = MaterialTheme.colorScheme.onSurfaceVariant,
fontWeight = FontWeight.SemiBold,
style = MaterialTheme.typography.bodyMedium,
)
}
}