A cheap attempt at a native Bluesky client for Android
SkeetView: don't wrap "blocked" or "not found" in a card when nested
+26
-11
+24
-9
app/src/main/java/industries/geesawra/monarch/ConditionalCard.kt
+24
-9
app/src/main/java/industries/geesawra/monarch/ConditionalCard.kt
···
14
14
import androidx.compose.ui.unit.dp
15
15
16
16
@Composable
17
-
fun ConditionalCard(text: String) {
18
-
OutlinedCard(
19
-
modifier = Modifier
20
-
.height(80.dp)
21
-
.padding(8.dp)
22
-
.fillMaxWidth()
23
-
) {
17
+
fun ConditionalCard(text: String, wrapWithCard: Boolean = true) {
18
+
if (wrapWithCard) {
19
+
OutlinedCard(
20
+
modifier = Modifier
21
+
.height(80.dp)
22
+
.padding(8.dp)
23
+
.fillMaxWidth()
24
+
) {
25
+
Column(
26
+
modifier = Modifier
27
+
.fillMaxSize()
28
+
.padding(start = 16.dp),
29
+
verticalArrangement = Arrangement.Center
30
+
) {
31
+
Text(
32
+
text = text,
33
+
color = MaterialTheme.colorScheme.onSurfaceVariant
34
+
)
35
+
}
36
+
}
37
+
} else {
24
38
Column(
25
39
modifier = Modifier
26
-
.fillMaxSize()
27
-
.padding(start = 16.dp),
40
+
.height(60.dp)
41
+
.padding(start = 16.dp)
42
+
.fillMaxSize(),
28
43
verticalArrangement = Arrangement.Center
29
44
) {
30
45
Text(
+2
-2
app/src/main/java/industries/geesawra/monarch/SkeetView.kt
+2
-2
app/src/main/java/industries/geesawra/monarch/SkeetView.kt
···
62
62
inThread: Boolean = false,
63
63
) {
64
64
if (skeet.blocked) {
65
-
ConditionalCard("Blocked :(")
65
+
ConditionalCard("Blocked :(", wrapWithCard = !nested)
66
66
return
67
67
}
68
68
69
69
if (skeet.notFound) {
70
-
ConditionalCard("Post not found")
70
+
ConditionalCard("Post not found", wrapWithCard = !nested)
71
71
return
72
72
}
73
73