n/futokb
1
0
Fork 0
mirror of https://gitlab.futo.org/keyboard/latinime.git synced 2024-09-19 23:28:31 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add missing 1dp separator to some action bar components

Browse Source
This commit is contained in:
Aleksandras Kostarevas 2024-07-22 01:43:06 +03:00
parent 02388e7388
commit 9c37a40006
1 changed files with 93 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

171
java/src/org/futo/inputmethod/latin/uix/ActionBar.kt
View File

@ -644,6 +644,20 @@ fun RowScope.PinnedActionItems(onSelect: (Action) -> Unit, onLongSelect: (Action
}
}
@Composable
fun ActionSep() {
val sepCol = if(!LocalInspectionMode.current) {
Color(LocalThemeProvider.current.keyColor)
} else {
MaterialTheme.colorScheme.surfaceVariant
}
Box(modifier = Modifier
.fillMaxWidth()
.height(1.dp)
.background(sepCol)) {}
}
@Composable
fun ActionBar(
words: SuggestedWords?,
@ -661,20 +675,11 @@ fun ActionBar(
val actionBarHeight = 40.dp
val sepCol = if(!LocalInspectionMode.current) {
Color(LocalThemeProvider.current.keyColor)
} else {
MaterialTheme.colorScheme.surfaceVariant
}
val oldActionBar = useDataStore(OldStyleActionsBar)
Column {
if(isActionsExpanded && !oldActionBar.value) {
Box(modifier = Modifier
.fillMaxWidth()
.height(1.dp)
.background(sepCol)) {}
ActionSep()
Surface(
modifier = Modifier
@ -685,10 +690,7 @@ fun ActionBar(
}
}
Box(modifier = Modifier
.fillMaxWidth()
.height(1.dp)
.background(sepCol)) {}
ActionSep()
Surface(
modifier = Modifier
@ -706,7 +708,9 @@ fun ActionBar(
}
if(oldActionBar.value && isActionsExpanded) {
Box(modifier = Modifier.weight(1.0f).fillMaxHeight()) {
Box(modifier = Modifier
.weight(1.0f)
.fillMaxHeight()) {
ActionItems(onActionActivated, onActionAltActivated)
}
} else {
@ -759,31 +763,34 @@ fun ActionWindowBar(
onBack: () -> Unit,
onExpand: () -> Unit
) {
Surface(
modifier = Modifier
.fillMaxWidth()
.height(40.dp), color = MaterialTheme.colorScheme.background
)
{
Row {
IconButton(onClick = onBack) {
Icon(
painter = painterResource(id = R.drawable.arrow_left_26),
contentDescription = "Back"
)
}
CompositionLocalProvider(LocalTextStyle provides Typography.titleMedium) {
windowTitleBar()
}
if(canExpand) {
IconButton(onClick = onExpand) {
Column {
ActionSep()
Surface(
modifier = Modifier
.fillMaxWidth()
.height(40.dp), color = MaterialTheme.colorScheme.background
)
{
Row {
IconButton(onClick = onBack) {
Icon(
painter = painterResource(id = R.drawable.arrow_up),
contentDescription = "Show Keyboard"
painter = painterResource(id = R.drawable.arrow_left_26),
contentDescription = "Back"
)
}
CompositionLocalProvider(LocalTextStyle provides Typography.titleMedium) {
windowTitleBar()
}
if (canExpand) {
IconButton(onClick = onExpand) {
Icon(
painter = painterResource(id = R.drawable.arrow_up),
contentDescription = "Show Keyboard"
)
}
}
}
}
}
@ -796,51 +803,59 @@ fun CollapsibleSuggestionsBar(
words: SuggestedWords?,
suggestionStripListener: SuggestionStripView.Listener,
) {
Surface(modifier = Modifier
.fillMaxWidth()
.height(40.dp), color = MaterialTheme.colorScheme.background)
{
Row {
val color = MaterialTheme.colorScheme.primary
Column {
ActionSep()
Surface(
modifier = Modifier
.fillMaxWidth()
.height(40.dp), color = MaterialTheme.colorScheme.background
)
{
Row {
val color = MaterialTheme.colorScheme.primary
IconButton(
onClick = onClose,
modifier = Modifier
.width(42.dp)
.fillMaxHeight()
.drawBehind {
drawCircle(color = color, radius = size.width / 3.0f + 1.0f)
},
IconButton(
onClick = onClose,
modifier = Modifier
.width(42.dp)
.fillMaxHeight()
.drawBehind {
drawCircle(color = color, radius = size.width / 3.0f + 1.0f)
},
colors = IconButtonDefaults.iconButtonColors(contentColor = MaterialTheme.colorScheme.onPrimary)
) {
Icon(
painter = painterResource(id = R.drawable.close),
contentDescription = "Close"
)
}
if(words != null) {
SuggestionItems(words, onClick = {
suggestionStripListener.pickSuggestionManually(
words.getInfo(it)
colors = IconButtonDefaults.iconButtonColors(contentColor = MaterialTheme.colorScheme.onPrimary)
) {
Icon(
painter = painterResource(id = R.drawable.close),
contentDescription = "Close"
)
}, onLongClick = { suggestionStripListener.requestForgetWord(words.getInfo(it)) })
} else {
Spacer(modifier = Modifier.weight(1.0f))
}
}
IconButton(
onClick = onCollapse,
modifier = Modifier
.width(42.dp)
.fillMaxHeight(),
colors = IconButtonDefaults.iconButtonColors(contentColor = MaterialTheme.colorScheme.onBackground)
) {
Icon(
painter = painterResource(id = R.drawable.arrow_down),
contentDescription = "Collapse"
)
if (words != null) {
SuggestionItems(
words,
onClick = {
suggestionStripListener.pickSuggestionManually(
words.getInfo(it)
)
},
onLongClick = { suggestionStripListener.requestForgetWord(words.getInfo(it)) })
} else {
Spacer(modifier = Modifier.weight(1.0f))
}
IconButton(
onClick = onCollapse,
modifier = Modifier
.width(42.dp)
.fillMaxHeight(),
colors = IconButtonDefaults.iconButtonColors(contentColor = MaterialTheme.colorScheme.onBackground)
) {
Icon(
painter = painterResource(id = R.drawable.arrow_down),
contentDescription = "Collapse"
)
}
}
}
}