geesawra.industries
A cheap attempt at a native Bluesky client for Android
SkeetView: Hide "replying to" on threaded replies
Don't show the "replying to" header on a skeet when it's being displayed as a reply in a thread. This avoids redundant information since the parent skeet is already visible directly above it.
+14
-5
+6
-2
app/src/main/java/industries/geesawra/monarch/ShowSkeets.kt
+6
-2
app/src/main/java/industries/geesawra/monarch/ShowSkeets.kt
···
63
63
val root = skeet.root()
64
64
val (parent, parentsParent) = skeet.parent()
65
65
66
-
67
66
if (!isShowingThread) {
68
67
if (!isRepost) {
69
68
root?.let {
···
107
106
}
108
107
109
108
110
-
SkeetView(viewModel = viewModel, skeet = skeet, onReplyTap = onReplyTap)
109
+
SkeetView(
110
+
viewModel = viewModel,
111
+
skeet = skeet,
112
+
onReplyTap = onReplyTap,
113
+
showInReplyTo = parent == null
114
+
)
111
115
}
112
116
}
113
117
+8
-3
app/src/main/java/industries/geesawra/monarch/SkeetView.kt
+8
-3
app/src/main/java/industries/geesawra/monarch/SkeetView.kt
···
69
69
nested: Boolean = false,
70
70
disableEmbeds: Boolean = false,
71
71
inThread: Boolean = false,
72
+
showInReplyTo: Boolean = true
72
73
) {
73
74
if (skeet.blocked) {
74
75
ConditionalCard(text = "Blocked :(", wrapWithCard = !nested)
···
100
101
.sizeIn(minHeight = minSize),
101
102
) {
102
103
103
-
SkeetReason(modifier = Modifier.padding(start = 4.dp), skeet = skeet)
104
+
SkeetReason(modifier = Modifier.padding(start = 4.dp), skeet = skeet, showInReplyTo)
104
105
105
106
Row(
106
107
modifier = Modifier
···
394
395
}
395
396
396
397
@Composable
397
-
private fun SkeetReason(modifier: Modifier = Modifier, skeet: SkeetData) {
398
+
private fun SkeetReason(
399
+
modifier: Modifier = Modifier,
400
+
skeet: SkeetData,
401
+
showInReplyTo: Boolean = true
402
+
) {
398
403
Column(modifier = modifier) {
399
404
var isRepost = false
400
405
skeet.reason?.let {
···
417
422
}
418
423
}
419
424
420
-
if (!isRepost) {
425
+
if (!isRepost && showInReplyTo) {
421
426
skeet.reply?.let {
422
427
it
423
428
val parent = it.parent