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

quick fixes

Browse source
This commit is contained in:
brreynie 2023-05-16 12:28:17 +02:00
parent af6032e75e
commit facdb14f31
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/be/ugent/sel/studeez/common/composable/PrimaryScreenComposable.kt
View file

@ -1,13 +1,16 @@
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
@ -67,7 +70,12 @@ fun PrimaryScreenTemplate(
)
}
) {
content(it)
Box(
modifier = Modifier.padding(bottom = it.calculateBottomPadding())
) {
content(it)
}
}
}

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

@ -69,7 +69,7 @@ fun FeedEntry(
}
Text(
text = HoursMinutesSeconds(feedEntry.totalStudyTime).toString(),
modifier = Modifier.weight(6f),
modifier = Modifier.weight(8f),
)
}
}

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

@ -106,7 +106,7 @@ fun FriendsFeedEntry(
) {
Column(
verticalArrangement = Arrangement.spacedBy(0.dp),
modifier = Modifier.weight(10f),
modifier = Modifier.weight(8f),
) {
Text(
text = "$name studied for ${feedEntry.subJectName}",