Skip to content

Adding cut shortcut #417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leandroBorgesFerreira merged 2 commits into from
Apr 22, 2025
Merged

Adding cut shortcut #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7557633
Adding cut shortcut
ftrtyfytfjh Apr 22, 2025
952f38d
ktlint
ftrtyfytfjh Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions application/composeApp/src/jvmMain/kotlin/io/writeopia/desktop/MainDesktop.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions application/core/utils/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
889 changes: 749 additions & 140 deletions application/core/utils/config/ktlint/baseline.xml
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion ...re/utils/src/androidMain/kotlin/io/writeopia/common/utils/di/SharedPreferencesInjector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ class SharedPreferencesInjector private constructor(val sharedPreferences: Share

fun singleton() = instance ?: throw IllegalStateException("SharedPreferencesInjector not initialized!")
}

}
5 changes: 5 additions & 0 deletions ...n/core/utils/src/commonMain/kotlin/io/writeopia/common/utils/keyboard/KeyboardCommands.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down
1 change: 0 additions & 1 deletion ...core/utils/src/commonMain/kotlin/io/writeopia/common/utils/keyboard/KeyboardExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ import androidx.compose.ui.input.key.KeyEvent
expect fun KeyEvent.isCommandTrigger(): Boolean

expect fun KeyEvent.isMultiSelectionTrigger(): Boolean

1 change: 1 addition & 0 deletions .../utils/src/commonMain/kotlin/io/writeopia/common/utils/persistence/di/AppDaosInjection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ import io.writeopia.common.utils.persistence.daos.NotesConfigurationCommonDao

interface AppDaosInjection {
fun provideConfigurationDao(): NotesConfigurationCommonDao

fun provideFolderDao(): FolderCommonDao
}
2 changes: 0 additions & 2 deletions .../core/utils/src/jsMain/kotlin/io/writeopia/common/utils/keyboard/KeyboardExtensions.js.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -26,4 +25,3 @@ actual fun KeyEvent.isMultiSelectionTrigger(): Boolean = when (hostOs) {
OS.Ios -> this.isCtrlPressed && this.isMetaPressed
else -> this.isCtrlPressed && this.isAltPressed
}

1 change: 0 additions & 1 deletion ...ore/utils/src/jvmMain/kotlin/io/writeopia/common/utils/keyboard/KeyboardExtensions.jvm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion ...ils/src/nativeMain/kotlin/io/writeopia/common/utils/keyboard/KeyboardExtensions.native.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 5 additions & 0 deletions ...commonMain/kotlin/io/writeopia/editor/features/editor/viewmodel/NoteEditorKmpViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ class NoteEditorKmpViewModel(
copySelection()
}

KeyboardEvent.CUT -> {
copySelection()
deleteSelection()
}

KeyboardEvent.AI_QUESTION -> {
askAiBySelection()
}
Expand Down
3 changes: 2 additions & 1 deletion writeopia_ui/src/commonMain/kotlin/io/writeopia/ui/keyboard/KeyboardEvent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ enum class KeyboardEvent {
LINK,
LOCAL_SAVE,
COPY,
CUT,
AI_QUESTION,
CANCEL,
IDLE,
UNDO,
REDO
REDO,
}