From d9d1b1105c915a9f93460ad7ed327e2939494777 Mon Sep 17 00:00:00 2001 From: Codex Mozc Autonomy Date: Tue, 17 Nov 2026 15:17:26 -0500 Subject: [PATCH] Preserve custom two-step flick outputs after editing --- .../ui/KeyboardEditorViewModel.kt | 1 + ...ardEditorViewModelFlexiblePlacementTest.kt | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/app/src/main/java/com/kazumaproject/markdownhelperkeyboard/custom_keyboard/ui/KeyboardEditorViewModel.kt b/app/src/main/java/com/kazumaproject/markdownhelperkeyboard/custom_keyboard/ui/KeyboardEditorViewModel.kt index 99b3c0faa..a2a94e0c7 100644 --- a/app/src/main/java/com/kazumaproject/markdownhelperkeyboard/custom_keyboard/ui/KeyboardEditorViewModel.kt +++ b/app/src/main/java/com/kazumaproject/markdownhelperkeyboard/custom_keyboard/ui/KeyboardEditorViewModel.kt @@ -1196,6 +1196,7 @@ class KeyboardEditorViewModel @Inject constructor( finalTwoStepLongPressMaps.remove(keyId) } + KeyType.TWO_STEP_FLICK, KeyType.FLICK_LONG_PRESS -> { finalFlickMaps.remove(keyId) finalCircularFlickMaps.remove(keyId) diff --git a/app/src/test/java/com/kazumaproject/markdownhelperkeyboard/custom_keyboard/ui/KeyboardEditorViewModelFlexiblePlacementTest.kt b/app/src/test/java/com/kazumaproject/markdownhelperkeyboard/custom_keyboard/ui/KeyboardEditorViewModelFlexiblePlacementTest.kt index 5b5469bc0..cac86d453 100644 --- a/app/src/test/java/com/kazumaproject/markdownhelperkeyboard/custom_keyboard/ui/KeyboardEditorViewModelFlexiblePlacementTest.kt +++ b/app/src/test/java/com/kazumaproject/markdownhelperkeyboard/custom_keyboard/ui/KeyboardEditorViewModelFlexiblePlacementTest.kt @@ -566,6 +566,38 @@ class KeyboardEditorViewModelFlexiblePlacementTest { assertEquals(beforeLayout.rowCount * 2, afterLayout.rowUnitCount) } + @Test + fun twoStepKeyEdit_keepsNormalAndLongPressOutputsInLayout() { + val viewModel = viewModel() + viewModel.applyTemplate(singleKeyLayout("key_a", "key_a")) + val key = viewModel.uiState.value.layout.keys.single() + val normalOutputs = mapOf( + TfbiFlickDirection.TAP to mapOf(TfbiFlickDirection.TAP to "あ"), + TfbiFlickDirection.UP to mapOf( + TfbiFlickDirection.TAP to "あ", + TfbiFlickDirection.UP to "い", + TfbiFlickDirection.UP_RIGHT to "う" + ) + ) + val longPressOutputs = mapOf( + TfbiFlickDirection.UP to mapOf(TfbiFlickDirection.UP_RIGHT to "ぅ") + ) + + assertTrue( + viewModel.updateKeyAndMappings( + newKeyData = key.copy(keyType = KeyType.TWO_STEP_FLICK, isFlickable = true), + flickMap = emptyMap(), + twoStepMap = normalOutputs, + longPressFlickMap = emptyMap(), + twoStepLongPressMap = longPressOutputs + ) + ) + + val editedLayout = viewModel.uiState.value.layout + assertEquals(normalOutputs, editedLayout.twoStepFlickKeyMaps[key.keyId]) + assertEquals(longPressOutputs, editedLayout.twoStepLongPressKeyMaps[key.keyId]) + } + @Test fun legacyLayout_keyResizeStillUsesRowSpanAndColSpanCells() { val vm = viewModel()