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.

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

More horizontal line fixes. #1423

Merged
merged 4 commits into from
Mar 8, 2024
Merged

More horizontal line fixes. #1423

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
e0324cf
More horizontal line fixes.
dessalines Mar 4, 2024
26de20b
Adding horizontal divider to separate post and comments in postactivity.
dessalines Mar 5, 2024
e793c89
Merge branch 'main' into more_horizontal_line_fixes
dessalines Mar 5, 2024
71f4426
Merge branch 'main' into more_horizontal_line_fixes
MV-GH Mar 7, 2024
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
2 changes: 1 addition & 1 deletion app/src/main/java/com/jerboa/Utils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1226,7 +1226,7 @@ fun calculateCommentOffset(
return if (depth == 0) {
0.dp
} else {
(abs((depth.minus(1) * padding.value.toInt())).dp + padding)
(abs((depth.minus(1) * padding.value)).dp + padding)
}
}

Expand Down
15 changes: 4 additions & 11 deletions app/src/main/java/com/jerboa/ui/components/comment/CommentNode.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import androidx.compose.material.icons.filled.Bookmark
import androidx.compose.material.icons.outlined.BookmarkBorder
import androidx.compose.material.icons.outlined.MoreVert
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.Text
Expand Down Expand Up @@ -77,6 +76,7 @@ import com.jerboa.ui.components.common.SwipeToAction
import com.jerboa.ui.components.common.VoteGeneric
import com.jerboa.ui.components.common.rememberSwipeActionState
import com.jerboa.ui.components.community.CommunityLink
import com.jerboa.ui.theme.BORDER_WIDTH
import com.jerboa.ui.theme.LARGE_PADDING
import com.jerboa.ui.theme.MEDIUM_PADDING
import com.jerboa.ui.theme.SMALL_PADDING
Expand Down Expand Up @@ -251,7 +251,7 @@ fun LazyListScope.commentNodeItem(

val backgroundColor = MaterialTheme.colorScheme.background
val borderColor = calculateBorderColor(backgroundColor, node.depth)
val border = Border(SMALL_PADDING, borderColor)
val border = Border(BORDER_WIDTH, borderColor)

val ctx = LocalContext.current

Expand Down Expand Up @@ -308,10 +308,6 @@ fun LazyListScope.commentNodeItem(
.border(start = border)
.padding(bottom = MEDIUM_PADDING),
) {
if (node.depth == 0) {
HorizontalDivider()
}

Column(
modifier =
Modifier.padding(
Expand Down Expand Up @@ -552,7 +548,7 @@ fun LazyListScope.missingCommentNodeItem(
item(key = commentId) {
val backgroundColor = MaterialTheme.colorScheme.background
val borderColor = calculateBorderColor(backgroundColor, node.depth)
val border = Border(SMALL_PADDING, borderColor)
val border = Border(BORDER_WIDTH, borderColor)

AnimatedVisibility(
visible = !isCollapsedByParent,
Expand All @@ -566,9 +562,6 @@ fun LazyListScope.missingCommentNodeItem(
start = offset,
).border(start = border),
) {
if (node.depth == 0) {
HorizontalDivider()
}
Column(
modifier =
Modifier.padding(
Expand Down Expand Up @@ -658,7 +651,7 @@ private fun ShowMoreChildrenNode(

val backgroundColor = MaterialTheme.colorScheme.background
val borderColor = calculateBorderColor(backgroundColor, newDepth)
val border = Border(SMALL_PADDING, borderColor)
val border = Border(BORDER_WIDTH, borderColor)

AnimatedVisibility(
visible = !isCollapsedByParent,
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/java/com/jerboa/ui/components/post/PostActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import androidx.compose.material.icons.automirrored.outlined.Sort
import androidx.compose.material.pullrefresh.pullRefresh
import androidx.compose.material.pullrefresh.rememberPullRefreshState
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
Expand Down Expand Up @@ -489,6 +490,10 @@ fun PostActivity(
}
}

item(contentType = "horizontalDivider") {
HorizontalDivider()
}

when (val commentsRes = postViewModel.commentsRes) {
is ApiState.Failure ->
item(key = "error") {
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/java/com/jerboa/ui/components/post/PostListings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material3.HorizontalDivider
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.LaunchedEffect
Expand All @@ -34,7 +33,6 @@ import com.jerboa.isScrolledToEnd
import com.jerboa.rememberJerboaAppState
import com.jerboa.ui.components.common.RetryLoadingPosts
import com.jerboa.ui.components.common.simpleVerticalScrollbar
import com.jerboa.ui.theme.SMALL_PADDING
import it.vercruysse.lemmyapi.v0x19.datatypes.Community
import it.vercruysse.lemmyapi.v0x19.datatypes.Person
import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId
Expand Down Expand Up @@ -150,7 +148,6 @@ fun PostListings(
}
}
}
HorizontalDivider(modifier = Modifier.padding(bottom = SMALL_PADDING))
}

if (showPostAppendRetry) {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/jerboa/ui/theme/Sizes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const val SCORE_SIZE_ADD = 4
val ACTION_BAR_ICON_SIZE = 16.dp
val MARKDOWN_BAR_ICON_SIZE = 24.dp

val BORDER_WIDTH = 1.dp
val SMALLER_PADDING = 2.dp
val SMALL_PADDING = 4.dp
val MEDIUM_PADDING = 8.dp
Expand Down