Skip to content

fix(ui): 条目详情页的Tab栏在平板上显示不全，超出限宽部分无法滑动问题 #2439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mystery406 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix(ui): 条目详情页的Tab栏在平板上显示不全，超出限宽部分无法滑动问题 #2439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb71958
fix(ui): 条目详情页的Tab栏在平板上显示不全问题
Mystery406 Aug 28, 2025
bdfabca
chore: 移除冗余的modifier
Mystery406 Sep 2, 2025
ead2912
fix(ui): 超出tab内容宽度限制部分无法响应垂直方向滑动问题
Mystery406 Sep 3, 2025
dd3bad3
Merge branch 'main' into fix-subject-detail-tab
Mystery406 Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions app/shared/ui-comment/src/commonMain/kotlin/ui/comment/CommentColumn.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.LazyGridItemScope
import androidx.compose.foundation.lazy.grid.LazyGridState
Expand All @@ -28,6 +29,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.paging.compose.LazyPagingItems
import androidx.paging.compose.itemContentType
Expand All @@ -53,7 +55,8 @@ fun CommentColumn(
contentPadding: PaddingValues = PaddingValues(0.dp),
connectedScrollState: ConnectedScrollState? = null,
state: LazyGridState = rememberLazyGridState(),
commentItem: @Composable LazyGridItemScope.(index: Int, item: UIComment) -> Unit
maxColumnWidth: Dp = Dp.Unspecified,
commentItem: @Composable LazyGridItemScope.(index: Int, item: UIComment) -> Unit,
) {
PullToRefreshBox(
isRefreshing = items.isLoadingFirstPageOrRefreshing,
Expand Down Expand Up @@ -90,15 +93,24 @@ fun CommentColumn(
key = items.itemKey { "CommentColumn-" + it.id },
contentType = items.itemContentType(),
) { index ->
Column {
val item = items[index] ?: return@items
commentItem(index, item)
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.Center,
) {
Column(
modifier = Modifier
.widthIn(max = maxColumnWidth)
.fillMaxWidth(),
) {
val item = items[index] ?: return@items
commentItem(index, item)

if (hasDividerLine && index != items.itemCount - 1) {
HorizontalDivider(
modifier = Modifier.fillMaxWidth(),
color = DividerDefaults.color.stronglyWeaken(),
)
if (hasDividerLine && index != items.itemCount - 1) {
HorizontalDivider(
modifier = Modifier.fillMaxWidth(),
color = DividerDefaults.color.stronglyWeaken(),
)
}
}
}
}
Expand Down
7 changes: 2 additions & 5 deletions app/shared/ui-subject/src/commonMain/kotlin/ui/subject/details/SubjectDetailsPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,8 @@ private fun SubjectDetailsPage(
relatedSubjects = state.relatedSubjectsPager.collectAsLazyPagingItemsWithLifecycle(),
Modifier
.nestedScrollWorkaround(state.detailsTabLazyListState, connectedScrollState)
.nestedScroll(connectedScrollState.nestedScrollConnection),
.nestedScroll(connectedScrollState.nestedScrollConnection)
.fillMaxWidth(),
state.detailsTabLazyListState,
contentPadding = contentPadding,
)
Expand Down Expand Up @@ -385,10 +386,6 @@ private fun SubjectDetailsPage(
}
}
},
Modifier
.fillMaxWidth()
.wrapContentWidth(align = Alignment.CenterHorizontally)
.widthIn(max = MaximumContentWidth),
)
}
}
Expand Down
29 changes: 19 additions & 10 deletions app/shared/ui-subject/src/commonMain/kotlin/ui/subject/details/components/DetailsTab.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyListState
Expand Down Expand Up @@ -134,23 +135,32 @@ fun SubjectDetailsDefaults.DetailsTab(
horizontalPadding: Dp = currentWindowAdaptiveInfo1().windowSizeClass.paneHorizontalPadding,
contentPadding: PaddingValues = PaddingValues(0.dp),
) {

fun Modifier.limitContentWidthAndApplyPadding() = this
.widthIn(max = MaximumContentWidth)
.fillMaxWidth()
.padding(horizontal = horizontalPadding)

LazyColumn(
modifier,
state = state,
contentPadding = contentPadding,
verticalArrangement = Arrangement.spacedBy(20.dp), // 这个页面内容比较密集, 如果用 16 显得有点拥挤
horizontalAlignment = Alignment.CenterHorizontally,
) {
item("spacer header") { }

// 简介
item("description") {
Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
Column(
modifier = Modifier.limitContentWidthAndApplyPadding(),
verticalArrangement = Arrangement.spacedBy(12.dp),
) {
SelectionContainer {
var expanded by rememberSaveable { mutableStateOf(false) }
Text(
info.summary,
Modifier.fillMaxWidth().padding(horizontal = horizontalPadding)
.clickable { expanded = !expanded },
Modifier.fillMaxWidth().clickable { expanded = !expanded },
style = MaterialTheme.typography.bodyMedium,
maxLines = if (expanded) Int.MAX_VALUE else 5, // TODO: add animation
overflow = TextOverflow.Ellipsis,
Expand All @@ -160,15 +170,14 @@ fun SubjectDetailsDefaults.DetailsTab(
TagsList(
info,
onClickTag,
Modifier.padding(horizontal = horizontalPadding),
)
}
}

item("characters title") {
Text(
"角色",
Modifier.padding(horizontal = horizontalPadding),
Modifier.limitContentWidthAndApplyPadding(),
style = MaterialTheme.typography.titleMedium,
)
}
Expand All @@ -182,15 +191,15 @@ fun SubjectDetailsDefaults.DetailsTab(
if (totalCharactersCount == null) "角色" else "角色 $totalCharactersCount",
)
},
modifier = Modifier.padding(horizontal = horizontalPadding),
modifier = Modifier.limitContentWidthAndApplyPadding(),
itemContent = { PersonCard(it) },
)
}

item("staff title") {
Text(
"制作人员",
Modifier.padding(horizontal = horizontalPadding),
Modifier.limitContentWidthAndApplyPadding(),
style = MaterialTheme.typography.titleMedium,
)
}
Expand All @@ -204,7 +213,7 @@ fun SubjectDetailsDefaults.DetailsTab(
if (totalStaffCount == null) "制作人员" else "制作人员 $totalStaffCount",
)
},
modifier = Modifier.padding(horizontal = horizontalPadding),
modifier = Modifier.limitContentWidthAndApplyPadding(),
itemContent = { PersonCard(it) },
)
}
Expand All @@ -213,7 +222,7 @@ fun SubjectDetailsDefaults.DetailsTab(
item("related subjects title") {
Text(
"关联条目",
Modifier.padding(horizontal = horizontalPadding),
Modifier.limitContentWidthAndApplyPadding(),
style = MaterialTheme.typography.titleMedium,
)
}
Expand All @@ -233,7 +242,7 @@ fun SubjectDetailsDefaults.DetailsTab(
),
)
},
Modifier.padding(horizontal = horizontalPadding),
Modifier.limitContentWidthAndApplyPadding(),
horizontalSpacing = horizontalPadding,
verticalSpacing = horizontalPadding,
)
Expand Down
13 changes: 4 additions & 9 deletions ...ed/ui-subject/src/commonMain/kotlin/ui/subject/details/components/SubjectCommentColumn.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,9 @@ import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.layout.wrapContentWidth
import androidx.compose.foundation.lazy.grid.LazyGridState
import androidx.compose.foundation.lazy.grid.rememberLazyGridState
import androidx.compose.material3.Text
Expand Down Expand Up @@ -54,14 +52,11 @@ fun SubjectDetailsDefaults.SubjectCommentColumn(
Box(modifier, contentAlignment = Alignment.TopCenter) {
CommentColumn(
state.list.collectAsLazyPagingItemsWithLifecycle(),
modifier = Modifier
.fillMaxWidth()
.wrapContentWidth(align = Alignment.CenterHorizontally)
.widthIn(max = SubjectDetailsDefaults.MaximumContentWidth)
.fillMaxHeight(),
modifier = Modifier.fillMaxSize(),
contentPadding = contentPadding,
state = gridState,
connectedScrollState = connectedScrollState,
maxColumnWidth = MaximumContentWidth,
) { _, comment ->
SubjectComment(
comment = comment,
Expand Down Expand Up @@ -97,7 +92,7 @@ fun SubjectComment(
}
},
)

Comment(
avatar = { CommentDefaults.Avatar(comment.author?.avatarUrl, authorModifier) },
primaryTitle = {
Expand Down
Loading