From 75c4a43d579c0895f68e5f63dd1fe22a8b79d6b0 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Thu, 29 Oct 2026 17:19:15 +0100 Subject: [PATCH] feat: ability to edit words --- app/build.gradle.kts | 1 + .../weekfocus/screens/WordListScreen.kt | 239 +++++++++++++++--- gradle/libs.versions.toml | 2 + 3 files changed, 202 insertions(+), 40 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 86ee171..832c51b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -78,6 +78,7 @@ android { dependencies { implementation(platform(libs.androidx.compose.bom)) implementation(libs.androidx.activity.compose) + implementation(libs.androidx.compose.animation) implementation(libs.androidx.compose.material3) implementation(libs.androidx.compose.ui) implementation(libs.androidx.compose.ui.graphics) diff --git a/app/src/main/java/de/schanbro/weekfocus/screens/WordListScreen.kt b/app/src/main/java/de/schanbro/weekfocus/screens/WordListScreen.kt index 8b39497..f893cd2 100644 --- a/app/src/main/java/de/schanbro/weekfocus/screens/WordListScreen.kt +++ b/app/src/main/java/de/schanbro/weekfocus/screens/WordListScreen.kt @@ -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(null) } + var wordToEdit by remember { mutableStateOf(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 } + ) + } } } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7ff40d3..4dd9783 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,6 +8,7 @@ lifecycleRuntimeKtx = "2.11.0" activityCompose = "1.13.0" kotlin = "2.4.20" composeBom = "2026.09.00" +animation = "1.12.1" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } @@ -25,6 +26,7 @@ androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui- androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" } androidx-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" } +androidx-compose-animation = { group = "androidx.compose.animation", name = "animation", version.ref = "animation" } [plugins] android-application = { id = "com.android.application", version.ref = "agp" }