Skip to content

Commit ab7e4c6

Browse files
committed
Make name clickable space smaller & fix header padding
1 parent c12ef0c commit ab7e4c6

2 files changed

Lines changed: 15 additions & 9 deletions

File tree

shared/src/commonMain/kotlin/site/remlit/snowdrop/component/Notification.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,17 @@ import androidx.compose.runtime.remember
1717
import androidx.compose.runtime.setValue
1818
import androidx.compose.ui.Alignment
1919
import androidx.compose.ui.Modifier
20+
import androidx.compose.ui.platform.LocalDensity
2021
import androidx.compose.ui.text.LinkAnnotation
2122
import androidx.compose.ui.text.LinkInteractionListener
2223
import androidx.compose.ui.text.SpanStyle
2324
import androidx.compose.ui.text.TextLinkStyles
2425
import androidx.compose.ui.text.buildAnnotatedString
2526
import androidx.compose.ui.text.font.FontWeight
2627
import androidx.compose.ui.text.style.TextDecoration
27-
import androidx.compose.ui.text.style.TextOverflow
2828
import androidx.compose.ui.text.withLink
2929
import androidx.compose.ui.text.withStyle
30+
import androidx.compose.ui.unit.TextUnit
3031
import androidx.compose.ui.unit.dp
3132
import androidx.compose.ui.unit.sp
3233
import org.jetbrains.compose.resources.painterResource
@@ -103,7 +104,7 @@ fun Notification(notification: Notification) {
103104
navHandler.navigate(ProfileRoute(notification.account.id))
104105
})
105106
) {
106-
Avatar(notification.account, small = true)
107+
Avatar(notification.account, smaller = true)
107108
}
108109

109110
Row(
@@ -165,11 +166,11 @@ fun Notification(notification: Notification) {
165166
toAnnotatedString()
166167
}
167168

169+
// todo: make only display name not wrap
168170
Text(
169171
text = title,
170172
modifier = Modifier.weight(1f),
171-
maxLines = 1,
172-
overflow = TextOverflow.Ellipsis
173+
lineHeight = with(LocalDensity.current) { smallerAvatarSize.dp.toSp() }
173174
)
174175

175176
Text(

shared/src/commonMain/kotlin/site/remlit/snowdrop/component/Status.kt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import androidx.compose.runtime.remember
2525
import androidx.compose.runtime.setValue
2626
import androidx.compose.ui.Alignment
2727
import androidx.compose.ui.Modifier
28+
import androidx.compose.ui.draw.blur
2829
import androidx.compose.ui.draw.clip
2930
import androidx.compose.ui.graphics.Color
3031
import androidx.compose.ui.platform.LocalClipboardManager
@@ -195,22 +196,26 @@ fun Status(status: Status) {
195196

196197
Column(
197198
modifier = Modifier.weight(1f)
198-
.clickable(onClick = {
199-
navHandler.navigate(ProfileRoute(realStatus.account?.id!!))
200-
})
199+
.padding(end = 10.dp)
201200
) {
202201
Text(
203202
realStatus.account?.displayName ?: realStatus.account?.username!!,
204203
fontWeight = FontWeight.Medium,
205204
overflow = TextOverflow.Ellipsis,
206-
maxLines = 1
205+
maxLines = 1,
206+
modifier = Modifier.clickable(onClick = {
207+
navHandler.navigate(ProfileRoute(realStatus.account?.id!!))
208+
})
207209
)
208210
Text(
209211
"@${realStatus.account?.acct}",
210212
overflow = TextOverflow.Ellipsis,
211213
color = MaterialTheme.colorScheme.onSurfaceVariant,
212214
fontSize = 13.sp,
213-
maxLines = 1
215+
maxLines = 1,
216+
modifier = Modifier.clickable(onClick = {
217+
navHandler.navigate(ProfileRoute(realStatus.account?.id!!))
218+
})
214219
)
215220
}
216221

0 commit comments

Comments
 (0)