From ba2f654a6fc70829ad5b10b0d152bfd6dea82d26 Mon Sep 17 00:00:00 2001 From: Maximilian Keppeler Date: Tue, 30 Jan 2024 22:23:21 +0800 Subject: [PATCH] (All) Supply horizontal padding values to custom header composable --- .../com/maxkeppeker/sheets/core/models/base/Header.kt | 8 +++++--- .../com/maxkeppeker/sheets/core/views/HeaderComponent.kt | 8 ++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/maxkeppeker/sheets/core/models/base/Header.kt b/core/src/main/java/com/maxkeppeker/sheets/core/models/base/Header.kt index 4b0d5c7d..a766621e 100644 --- a/core/src/main/java/com/maxkeppeker/sheets/core/models/base/Header.kt +++ b/core/src/main/java/com/maxkeppeker/sheets/core/models/base/Header.kt @@ -15,6 +15,7 @@ */ package com.maxkeppeker.sheets.core.models.base +import androidx.compose.foundation.layout.PaddingValues import androidx.compose.runtime.Composable /** @@ -24,8 +25,8 @@ abstract class Header { /** * Standard implementation of a header. - * @param icon The icon that is displayed above the title.. - * @param title The text that will be set as title. + * @param title The title of the header. + * @param icon The icon of the header. */ data class Default( val title: String, @@ -34,8 +35,9 @@ abstract class Header { /** * Custom implementation of a header. + * @param header The custom header implementation with the horizontal padding values of the default header. */ data class Custom( - val header: @Composable () -> Unit + val header: @Composable (paddingValues: PaddingValues) -> Unit ) : Header() } \ No newline at end of file diff --git a/core/src/main/java/com/maxkeppeker/sheets/core/views/HeaderComponent.kt b/core/src/main/java/com/maxkeppeker/sheets/core/views/HeaderComponent.kt index f3ebdf32..7e8bc308 100644 --- a/core/src/main/java/com/maxkeppeker/sheets/core/views/HeaderComponent.kt +++ b/core/src/main/java/com/maxkeppeker/sheets/core/views/HeaderComponent.kt @@ -15,7 +15,11 @@ */ package com.maxkeppeker.sheets.core.views -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -41,7 +45,7 @@ fun HeaderComponent( contentHorizontalPadding: PaddingValues, ) { when (header) { - is Header.Custom -> header.header.invoke() + is Header.Custom -> header.header.invoke(contentHorizontalPadding) is Header.Default -> DefaultHeaderComponent(header, contentHorizontalPadding) } }