Adding cut shortcut (#417)

leandroBorgesFerreira · Leandro Ferreira · web-flow · commit 8f88ceab3940 · 2025-04-22T13:50:42.000+02:00
* Adding cut shortcut

* ktlint

---------

Co-authored-by: Leandro Ferreira &lt;email@email.com&gt;
diff --git a/application/composeApp/src/jvmMain/kotlin/io/writeopia/desktop/MainDesktop.kt b/application/composeApp/src/jvmMain/kotlin/io/writeopia/desktop/MainDesktop.kt
@@ -125,6 +125,11 @@ private fun ApplicationScope.App(onCloseRequest: () -> Unit = ::exitApplication)
                 false
             }
 
+            KeyboardCommands.isCutEvent(keyEvent) -> {
+                sendEvent(KeyboardEvent.CUT)
+                false
+            }
+
             KeyboardCommands.isQuestionEvent(keyEvent) -> {
                 sendEvent(KeyboardEvent.AI_QUESTION)
                 false
diff --git a/application/core/utils/build.gradle.kts b/application/core/utils/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     alias(libs.plugins.compose.multiplatform)
     alias(libs.plugins.compose.multiplatform.compiler)
     alias(libs.plugins.androidLibrary)
+    alias(libs.plugins.ktlint)
 }
 
 kotlin {
diff --git a/application/core/utils/config/ktlint/baseline.xml b/application/core/utils/config/ktlint/baseline.xml
diff --git a/application/core/utils/src/androidMain/kotlin/io/writeopia/common/utils/di/SharedPreferencesInjector.kt b/application/core/utils/src/androidMain/kotlin/io/writeopia/common/utils/di/SharedPreferencesInjector.kt
@@ -13,5 +13,4 @@ class SharedPreferencesInjector private constructor(val sharedPreferences: Share
 
         fun singleton() = instance ?: throw IllegalStateException("SharedPreferencesInjector not initialized!")
     }
-
 }
diff --git a/application/core/utils/src/commonMain/kotlin/io/writeopia/common/utils/keyboard/KeyboardCommands.kt b/application/core/utils/src/commonMain/kotlin/io/writeopia/common/utils/keyboard/KeyboardCommands.kt
@@ -66,6 +66,11 @@ object KeyboardCommands {
             keyEvent.key.keyCode == Key.C.keyCode &&
             keyEvent.type == KeyEventType.KeyUp
 
+    fun isCutEvent(keyEvent: KeyEvent) =
+        keyEvent.isCommandTrigger() &&
+            keyEvent.key.keyCode == Key.X.keyCode &&
+            keyEvent.type == KeyEventType.KeyUp
+
     fun isQuestionEvent(keyEvent: KeyEvent) =
         keyEvent.isCommandTrigger() &&
             keyEvent.key.keyCode == Key.K.keyCode &&
diff --git a/application/core/utils/src/commonMain/kotlin/io/writeopia/common/utils/keyboard/KeyboardExtensions.kt b/application/core/utils/src/commonMain/kotlin/io/writeopia/common/utils/keyboard/KeyboardExtensions.kt
@@ -5,4 +5,3 @@ import androidx.compose.ui.input.key.KeyEvent
 expect fun KeyEvent.isCommandTrigger(): Boolean
 
 expect fun KeyEvent.isMultiSelectionTrigger(): Boolean
-
diff --git a/application/core/utils/src/commonMain/kotlin/io/writeopia/common/utils/persistence/di/AppDaosInjection.kt b/application/core/utils/src/commonMain/kotlin/io/writeopia/common/utils/persistence/di/AppDaosInjection.kt
@@ -5,5 +5,6 @@ import io.writeopia.common.utils.persistence.daos.NotesConfigurationCommonDao
 
 interface AppDaosInjection {
     fun provideConfigurationDao(): NotesConfigurationCommonDao
+
     fun provideFolderDao(): FolderCommonDao
 }
diff --git a/application/core/utils/src/jsMain/kotlin/io/writeopia/common/utils/keyboard/KeyboardExtensions.js.kt b/application/core/utils/src/jsMain/kotlin/io/writeopia/common/utils/keyboard/KeyboardExtensions.js.kt
@@ -4,7 +4,6 @@ import androidx.compose.ui.input.key.KeyEvent
 import androidx.compose.ui.input.key.isAltPressed
 import androidx.compose.ui.input.key.isCtrlPressed
 import androidx.compose.ui.input.key.isMetaPressed
-import androidx.compose.ui.input.key.isShiftPressed
 import org.jetbrains.skiko.OS
 import org.jetbrains.skiko.hostOs
 
@@ -26,4 +25,3 @@ actual fun KeyEvent.isMultiSelectionTrigger(): Boolean = when (hostOs) {
     OS.Ios -> this.isCtrlPressed && this.isMetaPressed
     else -> this.isCtrlPressed && this.isAltPressed
 }
-
diff --git a/application/core/utils/src/jvmMain/kotlin/io/writeopia/common/utils/keyboard/KeyboardExtensions.jvm.kt b/application/core/utils/src/jvmMain/kotlin/io/writeopia/common/utils/keyboard/KeyboardExtensions.jvm.kt
@@ -4,7 +4,6 @@ import androidx.compose.ui.input.key.KeyEvent
 import androidx.compose.ui.input.key.isAltPressed
 import androidx.compose.ui.input.key.isCtrlPressed
 import androidx.compose.ui.input.key.isMetaPressed
-import androidx.compose.ui.input.key.isShiftPressed
 import org.jetbrains.skiko.OS
 import org.jetbrains.skiko.hostOs
 
diff --git a/application/core/utils/src/nativeMain/kotlin/io/writeopia/common/utils/keyboard/KeyboardExtensions.native.kt b/application/core/utils/src/nativeMain/kotlin/io/writeopia/common/utils/keyboard/KeyboardExtensions.native.kt
@@ -4,7 +4,6 @@ import androidx.compose.ui.input.key.KeyEvent
 import androidx.compose.ui.input.key.isAltPressed
 import androidx.compose.ui.input.key.isCtrlPressed
 import androidx.compose.ui.input.key.isMetaPressed
-import androidx.compose.ui.input.key.isShiftPressed
 import org.jetbrains.skiko.OS
 import org.jetbrains.skiko.hostOs
 
diff --git a/application/features/editor/src/commonMain/kotlin/io/writeopia/editor/features/editor/viewmodel/NoteEditorKmpViewModel.kt b/application/features/editor/src/commonMain/kotlin/io/writeopia/editor/features/editor/viewmodel/NoteEditorKmpViewModel.kt
@@ -90,6 +90,11 @@ class NoteEditorKmpViewModel(
                             copySelection()
                         }
 
+                        KeyboardEvent.CUT -> {
+                            copySelection()
+                            deleteSelection()
+                        }
+
                         KeyboardEvent.AI_QUESTION -> {
                             askAiBySelection()
                         }
diff --git a/writeopia_ui/src/commonMain/kotlin/io/writeopia/ui/keyboard/KeyboardEvent.kt b/writeopia_ui/src/commonMain/kotlin/io/writeopia/ui/keyboard/KeyboardEvent.kt
@@ -10,9 +10,10 @@ enum class KeyboardEvent {
     LINK,
     LOCAL_SAVE,
     COPY,
+    CUT,
     AI_QUESTION,
     CANCEL,
     IDLE,
     UNDO,
-    REDO
+    REDO,
 }

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ plugins {`
`3`	`3`	`alias(libs.plugins.compose.multiplatform)`
`4`	`4`	`alias(libs.plugins.compose.multiplatform.compiler)`
`5`	`5`	`alias(libs.plugins.androidLibrary)`
	`6`	`+ alias(libs.plugins.ktlint)`
`6`	`7`	`}`
`7`	`8`
`8`	`9`	`kotlin {`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,4 @@ class SharedPreferencesInjector private constructor(val sharedPreferences: Share`
`13`	`13`
`14`	`14`	`fun singleton() = instance ?: throw IllegalStateException("SharedPreferencesInjector not initialized!")`
`15`	`15`	`}`
`16`		`-`
`17`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,3 @@ import androidx.compose.ui.input.key.KeyEvent`
`5`	`5`	`expect fun KeyEvent.isCommandTrigger(): Boolean`
`6`	`6`
`7`	`7`	`expect fun KeyEvent.isMultiSelectionTrigger(): Boolean`
`8`		`-`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,6 @@ import io.writeopia.common.utils.persistence.daos.NotesConfigurationCommonDao`
`5`	`5`
`6`	`6`	`interface AppDaosInjection {`
`7`	`7`	`fun provideConfigurationDao(): NotesConfigurationCommonDao`
	`8`	`+`
`8`	`9`	`fun provideFolderDao(): FolderCommonDao`
`9`	`10`	`}`