|
@@ -5,11 +5,9 @@ import androidx.compose.animation.AnimatedVisibility
|
|
|
import androidx.compose.animation.core.animateFloatAsState
|
|
|
import androidx.compose.animation.fadeIn
|
|
|
import androidx.compose.animation.fadeOut
|
|
|
-import androidx.compose.foundation.layout.Arrangement
|
|
|
import androidx.compose.foundation.layout.Box
|
|
|
import androidx.compose.foundation.layout.Column
|
|
|
import androidx.compose.foundation.layout.PaddingValues
|
|
|
-import androidx.compose.foundation.layout.Row
|
|
|
import androidx.compose.foundation.layout.WindowInsets
|
|
|
import androidx.compose.foundation.layout.WindowInsetsSides
|
|
|
import androidx.compose.foundation.layout.asPaddingValues
|
|
@@ -28,9 +26,7 @@ import androidx.compose.foundation.rememberScrollState
|
|
|
import androidx.compose.foundation.verticalScroll
|
|
|
import androidx.compose.material.icons.Icons
|
|
|
import androidx.compose.material.icons.filled.PlayArrow
|
|
|
-import androidx.compose.material3.HorizontalDivider
|
|
|
import androidx.compose.material3.Icon
|
|
|
-import androidx.compose.material3.MaterialTheme
|
|
|
import androidx.compose.material3.SnackbarHost
|
|
|
import androidx.compose.material3.SnackbarHostState
|
|
|
import androidx.compose.material3.Text
|
|
@@ -48,7 +44,6 @@ import androidx.compose.ui.platform.LocalContext
|
|
|
import androidx.compose.ui.platform.LocalDensity
|
|
|
import androidx.compose.ui.platform.LocalHapticFeedback
|
|
|
import androidx.compose.ui.platform.LocalLayoutDirection
|
|
|
-import androidx.compose.ui.res.pluralStringResource
|
|
|
import androidx.compose.ui.res.stringResource
|
|
|
import androidx.compose.ui.util.fastAll
|
|
|
import androidx.compose.ui.util.fastAny
|
|
@@ -62,6 +57,7 @@ import eu.kanade.presentation.manga.components.MangaBottomActionMenu
|
|
|
import eu.kanade.presentation.manga.components.MangaChapterListItem
|
|
|
import eu.kanade.presentation.manga.components.MangaInfoBox
|
|
|
import eu.kanade.presentation.manga.components.MangaToolbar
|
|
|
+import eu.kanade.presentation.manga.components.MissingChapterCountListItem
|
|
|
import eu.kanade.presentation.util.formatChapterNumber
|
|
|
import eu.kanade.tachiyomi.R
|
|
|
import eu.kanade.tachiyomi.data.download.model.Download
|
|
@@ -80,10 +76,8 @@ import tachiyomi.presentation.core.components.VerticalFastScroller
|
|
|
import tachiyomi.presentation.core.components.material.ExtendedFloatingActionButton
|
|
|
import tachiyomi.presentation.core.components.material.PullRefresh
|
|
|
import tachiyomi.presentation.core.components.material.Scaffold
|
|
|
-import tachiyomi.presentation.core.components.material.padding
|
|
|
import tachiyomi.presentation.core.util.isScrolledToEnd
|
|
|
import tachiyomi.presentation.core.util.isScrollingUp
|
|
|
-import tachiyomi.presentation.core.util.secondaryItemAlpha
|
|
|
import java.text.DateFormat
|
|
|
import java.util.Date
|
|
|
|
|
@@ -789,25 +783,7 @@ private fun LazyListScope.sharedChapterItems(
|
|
|
|
|
|
when (item) {
|
|
|
is ChapterList.MissingCount -> {
|
|
|
- Row(
|
|
|
- modifier = Modifier.padding(
|
|
|
- horizontal = MaterialTheme.padding.medium,
|
|
|
- vertical = MaterialTheme.padding.small,
|
|
|
- ),
|
|
|
- verticalAlignment = Alignment.CenterVertically,
|
|
|
- horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.medium),
|
|
|
- ) {
|
|
|
- HorizontalDivider(modifier = Modifier.weight(1f))
|
|
|
- Text(
|
|
|
- text = pluralStringResource(
|
|
|
- id = R.plurals.missing_chapters,
|
|
|
- count = item.count,
|
|
|
- item.count,
|
|
|
- ),
|
|
|
- modifier = Modifier.secondaryItemAlpha(),
|
|
|
- )
|
|
|
- HorizontalDivider(modifier = Modifier.weight(1f))
|
|
|
- }
|
|
|
+ MissingChapterCountListItem(count = item.count)
|
|
|
}
|
|
|
is ChapterList.Item -> {
|
|
|
MangaChapterListItem(
|