Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Merge pull request #1670 from vector-im/feature/bma/topBarInPage

Browse source 
Top bar in page
This commit is contained in:
Benoit Marty 2023-10-30 10:46:25 +01:00 • committed by GitHub
commit d6a862581d
1 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

40
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/HeaderFooterPage.kt
View file

@ -18,21 +18,23 @@ package io.element.android.libraries.designsystem.atomic.pages
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.systemBarsPadding
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.ElementPreview
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
import io.element.android.libraries.designsystem.theme.components.Scaffold
import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.theme.ElementTheme
/** /**
* @param modifier Classical modifier. * @param modifier Classical modifier.
* @param topBar optional topBar.
* @param header optional header. * @param header optional header.
* @param footer optional footer. * @param footer optional footer.
* @param content main content. * @param content main content.
@ -40,28 +42,34 @@ import io.element.android.libraries.theme.ElementTheme
@Composable @Composable
fun HeaderFooterPage( fun HeaderFooterPage(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
topBar: @Composable () -> Unit = {},
header: @Composable () -> Unit = {}, header: @Composable () -> Unit = {},
footer: @Composable () -> Unit = {}, footer: @Composable () -> Unit = {},
content: @Composable () -> Unit = {}, content: @Composable () -> Unit = {},
) { ) {
Column( Scaffold(
modifier = modifier modifier = modifier,
.fillMaxSize() topBar = topBar,
.systemBarsPadding() ) { padding ->
.padding(all = 20.dp),
) {
// Header
header()
// Content
Column( Column(
modifier = Modifier modifier = Modifier
.weight(1f) .padding(padding)
.fillMaxWidth(), .consumeWindowInsets(padding)
.padding(all = 20.dp),
) { ) {
content() // Header
header()
// Content
Column(
modifier = Modifier
.weight(1f)
.fillMaxWidth(),
) {
content()
}
// Footer
footer()
} }
// Footer
footer()
} }
} }