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

Hide some special actions from editor

Browse Source
This commit is contained in:
Aleksandras Kostarevas 2024-07-20 23:27:52 +03:00
parent d2f1b1e358
commit cee9548995
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/org/futo/inputmethod/latin/uix/Action.kt
View File

@ -110,4 +110,6 @@ data class Action(
val persistentState: ((KeyboardManagerForAction) -> PersistentActionState)? = null, val persistentState: ((KeyboardManagerForAction) -> PersistentActionState)? = null,
val persistentStateInitialization: PersistentStateInitialization = PersistentStateInitialization.OnActionTrigger, val persistentStateInitialization: PersistentStateInitialization = PersistentStateInitialization.OnActionTrigger,
val altPressImpl: ((KeyboardManagerForAction, PersistentActionState?) -> Unit)? = null, val altPressImpl: ((KeyboardManagerForAction, PersistentActionState?) -> Unit)? = null,
val shownInEditor: Boolean = true
) )

5
java/src/org/futo/inputmethod/latin/uix/actions/MoreActions.kt
View File

@ -122,7 +122,9 @@ fun ActionsEditor() {
val view = LocalView.current val view = LocalView.current
val initialList: List<ActionEditorItem> = remember { val initialList: List<ActionEditorItem> = remember {
context.getSettingBlocking(ActionsSettings).toActionEditorItems().ensureWellFormed() context.getSettingBlocking(ActionsSettings).toActionEditorItems().ensureWellFormed().filter {
it !is ActionEditorItem.Item || it.action.shownInEditor
}
} }
val list = remember { initialList.toMutableStateList() } val list = remember { initialList.toMutableStateList() }
@ -212,6 +214,7 @@ val MoreActionsAction = Action(
icon = R.drawable.more_horizontal, icon = R.drawable.more_horizontal,
name = R.string.more_actions_action_title, name = R.string.more_actions_action_title,
simplePressImpl = null, simplePressImpl = null,
shownInEditor = false,
windowImpl = { manager, _ -> windowImpl = { manager, _ ->
object : ActionWindow { object : ActionWindow {
@Composable @Composable

5
java/src/org/futo/inputmethod/latin/uix/actions/Registry.kt
View File

@ -171,7 +171,8 @@ fun Map<ActionCategory, List<Action>>.ensureAllActionsPresent(): Map<ActionCateg
val actionsMissing = actionsRequired.subtract(actionsPresent) val actionsMissing = actionsRequired.subtract(actionsPresent)
if(actionsMissing.isNotEmpty()) { if(actionsMissing.isNotEmpty()) {
map[ActionCategory.More] = map[ActionCategory.More]!! + actionsMissing map[ActionCategory.More] = map[ActionCategory.More]!! + actionsMissing.filter { it.shownInEditor }
map[ActionCategory.Disabled] = map[ActionCategory.Disabled]!! + actionsMissing.filter { !it.shownInEditor }
} }
return map return map
@ -220,7 +221,7 @@ val DefaultActionSettings = mapOf(
ActionCategory.PinnedKey to listOf(VoiceInputAction), ActionCategory.PinnedKey to listOf(VoiceInputAction),
ActionCategory.Favorites to listOf(SwitchLanguageAction, UndoAction, RedoAction, TextEditAction, ClipboardHistoryAction, ThemeAction), ActionCategory.Favorites to listOf(SwitchLanguageAction, UndoAction, RedoAction, TextEditAction, ClipboardHistoryAction, ThemeAction),
ActionCategory.More to listOf(), // Remaining actions get populated automatically by ensureWellFormed ActionCategory.More to listOf(), // Remaining actions get populated automatically by ensureWellFormed
ActionCategory.Disabled to listOf(MemoryDebugAction) ActionCategory.Disabled to listOf(MemoryDebugAction, SystemVoiceInputAction)
) )
val ActionsSettings = SettingsKey( val ActionsSettings = SettingsKey(

3
java/src/org/futo/inputmethod/latin/uix/actions/VoiceInputAction.kt
View File

@ -64,7 +64,8 @@ val SystemVoiceInputAction = Action(
it.triggerSystemVoiceInput() it.triggerSystemVoiceInput()
}, },
persistentState = null, persistentState = null,
windowImpl = null windowImpl = null,
shownInEditor = false
) )