Compare commits

..
38 Commits
Author SHA1 Message Date
robin a2d049e280 Merge pull request 'chore(l10n): add translations' (#31) from chore(l10n)/translation into main
Build & Release Android App / build (push) Successful in 8m24s
Reviewed-on: robin/WeekFocus#31
2026-10-29 16:41:08 +00:00
robin a393624d03 chore(l10n): add translations 2026-10-29 17:40:35 +01:00
robin 27d1a4b6ea Merge pull request 'Feat/edit words' (#30) from feat/edit-words into main
Build & Release Android App / build (push) Successful in 20m22s
Reviewed-on: robin/WeekFocus#30
2026-10-29 16:23:20 +00:00
robin 5ae35c4cac CHANGELOG update 2026-10-29 17:22:42 +01:00
robin 75c4a43d57 feat: ability to edit words 2026-10-29 17:19:15 +01:00
robin 0c75afab4e CHANGELOG update
Build & Release Android App / build (push) Successful in 16m15s
2026-10-08 15:20:25 +02:00
robin 0c2ec3f20c chore: add proguard-rules.pro
Build & Release Android App / build (push) Successful in 18m51s
2026-10-08 14:55:36 +02:00
robin daf16f0e67 chore: adjust workflow
Build & Release Android App / build (push) Failing after 18m42s
2026-10-08 14:35:15 +02:00
robin 8ccd4430da Merge pull request 'refactor: implement better choosing of the word' (#23) from test/widget-automation into main
Build & Release Android App / build (push) Failing after 54s
Reviewed-on: #23
2026-10-08 11:45:25 +00:00
robin 98ffa47fa4 Merge branch 'main' into test/widget-automation 2026-10-08 11:45:17 +00:00
robin dfd0b75521 Merge pull request 'Chore/reduce apk size' (#29) from chore/reduce-apk-size into main
Reviewed-on: #29
2026-10-07 14:50:17 +00:00
robin d9c1942f2a Merge branch 'main' into chore/reduce-apk-size 2026-10-07 14:50:08 +00:00
robin bc6edc4a04 chore: adjust workflow 2026-10-07 16:49:40 +02:00
robin d03f9eee67 chore: enable R8 (Code-Shrinking) 2026-10-07 16:48:13 +02:00
robin 7eff7300d0 chore: disable abi (apk-split) 2026-10-07 16:45:22 +02:00
robin 8458f0fce5 Merge pull request 'Chore/smaller apk' (#28) from chore/smaller-apk into main
Build & Release Android App / build (push) Successful in 19m5s
Reviewed-on: #28
2026-10-07 14:08:54 +00:00
robin e444abecae Merge branch 'main' into chore/smaller-apk 2026-10-07 14:08:43 +00:00
robin 3bac488893 chore: force to use JDK 17 2026-10-07 16:08:14 +02:00
robin b8195b74f1 chore: force to use JDK 17 2026-10-07 16:06:27 +02:00
robin f431fb272d chore: force to use JDK 17 2026-10-07 16:03:39 +02:00
robin 107f1c3955 Merge pull request 'chore: fix workflow 2' (#26) from chore/smaller-apk into main
Build & Release Android App / build (push) Failing after 1m16s
Reviewed-on: #26
2026-10-07 13:57:30 +00:00
robin ce1eba6b83 Merge branch 'main' into chore/smaller-apk 2026-10-07 13:57:20 +00:00
robin 4b8e2bc88d chore: fix workflow 2026-10-07 15:56:01 +02:00
robin c71851702f Merge pull request 'chore: fix workflow' (#25) from chore/smaller-apk into main
Reviewed-on: #25
2026-10-07 13:44:27 +00:00
robin 4c04a5260c Merge branch 'main' into chore/smaller-apk 2026-10-07 13:44:17 +00:00
robin 90e477cb04 chore: fix workflow
Build & Release Android App / build (push) Failing after 47s
2026-10-07 15:43:51 +02:00
robin 82d4fa331b Merge pull request 'chore: apk-splits' (#24) from chore/smaller-apk into main
Reviewed-on: #24
2026-10-07 13:27:42 +00:00
robin 6206a47fc7 chore: apk-splits
Build & Release Android App / build (push) Failing after 3m51s
chore: adjust workflow in Gitea
chore(deps): update versions
2026-10-07 15:19:22 +02:00
robin ff78c71ab5 Merge pull request 'chore: automaticly mark as prerelease if necessary' (#19) from chore into main
Reviewed-on: #19
2026-10-06 15:19:59 +00:00
robin c6d6ac359b chore: automaticly mark as prerelease if necessary 2026-10-06 15:19:44 +00:00
robin 7cc3245b97 refactor: implement better choosing of the word 2026-10-06 17:06:13 +02:00
robin 8cacb6f582 Merge pull request 'chore(l10n): update translations' (#17) from weblate-translations into main
Reviewed-on: #17
2026-10-04 15:32:04 +00:00
robin 86882fafcb chore(l10n): update German (formal) translation
chore(l10n): update English translation

Co-authored-by: Weblate Admin <robin@schanbros.de>
Language: English
Language: German (formal)
Progress: 100.0% (7 of 7 strings)
Translate-URL: https://weblate.schamagusa.de/projects/weekfocus/weekfocus/de@formal/
Translate-URL: https://weblate.schamagusa.de/projects/weekfocus/weekfocus/en/
Translation: WeekFocus/WeekFocus
2026-10-04 15:31:23 +00:00
robin edb11b360b CHANGELOG update
Build & Release Android App / build (push) Successful in 19m15s
2026-10-04 17:22:47 +02:00
robin 18c375979c Merge pull request 'feat: better layout' (#16) from feat/better-layout into main
Reviewed-on: #16
2026-10-04 15:18:58 +00:00
robin 2545498dc2 feat: navigation
feat: remove word
2026-10-04 17:17:23 +02:00
robin fd20b5d91e chore: debug/dev builds besides normal builds 2026-10-04 15:53:24 +02:00
robin 76cf592cd1 Merge pull request 'chore(l10n): update translations' (#14) from weblate-translations into main
Reviewed-on: #14
2026-10-04 12:58:52 +00:00
16 changed files with 717 additions and 176 deletions

No files matched your search

+32 -22
View File
@@ -1,4 +1,3 @@
# .gitea/workflows/build-release.yml
name: Build & Release Android App
on:
@@ -19,6 +18,7 @@ jobs:
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
- name: Code auschecken
uses: actions/checkout@v4
@@ -46,14 +46,12 @@ jobs:
rm /tmp/tools.zip
fi
# Lizenzen korrekt akzeptieren (kein "yes |", wegen pipefail/SIGPIPE)
"$SDKMANAGER" --sdk_root="$SDK_PATH" --licenses < <(yes) > /dev/null
# Benötigte Pakete direkt installieren
"$SDKMANAGER" --sdk_root="$SDK_PATH" \
"platform-tools" \
"platforms;android-37.0" \
"build-tools;36.0.0"
"platforms;android-35" \
"build-tools;35.0.0"
echo "ANDROID_HOME=$SDK_PATH" >> $GITHUB_ENV
echo "ANDROID_SDK_ROOT=$SDK_PATH" >> $GITHUB_ENV
@@ -71,33 +69,33 @@ jobs:
set -euo pipefail
VERSION="${GITHUB_REF_NAME#v}"
echo "Baue Version: $VERSION"
./gradlew assembleRelease \
--no-daemon \
-Dorg.gradle.java.home="$JAVA_HOME" \
-Porg.gradle.java.installations.auto-download=false \
-PversionNameOverride="$VERSION"
echo "Erzeugte APK-Dateien:"
find app/build/outputs -type f -name "*.apk" -print
APK_DIR="app/build/outputs/apk/release"
APK_SOURCE="$(find app/build/outputs/apk/release -maxdepth 1 -type f -name "*.apk" ! -name "*unsigned*" | head -n 1)"
echo "Gefundene APKs in $APK_DIR:"
ls -lh "$APK_DIR"
if [ -z "$APK_SOURCE" ]; then
echo "Keine Release-APK gefunden."
SRC="$APK_DIR/app-release.apk"
if [ ! -f "$SRC" ]; then
echo "app-release.apk nicht gefunden (evtl. unsigniert oder anderer Name)"
exit 1
fi
APK_DIR="app/build/outputs/apk/release"
APK_NAME="WeekFocus-${VERSION}.apk"
APK_TARGET="$APK_DIR/$APK_NAME"
TARGET_PATH="$APK_DIR/WeekFocus-${VERSION}.apk"
mv "$SRC" "$TARGET_PATH"
mv "$APK_SOURCE" "$APK_TARGET"
echo "Signatur prüfen für $(basename "$TARGET_PATH")..."
"$ANDROID_HOME/build-tools/35.0.0/apksigner" verify --verbose "$TARGET_PATH"
"$ANDROID_HOME/build-tools/36.0.0/apksigner" verify --verbose "$APK_TARGET"
echo "APK erstellt: $APK_TARGET"
ls -lh "$APK_DIR"
echo "Finale Release-APK:"
ls -lh "$TARGET_PATH"
env:
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
@@ -141,14 +139,22 @@ jobs:
run: |
set -euo pipefail
TAG="$GITHUB_REF_NAME"
VERSION="${TAG#v}"
NOTES_FILE="$RUNNER_TEMP/release_notes.md"
AUTH="Authorization: token $TOKEN"
# Release holen oder neu anlegen
CODE=$(curl -sS -o release.json -w '%{http_code}' -H "$AUTH" "$API/releases/tags/$TAG")
if [ "$CODE" = "404" ]; then
if [[ "$VERSION" =~ (alpha|beta|rc|dev) ]]; then
IS_PRERELEASE="true"
else
IS_PRERELEASE="false"
fi
jq -n --arg tag "$TAG" --arg name "$TAG" --rawfile body "$NOTES_FILE" \
'{tag_name:$tag, name:$name, body:$body}' > payload.json
--argjson prerelease "$IS_PRERELEASE" \
'{tag_name:$tag, name:$name, body:$body, prerelease:$prerelease}' > payload.json
curl -fsS -X POST -H "$AUTH" -H "Content-Type: application/json" \
-d @payload.json "$API/releases" -o release.json
elif [ "$CODE" != "200" ]; then
@@ -156,14 +162,18 @@ jobs:
cat release.json
exit 1
fi
RELEASE_ID=$(jq -r .id release.json)
# APK hochladen, gleichnamige alte Assets vorher löschen
for APK in app/build/outputs/apk/release/WeekFocus-*.apk; do
[ -e "$APK" ] || continue
NAME=$(basename "$APK")
echo "Lade Hoch: $NAME"
for ID in $(jq -r --arg n "$NAME" '.assets[]? | select(.name==$n) | .id' release.json); do
curl -fsS -X DELETE -H "$AUTH" "$API/releases/$RELEASE_ID/assets/$ID"
done
curl -fsS -X POST -H "$AUTH" -F "attachment=@$APK" \
"$API/releases/$RELEASE_ID/assets?name=$NAME"
done
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_25" default="true" project-jdk-name="jbr-25" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
+19 -1
View File
@@ -1,8 +1,26 @@
# 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
### New
* navigation
* ability to delete words
* better layout
## [1.1.3] - 2026-10-03
### 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
### Changed
+24 -6
View File
@@ -5,7 +5,6 @@ plugins {
val tagVersion = (project.findProperty("versionNameOverride") as String?) ?: "0.0.0-dev"
// "1.2.3" oder "1.2.3-alpha9" -> Kern "1.2.3" für den versionCode
val core = tagVersion
.removePrefix("v")
.substringBefore("-")
@@ -16,20 +15,28 @@ val patch = parts.getOrElse(2) { 0 }
android {
namespace = "de.schanbro.weekfocus"
compileSdk {
version = release(37)
}
compileSdk = 37
defaultConfig {
applicationId = "de.schanbro.weekfocus"
minSdk = 29
targetSdk = 37
versionCode = major * 10000 + minor * 100 + patch
versionCode = (major * 10000 + minor * 100 + patch).coerceAtLeast(1)
versionName = tagVersion
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
// not necessary
/*splits {
abi {
isEnable = true
reset()
include("arm64-v8a", "armeabi-v7a", "x86", "x86_64")
isUniversalApk = true
}
}*/
signingConfigs {
create("release") {
val ksPath = System.getenv("KEYSTORE_PATH")
@@ -43,11 +50,20 @@ android {
}
buildTypes {
debug {
applicationIdSuffix = ".debug"
versionNameSuffix = "-dev"
}
release {
signingConfig = signingConfigs.getByName("release")
optimization {
enable = false
enable = true
}
isShrinkResources = true
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
}
}
compileOptions {
@@ -62,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)
@@ -75,4 +92,5 @@ dependencies {
androidTestImplementation(libs.androidx.junit)
debugImplementation(libs.androidx.compose.ui.test.manifest)
debugImplementation(libs.androidx.compose.ui.tooling)
implementation(libs.androidx.material.icons.extended)
}
+6
View File
@@ -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
+4
View File
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="false">WeekFocus-dev</string>
</resources>
+8 -2
View File
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
<!-- Nötig, damit der Wochenwechsel-Alarm nach einem Neustart neu geplant wird -->
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<application
android:allowBackup="true"
@@ -28,6 +30,10 @@
android:exported="true">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
<action android:name="android.intent.action.BOOT_COMPLETED" />
<action android:name="android.intent.action.DATE_CHANGED" />
<action android:name="android.intent.action.TIME_SET" />
<action android:name="android.intent.action.TIMEZONE_CHANGED" />
</intent-filter>
<meta-data
android:name="android.appwidget.provider"
@@ -6,17 +6,22 @@ import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Home
import androidx.compose.material.icons.filled.List
import androidx.compose.material.icons.filled.Settings
import androidx.compose.material.icons.outlined.Home
import androidx.compose.material.icons.outlined.List
import androidx.compose.material.icons.outlined.Settings
import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.dp
import android.appwidget.AppWidgetManager
import android.content.ComponentName
import de.schanbro.weekfocus.ui.theme.WeekFocusTheme
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.res.stringResource
import de.schanbro.weekfocus.ui.theme.WeekFocusTheme
import de.schanbro.weekfocus.screens.WordListScreen
class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
@@ -24,105 +29,118 @@ class MainActivity : ComponentActivity() {
enableEdgeToEdge()
setContent {
WeekFocusTheme {
Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
WordListScreen(
modifier = Modifier.padding(innerPadding)
MainScreen()
}
}
}
override fun onResume() {
super.onResume()
// Falls das Widget (z.B. durch Energiesparmodus) nicht rechtzeitig aktualisiert
// wurde, wird es beim Öffnen der App nachgezogen.
updateWidget(this)
}
}
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun MainScreen() {
var selectedTab by remember { mutableIntStateOf(0) }
val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
Scaffold(
modifier = Modifier
.fillMaxSize()
.nestedScroll(scrollBehavior.nestedScrollConnection),
topBar = {
LargeTopAppBar(
title = {
Text(
when (selectedTab) {
0 -> stringResource(R.string.title_home)
1 -> stringResource(R.string.title_words)
2 -> stringResource(R.string.title_settings)
else -> stringResource(R.string.app_name)
}
)
},
scrollBehavior = scrollBehavior,
colors = TopAppBarDefaults.largeTopAppBarColors(
containerColor = MaterialTheme.colorScheme.surface,
scrolledContainerColor = MaterialTheme.colorScheme.surfaceContainer
)
)
},
bottomBar = {
NavigationBar {
NavigationBarItem(
selected = selectedTab == 0,
onClick = { selectedTab = 0 },
icon = {
Icon(
imageVector = if (selectedTab == 0) Icons.Filled.Home else Icons.Outlined.Home,
contentDescription = stringResource(R.string.title_home)
)
},
label = { Text(stringResource(R.string.title_home)) }
)
NavigationBarItem(
selected = selectedTab == 1,
onClick = { selectedTab = 1 },
icon = {
Icon(
imageVector = if (selectedTab == 1) Icons.Filled.List else Icons.Outlined.List,
contentDescription = stringResource(R.string.title_words)
)
},
label = { Text(stringResource(R.string.title_words)) }
)
NavigationBarItem(
selected = selectedTab == 2,
onClick = { selectedTab = 2 },
icon = {
Icon(
imageVector = if (selectedTab == 2) Icons.Filled.Settings else Icons.Outlined.Settings,
contentDescription = stringResource(R.string.title_settings)
)
},
label = { Text(stringResource(R.string.title_settings)) }
)
}
}
) { innerPadding ->
Surface(
modifier = Modifier
.fillMaxSize()
.padding(innerPadding),
color = MaterialTheme.colorScheme.background
) {
when (selectedTab) {
0 -> PlaceholderScreen(title = stringResource(R.string.title_weekly_focus))
1 -> WordListScreen()
2 -> PlaceholderScreen(title = stringResource(R.string.title_settings))
}
}
}
}
@Composable
fun WordListScreen(modifier: Modifier = Modifier) {
val context = LocalContext.current
val sharedPrefs = remember {
context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE)
}
// Wörter aus SharedPreferences laden und Zustand verwalten
var textInput by remember { mutableStateOf("") }
val wordList = remember {
mutableStateListOf<String>().apply {
val savedSet = sharedPrefs.getStringSet("words_key", emptySet()) ?: emptySet()
addAll(savedSet)
}
}
// Funktion zum Speichern in SharedPreferences
fun saveWords() {
sharedPrefs.edit().putStringSet("words_key", wordList.toSet()).apply()
}
Column(
modifier = modifier
.fillMaxSize()
.padding(16.dp)
fun PlaceholderScreen(title: String) {
Box(
modifier = Modifier.fillMaxSize(),
contentAlignment = Alignment.Center
) {
// Eingabefeld für ein neues Wort
OutlinedTextField(
value = textInput,
onValueChange = { textInput = it },
label = { Text(stringResource(R.string.hint_new_word)) },
modifier = Modifier.fillMaxWidth(),
singleLine = true
)
Spacer(modifier = Modifier.height(8.dp))
// Button zum Hinzufügen
Button(
onClick = {
val trimmed = textInput.trim()
if (trimmed.isNotEmpty()) {
wordList.add(trimmed)
saveWords()
updateWidget(context)
textInput = ""
}
},
modifier = Modifier.fillMaxWidth()
) {
Text(stringResource(R.string.hint_add_word))
}
Spacer(modifier = Modifier.height(24.dp))
Text(
text = stringResource(R.string.title_saved_words),
style = MaterialTheme.typography.titleMedium
)
Spacer(modifier = Modifier.height(8.dp))
// Liste der Wörter
if (wordList.isEmpty()) {
Text(
text = stringResource(R.string.msg_no_words_yet),
style = MaterialTheme.typography.bodyMedium
)
} else {
LazyColumn {
items(wordList) { word ->
Text(
text = "• $word",
style = MaterialTheme.typography.bodyLarge,
modifier = Modifier.padding(vertical = 4.dp)
text = title,
style = MaterialTheme.typography.headlineMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
}
}
}
}
}
// Hilfsfunktion zum Aktualisieren des Widgets
/**
* Bleibt als Top-Level-Funktion erhalten, damit WordListScreen unverändert weiter funktioniert.
*/
fun updateWidget(context: Context) {
val appWidgetManager = AppWidgetManager.getInstance(context)
val componentName = ComponentName(context, SimpleWidget::class.java)
val appWidgetIds = appWidgetManager.getAppWidgetIds(componentName)
for (appWidgetId in appWidgetIds) {
SimpleWidget.updateAppWidget(context, appWidgetManager, appWidgetId)
}
SimpleWidget.updateAllWidgets(context)
}
@@ -1,15 +1,35 @@
package de.schanbro.weekfocus
import android.app.AlarmManager
import android.app.PendingIntent
import android.appwidget.AppWidgetManager
import android.appwidget.AppWidgetProvider
import android.content.ComponentName
import android.content.Context
import android.content.Intent
import android.widget.RemoteViews
import androidx.compose.ui.res.stringResource
import java.util.Calendar
import java.util.Random
import java.time.DayOfWeek
import java.time.LocalDate
import java.time.ZoneId
import java.time.temporal.ChronoUnit
import java.time.temporal.IsoFields
import java.time.temporal.TemporalAdjusters
class SimpleWidget : AppWidgetProvider() {
override fun onReceive(context: Context, intent: Intent) {
// Verarbeitet u.a. APPWIDGET_UPDATE / ENABLED / DISABLED und ruft die Callbacks unten auf
super.onReceive(context, intent)
when (intent.action) {
ACTION_WEEK_CHANGED,
Intent.ACTION_BOOT_COMPLETED, // Alarme überleben keinen Neustart
Intent.ACTION_DATE_CHANGED,
Intent.ACTION_TIME_CHANGED, // "android.intent.action.TIME_SET"
Intent.ACTION_TIMEZONE_CHANGED -> updateAllWidgets(context)
}
}
override fun onUpdate(
context: Context,
appWidgetManager: AppWidgetManager,
@@ -18,40 +38,141 @@ class SimpleWidget : AppWidgetProvider() {
for (appWidgetId in appWidgetIds) {
updateAppWidget(context, appWidgetManager, appWidgetId)
}
// Selbstheilung: stellt sicher, dass immer ein Wochenwechsel-Alarm existiert
scheduleNextWeekChange(context)
}
override fun onEnabled(context: Context) {
// Erstes Widget wurde platziert
scheduleNextWeekChange(context)
}
override fun onDisabled(context: Context) {
// Letztes Widget wurde entfernt
cancelWeekChange(context)
}
companion object {
const val ACTION_WEEK_CHANGED = "de.schanbro.weekfocus.ACTION_WEEK_CHANGED"
private const val PREFS_NAME = "WeekFocusPrefs"
private const val KEY_WORDS = "words_key"
private const val KEY_WEEK = "current_week_key"
private const val KEY_WORD = "current_word"
/**
* Aktualisiert alle Widget-Instanzen und plant den nächsten Wochenwechsel.
*/
fun updateAllWidgets(context: Context) {
val appWidgetManager = AppWidgetManager.getInstance(context)
val componentName = ComponentName(context, SimpleWidget::class.java)
val appWidgetIds = appWidgetManager.getAppWidgetIds(componentName)
if (appWidgetIds.isEmpty()) return
for (appWidgetId in appWidgetIds) {
updateAppWidget(context, appWidgetManager, appWidgetId)
}
scheduleNextWeekChange(context)
}
fun updateAppWidget(
context: Context,
appWidgetManager: AppWidgetManager,
appWidgetId: Int
) {
// 1. SharedPreferences auslesen
val sharedPrefs = context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE)
val savedSet = sharedPrefs.getStringSet("words_key", emptySet()) ?: emptySet()
val wordList = savedSet.toList()
val displayText = resolveWordOfWeek(context)
?: context.getString(R.string.msg_no_words)
// 2. Aktuelle Kalenderwoche & Jahr bestimmen
val calendar = Calendar.getInstance()
val weekOfYear = calendar.get(Calendar.WEEK_OF_YEAR)
val year = calendar.get(Calendar.YEAR)
// 3. Wort für die aktuelle Kalenderwoche auswählen
val displayText = if (wordList.isNotEmpty()) {
// Kombinierter Seed aus Jahr und Kalenderwoche
val seed = (year * 100 + weekOfYear).toLong()
val random = Random(seed)
val randomIndex = random.nextInt(wordList.size)
wordList[randomIndex]
} else {
context.getString(R.string.msg_no_words)
}
// 4. RemoteViews aktualisieren
val views = RemoteViews(context.packageName, R.layout.widget_main)
views.setTextViewText(R.id.appwidget_text, displayText)
appWidgetManager.updateAppWidget(appWidgetId, views)
}
/**
* ISO-Kalenderwoche (Montag = Wochenbeginn, unabhängig von der Geräte-Locale)
* kombiniert mit dem zugehörigen Wochenjahr, z.B. 202641.
*
* Das Wochenjahr (nicht das Kalenderjahr!) verhindert, dass sich der Wert
* um Neujahr mitten in der Woche ändert.
*/
internal fun weekKeyFor(date: LocalDate): Int {
val weekBasedYear = date.get(IsoFields.WEEK_BASED_YEAR)
val week = date.get(IsoFields.WEEK_OF_WEEK_BASED_YEAR)
return weekBasedYear * 100 + week
}
/**
* Liefert das Wort der aktuellen Woche.
*
* - Die Liste wird sortiert, damit die Reihenfolge deterministisch ist
* (ein Set hat keine garantierte Reihenfolge).
* - Das gewählte Wort wird pro Woche gespeichert. Dadurch ändert sich das Wort
* nicht, wenn Wörter hinzugefügt oder gelöscht werden. Nur wenn das aktuelle
* Wort selbst gelöscht wird, wird neu gewählt.
*/
private fun resolveWordOfWeek(context: Context): String? {
val prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
val words = (prefs.getStringSet(KEY_WORDS, emptySet()) ?: emptySet()).sorted()
if (words.isEmpty()) {
prefs.edit().remove(KEY_WEEK).remove(KEY_WORD).apply()
return null
}
val weekKey = weekKeyFor(LocalDate.now())
val storedWord = prefs.getString(KEY_WORD, null)
if (prefs.getInt(KEY_WEEK, -1) == weekKey && storedWord != null && storedWord in words) {
return storedWord
}
val currentMonday = LocalDate.now().with(DayOfWeek.MONDAY)
val weeksSinceEpoch = ChronoUnit.WEEKS.between(LocalDate.ofEpochDay(4), currentMonday) // 5.1.1970 war ein Montag
val word = words[(weeksSinceEpoch % words.size).toInt()]
prefs.edit()
.putInt(KEY_WEEK, weekKey)
.putString(KEY_WORD, word)
.apply()
return word
}
/**
* Plant einen Alarm für den nächsten Montag, 00:00 Uhr (lokale Zeit).
* Bewusst ohne Exact-Alarm-Berechtigung: Eine Verzögerung von wenigen Minuten
* ist für ein Wochenwort unkritisch.
*/
private fun scheduleNextWeekChange(context: Context) {
val alarmManager = context.getSystemService(AlarmManager::class.java) ?: return
val triggerAtMillis = LocalDate.now()
.with(TemporalAdjusters.next(DayOfWeek.MONDAY)) // "next" schließt heute aus
.atStartOfDay(ZoneId.systemDefault())
.toInstant()
.toEpochMilli()
alarmManager.setAndAllowWhileIdle(
AlarmManager.RTC_WAKEUP,
triggerAtMillis,
weekChangePendingIntent(context)
)
}
private fun cancelWeekChange(context: Context) {
val alarmManager = context.getSystemService(AlarmManager::class.java) ?: return
alarmManager.cancel(weekChangePendingIntent(context))
}
private fun weekChangePendingIntent(context: Context): PendingIntent {
val intent = Intent(context, SimpleWidget::class.java).apply {
action = ACTION_WEEK_CHANGED
}
return PendingIntent.getBroadcast(
context,
0,
intent,
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
)
}
}
}
@@ -0,0 +1,328 @@
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.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(stringResource(R.string.dialog_delete_title)) },
text = { Text(stringResource(R.string.dialog_delete_message, word)) },
confirmButton = {
TextButton(onClick = onConfirm) { Text(stringResource(R.string.action_delete)) }
},
dismissButton = {
TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) }
}
)
}
@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(stringResource(R.string.dialog_edit_title)) },
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(stringResource(R.string.action_save)) }
},
dismissButton = {
TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) }
}
)
}
@Composable
fun WordListScreen(modifier: Modifier = Modifier) {
val context = LocalContext.current
val focusManager = LocalFocusManager.current // FocusManager holen
val sharedPrefs = remember {
context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE)
}
var textInput by remember { mutableStateOf("") }
val wordList = remember {
mutableStateListOf<String>().apply {
val savedSet = sharedPrefs.getStringSet("words_key", emptySet()) ?: emptySet()
addAll(savedSet)
}
}
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() && trimmed !in wordList) {
wordList.add(0, trimmed)
saveWords()
updateWidget(context)
textInput = ""
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
.pointerInput(Unit) {
detectTapGestures(onTap = {
focusManager.clearFocus()
})
}
.padding(horizontal = 16.dp)
) {
Column(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 8.dp),
verticalArrangement = Arrangement.spacedBy(8.dp)
) {
OutlinedTextField(
value = textInput,
onValueChange = { textInput = it },
label = { Text(stringResource(R.string.hint_new_word)) },
modifier = Modifier.fillMaxWidth(),
singleLine = true,
shape = MaterialTheme.shapes.medium,
// "Fertig" / "Hinzufügen" Taste auf der Tastatur konfigurieren
keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
keyboardActions = KeyboardActions(
onDone = { addCurrentWord() }
)
)
Button(
onClick = { addCurrentWord() },
modifier = Modifier
.fillMaxWidth()
.height(50.dp),
shape = MaterialTheme.shapes.medium
) {
Icon(Icons.Default.Add, contentDescription = null)
Spacer(Modifier.width(8.dp))
Text(stringResource(R.string.hint_add_word))
}
}
Spacer(modifier = Modifier.height(16.dp))
AnimatedVisibility(
visible = wordList.isEmpty(),
enter = fadeIn(),
exit = fadeOut()
) {
Box(
modifier = Modifier
.fillMaxWidth()
.padding(top = 32.dp),
contentAlignment = Alignment.Center
) {
Text(
text = stringResource(R.string.msg_no_words_yet),
style = MaterialTheme.typography.bodyLarge,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
}
}
LazyColumn(
verticalArrangement = Arrangement.spacedBy(8.dp),
contentPadding = PaddingValues(bottom = 16.dp)
) {
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 }
)
}
}
}
+1 -2
View File
@@ -11,10 +11,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_focus"
android:text="@string/title_weekly_focus"
android:textSize="11sp"
android:letterSpacing="0.1"
android:textAllCaps="true"
android:textColor="?android:attr/textColorSecondary"
android:textStyle="bold" />
+13 -3
View File
@@ -1,9 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="hint_new_word">Enter new Word</string>
<string name="hint_new_word">Enter new word</string>
<string name="hint_add_word">Add word</string>
<string name="title_saved_words">Saved words:</string>
<string name="msg_no_words_yet">No words yet.</string>
<string name="msg_no_words">No words</string>
<string name="title_focus">Weekly Focus</string>
<string name="title_weekly_focus">Weekly focus</string>
<string name="title_settings">Settings</string>
<string name="title_words">Words</string>
<string name="title_home">Home</string>
<string name="action_delete">Delete</string>
<string name="action_cancel">Cancel</string>
<string name="action_save">Save</string>
<string name="dialog_delete_title">Delete word?</string>
<string name="dialog_delete_message">“%1$s” will be permanently removed.</string>
<string name="dialog_edit_title">Edit word</string>
</resources>
+14 -2
View File
@@ -3,8 +3,20 @@
<string name="app_name" translatable="false">WeekFocus</string>
<string name="hint_new_word">Neues Wort eingeben</string>
<string name="hint_add_word">Wort hinzufügen</string>
<string name="title_saved_words">Gespeicherte Wörter:</string>
<string name="msg_no_words_yet">Noch keine Wörter vorhanden.</string>
<string name="msg_no_words">Keine Wörter</string>
<string name="title_focus">Wochenfokus</string>
<string name="title_weekly_focus">Wochenfokus</string>
<string name="title_settings">Einstellungen</string>
<string name="title_words">Wörter</string>
<string name="title_home">Start</string>
<!-- Aktionen -->
<string name="action_delete">Löschen</string>
<string name="action_cancel">Abbrechen</string>
<string name="action_save">Speichern</string>
<!-- Dialoge -->
<string name="dialog_delete_title">Wort löschen?</string>
<string name="dialog_delete_message">„%1$s“ wird dauerhaft entfernt.</string>
<string name="dialog_edit_title">Wort bearbeiten</string>
</resources>
+1 -1
View File
@@ -7,5 +7,5 @@
android:resizeMode="horizontal|vertical"
android:widgetCategory="home_screen"
android:targetCellWidth="2"
android:targetCellHeight="2">
android:targetCellHeight="1">
</appwidget-provider>
-12
View File
@@ -1,12 +0,0 @@
#This file is generated by updateDaemonJvm
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d76df094a9cbbabd3b08251f9e61444a/redirect
toolchainVersion=25
+10 -7
View File
@@ -1,13 +1,14 @@
[versions]
agp = "9.4.1"
coreKtx = "1.10.1"
coreKtx = "1.19.1"
junit = "4.13.2"
junitVersion = "1.1.5"
espressoCore = "3.5.1"
lifecycleRuntimeKtx = "2.6.1"
activityCompose = "1.8.0"
kotlin = "2.2.10"
composeBom = "2026.02.01"
junitVersion = "1.3.0"
espressoCore = "3.7.0"
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" }
@@ -24,6 +25,8 @@ androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "u
androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
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" }