Skip to content

A cut btn Added in Android app #446

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

Open
MdIzAZ wants to merge 1 commit into
base: main
Choose a base branch
from
Open

A cut btn Added in Android app #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions ...roidMain/kotlin/io/writeopia/editor/features/editor/ui/screen/NoteEditorScreen.android.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ internal fun NoteEditorScreen(
noteEditorViewModel::onAddSpanClick,
noteEditorViewModel::deleteSelection,
noteEditorViewModel::copySelection,
noteEditorViewModel::cutSelection,
noteEditorViewModel::clearSelections,
noteEditorViewModel::onAddCheckListClick,
noteEditorViewModel::onAddListItemClick
Expand Down Expand Up @@ -318,6 +319,7 @@ private fun BottomScreen(
onSpanSelected: (Span) -> Unit = {},
deleteSelection: () -> Unit = {},
copySelection: () -> Unit = {},
cutSelection: () -> Unit = {},
onClose: () -> Unit = {},
onCheckItem: () -> Unit = {},
onListItem: () -> Unit = {}
Expand Down Expand Up @@ -361,6 +363,7 @@ private fun BottomScreen(
onSpanClick = onSpanSelected,
onDelete = deleteSelection,
onCopy = copySelection,
onCut = cutSelection,
onClose = onClose,
checkboxClick = onCheckItem,
listItemClick = onListItem
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 @@ -518,6 +518,11 @@ class NoteEditorKmpViewModel(
copyManager.copy(annotatedString)
}

override fun cutSelection() {
copySelection()
deleteSelection()
}

override fun deleteDocument() {
viewModelScope.launch(Dispatchers.Default) {
documentRepository.deleteDocument(writeopiaManager.getDocument())
Expand Down
2 changes: 2 additions & 0 deletions ...rc/commonMain/kotlin/io/writeopia/editor/features/editor/viewmodel/NoteEditorViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ interface NoteEditorViewModel : BackstackInform, BackstackHandler {

fun copySelection()

fun cutSelection()

fun deleteDocument()

fun toggleFavorite()
Expand Down
15 changes: 15 additions & 0 deletions writeopia_ui/src/commonMain/kotlin/io/writeopia/ui/components/EditionScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ContentCut
import androidx.compose.material.icons.filled.DeleteOutline
import androidx.compose.material.icons.outlined.FormatBold
import androidx.compose.material.icons.outlined.FormatItalic
Expand All @@ -34,6 +35,7 @@ fun EditionScreen(
listItemClick: () -> Unit = {},
onDelete: () -> Unit = {},
onCopy: () -> Unit = {},
onCut: () -> Unit = {},
onClose: () -> Unit = {},
) {
val iconPadding = PaddingValues(vertical = 4.dp)
Expand Down Expand Up @@ -131,6 +133,19 @@ fun EditionScreen(

Spacer(modifier = Modifier.width(spaceWidth))

Icon(
modifier = Modifier
.clip(clipShape)
.clickable(onClick = onCut)
.size(32.dp)
.padding(iconPadding),
imageVector = Icons.Default.ContentCut,
contentDescription = "Cut",
tint = tint
)

Spacer(modifier = Modifier.width(spaceWidth))

Icon(
modifier = Modifier
.clip(clipShape)
Expand Down