Compare commits
5
Commits
v1.2.9-beta
...
v0.2.11
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
27d1a4b6ea | ||
|
|
5ae35c4cac | ||
|
|
75c4a43d57 | ||
|
|
0c75afab4e | ||
|
|
0c2ec3f20c |
No files matched your search
+13
-1
@@ -1,5 +1,17 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [1.2.11] - 2026-10-29
|
||||||
|
### New
|
||||||
|
* ability to edit words (with swiping to the left)
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
* delete words with swiping to the right (instead of pressing the button)
|
||||||
|
|
||||||
|
## [1.2.10] - 2026-10-08
|
||||||
|
### Changed
|
||||||
|
* implemented a better choosing of the focus word.
|
||||||
|
* reduced apk file size from 44MB to 2.2MB
|
||||||
|
|
||||||
## [1.2.0] - 2026-10-04
|
## [1.2.0] - 2026-10-04
|
||||||
### New
|
### New
|
||||||
* navigation
|
* navigation
|
||||||
@@ -8,7 +20,7 @@
|
|||||||
|
|
||||||
## [1.1.3] - 2026-10-03
|
## [1.1.3] - 2026-10-03
|
||||||
### Changed
|
### Changed
|
||||||
- chore: refactor: switch from release github action to bash
|
- chore: refactor: switch from release GitHub Action to bash
|
||||||
|
|
||||||
## [1.1.1] - 2026-10-03
|
## [1.1.1] - 2026-10-03
|
||||||
### Changed
|
### Changed
|
||||||
|
|||||||
@@ -78,6 +78,7 @@ android {
|
|||||||
dependencies {
|
dependencies {
|
||||||
implementation(platform(libs.androidx.compose.bom))
|
implementation(platform(libs.androidx.compose.bom))
|
||||||
implementation(libs.androidx.activity.compose)
|
implementation(libs.androidx.activity.compose)
|
||||||
|
implementation(libs.androidx.compose.animation)
|
||||||
implementation(libs.androidx.compose.material3)
|
implementation(libs.androidx.compose.material3)
|
||||||
implementation(libs.androidx.compose.ui)
|
implementation(libs.androidx.compose.ui)
|
||||||
implementation(libs.androidx.compose.ui.graphics)
|
implementation(libs.androidx.compose.ui.graphics)
|
||||||
|
|||||||
Vendored
+6
@@ -0,0 +1,6 @@
|
|||||||
|
# Project-specific R8/ProGuard rules for WeekFocus.
|
||||||
|
# Default Android and Compose rules are applied automatically via consumer rules.
|
||||||
|
|
||||||
|
# Keep line numbers for readable stack traces
|
||||||
|
-keepattributes SourceFile,LineNumberTable
|
||||||
|
-renamesourcefileattribute SourceFile
|
||||||
@@ -2,29 +2,177 @@ package de.schanbro.weekfocus.screens
|
|||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import androidx.compose.animation.AnimatedVisibility
|
import androidx.compose.animation.AnimatedVisibility
|
||||||
|
import androidx.compose.animation.animateColorAsState
|
||||||
import androidx.compose.animation.fadeIn
|
import androidx.compose.animation.fadeIn
|
||||||
import androidx.compose.animation.fadeOut
|
import androidx.compose.animation.fadeOut
|
||||||
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.gestures.detectTapGestures
|
import androidx.compose.foundation.gestures.detectTapGestures
|
||||||
import androidx.compose.foundation.layout.*
|
import androidx.compose.foundation.layout.*
|
||||||
import androidx.compose.foundation.lazy.LazyColumn
|
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.KeyboardActions
|
||||||
import androidx.compose.foundation.text.KeyboardOptions
|
import androidx.compose.foundation.text.KeyboardOptions
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.filled.Add
|
import androidx.compose.material.icons.filled.Add
|
||||||
import androidx.compose.material.icons.filled.Delete
|
import androidx.compose.material.icons.filled.Delete
|
||||||
|
import androidx.compose.material.icons.filled.Edit
|
||||||
import androidx.compose.material3.*
|
import androidx.compose.material3.*
|
||||||
import androidx.compose.runtime.*
|
import androidx.compose.runtime.*
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.draw.clip
|
||||||
import androidx.compose.ui.input.pointer.pointerInput
|
import androidx.compose.ui.input.pointer.pointerInput
|
||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.platform.LocalContext
|
||||||
import androidx.compose.ui.platform.LocalFocusManager
|
import androidx.compose.ui.platform.LocalFocusManager
|
||||||
|
import androidx.compose.ui.platform.LocalHapticFeedback
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
import androidx.compose.ui.text.input.ImeAction
|
import androidx.compose.ui.text.input.ImeAction
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import de.schanbro.weekfocus.R
|
import de.schanbro.weekfocus.R
|
||||||
import de.schanbro.weekfocus.updateWidget
|
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
|
@Composable
|
||||||
fun WordListScreen(modifier: Modifier = Modifier) {
|
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() {
|
fun saveWords() {
|
||||||
sharedPrefs.edit().putStringSet("words_key", wordList.toSet()).apply()
|
sharedPrefs.edit().putStringSet("words_key", wordList.toSet()).apply()
|
||||||
}
|
}
|
||||||
|
|
||||||
fun addCurrentWord() {
|
fun addCurrentWord() {
|
||||||
val trimmed = textInput.trim()
|
val trimmed = textInput.trim()
|
||||||
if (trimmed.isNotEmpty()) {
|
if (trimmed.isNotEmpty() && trimmed !in wordList) {
|
||||||
wordList.add(0, trimmed)
|
wordList.add(0, trimmed)
|
||||||
saveWords()
|
saveWords()
|
||||||
updateWidget(context)
|
updateWidget(context)
|
||||||
textInput = ""
|
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(
|
Column(
|
||||||
modifier = modifier
|
modifier = modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
// Auf Klicks im leeren Bereich reagieren -> Fokus aufheben
|
// Auf Klicks im leeren Bereich reagieren → Fokus aufheben
|
||||||
.pointerInput(Unit) {
|
.pointerInput(Unit) {
|
||||||
detectTapGestures(onTap = {
|
detectTapGestures(onTap = {
|
||||||
focusManager.clearFocus()
|
focusManager.clearFocus()
|
||||||
@@ -127,43 +290,39 @@ fun WordListScreen(modifier: Modifier = Modifier) {
|
|||||||
verticalArrangement = Arrangement.spacedBy(8.dp),
|
verticalArrangement = Arrangement.spacedBy(8.dp),
|
||||||
contentPadding = PaddingValues(bottom = 16.dp)
|
contentPadding = PaddingValues(bottom = 16.dp)
|
||||||
) {
|
) {
|
||||||
itemsIndexed(wordList) { index, word ->
|
items(items = wordList, key = { it }) { word ->
|
||||||
ElevatedCard(
|
SwipeableWordItem(
|
||||||
modifier = Modifier.fillMaxWidth(),
|
word = word,
|
||||||
shape = MaterialTheme.shapes.medium,
|
onDeleteRequest = { wordToDelete = word },
|
||||||
colors = CardDefaults.elevatedCardColors(
|
onEditRequest = { wordToEdit = word },
|
||||||
containerColor = MaterialTheme.colorScheme.surfaceContainerLow
|
modifier = Modifier.animateItem() // ältere Compose-Versionen: animateItemPlacement()
|
||||||
)
|
)
|
||||||
) {
|
|
||||||
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
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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 }
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,6 +8,7 @@ lifecycleRuntimeKtx = "2.11.0"
|
|||||||
activityCompose = "1.13.0"
|
activityCompose = "1.13.0"
|
||||||
kotlin = "2.4.20"
|
kotlin = "2.4.20"
|
||||||
composeBom = "2026.09.00"
|
composeBom = "2026.09.00"
|
||||||
|
animation = "1.12.1"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
|
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-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
|
||||||
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
|
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
|
||||||
androidx-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" }
|
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]
|
[plugins]
|
||||||
android-application = { id = "com.android.application", version.ref = "agp" }
|
android-application = { id = "com.android.application", version.ref = "agp" }
|
||||||
|
|||||||
Reference in new issue
Block a user