wbrawner/Simple-Commons
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: long press action menu and paddings for category title

Browse source
This commit is contained in:
FunkyMuse 2023-09-04 13:21:58 +02:00
parent c8ee14a9e5
commit b04dbcc5d4
2 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
commons/src/main/kotlin/com/simplemobiletools/commons/compose/menus/ActionMenu.kt
View file

@ -6,18 +6,19 @@ import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.MoreVert
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.IconButtonDefaults
import androidx.compose.material3.*
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Immutable
import androidx.compose.runtime.key
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.onLongClick
import androidx.compose.ui.semantics.semantics
import com.simplemobiletools.commons.compose.components.SimpleDropDownMenuItem
import com.simplemobiletools.commons.compose.theme.Shapes
import kotlinx.collections.immutable.ImmutableList
/**
@ -81,11 +82,23 @@ fun ActionMenu(
} else {
IconButtonDefaults.iconButtonColors(contentColor = iconButtonColor)
}
IconButton(onClick = item.doAction, colors = iconButtonColors) {
Icon(
imageVector = item.icon,
contentDescription = name
)
PlainTooltipBox(tooltip = { Text(name) }, shape = Shapes.extraLarge,
modifier = Modifier.semantics {
onLongClick {
true
}
}) {
IconButton(
onClick = item.doAction,
colors = iconButtonColors,
modifier = Modifier.tooltipTrigger()
) {
Icon(
imageVector = item.icon,
contentDescription = name
)
}
}
} else {
SimpleDropDownMenuItem(onClick = item.doAction, text = name)
@ -99,8 +112,14 @@ fun ActionMenu(
} else {
IconButtonDefaults.iconButtonColors(contentColor = iconsColor)
}
IconButton(onClick = { onMenuToggle(true) }, colors = iconButtonColors) {
Icon(imageVector = Icons.Default.MoreVert, contentDescription = stringResource(id = com.simplemobiletools.commons.R.string.more_info))
PlainTooltipBox(tooltip = { Text(text = stringResource(id = com.simplemobiletools.commons.R.string.more_info)) }, shape = Shapes.extraLarge) {
IconButton(
onClick = { onMenuToggle(true) },
colors = iconButtonColors,
modifier = Modifier.tooltipTrigger()
) {
Icon(imageVector = Icons.Default.MoreVert, contentDescription = stringResource(id = com.simplemobiletools.commons.R.string.more_info))
}
}
DropdownMenu(
expanded = isMenuVisible,

2
commons/src/main/kotlin/com/simplemobiletools/commons/compose/settings/SettingsTitleTextComponent.kt
View file

@ -19,7 +19,7 @@ fun SettingsTitleTextComponent(
text: String,
color: Color = MaterialTheme.colorScheme.primary,
) {
Box(modifier = Modifier.padding(top = 24.dp, bottom = 8.dp)) {
Box(modifier = Modifier.padding(top = 16.dp)) {
Text(
text = text.uppercase(),
modifier = modifier