diff --git a/app/src/main/java/be/ugent/sel/studeez/common/composable/PrimaryScreenComposable.kt b/app/src/main/java/be/ugent/sel/studeez/common/composable/PrimaryScreenComposable.kt index 8ffc681..5bf4cf9 100644 --- a/app/src/main/java/be/ugent/sel/studeez/common/composable/PrimaryScreenComposable.kt +++ b/app/src/main/java/be/ugent/sel/studeez/common/composable/PrimaryScreenComposable.kt @@ -1,16 +1,13 @@ package be.ugent.sel.studeez.common.composable -import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.RowScope -import androidx.compose.foundation.layout.padding import androidx.compose.material.* import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Edit import androidx.compose.material.icons.filled.Menu import androidx.compose.runtime.Composable import androidx.compose.runtime.rememberCoroutineScope -import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import be.ugent.sel.studeez.R import be.ugent.sel.studeez.common.composable.drawer.Drawer @@ -70,12 +67,7 @@ fun PrimaryScreenTemplate( ) } ) { - Box( - modifier = Modifier.padding(bottom = it.calculateBottomPadding()) - ) { - - content(it) - } + content(it) } } 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 d606cac..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 @@ -69,7 +69,7 @@ fun FeedEntry( } Text( text = HoursMinutesSeconds(feedEntry.totalStudyTime).toString(), - modifier = Modifier.weight(8f), + modifier = Modifier.weight(6f), ) } } 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 0fb3998..7ddef78 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 @@ -106,7 +106,7 @@ fun FriendsFeedEntry( ) { Column( verticalArrangement = Arrangement.spacedBy(0.dp), - modifier = Modifier.weight(8f), + modifier = Modifier.weight(10f), ) { Text( text = "$name studied for ${feedEntry.subJectName}",