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

Merge pull request #1068 from vector-im/fix/jme/snackbar-padding

Browse source 
Fix snackbar padding
This commit is contained in:
Benoit Marty 2023-08-17 17:53:54 +02:00 • committed by GitHub
commit ae329677d7
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build.gradle.kts
View file

@ -352,7 +352,7 @@ subprojects {
doLast { doLast {
fileTree(buildDir).apply { include("**/*ShowkaseExtension*.kt") }.files.forEach { file -> fileTree(buildDir).apply { include("**/*ShowkaseExtension*.kt") }.files.forEach { file ->
ReplaceRegExp().apply { ReplaceRegExp().apply {
setMatch("public fun Showkase.getMetadata") setMatch("^public fun Showkase.getMetadata")
setReplace("@Suppress(\"DEPRECATION\") public fun Showkase.getMetadata") setReplace("@Suppress(\"DEPRECATION\") public fun Showkase.getMetadata")
setFlags("g") setFlags("g")
setByLine(true) setByLine(true)

3
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/Snackbar.kt
View file

@ -17,6 +17,7 @@
package io.element.android.libraries.designsystem.utils package io.element.android.libraries.designsystem.utils
import androidx.annotation.StringRes import androidx.annotation.StringRes
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.Close
import androidx.compose.material3.SnackbarDuration import androidx.compose.material3.SnackbarDuration
@ -29,6 +30,7 @@ import androidx.compose.runtime.compositionLocalOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import io.element.android.libraries.designsystem.components.button.ButtonVisuals import io.element.android.libraries.designsystem.components.button.ButtonVisuals
import io.element.android.libraries.designsystem.theme.components.IconSource import io.element.android.libraries.designsystem.theme.components.IconSource
import io.element.android.libraries.designsystem.theme.components.Snackbar import io.element.android.libraries.designsystem.theme.components.Snackbar
@ -75,6 +77,7 @@ fun SnackbarDispatcher.collectSnackbarMessageAsState(): State<SnackbarMessage?>
fun SnackbarHost(hostState: SnackbarHostState, modifier: Modifier = Modifier) { fun SnackbarHost(hostState: SnackbarHostState, modifier: Modifier = Modifier) {
androidx.compose.material3.SnackbarHost(hostState, modifier) { data -> androidx.compose.material3.SnackbarHost(hostState, modifier) { data ->
Snackbar( Snackbar(
modifier = Modifier.padding(12.dp), // Add default padding
message = data.visuals.message, message = data.visuals.message,
action = data.visuals.actionLabel?.let { ButtonVisuals.Text(it, data::performAction) }, action = data.visuals.actionLabel?.let { ButtonVisuals.Text(it, data::performAction) },
dismissAction = if (data.visuals.withDismissAction) { dismissAction = if (data.visuals.withDismissAction) {