Skip to content
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.

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

[1.117.*] Pre-release merge #433

Merged
merged 4 commits into from
Apr 9, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Extract out common functions for calculating feed list item paddings
msasikanth committed Apr 9, 2024
commit e745c6ace4b7a2da05072e07721eeee321bf5fb7
Original file line number Diff line number Diff line change
@@ -432,32 +432,10 @@ private fun LazyGridScope.feedSearchResults(
span = { gridItemSpan }
) { index ->
val feed = searchResults[index]
val startPadding =
when {
gridItemSpan.currentLineSpan == 2 ||
(gridItemSpan.currentLineSpan == 1 && index % 2 == 0) -> 24.dp
else -> 8.dp
}

val endPadding =
when {
gridItemSpan.currentLineSpan == 2 ||
(gridItemSpan.currentLineSpan == 1 && index % 2 == 1) -> 24.dp
else -> 8.dp
}

val topPadding =
when {
gridItemSpan.currentLineSpan == 2 && index > 0 -> 8.dp
gridItemSpan.currentLineSpan == 1 && index > 1 -> 8.dp
else -> 0.dp
}

val bottomPadding =
when {
index < searchResults.itemCount -> 8.dp
else -> 0.dp
}
val startPadding = startPaddingOfFeedListItem(gridItemSpan, index)
val endPadding = endPaddingOfFeedListItem(gridItemSpan, index)
val topPadding = topPaddingOfFeedListItem(gridItemSpan, index)
val bottomPadding = bottomPAddingOfFeedListItem(index, searchResults.itemCount)

if (feed != null) {
FeedListItem(
@@ -502,32 +480,10 @@ private fun LazyGridScope.allFeeds(
span = { gridItemSpan }
) { index ->
val feed = feeds[index]
val startPadding =
when {
gridItemSpan.currentLineSpan == 2 ||
(gridItemSpan.currentLineSpan == 1 && index % 2 == 0) -> 24.dp
else -> 8.dp
}

val endPadding =
when {
gridItemSpan.currentLineSpan == 2 ||
(gridItemSpan.currentLineSpan == 1 && index % 2 == 1) -> 24.dp
else -> 8.dp
}

val topPadding =
when {
gridItemSpan.currentLineSpan == 2 && index > 0 -> 8.dp
gridItemSpan.currentLineSpan == 1 && index > 1 -> 8.dp
else -> 0.dp
}

val bottomPadding =
when {
index < feeds.itemCount -> 8.dp
else -> 0.dp
}
val startPadding = startPaddingOfFeedListItem(gridItemSpan, index)
val endPadding = endPaddingOfFeedListItem(gridItemSpan, index)
val topPadding = topPaddingOfFeedListItem(gridItemSpan, index)
val bottomPadding = bottomPAddingOfFeedListItem(index, feeds.itemCount)

if (feed != null) {
FeedListItem(
@@ -573,32 +529,10 @@ private fun LazyGridScope.pinnedFeeds(
span = { gridItemSpan }
) { index ->
val feed = pinnedFeeds[index]
val startPadding =
when {
gridItemSpan.currentLineSpan == 2 ||
(gridItemSpan.currentLineSpan == 1 && index % 2 == 0) -> 24.dp
else -> 8.dp
}

val endPadding =
when {
gridItemSpan.currentLineSpan == 2 ||
(gridItemSpan.currentLineSpan == 1 && index % 2 == 1) -> 24.dp
else -> 8.dp
}

val topPadding =
when {
gridItemSpan.currentLineSpan == 2 && index > 0 -> 8.dp
gridItemSpan.currentLineSpan == 1 && index > 1 -> 8.dp
else -> 0.dp
}

val bottomPadding =
when {
index < pinnedFeeds.itemCount -> 8.dp
else -> 0.dp
}
val startPadding = startPaddingOfFeedListItem(gridItemSpan, index)
val endPadding = endPaddingOfFeedListItem(gridItemSpan, index)
val topPadding = topPaddingOfFeedListItem(gridItemSpan, index)
val bottomPadding = bottomPAddingOfFeedListItem(index, pinnedFeeds.itemCount)

if (feed != null) {
FeedListItem(
@@ -627,6 +561,33 @@ private fun LazyGridScope.pinnedFeeds(
}
}

private fun bottomPAddingOfFeedListItem(index: Int, itemCount: Int) =
when {
index < itemCount -> 8.dp
else -> 0.dp
}

private fun topPaddingOfFeedListItem(gridItemSpan: GridItemSpan, index: Int) =
when {
gridItemSpan.currentLineSpan == 2 && index > 0 -> 8.dp
gridItemSpan.currentLineSpan == 1 && index > 1 -> 8.dp
else -> 0.dp
}

private fun endPaddingOfFeedListItem(gridItemSpan: GridItemSpan, index: Int) =
when {
gridItemSpan.currentLineSpan == 2 || (gridItemSpan.currentLineSpan == 1 && index % 2 == 1) ->
24.dp
else -> 8.dp
}

private fun startPaddingOfFeedListItem(gridItemSpan: GridItemSpan, index: Int) =
when {
gridItemSpan.currentLineSpan == 2 || (gridItemSpan.currentLineSpan == 1 && index % 2 == 0) ->
24.dp
else -> 8.dp
}

@Composable
private fun AllFeedsHeader(
feedsCount: Int,