Compare commits
No commits in common. "main" and "v1" have entirely different histories.
3 changed files with 3 additions and 11 deletions
|
@ -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,14 +67,9 @@ fun PrimaryScreenTemplate(
|
|||
)
|
||||
}
|
||||
) {
|
||||
Box(
|
||||
modifier = Modifier.padding(bottom = it.calculateBottomPadding())
|
||||
) {
|
||||
|
||||
content(it)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Preview
|
||||
@Composable
|
||||
|
|
|
@ -69,7 +69,7 @@ fun FeedEntry(
|
|||
}
|
||||
Text(
|
||||
text = HoursMinutesSeconds(feedEntry.totalStudyTime).toString(),
|
||||
modifier = Modifier.weight(8f),
|
||||
modifier = Modifier.weight(6f),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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}",
|
||||
|
|
Reference in a new issue