tdpeuter/2023SELab1-project-Studeez
tdpeuter/2023SELab1-project-Studeez
Archived
1
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

fix elipsis not showing on feeds

Browse source
This commit is contained in:
brreynie 2023-05-16 11:52:17 +02:00
parent 6542d2dbf2
commit 8f3d356502
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/be/ugent/sel/studeez/common/composable/feed/FeedEntry.kt
View file

@ -52,7 +52,8 @@ fun FeedEntry(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
) { ) {
Column( Column(
verticalArrangement = Arrangement.spacedBy(0.dp) verticalArrangement = Arrangement.spacedBy(0.dp),
modifier = Modifier.weight(13f)
) { ) {
Text( Text(
text = feedEntry.subJectName, text = feedEntry.subJectName,
@ -66,7 +67,10 @@ fun FeedEntry(
maxLines = 1, maxLines = 1,
) )
} }
Text(text = HoursMinutesSeconds(feedEntry.totalStudyTime).toString()) Text(
text = HoursMinutesSeconds(feedEntry.totalStudyTime).toString(),
modifier = Modifier.weight(6f),
)
} }
} }
val buttonText: Int = val buttonText: Int =

8
app/src/main/java/be/ugent/sel/studeez/screens/friends_feed/FriendsFeedScreen.kt
View file

@ -103,7 +103,8 @@ fun FriendsFeedEntry(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
) { ) {
Column( Column(
verticalArrangement = Arrangement.spacedBy(0.dp) verticalArrangement = Arrangement.spacedBy(0.dp),
modifier = Modifier.weight(10f),
) { ) {
Text( Text(
text = "$name studied for ${feedEntry.subJectName}", text = "$name studied for ${feedEntry.subJectName}",
@ -117,7 +118,10 @@ fun FriendsFeedEntry(
maxLines = 1, maxLines = 1,
) )
} }
Text(text = HoursMinutesSeconds(feedEntry.totalStudyTime).toString()) Text(
text = HoursMinutesSeconds(feedEntry.totalStudyTime).toString(),
modifier = Modifier.weight(3f).padding(start = 5.dp),
)
} }
} }