MangaScreen: Ditch the expanded app bar (#7470)
Animating the content padding that's used for the lazy list is heavy. A simple fix to *just* offset the list is blocked by a Compose fling issue (b/179417109). So I decided to go with the previous layout of this screen by putting everything in the list. MangaInfoHeader is split into separate composables to avoid jank when the item is being inflated.
This commit is contained in:
parent
86bacbe586
commit
34906a7425
3 changed files with 337 additions and 462 deletions
|
@ -2,15 +2,11 @@ package eu.kanade.presentation.manga
|
||||||
|
|
||||||
import androidx.activity.compose.BackHandler
|
import androidx.activity.compose.BackHandler
|
||||||
import androidx.compose.animation.AnimatedVisibility
|
import androidx.compose.animation.AnimatedVisibility
|
||||||
|
import androidx.compose.animation.core.animateFloatAsState
|
||||||
import androidx.compose.animation.fadeIn
|
import androidx.compose.animation.fadeIn
|
||||||
import androidx.compose.animation.fadeOut
|
import androidx.compose.animation.fadeOut
|
||||||
import androidx.compose.animation.rememberSplineBasedDecay
|
|
||||||
import androidx.compose.foundation.gestures.Orientation
|
|
||||||
import androidx.compose.foundation.gestures.rememberScrollableState
|
|
||||||
import androidx.compose.foundation.gestures.scrollBy
|
|
||||||
import androidx.compose.foundation.gestures.scrollable
|
|
||||||
import androidx.compose.foundation.interaction.MutableInteractionSource
|
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.PaddingValues
|
import androidx.compose.foundation.layout.PaddingValues
|
||||||
import androidx.compose.foundation.layout.Row
|
import androidx.compose.foundation.layout.Row
|
||||||
import androidx.compose.foundation.layout.WindowInsets
|
import androidx.compose.foundation.layout.WindowInsets
|
||||||
|
@ -36,10 +32,10 @@ import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.SnackbarHost
|
import androidx.compose.material3.SnackbarHost
|
||||||
import androidx.compose.material3.SnackbarHostState
|
import androidx.compose.material3.SnackbarHostState
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.material3.rememberTopAppBarScrollState
|
|
||||||
import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
|
import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.SideEffect
|
import androidx.compose.runtime.derivedStateOf
|
||||||
|
import androidx.compose.runtime.getValue
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.snapshots.SnapshotStateList
|
import androidx.compose.runtime.snapshots.SnapshotStateList
|
||||||
|
@ -47,7 +43,6 @@ import androidx.compose.runtime.toMutableStateList
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.hapticfeedback.HapticFeedbackType
|
import androidx.compose.ui.hapticfeedback.HapticFeedbackType
|
||||||
import androidx.compose.ui.input.nestedscroll.nestedScroll
|
|
||||||
import androidx.compose.ui.layout.onSizeChanged
|
import androidx.compose.ui.layout.onSizeChanged
|
||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.platform.LocalContext
|
||||||
import androidx.compose.ui.platform.LocalDensity
|
import androidx.compose.ui.platform.LocalDensity
|
||||||
|
@ -63,12 +58,12 @@ import eu.kanade.presentation.components.Scaffold
|
||||||
import eu.kanade.presentation.components.SwipeRefreshIndicator
|
import eu.kanade.presentation.components.SwipeRefreshIndicator
|
||||||
import eu.kanade.presentation.components.VerticalFastScroller
|
import eu.kanade.presentation.components.VerticalFastScroller
|
||||||
import eu.kanade.presentation.manga.components.ChapterHeader
|
import eu.kanade.presentation.manga.components.ChapterHeader
|
||||||
|
import eu.kanade.presentation.manga.components.ExpandableMangaDescription
|
||||||
|
import eu.kanade.presentation.manga.components.MangaActionRow
|
||||||
import eu.kanade.presentation.manga.components.MangaBottomActionMenu
|
import eu.kanade.presentation.manga.components.MangaBottomActionMenu
|
||||||
import eu.kanade.presentation.manga.components.MangaChapterListItem
|
import eu.kanade.presentation.manga.components.MangaChapterListItem
|
||||||
import eu.kanade.presentation.manga.components.MangaInfoHeader
|
import eu.kanade.presentation.manga.components.MangaInfoBox
|
||||||
import eu.kanade.presentation.manga.components.MangaSmallAppBar
|
import eu.kanade.presentation.manga.components.MangaSmallAppBar
|
||||||
import eu.kanade.presentation.manga.components.MangaTopAppBar
|
|
||||||
import eu.kanade.presentation.util.ExitUntilCollapsedScrollBehavior
|
|
||||||
import eu.kanade.presentation.util.isScrolledToEnd
|
import eu.kanade.presentation.util.isScrolledToEnd
|
||||||
import eu.kanade.presentation.util.isScrollingUp
|
import eu.kanade.presentation.util.isScrollingUp
|
||||||
import eu.kanade.presentation.util.plus
|
import eu.kanade.presentation.util.plus
|
||||||
|
@ -79,7 +74,6 @@ import eu.kanade.tachiyomi.source.getNameForMangaInfo
|
||||||
import eu.kanade.tachiyomi.ui.manga.ChapterItem
|
import eu.kanade.tachiyomi.ui.manga.ChapterItem
|
||||||
import eu.kanade.tachiyomi.ui.manga.MangaScreenState
|
import eu.kanade.tachiyomi.ui.manga.MangaScreenState
|
||||||
import eu.kanade.tachiyomi.util.lang.toRelativeString
|
import eu.kanade.tachiyomi.util.lang.toRelativeString
|
||||||
import kotlinx.coroutines.runBlocking
|
|
||||||
import java.text.DecimalFormat
|
import java.text.DecimalFormat
|
||||||
import java.text.DecimalFormatSymbols
|
import java.text.DecimalFormatSymbols
|
||||||
import java.util.Date
|
import java.util.Date
|
||||||
|
@ -208,34 +202,9 @@ private fun MangaScreenSmallImpl(
|
||||||
onMultiDeleteClicked: (List<Chapter>) -> Unit,
|
onMultiDeleteClicked: (List<Chapter>) -> Unit,
|
||||||
) {
|
) {
|
||||||
val layoutDirection = LocalLayoutDirection.current
|
val layoutDirection = LocalLayoutDirection.current
|
||||||
val decayAnimationSpec = rememberSplineBasedDecay<Float>()
|
|
||||||
val scrollBehavior = ExitUntilCollapsedScrollBehavior(rememberTopAppBarScrollState(), decayAnimationSpec)
|
|
||||||
val chapterListState = rememberLazyListState()
|
val chapterListState = rememberLazyListState()
|
||||||
SideEffect {
|
|
||||||
if (chapterListState.firstVisibleItemIndex > 0 || chapterListState.firstVisibleItemScrollOffset > 0) {
|
|
||||||
// Should go here after a configuration change
|
|
||||||
// Safe to say that the app bar is fully scrolled
|
|
||||||
scrollBehavior.state.offset = scrollBehavior.state.offsetLimit
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val insetPadding = WindowInsets.systemBars.only(WindowInsetsSides.Horizontal).asPaddingValues()
|
val insetPadding = WindowInsets.systemBars.only(WindowInsetsSides.Horizontal).asPaddingValues()
|
||||||
val (topBarHeight, onTopBarHeightChanged) = remember { mutableStateOf(1) }
|
|
||||||
SwipeRefresh(
|
|
||||||
state = rememberSwipeRefreshState(state.isRefreshingInfo || state.isRefreshingChapter),
|
|
||||||
onRefresh = onRefresh,
|
|
||||||
indicatorPadding = PaddingValues(
|
|
||||||
start = insetPadding.calculateStartPadding(layoutDirection),
|
|
||||||
top = with(LocalDensity.current) { topBarHeight.toDp() },
|
|
||||||
end = insetPadding.calculateEndPadding(layoutDirection),
|
|
||||||
),
|
|
||||||
indicator = { s, trigger ->
|
|
||||||
SwipeRefreshIndicator(
|
|
||||||
state = s,
|
|
||||||
refreshTriggerDistance = trigger,
|
|
||||||
)
|
|
||||||
},
|
|
||||||
) {
|
|
||||||
val chapters = remember(state) { state.processedChapters.toList() }
|
val chapters = remember(state) { state.processedChapters.toList() }
|
||||||
val selected = remember(chapters) { emptyList<ChapterItem>().toMutableStateList() }
|
val selected = remember(chapters) { emptyList<ChapterItem>().toMutableStateList() }
|
||||||
val selectedPositions = remember(chapters) { arrayOf(-1, -1) } // first and last selected index in list
|
val selectedPositions = remember(chapters) { arrayOf(-1, -1) } // first and last selected index in list
|
||||||
|
@ -251,55 +220,31 @@ private fun MangaScreenSmallImpl(
|
||||||
|
|
||||||
Scaffold(
|
Scaffold(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.nestedScroll(scrollBehavior.nestedScrollConnection)
|
|
||||||
.padding(insetPadding),
|
.padding(insetPadding),
|
||||||
topBar = {
|
topBar = {
|
||||||
MangaTopAppBar(
|
val firstVisibleItemIndex by remember {
|
||||||
modifier = Modifier
|
derivedStateOf { chapterListState.firstVisibleItemIndex }
|
||||||
.scrollable(
|
|
||||||
state = rememberScrollableState {
|
|
||||||
var consumed = runBlocking { chapterListState.scrollBy(-it) } * -1
|
|
||||||
if (consumed == 0f) {
|
|
||||||
// Pass scroll to app bar if we're on the top of the list
|
|
||||||
val newOffset =
|
|
||||||
(scrollBehavior.state.offset + it).coerceIn(scrollBehavior.state.offsetLimit, 0f)
|
|
||||||
consumed = newOffset - scrollBehavior.state.offset
|
|
||||||
scrollBehavior.state.offset = newOffset
|
|
||||||
}
|
}
|
||||||
consumed
|
val firstVisibleItemScrollOffset by remember {
|
||||||
},
|
derivedStateOf { chapterListState.firstVisibleItemScrollOffset }
|
||||||
orientation = Orientation.Vertical,
|
}
|
||||||
interactionSource = chapterListState.interactionSource as MutableInteractionSource,
|
val animatedTitleAlpha by animateFloatAsState(
|
||||||
),
|
if (firstVisibleItemIndex > 0) 1f else 0f,
|
||||||
|
)
|
||||||
|
val animatedBgAlpha by animateFloatAsState(
|
||||||
|
if (firstVisibleItemIndex > 0 || firstVisibleItemScrollOffset > 0) 1f else 0f,
|
||||||
|
)
|
||||||
|
MangaSmallAppBar(
|
||||||
title = state.manga.title,
|
title = state.manga.title,
|
||||||
author = state.manga.author,
|
titleAlphaProvider = { animatedTitleAlpha },
|
||||||
artist = state.manga.artist,
|
backgroundAlphaProvider = { animatedBgAlpha },
|
||||||
description = state.manga.description,
|
|
||||||
tagsProvider = { state.manga.genre },
|
|
||||||
coverDataProvider = { state.manga },
|
|
||||||
sourceName = remember { state.source.getNameForMangaInfo() },
|
|
||||||
isStubSource = remember { state.source is SourceManager.StubSource },
|
|
||||||
favorite = state.manga.favorite,
|
|
||||||
status = state.manga.status,
|
|
||||||
trackingCount = state.trackingCount,
|
|
||||||
chapterCount = chapters.size,
|
|
||||||
chapterFiltered = state.manga.chaptersFiltered(),
|
|
||||||
incognitoMode = state.isIncognitoMode,
|
incognitoMode = state.isIncognitoMode,
|
||||||
downloadedOnlyMode = state.isDownloadedOnlyMode,
|
downloadedOnlyMode = state.isDownloadedOnlyMode,
|
||||||
fromSource = state.isFromSource,
|
onBackClicked = onBackClicked,
|
||||||
onBackClicked = internalOnBackPressed,
|
|
||||||
onCoverClick = onCoverClicked,
|
|
||||||
onTagClicked = onTagClicked,
|
|
||||||
onAddToLibraryClicked = onAddToLibraryClicked,
|
|
||||||
onWebViewClicked = onWebViewClicked,
|
|
||||||
onTrackingClicked = onTrackingClicked,
|
|
||||||
onFilterButtonClicked = onFilterButtonClicked,
|
|
||||||
onShareClicked = onShareClicked,
|
onShareClicked = onShareClicked,
|
||||||
onDownloadClicked = onDownloadActionClicked,
|
onDownloadClicked = onDownloadActionClicked,
|
||||||
onEditCategoryClicked = onEditCategoryClicked,
|
onEditCategoryClicked = onEditCategoryClicked,
|
||||||
onMigrateClicked = onMigrateClicked,
|
onMigrateClicked = onMigrateClicked,
|
||||||
doGlobalSearch = onSearch,
|
|
||||||
scrollBehavior = scrollBehavior,
|
|
||||||
actionModeCounter = selected.size,
|
actionModeCounter = selected.size,
|
||||||
onSelectAll = {
|
onSelectAll = {
|
||||||
selected.clear()
|
selected.clear()
|
||||||
|
@ -310,7 +255,6 @@ private fun MangaScreenSmallImpl(
|
||||||
selected.clear()
|
selected.clear()
|
||||||
selected.addAll(toSelect)
|
selected.addAll(toSelect)
|
||||||
},
|
},
|
||||||
onSmallAppBarHeightChanged = onTopBarHeightChanged,
|
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
bottomBar = {
|
bottomBar = {
|
||||||
|
@ -349,19 +293,78 @@ private fun MangaScreenSmallImpl(
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
) { contentPadding ->
|
) { contentPadding ->
|
||||||
val withNavBarContentPadding = contentPadding +
|
val noTopContentPadding = PaddingValues(
|
||||||
WindowInsets.navigationBars.only(WindowInsetsSides.Bottom).asPaddingValues()
|
start = contentPadding.calculateStartPadding(layoutDirection),
|
||||||
|
end = contentPadding.calculateEndPadding(layoutDirection),
|
||||||
|
bottom = contentPadding.calculateBottomPadding(),
|
||||||
|
) + WindowInsets.navigationBars.only(WindowInsetsSides.Bottom).asPaddingValues()
|
||||||
|
val topPadding = contentPadding.calculateTopPadding()
|
||||||
|
|
||||||
|
SwipeRefresh(
|
||||||
|
state = rememberSwipeRefreshState(state.isRefreshingInfo || state.isRefreshingChapter),
|
||||||
|
onRefresh = onRefresh,
|
||||||
|
indicatorPadding = contentPadding,
|
||||||
|
indicator = { s, trigger ->
|
||||||
|
SwipeRefreshIndicator(
|
||||||
|
state = s,
|
||||||
|
refreshTriggerDistance = trigger,
|
||||||
|
)
|
||||||
|
},
|
||||||
|
) {
|
||||||
VerticalFastScroller(
|
VerticalFastScroller(
|
||||||
listState = chapterListState,
|
listState = chapterListState,
|
||||||
thumbAllowed = { scrollBehavior.state.offset == scrollBehavior.state.offsetLimit },
|
topContentPadding = topPadding,
|
||||||
topContentPadding = withNavBarContentPadding.calculateTopPadding(),
|
endContentPadding = noTopContentPadding.calculateEndPadding(layoutDirection),
|
||||||
endContentPadding = withNavBarContentPadding.calculateEndPadding(LocalLayoutDirection.current),
|
|
||||||
) {
|
) {
|
||||||
LazyColumn(
|
LazyColumn(
|
||||||
modifier = Modifier.fillMaxHeight(),
|
modifier = Modifier.fillMaxHeight(),
|
||||||
state = chapterListState,
|
state = chapterListState,
|
||||||
contentPadding = withNavBarContentPadding,
|
contentPadding = noTopContentPadding,
|
||||||
) {
|
) {
|
||||||
|
item(contentType = "info_box") {
|
||||||
|
MangaInfoBox(
|
||||||
|
windowWidthSizeClass = WindowWidthSizeClass.Compact,
|
||||||
|
appBarPadding = topPadding,
|
||||||
|
title = state.manga.title,
|
||||||
|
author = state.manga.author,
|
||||||
|
artist = state.manga.artist,
|
||||||
|
sourceName = remember { state.source.getNameForMangaInfo() },
|
||||||
|
isStubSource = remember { state.source is SourceManager.StubSource },
|
||||||
|
coverDataProvider = { state.manga },
|
||||||
|
status = state.manga.status,
|
||||||
|
onCoverClick = onCoverClicked,
|
||||||
|
doSearch = onSearch,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
item(contentType = "action_row") {
|
||||||
|
MangaActionRow(
|
||||||
|
favorite = state.manga.favorite,
|
||||||
|
trackingCount = state.trackingCount,
|
||||||
|
onAddToLibraryClicked = onAddToLibraryClicked,
|
||||||
|
onWebViewClicked = onWebViewClicked,
|
||||||
|
onTrackingClicked = onTrackingClicked,
|
||||||
|
onEditCategory = onEditCategoryClicked,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
item(contentType = "desc") {
|
||||||
|
ExpandableMangaDescription(
|
||||||
|
defaultExpandState = state.isFromSource,
|
||||||
|
description = state.manga.description,
|
||||||
|
tagsProvider = { state.manga.genre },
|
||||||
|
onTagClicked = onTagClicked,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
item(contentType = "header") {
|
||||||
|
ChapterHeader(
|
||||||
|
chapterCount = chapters.size,
|
||||||
|
isChapterFiltered = state.manga.chaptersFiltered(),
|
||||||
|
onFilterButtonClicked = onFilterButtonClicked,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
sharedChapterItems(
|
sharedChapterItems(
|
||||||
chapters = chapters,
|
chapters = chapters,
|
||||||
state = state,
|
state = state,
|
||||||
|
@ -514,33 +517,40 @@ fun MangaScreenLargeImpl(
|
||||||
Row {
|
Row {
|
||||||
val withNavBarContentPadding = contentPadding +
|
val withNavBarContentPadding = contentPadding +
|
||||||
WindowInsets.navigationBars.only(WindowInsetsSides.Bottom).asPaddingValues()
|
WindowInsets.navigationBars.only(WindowInsetsSides.Bottom).asPaddingValues()
|
||||||
MangaInfoHeader(
|
Column(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.weight(1f)
|
.weight(1f)
|
||||||
.verticalScroll(rememberScrollState())
|
.verticalScroll(rememberScrollState())
|
||||||
.padding(bottom = withNavBarContentPadding.calculateBottomPadding()),
|
.padding(bottom = withNavBarContentPadding.calculateBottomPadding()),
|
||||||
windowWidthSizeClass = WindowWidthSizeClass.Expanded,
|
) {
|
||||||
|
MangaInfoBox(
|
||||||
|
windowWidthSizeClass = windowWidthSizeClass,
|
||||||
appBarPadding = contentPadding.calculateTopPadding(),
|
appBarPadding = contentPadding.calculateTopPadding(),
|
||||||
title = state.manga.title,
|
title = state.manga.title,
|
||||||
author = state.manga.author,
|
author = state.manga.author,
|
||||||
artist = state.manga.artist,
|
artist = state.manga.artist,
|
||||||
description = state.manga.description,
|
|
||||||
tagsProvider = { state.manga.genre },
|
|
||||||
sourceName = remember { state.source.getNameForMangaInfo() },
|
sourceName = remember { state.source.getNameForMangaInfo() },
|
||||||
isStubSource = remember { state.source is SourceManager.StubSource },
|
isStubSource = remember { state.source is SourceManager.StubSource },
|
||||||
coverDataProvider = { state.manga },
|
coverDataProvider = { state.manga },
|
||||||
favorite = state.manga.favorite,
|
|
||||||
status = state.manga.status,
|
status = state.manga.status,
|
||||||
trackingCount = state.trackingCount,
|
|
||||||
fromSource = state.isFromSource,
|
|
||||||
onAddToLibraryClicked = onAddToLibraryClicked,
|
|
||||||
onWebViewClicked = onWebViewClicked,
|
|
||||||
onTrackingClicked = onTrackingClicked,
|
|
||||||
onTagClicked = onTagClicked,
|
|
||||||
onEditCategory = onEditCategoryClicked,
|
|
||||||
onCoverClick = onCoverClicked,
|
onCoverClick = onCoverClicked,
|
||||||
doSearch = onSearch,
|
doSearch = onSearch,
|
||||||
)
|
)
|
||||||
|
MangaActionRow(
|
||||||
|
favorite = state.manga.favorite,
|
||||||
|
trackingCount = state.trackingCount,
|
||||||
|
onAddToLibraryClicked = onAddToLibraryClicked,
|
||||||
|
onWebViewClicked = onWebViewClicked,
|
||||||
|
onTrackingClicked = onTrackingClicked,
|
||||||
|
onEditCategory = onEditCategoryClicked,
|
||||||
|
)
|
||||||
|
ExpandableMangaDescription(
|
||||||
|
defaultExpandState = true,
|
||||||
|
description = state.manga.description,
|
||||||
|
tagsProvider = { state.manga.genre },
|
||||||
|
onTagClicked = onTagClicked,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
val chaptersWeight = if (windowWidthSizeClass == WindowWidthSizeClass.Medium) 1f else 2f
|
val chaptersWeight = if (windowWidthSizeClass == WindowWidthSizeClass.Medium) 1f else 2f
|
||||||
VerticalFastScroller(
|
VerticalFastScroller(
|
||||||
|
|
|
@ -85,33 +85,21 @@ import kotlin.math.roundToInt
|
||||||
private val whitespaceLineRegex = Regex("[\\r\\n]{2,}", setOf(RegexOption.MULTILINE))
|
private val whitespaceLineRegex = Regex("[\\r\\n]{2,}", setOf(RegexOption.MULTILINE))
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun MangaInfoHeader(
|
fun MangaInfoBox(
|
||||||
modifier: Modifier = Modifier,
|
modifier: Modifier = Modifier,
|
||||||
windowWidthSizeClass: WindowWidthSizeClass,
|
windowWidthSizeClass: WindowWidthSizeClass,
|
||||||
appBarPadding: Dp,
|
appBarPadding: Dp,
|
||||||
title: String,
|
title: String,
|
||||||
author: String?,
|
author: String?,
|
||||||
artist: String?,
|
artist: String?,
|
||||||
description: String?,
|
|
||||||
tagsProvider: () -> List<String>?,
|
|
||||||
sourceName: String,
|
sourceName: String,
|
||||||
isStubSource: Boolean,
|
isStubSource: Boolean,
|
||||||
coverDataProvider: () -> Manga,
|
coverDataProvider: () -> Manga,
|
||||||
favorite: Boolean,
|
|
||||||
status: Long,
|
status: Long,
|
||||||
trackingCount: Int,
|
|
||||||
fromSource: Boolean,
|
|
||||||
onAddToLibraryClicked: () -> Unit,
|
|
||||||
onWebViewClicked: (() -> Unit)?,
|
|
||||||
onTrackingClicked: (() -> Unit)?,
|
|
||||||
onTagClicked: (String) -> Unit,
|
|
||||||
onEditCategory: (() -> Unit)?,
|
|
||||||
onCoverClick: () -> Unit,
|
onCoverClick: () -> Unit,
|
||||||
doSearch: (query: String, global: Boolean) -> Unit,
|
doSearch: (query: String, global: Boolean) -> Unit,
|
||||||
) {
|
) {
|
||||||
val context = LocalContext.current
|
Box(modifier = modifier) {
|
||||||
Column(modifier = modifier) {
|
|
||||||
Box {
|
|
||||||
// Backdrop
|
// Backdrop
|
||||||
val backdropGradientColors = listOf(
|
val backdropGradientColors = listOf(
|
||||||
Color.Transparent,
|
Color.Transparent,
|
||||||
|
@ -140,7 +128,7 @@ fun MangaInfoHeader(
|
||||||
coverDataProvider = coverDataProvider,
|
coverDataProvider = coverDataProvider,
|
||||||
onCoverClick = onCoverClick,
|
onCoverClick = onCoverClick,
|
||||||
title = title,
|
title = title,
|
||||||
context = context,
|
context = LocalContext.current,
|
||||||
doSearch = doSearch,
|
doSearch = doSearch,
|
||||||
author = author,
|
author = author,
|
||||||
artist = artist,
|
artist = artist,
|
||||||
|
@ -154,7 +142,7 @@ fun MangaInfoHeader(
|
||||||
coverDataProvider = coverDataProvider,
|
coverDataProvider = coverDataProvider,
|
||||||
onCoverClick = onCoverClick,
|
onCoverClick = onCoverClick,
|
||||||
title = title,
|
title = title,
|
||||||
context = context,
|
context = LocalContext.current,
|
||||||
doSearch = doSearch,
|
doSearch = doSearch,
|
||||||
author = author,
|
author = author,
|
||||||
artist = artist,
|
artist = artist,
|
||||||
|
@ -165,9 +153,19 @@ fun MangaInfoHeader(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Action buttons
|
@Composable
|
||||||
Row(modifier = Modifier.padding(start = 16.dp, top = 8.dp, end = 16.dp)) {
|
fun MangaActionRow(
|
||||||
|
modifier: Modifier = Modifier,
|
||||||
|
favorite: Boolean,
|
||||||
|
trackingCount: Int,
|
||||||
|
onAddToLibraryClicked: () -> Unit,
|
||||||
|
onWebViewClicked: (() -> Unit)?,
|
||||||
|
onTrackingClicked: (() -> Unit)?,
|
||||||
|
onEditCategory: (() -> Unit)?,
|
||||||
|
) {
|
||||||
|
Row(modifier = modifier.padding(start = 16.dp, top = 8.dp, end = 16.dp)) {
|
||||||
val defaultActionButtonColor = MaterialTheme.colorScheme.onSurface.copy(alpha = .38f)
|
val defaultActionButtonColor = MaterialTheme.colorScheme.onSurface.copy(alpha = .38f)
|
||||||
MangaActionButton(
|
MangaActionButton(
|
||||||
title = if (favorite) {
|
title = if (favorite) {
|
||||||
|
@ -201,11 +199,20 @@ fun MangaInfoHeader(
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Expandable description-tags
|
@Composable
|
||||||
Column {
|
fun ExpandableMangaDescription(
|
||||||
|
modifier: Modifier = Modifier,
|
||||||
|
defaultExpandState: Boolean,
|
||||||
|
description: String?,
|
||||||
|
tagsProvider: () -> List<String>?,
|
||||||
|
onTagClicked: (String) -> Unit,
|
||||||
|
) {
|
||||||
|
val context = LocalContext.current
|
||||||
|
Column(modifier = modifier) {
|
||||||
val (expanded, onExpanded) = rememberSaveable {
|
val (expanded, onExpanded) = rememberSaveable {
|
||||||
mutableStateOf(fromSource || windowWidthSizeClass != WindowWidthSizeClass.Compact)
|
mutableStateOf(defaultExpandState)
|
||||||
}
|
}
|
||||||
val desc =
|
val desc =
|
||||||
description.takeIf { !it.isNullOrBlank() } ?: stringResource(id = R.string.description_placeholder)
|
description.takeIf { !it.isNullOrBlank() } ?: stringResource(id = R.string.description_placeholder)
|
||||||
|
@ -263,7 +270,6 @@ fun MangaInfoHeader(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
|
|
|
@ -1,141 +0,0 @@
|
||||||
package eu.kanade.presentation.manga.components
|
|
||||||
|
|
||||||
import androidx.compose.foundation.layout.Column
|
|
||||||
import androidx.compose.material3.TopAppBarScrollBehavior
|
|
||||||
import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.runtime.mutableStateOf
|
|
||||||
import androidx.compose.runtime.remember
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.layout.Layout
|
|
||||||
import androidx.compose.ui.layout.layoutId
|
|
||||||
import androidx.compose.ui.layout.onSizeChanged
|
|
||||||
import androidx.compose.ui.platform.LocalDensity
|
|
||||||
import androidx.compose.ui.unit.Constraints
|
|
||||||
import eu.kanade.domain.manga.model.Manga
|
|
||||||
import eu.kanade.presentation.manga.DownloadAction
|
|
||||||
import kotlin.math.roundToInt
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun MangaTopAppBar(
|
|
||||||
modifier: Modifier = Modifier,
|
|
||||||
title: String,
|
|
||||||
author: String?,
|
|
||||||
artist: String?,
|
|
||||||
description: String?,
|
|
||||||
tagsProvider: () -> List<String>?,
|
|
||||||
coverDataProvider: () -> Manga,
|
|
||||||
sourceName: String,
|
|
||||||
isStubSource: Boolean,
|
|
||||||
favorite: Boolean,
|
|
||||||
status: Long,
|
|
||||||
trackingCount: Int,
|
|
||||||
chapterCount: Int?,
|
|
||||||
chapterFiltered: Boolean,
|
|
||||||
incognitoMode: Boolean,
|
|
||||||
downloadedOnlyMode: Boolean,
|
|
||||||
fromSource: Boolean,
|
|
||||||
onBackClicked: () -> Unit,
|
|
||||||
onCoverClick: () -> Unit,
|
|
||||||
onTagClicked: (String) -> Unit,
|
|
||||||
onAddToLibraryClicked: () -> Unit,
|
|
||||||
onWebViewClicked: (() -> Unit)?,
|
|
||||||
onTrackingClicked: (() -> Unit)?,
|
|
||||||
onFilterButtonClicked: () -> Unit,
|
|
||||||
onShareClicked: (() -> Unit)?,
|
|
||||||
onDownloadClicked: ((DownloadAction) -> Unit)?,
|
|
||||||
onEditCategoryClicked: (() -> Unit)?,
|
|
||||||
onMigrateClicked: (() -> Unit)?,
|
|
||||||
doGlobalSearch: (query: String, global: Boolean) -> Unit,
|
|
||||||
scrollBehavior: TopAppBarScrollBehavior?,
|
|
||||||
// For action mode
|
|
||||||
actionModeCounter: Int,
|
|
||||||
onSelectAll: () -> Unit,
|
|
||||||
onInvertSelection: () -> Unit,
|
|
||||||
onSmallAppBarHeightChanged: (Int) -> Unit,
|
|
||||||
) {
|
|
||||||
val scrollPercentageProvider = { scrollBehavior?.scrollFraction?.coerceIn(0f, 1f) ?: 0f }
|
|
||||||
val inverseScrollPercentageProvider = { 1f - scrollPercentageProvider() }
|
|
||||||
|
|
||||||
Layout(
|
|
||||||
modifier = modifier,
|
|
||||||
content = {
|
|
||||||
val (smallHeightPx, onSmallHeightPxChanged) = remember { mutableStateOf(0) }
|
|
||||||
Column(modifier = Modifier.layoutId("mangaInfo")) {
|
|
||||||
MangaInfoHeader(
|
|
||||||
windowWidthSizeClass = WindowWidthSizeClass.Compact,
|
|
||||||
appBarPadding = with(LocalDensity.current) { smallHeightPx.toDp() },
|
|
||||||
title = title,
|
|
||||||
author = author,
|
|
||||||
artist = artist,
|
|
||||||
description = description,
|
|
||||||
tagsProvider = tagsProvider,
|
|
||||||
sourceName = sourceName,
|
|
||||||
isStubSource = isStubSource,
|
|
||||||
coverDataProvider = coverDataProvider,
|
|
||||||
favorite = favorite,
|
|
||||||
status = status,
|
|
||||||
trackingCount = trackingCount,
|
|
||||||
fromSource = fromSource,
|
|
||||||
onAddToLibraryClicked = onAddToLibraryClicked,
|
|
||||||
onWebViewClicked = onWebViewClicked,
|
|
||||||
onTrackingClicked = onTrackingClicked,
|
|
||||||
onTagClicked = onTagClicked,
|
|
||||||
onEditCategory = onEditCategoryClicked,
|
|
||||||
onCoverClick = onCoverClick,
|
|
||||||
doSearch = doGlobalSearch,
|
|
||||||
)
|
|
||||||
ChapterHeader(
|
|
||||||
chapterCount = chapterCount,
|
|
||||||
isChapterFiltered = chapterFiltered,
|
|
||||||
onFilterButtonClicked = onFilterButtonClicked,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
MangaSmallAppBar(
|
|
||||||
modifier = Modifier
|
|
||||||
.layoutId("topBar")
|
|
||||||
.onSizeChanged {
|
|
||||||
onSmallHeightPxChanged(it.height)
|
|
||||||
onSmallAppBarHeightChanged(it.height)
|
|
||||||
},
|
|
||||||
title = title,
|
|
||||||
titleAlphaProvider = { if (actionModeCounter == 0) scrollPercentageProvider() else 1f },
|
|
||||||
incognitoMode = incognitoMode,
|
|
||||||
downloadedOnlyMode = downloadedOnlyMode,
|
|
||||||
onBackClicked = onBackClicked,
|
|
||||||
onShareClicked = onShareClicked,
|
|
||||||
onDownloadClicked = onDownloadClicked,
|
|
||||||
onEditCategoryClicked = onEditCategoryClicked,
|
|
||||||
onMigrateClicked = onMigrateClicked,
|
|
||||||
actionModeCounter = actionModeCounter,
|
|
||||||
onSelectAll = onSelectAll,
|
|
||||||
onInvertSelection = onInvertSelection,
|
|
||||||
)
|
|
||||||
},
|
|
||||||
) { measurables, constraints ->
|
|
||||||
val mangaInfoPlaceable = measurables
|
|
||||||
.first { it.layoutId == "mangaInfo" }
|
|
||||||
.measure(constraints.copy(maxHeight = Constraints.Infinity))
|
|
||||||
val topBarPlaceable = measurables
|
|
||||||
.first { it.layoutId == "topBar" }
|
|
||||||
.measure(constraints)
|
|
||||||
val mangaInfoHeight = mangaInfoPlaceable.height
|
|
||||||
val topBarHeight = topBarPlaceable.height
|
|
||||||
val mangaInfoSansTopBarHeightPx = mangaInfoHeight - topBarHeight
|
|
||||||
val layoutHeight = topBarHeight +
|
|
||||||
(mangaInfoSansTopBarHeightPx * inverseScrollPercentageProvider()).roundToInt()
|
|
||||||
|
|
||||||
layout(constraints.maxWidth, layoutHeight) {
|
|
||||||
val mangaInfoY = (-mangaInfoSansTopBarHeightPx * scrollPercentageProvider()).roundToInt()
|
|
||||||
mangaInfoPlaceable.place(0, mangaInfoY)
|
|
||||||
topBarPlaceable.place(0, 0)
|
|
||||||
|
|
||||||
// Update offset limit
|
|
||||||
val offsetLimit = -mangaInfoSansTopBarHeightPx.toFloat()
|
|
||||||
if (scrollBehavior?.state?.offsetLimit != offsetLimit) {
|
|
||||||
scrollBehavior?.state?.offsetLimit = offsetLimit
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
Reference in a new issue