laantungir/Amber
1
0
Fork 0
mirror of https://github.com/greenart7c3/Amber.git synced 2026-10-05 19:08:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #478 from greenart7c3/claude/layout-fix-o9axba

Browse Source 
Fix overlapping feedback type selector with long labels
This commit is contained in:
greenart7c3
2026-06-19 06:06:41 -03:00
committed by GitHub
parent 9794638e55 e6c22db266
commit 32c79395ec
1 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/greenart7c3/nostrsigner/ui/FeedbackScreen.kt
+28 -11
View File
@@ -2,20 +2,25 @@ package com.greenart7c3.nostrsigner.ui
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.FlowRow
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Check
import androidx.compose.material3.FilterChip
import androidx.compose.material3.FilterChipDefaults
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.SegmentedButton
import androidx.compose.material3.SegmentedButtonDefaults
import androidx.compose.material3.SingleChoiceSegmentedButtonRow
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
@@ -35,6 +40,7 @@ import com.greenart7c3.nostrsigner.ui.components.AmberButton
import kotlin.coroutines.cancellation.CancellationException
import kotlinx.coroutines.launch
@OptIn(ExperimentalLayoutApi::class)
@Composable
fun FeedbackScreen(
modifier: Modifier = Modifier,
@@ -64,15 +70,15 @@ fun FeedbackScreen(
style = MaterialTheme.typography.labelLarge,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
SingleChoiceSegmentedButtonRow(modifier = Modifier.fillMaxWidth()) {
FeedbackType.entries.forEachIndexed { index, type ->
SegmentedButton(
selected = feedbackType == type,
FlowRow(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.spacedBy(8.dp),
) {
FeedbackType.entries.forEach { type ->
val selected = feedbackType == type
FilterChip(
selected = selected,
onClick = { feedbackType = type },
shape = SegmentedButtonDefaults.itemShape(
index = index,
count = FeedbackType.entries.size,
),
label = {
Text(
text = stringResource(
@@ -83,6 +89,17 @@ fun FeedbackScreen(
),
)
},
leadingIcon = if (selected) {
{
Icon(
imageVector = Icons.Filled.Check,
contentDescription = null,
modifier = Modifier.size(FilterChipDefaults.IconSize),
)
}
} else {
null
},
)
}
}