feat: ability to edit words

This commit is contained in:
robin committed 2026-10-29 17:19:15 +01:00
1 parent 0c75afab4e
commit 75c4a43d57
3 files changed
+202 -40

No files matched your search

@@ -2,29 +2,177 @@ package de.schanbro.weekfocus.screens
import android.content.Context
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.detectTapGestures
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.Delete
import androidx.compose.material.icons.filled.Edit
import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.platform.LocalHapticFeedback
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.unit.dp
import de.schanbro.weekfocus.R
import de.schanbro.weekfocus.updateWidget
import androidx.compose.ui.hapticfeedback.HapticFeedbackType
import androidx.compose.ui.graphics.Color
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun SwipeableWordItem(
word: String,
onDeleteRequest: () -> Unit,
onEditRequest: () -> Unit,
modifier: Modifier = Modifier
) {
val haptic = LocalHapticFeedback.current
val dismissState = rememberSwipeToDismissBoxState(
confirmValueChange = { value ->
when (value) {
SwipeToDismissBoxValue.StartToEnd -> onDeleteRequest() // nach rechts
SwipeToDismissBoxValue.EndToStart -> onEditRequest() // nach links
SwipeToDismissBoxValue.Settled -> Unit
}
false // Karte springt immer zurück, Dialog übernimmt
},
positionalThreshold = { totalDistance -> totalDistance * 0.4f }
)
// Haptisches Feedback, sobald die Schwelle überschritten wird
LaunchedEffect(dismissState.targetValue) {
if (dismissState.targetValue != SwipeToDismissBoxValue.Settled) {
haptic.performHapticFeedback(HapticFeedbackType.LongPress)
}
}
SwipeToDismissBox(
state = dismissState,
modifier = modifier,
backgroundContent = {
val direction = dismissState.dismissDirection
val isDelete = direction == SwipeToDismissBoxValue.StartToEnd
val isEdit = direction == SwipeToDismissBoxValue.EndToStart
val color by animateColorAsState(
targetValue = when {
isDelete -> MaterialTheme.colorScheme.errorContainer
isEdit -> MaterialTheme.colorScheme.secondaryContainer
else -> Color.Transparent
},
label = "swipeBackground"
)
Box(
modifier = Modifier
.fillMaxSize()
.clip(MaterialTheme.shapes.medium)
.background(color)
.padding(horizontal = 20.dp),
contentAlignment = if (isDelete) Alignment.CenterStart else Alignment.CenterEnd
) {
when {
isDelete -> Icon(
Icons.Default.Delete,
contentDescription = null,
tint = MaterialTheme.colorScheme.onErrorContainer
)
isEdit -> Icon(
Icons.Default.Edit,
contentDescription = null,
tint = MaterialTheme.colorScheme.onSecondaryContainer
)
}
}
}
) {
ElevatedCard(
modifier = Modifier.fillMaxWidth(),
shape = MaterialTheme.shapes.medium,
colors = CardDefaults.elevatedCardColors(
containerColor = MaterialTheme.colorScheme.surfaceContainerLow
)
) {
Text(
text = word,
style = MaterialTheme.typography.bodyLarge,
color = MaterialTheme.colorScheme.onSurface,
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp, vertical = 16.dp)
)
}
}
}
@Composable
fun DeleteWordDialog(
word: String,
onConfirm: () -> Unit,
onDismiss: () -> Unit
) {
AlertDialog(
onDismissRequest = onDismiss,
icon = { Icon(Icons.Default.Delete, contentDescription = null) },
title = { Text("Wort löschen?") },
text = { Text("„$word“ wird dauerhaft entfernt.") },
confirmButton = {
TextButton(onClick = onConfirm) { Text("Löschen") }
},
dismissButton = {
TextButton(onClick = onDismiss) { Text("Abbrechen") }
}
)
}
@Composable
fun EditWordDialog(
word: String,
onSave: (String) -> Unit,
onDismiss: () -> Unit
) {
var text by remember(word) { mutableStateOf(word) }
AlertDialog(
onDismissRequest = onDismiss,
icon = { Icon(Icons.Default.Edit, contentDescription = null) },
title = { Text("Wort bearbeiten") },
text = {
OutlinedTextField(
value = text,
onValueChange = { text = it },
singleLine = true,
keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
keyboardActions = KeyboardActions(onDone = { onSave(text) })
)
},
confirmButton = {
TextButton(
onClick = { onSave(text) },
enabled = text.isNotBlank()
) { Text("Speichern") }
},
dismissButton = {
TextButton(onClick = onDismiss) { Text("Abbrechen") }
}
)
}
@Composable
fun WordListScreen(modifier: Modifier = Modifier) {
@@ -43,25 +191,40 @@ fun WordListScreen(modifier: Modifier = Modifier) {
}
}
val haptic = LocalHapticFeedback.current
var wordToDelete by remember { mutableStateOf<String?>(null) }
var wordToEdit by remember { mutableStateOf<String?>(null) }
fun saveWords() {
sharedPrefs.edit().putStringSet("words_key", wordList.toSet()).apply()
}
fun addCurrentWord() {
val trimmed = textInput.trim()
if (trimmed.isNotEmpty()) {
if (trimmed.isNotEmpty() && trimmed !in wordList) {
wordList.add(0, trimmed)
saveWords()
updateWidget(context)
textInput = ""
focusManager.clearFocus() // Fokus aufheben & Tastatur schließen
focusManager.clearFocus()
}
}
fun updateWord(old: String, new: String) {
val trimmed = new.trim()
val index = wordList.indexOf(old)
// Duplikate vermeiden, da das Set ohnehin keine doppelten Einträge speichert
if (index >= 0 && trimmed.isNotEmpty() && (trimmed == old || trimmed !in wordList)) {
wordList[index] = trimmed
saveWords()
updateWidget(context)
}
}
Column(
modifier = modifier
.fillMaxSize()
// Auf Klicks im leeren Bereich reagieren -> Fokus aufheben
// Auf Klicks im leeren Bereich reagieren → Fokus aufheben
.pointerInput(Unit) {
detectTapGestures(onTap = {
focusManager.clearFocus()
@@ -127,43 +290,39 @@ fun WordListScreen(modifier: Modifier = Modifier) {
verticalArrangement = Arrangement.spacedBy(8.dp),
contentPadding = PaddingValues(bottom = 16.dp)
) {
itemsIndexed(wordList) { index, word ->
ElevatedCard(
modifier = Modifier.fillMaxWidth(),
shape = MaterialTheme.shapes.medium,
colors = CardDefaults.elevatedCardColors(
containerColor = MaterialTheme.colorScheme.surfaceContainerLow
)
) {
Row(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp, vertical = 12.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween
) {
Text(
text = word,
style = MaterialTheme.typography.bodyLarge,
color = MaterialTheme.colorScheme.onSurface,
modifier = Modifier.weight(1f)
)
IconButton(
onClick = {
wordList.removeAt(index)
saveWords()
updateWidget(context)
}
) {
Icon(
imageVector = Icons.Default.Delete,
contentDescription = "Entfernen",
tint = MaterialTheme.colorScheme.error
)
}
}
}
items(items = wordList, key = { it }) { word ->
SwipeableWordItem(
word = word,
onDeleteRequest = { wordToDelete = word },
onEditRequest = { wordToEdit = word },
modifier = Modifier.animateItem() // ältere Compose-Versionen: animateItemPlacement()
)
}
}
wordToDelete?.let { word ->
DeleteWordDialog(
word = word,
onConfirm = {
wordList.remove(word)
saveWords()
updateWidget(context)
haptic.performHapticFeedback(HapticFeedbackType.LongPress)
wordToDelete = null
},
onDismiss = { wordToDelete = null }
)
}
wordToEdit?.let { word ->
EditWordDialog(
word = word,
onSave = { new ->
updateWord(word, new)
wordToEdit = null
},
onDismiss = { wordToEdit = null }
)
}
}
}