mirror/florisboard
0
0
Fork 0
mirror of https://github.com/florisboard/florisboard.git synced 2024-09-20 12:02:19 +02:00
Code

Add codes modifier UI in rule editor for stylesheet editor

Browse Source
This commit is contained in:
Patrick Goldinger 2022-01-23 13:30:07 +01:00
parent d860bbfb90
commit a2805bedca
4 changed files with 141 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle.kts
View File

@ -155,6 +155,7 @@ dependencies {
implementation("androidx.core:core-ktx:1.7.0")
implementation("androidx.core:core-splashscreen:1.0.0-alpha02")
implementation("androidx.navigation:navigation-compose:2.4.0-rc01")
implementation("com.google.accompanist:accompanist-flowlayout:0.20.2")
implementation("com.google.accompanist:accompanist-systemuicontroller:0.20.2")
implementation("dev.patrickgold.jetpref:jetpref-datastore-model:0.1.0-beta03")
implementation("dev.patrickgold.jetpref:jetpref-datastore-ui:0.1.0-beta03")

146
app/src/main/java/dev/patrickgold/florisboard/app/ui/settings/theme/ThemeEditorScreen.kt
View File

@ -25,17 +25,16 @@ 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.heightIn
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.requiredSize
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material.ButtonDefaults
import androidx.compose.material.ExtendedFloatingActionButton
import androidx.compose.material.Icon
import androidx.compose.material.LocalContentColor
import androidx.compose.material.MaterialTheme
import androidx.compose.material.OutlinedTextField
import androidx.compose.material.Surface
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
@ -46,17 +45,19 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.Saver
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.runtime.snapshots.SnapshotStateList
import androidx.compose.runtime.toMutableStateList
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontStyle
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.google.accompanist.flowlayout.FlowRow
import dev.patrickgold.florisboard.R
import dev.patrickgold.florisboard.app.res.stringRes
import dev.patrickgold.florisboard.app.ui.components.FlorisChip
@ -67,6 +68,9 @@ import dev.patrickgold.florisboard.app.ui.components.FlorisScreen
import dev.patrickgold.florisboard.app.ui.components.FlorisTextButton
import dev.patrickgold.florisboard.app.ui.components.florisHorizontalScroll
import dev.patrickgold.florisboard.app.ui.components.rippleClickable
import dev.patrickgold.florisboard.common.kotlin.curlyFormat
import dev.patrickgold.florisboard.ime.nlp.NATIVE_NULLPTR
import dev.patrickgold.florisboard.ime.text.key.KeyCode
import dev.patrickgold.florisboard.ime.theme.FlorisImeUi
import dev.patrickgold.florisboard.ime.theme.FlorisImeUiSpec
import dev.patrickgold.florisboard.ime.theme.ThemeExtensionComponentEditor
@ -88,9 +92,9 @@ import dev.patrickgold.jetpref.material.ui.JetPrefAlertDialog
import dev.patrickgold.jetpref.material.ui.JetPrefListItem
private val SnyggEmptyRuleForAdding = SnyggRule(element = "- select -")
private val IntListSaver = Saver<List<Int>, ArrayList<Int>>(
private val IntListSaver = Saver<SnapshotStateList<Int>, ArrayList<Int>>(
save = { ArrayList(it) },
restore = { it.toList() },
restore = { it.toMutableStateList() },
)
@Composable
@ -343,6 +347,7 @@ private fun EditRuleDialog(
}
val codes = rememberSaveable(saver = IntListSaver) { initRule.codes.toMutableStateList() }
var editCodeDialogValue by rememberSaveable { mutableStateOf<Int?>(null) }
val groups = rememberSaveable(saver = IntListSaver) { initRule.groups.toMutableStateList() }
val modes = rememberSaveable(saver = IntListSaver) { initRule.modes.toMutableStateList() }
var pressedSelector by rememberSaveable { mutableStateOf(initRule.pressedSelector) }
@ -415,28 +420,125 @@ private fun EditRuleDialog(
}
}
//DialogProperty(text = stringRes(R.string.settings__theme_editor__rule_codes)) {
// FlorisOutlinedTextField(
// modifier = Modifier
// .fillMaxWidth()
// .heightIn(42.dp, 42.dp),
// value = "value",
// onValueChange = { },
// keyboardOptions = KeyboardOptions(imeAction = ImeAction.Next),
// )
//}
DialogProperty(
text = stringRes(R.string.settings__theme_editor__rule_codes),
iconTrailingTitle = {
FlorisIconButton(
onClick = { editCodeDialogValue = NATIVE_NULLPTR },
icon = painterResource(R.drawable.ic_add),
)
}
) {
if (codes.isEmpty()) {
Text(
text = stringRes(R.string.settings__theme_editor__no_codes_defined),
fontStyle = FontStyle.Italic,
)
}
FlowRow {
for (code in codes) {
FlorisChip(
onClick = { editCodeDialogValue = code },
text = code.toString(),
shape = MaterialTheme.shapes.medium
)
}
}
}
}
}
val initCodeValue = editCodeDialogValue
if (initCodeValue != null) {
var inputCodeString by rememberSaveable(initCodeValue) { mutableStateOf(initCodeValue.toString()) }
val showKeyCodesHelp by rememberSaveable(initCodeValue) { mutableStateOf(false) }
var errorId by rememberSaveable(initCodeValue) { mutableStateOf<Int?>(null) }
JetPrefAlertDialog(
title = stringRes(if (initCodeValue == NATIVE_NULLPTR) {
R.string.settings__theme_editor__add_code
} else {
R.string.settings__theme_editor__edit_code
}),
confirmLabel = stringRes(if (initCodeValue == NATIVE_NULLPTR) {
R.string.action__add
} else {
R.string.action__apply
}),
onConfirm = {
val code = inputCodeString.trim().toIntOrNull(radix = 10)
when {
code == null || (code !in KeyCode.Spec.CHARACTERS && code !in KeyCode.Spec.INTERNAL) -> {
errorId = R.string.settings__theme_editor__code_invalid
}
code == initCodeValue -> {
editCodeDialogValue = null
}
codes.contains(code) -> {
errorId = R.string.settings__theme_editor__code_already_exists
}
else -> {
codes.add(code)
editCodeDialogValue = null
}
}
},
dismissLabel = stringRes(R.string.action__cancel),
onDismiss = {
editCodeDialogValue = null
},
neutralLabel = if (initCodeValue != NATIVE_NULLPTR) {
stringRes(R.string.action__delete)
} else {
null
},
onNeutral = {
codes.remove(initCodeValue)
editCodeDialogValue = null
},
) {
Column {
OutlinedTextField(
value = inputCodeString,
onValueChange = { v ->
inputCodeString = v
errorId = null
},
isError = errorId != null,
)
val id = errorId
if (id != null) {
Text(
text = stringRes(id).curlyFormat(
"c_min" to KeyCode.Spec.CHARACTERS_MIN,
"c_max" to KeyCode.Spec.CHARACTERS_MAX,
"i_min" to KeyCode.Spec.INTERNAL_MIN,
"i_max" to KeyCode.Spec.INTERNAL_MAX,
),
color = MaterialTheme.colors.error,
)
}
}
}
}
}
@Composable
private fun DialogProperty(text: String, content: @Composable () -> Unit) {
Column(modifier = Modifier.padding(vertical = 8.dp)) {
Text(
modifier = Modifier.padding(bottom = 8.dp),
text = text,
style = MaterialTheme.typography.subtitle2,
)
private fun DialogProperty(
text: String,
iconTrailingTitle: @Composable () -> Unit = { },
content: @Composable () -> Unit,
) {
Column(modifier = Modifier.padding(bottom = 8.dp)) {
Row(verticalAlignment = Alignment.CenterVertically) {
Text(
modifier = Modifier
.weight(1f)
.padding(vertical = 8.dp),
text = text,
style = MaterialTheme.typography.subtitle2,
)
iconTrailingTitle()
}
content()
}
}

10
app/src/main/java/dev/patrickgold/florisboard/ime/text/key/KeyCode.kt
View File

@ -17,6 +17,16 @@
package dev.patrickgold.florisboard.ime.text.key
object KeyCode {
object Spec {
const val CHARACTERS_MIN = SPACE
const val CHARACTERS_MAX = 65535
val CHARACTERS = CHARACTERS_MIN..CHARACTERS_MAX
const val INTERNAL_MIN = -9999
const val INTERNAL_MAX = -1
val INTERNAL = INTERNAL_MIN..INTERNAL_MAX
}
const val UNSPECIFIED = 0
const val PHONE_WAIT = 59 // ;

7
app/src/main/res/values/strings.xml
View File

@ -113,9 +113,14 @@
<string name="settings__theme_manager__theme_import_success" comment="Message for theme import success">Theme imported successfully!</string>
<string name="settings__theme_manager__theme_export_success" comment="Message for theme export success">Theme exported successfully!</string>
<string name="settings__theme_editor__no_rules_defined">This stylesheet has no rules defined. Add a rule to start customizing this stylesheet.</string>
<string name="settings__theme_editor__add_rule">Add rule</string>
<string name="settings__theme_editor__edit_rule">Edit rule</string>
<string name="settings__theme_editor__no_rules_defined">This stylesheet has no rules defined. Add a rule to start customizing this stylesheet.</string>
<string name="settings__theme_editor__add_code">Add code</string>
<string name="settings__theme_editor__edit_code">Edit code</string>
<string name="settings__theme_editor__no_codes_defined">No codes defined.</string>
<string name="settings__theme_editor__code_already_exists">This key code is already defined.</string>
<string name="settings__theme_editor__code_invalid">This key code is not valid. Ensure that the key code is within the range of {c_min} to {c_max} for characters or {i_min} to {i_max} for internal special keys.</string>
<string name="settings__theme_editor__rule_element">Target element</string>
<string name="settings__theme_editor__rule_codes">Codes</string>
<string name="settings__theme_editor__rule_groups">Groups</string>