From 8f3d356502ecc0222384ed50196cf957199ed63a Mon Sep 17 00:00:00 2001 From: brreynie Date: Tue, 16 May 2023 11:52:17 +0200 Subject: [PATCH] fix elipsis not showing on feeds --- .../ugent/sel/studeez/common/composable/feed/FeedEntry.kt | 8 ++++++-- .../sel/studeez/screens/friends_feed/FriendsFeedScreen.kt | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/be/ugent/sel/studeez/common/composable/feed/FeedEntry.kt b/app/src/main/java/be/ugent/sel/studeez/common/composable/feed/FeedEntry.kt index 016090d..465fda2 100644 --- a/app/src/main/java/be/ugent/sel/studeez/common/composable/feed/FeedEntry.kt +++ b/app/src/main/java/be/ugent/sel/studeez/common/composable/feed/FeedEntry.kt @@ -52,7 +52,8 @@ fun FeedEntry( verticalAlignment = Alignment.CenterVertically, ) { Column( - verticalArrangement = Arrangement.spacedBy(0.dp) + verticalArrangement = Arrangement.spacedBy(0.dp), + modifier = Modifier.weight(13f) ) { Text( text = feedEntry.subJectName, @@ -66,7 +67,10 @@ fun FeedEntry( maxLines = 1, ) } - Text(text = HoursMinutesSeconds(feedEntry.totalStudyTime).toString()) + Text( + text = HoursMinutesSeconds(feedEntry.totalStudyTime).toString(), + modifier = Modifier.weight(6f), + ) } } val buttonText: Int = diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/friends_feed/FriendsFeedScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/friends_feed/FriendsFeedScreen.kt index 7aab92a..36bb57e 100644 --- a/app/src/main/java/be/ugent/sel/studeez/screens/friends_feed/FriendsFeedScreen.kt +++ b/app/src/main/java/be/ugent/sel/studeez/screens/friends_feed/FriendsFeedScreen.kt @@ -103,7 +103,8 @@ fun FriendsFeedEntry( verticalAlignment = Alignment.CenterVertically, ) { Column( - verticalArrangement = Arrangement.spacedBy(0.dp) + verticalArrangement = Arrangement.spacedBy(0.dp), + modifier = Modifier.weight(10f), ) { Text( text = "$name studied for ${feedEntry.subJectName}", @@ -117,7 +118,10 @@ fun FriendsFeedEntry( maxLines = 1, ) } - Text(text = HoursMinutesSeconds(feedEntry.totalStudyTime).toString()) + Text( + text = HoursMinutesSeconds(feedEntry.totalStudyTime).toString(), + modifier = Modifier.weight(3f).padding(start = 5.dp), + ) } }