Compare commits

..
Author SHA1 Message Date
robin 2a4b5f54a8 CHANGELOG update 2026-10-30 14:24:38 +01:00
robin 31a1f5158f feat: about screen 2026-10-30 14:24:03 +01:00
robin 3aedc51b97 Merge pull request 'Feat/settings' (#39) from feat/settings into main
Build & Release Android App / build (push) Successful in 11m1s
Reviewed-on: robin/WeekFocus#39
2026-10-30 12:35:53 +00:00
robin 8e88e9601a CHANGELOG update 2026-10-30 13:35:25 +01:00
robin 8f65bb05b7 feat: settings 2026-10-30 13:34:34 +01:00
robin 6be81093e0 fix CHANGELOG typo 2026-10-30 13:18:07 +01:00
robin 1b90010bbc README.md aktualisiert 2026-10-30 12:06:00 +00:00
robin ade61c0850 README.md aktualisiert 2026-10-30 12:04:13 +00:00
robin e97498a148 CHANGELOG update
Build & Release Android App / build (push) Successful in 12m17s
2026-10-30 12:57:30 +01:00
robin 584ec246d1 Merge pull request 'Feat/auto update' (#36) from feat/auto-update into main
Reviewed-on: robin/WeekFocus#36
2026-10-30 11:56:19 +00:00
robin 200b834d1c Merge branch 'main' into feat/auto-update 2026-10-30 11:56:09 +00:00
robin 0fcc9ba514 refactor: move update code to folder update 2026-10-30 12:55:37 +01:00
robin 8d38c319a2 feat: ask for network permission before checking for updates 2026-10-30 12:50:15 +01:00
robin 90ce637846 feat: auto update 2026-10-30 12:42:29 +01:00
robin f77080f6f2 CHANGELOG update 2026-10-30 12:33:22 +01:00
robin f161db3345 Merge pull request 'fix: show app icon' (#35) from fix/splashscreen-light into main
Reviewed-on: robin/WeekFocus#35
2026-10-30 11:26:47 +00:00
robin 32ae274da3 fix: show app icon 2026-10-30 12:26:14 +01:00
robin 431f61e683 CHANGELOG update
Build & Release Android App / build (push) Successful in 14m33s
2026-10-29 18:11:33 +01:00
robin 2cadfa8972 Merge pull request 'style: dark mode support on splash screen' (#33) from style/splash-screen into main
Reviewed-on: robin/WeekFocus#33
2026-10-29 17:10:17 +00:00
robin 77bcaddc55 style: dark mode support on splash screen 2026-10-29 18:09:55 +01:00
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
robin d134b0cd0a chore(l10n): update English translation
chore(l10n): update German (formal) 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 12:54:11 +00:00
robin 4a62373992 refactor: move hardcoded texts to strings.xml 2026-10-04 14:19:38 +02:00
robin e589693c67 README.md aktualisiert 2026-10-04 10:19:26 +00:00
robin f5568cf211 README.md aktualisiert 2026-10-03 17:45:08 +00:00
robin 2ab1b230d8 CHANGELOG update
Build & Release Android App / build (push) Successful in 18m15s
2026-10-03 19:19:54 +02:00
robin ce4a40c4f3 chore: refactor: switch from release github action 2026-10-03 19:19:22 +02:00
robin a8375c4025 README.md aktualisiert
add and reorder badges
2026-10-03 16:53:38 +00:00
robin 0d3577aa2f CHANGELOG update
Build & Release Android App / build (push) Canceled after 46s
2026-10-03 17:35:06 +02:00
robin 33277b25e5 Merge pull request 'chore(l10n): update translations' (#12) from weblate-translations into main
Reviewed-on: #12
2026-10-03 15:32:18 +00:00
robin e2dff7cdf6 chore(l10n): update English translation
Co-authored-by: Weblate Admin <robin@schanbros.de>
Language: English
Progress: 100.0% (5 of 5 strings)
Translate-URL: https://weblate.schamagusa.de/projects/weekfocus/weekfocus/en/
Translation: WeekFocus/WeekFocus
2026-10-03 15:31:55 +00:00
robin 2ea4c2dbad refactor: move hardcoded strings to strings.xml 2026-10-03 17:29:08 +02:00
robin f05184a712 Important message: heavy development 2026-10-03 15:22:43 +00:00
robin e415b49232 Added Weblate/Translation information 2026-10-03 15:20:51 +00:00
robin 642bb0c3bd Merge pull request 'chore(l10n): update translations' (#11) from weblate-translations into main
Reviewed-on: #11
2026-10-03 15:10:19 +00:00
29 changed files with 1810 additions and 206 deletions

No files matched your search

+61 -27
View File
@@ -1,4 +1,3 @@
# .gitea/workflows/build-release.yml
name: Build & Release Android App name: Build & Release Android App
on: on:
@@ -19,6 +18,7 @@ jobs:
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
- name: Code auschecken - name: Code auschecken
uses: actions/checkout@v4 uses: actions/checkout@v4
@@ -46,14 +46,12 @@ jobs:
rm /tmp/tools.zip rm /tmp/tools.zip
fi fi
# Lizenzen korrekt akzeptieren (kein "yes |", wegen pipefail/SIGPIPE)
"$SDKMANAGER" --sdk_root="$SDK_PATH" --licenses < <(yes) > /dev/null "$SDKMANAGER" --sdk_root="$SDK_PATH" --licenses < <(yes) > /dev/null
# Benötigte Pakete direkt installieren
"$SDKMANAGER" --sdk_root="$SDK_PATH" \ "$SDKMANAGER" --sdk_root="$SDK_PATH" \
"platform-tools" \ "platform-tools" \
"platforms;android-37.0" \ "platforms;android-35" \
"build-tools;36.0.0" "build-tools;35.0.0"
echo "ANDROID_HOME=$SDK_PATH" >> $GITHUB_ENV echo "ANDROID_HOME=$SDK_PATH" >> $GITHUB_ENV
echo "ANDROID_SDK_ROOT=$SDK_PATH" >> $GITHUB_ENV echo "ANDROID_SDK_ROOT=$SDK_PATH" >> $GITHUB_ENV
@@ -71,33 +69,33 @@ jobs:
set -euo pipefail set -euo pipefail
VERSION="${GITHUB_REF_NAME#v}" VERSION="${GITHUB_REF_NAME#v}"
echo "Baue Version: $VERSION" echo "Baue Version: $VERSION"
./gradlew assembleRelease \ ./gradlew assembleRelease \
--no-daemon \ --no-daemon \
-Dorg.gradle.java.home="$JAVA_HOME" \
-Porg.gradle.java.installations.auto-download=false \
-PversionNameOverride="$VERSION" -PversionNameOverride="$VERSION"
echo "Erzeugte APK-Dateien:" APK_DIR="app/build/outputs/apk/release"
find app/build/outputs -type f -name "*.apk" -print
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 SRC="$APK_DIR/app-release.apk"
echo "Keine Release-APK gefunden." if [ ! -f "$SRC" ]; then
echo "app-release.apk nicht gefunden (evtl. unsigniert oder anderer Name)"
exit 1 exit 1
fi fi
APK_DIR="app/build/outputs/apk/release" TARGET_PATH="$APK_DIR/WeekFocus-${VERSION}.apk"
APK_NAME="WeekFocus-${VERSION}.apk" mv "$SRC" "$TARGET_PATH"
APK_TARGET="$APK_DIR/$APK_NAME"
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 "Finale Release-APK:"
ls -lh "$TARGET_PATH"
echo "APK erstellt: $APK_TARGET"
ls -lh "$APK_DIR"
env: env:
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
@@ -134,12 +132,48 @@ jobs:
echo "Release-Notes:" echo "Release-Notes:"
cat "$NOTES_FILE" cat "$NOTES_FILE"
- name: Release in Gitea erstellen - name: Release in Gitea erstellen und APK hochladen
uses: softprops/action-gh-release@v2
with:
tag_name: ${{ github.ref_name }}
name: ${{ github.ref_name }}
body_path: ${{ runner.temp }}/release_notes.md
files: app/build/outputs/apk/release/WeekFocus-*.apk
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TOKEN: ${{ secrets.GITHUB_TOKEN }}
API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
run: |
set -euo pipefail
TAG="$GITHUB_REF_NAME"
VERSION="${TAG#v}"
NOTES_FILE="$RUNNER_TEMP/release_notes.md"
AUTH="Authorization: token $TOKEN"
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" \
--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
echo "Release konnte nicht abgefragt werden (HTTP $CODE)"
cat release.json
exit 1
fi
RELEASE_ID=$(jq -r .id release.json)
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"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" /> <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" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
+44 -1
View File
@@ -1,6 +1,49 @@
# Changelog # Changelog
## [1.1.0] - 2026-10-03 ## [1.4.1] - 2026-10-30
### New
* about screen
## [1.4.0] - 2026-10-30
### New
* settings
## [1.3.0] - 2026-10-30
### New
* auto update
### Fixed
* show app icon on splash screen
## [1.2.12] - 2026-10-29
### New
* dark mode support on the splash screen
## [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
## [1.1.1] - 2026-10-03
### Changed
- refactor: move hardcoded text to strings.xml
## [1.1.0] - 2026-10-03
### New ### New
- chore: auto-generate apk files #6 - chore: auto-generate apk files #6
+61 -21
View File
@@ -1,3 +1,6 @@
> [!IMPORTANT]
> This app is under heavy development currently.
<div align="center"> <div align="center">
# WeekFocus # WeekFocus
@@ -8,9 +11,19 @@
<img src="https://raw.githubusercontent.com/ImranR98/Obtainium/main/assets/graphics/badge_obtainium.png" alt="Get it on Obtainium" height="64"> <img src="https://raw.githubusercontent.com/ImranR98/Obtainium/main/assets/graphics/badge_obtainium.png" alt="Get it on Obtainium" height="64">
</a> </a>
![Platform](https://img.shields.io/badge/Platform-Android-3DDC84?logo=android&logoColor=white) [![Release](https://img.shields.io/gitea/v/release/Schanbro/WeekFocus?gitea_url=https://git.schamagusa.de&style=for-the-badge&label=Release)](https://git.schamagusa.de/Schanbro/WeekFocus/releases)
[![Release](https://img.shields.io/gitea/v/release/Schanbro/WeekFocus?gitea_url=https://git.schamagusa.de&label=Release)](https://git.schamagusa.de/Schanbro/WeekFocus/releases) [![License: GPL-3.0](https://img.shields.io/badge/License-GPL--3.0-blue?style=for-the-badge)](LICENSE)
[![License: GPL-3.0](https://img.shields.io/badge/License-GPL--3.0-blue)](LICENSE) <!--[![Translation status](https://weblate.schamagusa.de/widgets/weekfocus/-/svg-badge.svg)](https://weblate.schamagusa.de/engage/weekfocus/)-->
![Android](https://img.shields.io/badge/Android-10%2B-3DDC84?style=for-the-badge&logo=android&logoColor=white)
![Language: Kotlin](https://img.shields.io/badge/Language-Kotlin-7F52FF?style=for-the-badge&logo=kotlin&logoColor=white)
![UI: Jetpack Compose](https://img.shields.io/badge/UI-Jetpack%20Compose-4285F4?style=for-the-badge&logo=jetpackcompose&logoColor=white)
![Design: Material 3](https://img.shields.io/badge/Design-Material%203-3DDC84?style=for-the-badge)
<!--[![Stars](https://img.shields.io/gitea/stars/Schanbro/WeekFocus?gitea_url=https://git.schamagusa.de&style=for-the-badge)](https://git.schamagusa.de/Schanbro/WeekFocus)
[![Forks](https://img.shields.io/gitea/forks/Schanbro/WeekFocus?gitea_url=https://git.schamagusa.de&style=for-the-badge)](https://git.schamagusa.de/Schanbro/WeekFocus)-->
[![Open Issues](https://img.shields.io/gitea/issues/open/Schanbro/WeekFocus?gitea_url=https://git.schamagusa.de&style=for-the-badge)](https://git.schamagusa.de/Schanbro/WeekFocus/issues)
[![Last Commit](https://img.shields.io/gitea/last-commit/Schanbro/WeekFocus?gitea_url=https://git.schamagusa.de&style=for-the-badge)](https://git.schamagusa.de/Schanbro/WeekFocus)
</div> </div>
@@ -21,11 +34,12 @@
- [About](#about) - [About](#about)
- [How It Works](#how-it-works) - [How It Works](#how-it-works)
- [Features](#features) - [Features](#features)
- [Screenshots](#screenshots)
- [Installation](#installation) - [Installation](#installation)
- [Building from Source](#building-from-source) - [Building from Source](#building-from-source)
- [Releases](#releases)
- [Contributing](#contributing) - [Contributing](#contributing)
- [License](#license) - [License](#license)
- [Translations](#translations)
## About ## About
@@ -44,21 +58,11 @@ No streaks, no pressure, no clutter. Just a gentle daily reminder of what you wa
## Features ## Features
- 🧩 Home screen widget showing your current quality of the week - Home screen widget showing your current quality of the week
- 🔄 Automatic weekly rotation to a new quality - Automatic weekly rotation to a new quality
- 🌙 Light and dark theme support - Light and dark theme support, Material You
- 🔒 No ads, no tracking, no unnecessary permissions - No ads, no tracking, no unnecessary permissions
- ⚡ Lightweight and battery-friendly - Lightweight and battery-friendly
## Screenshots
<!-- Add screenshots here, for example:
<p align="center">
<img src="docs/screenshots/1.png" width="24%" />
<img src="docs/screenshots/2.png" width="24%" />
<img src="docs/screenshots/3.png" width="24%" />
</p>
-->
## Installation ## Installation
@@ -67,8 +71,7 @@ No streaks, no pressure, no clutter. Just a gentle daily reminder of what you wa
With [Obtainium](https://github.com/ImranR98/Obtainium) you get updates directly from this repository, no app store required. With [Obtainium](https://github.com/ImranR98/Obtainium) you get updates directly from this repository, no app store required.
1. Install Obtainium on your Android device. 1. Install Obtainium on your Android device.
2. Tap the badge above or open this link: 2. Tap the badge above.
[Add WeekFocus to Obtainium](https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://git.schamagusa.de/Schanbro/WeekFocus)
3. Confirm and install the app. 3. Confirm and install the app.
Alternatively, tap **Add App** in Obtainium and paste this URL: Alternatively, tap **Add App** in Obtainium and paste this URL:
@@ -89,6 +92,7 @@ https://git.schamagusa.de/Schanbro/WeekFocus
- [Android Studio](https://developer.android.com/studio) (latest stable) - [Android Studio](https://developer.android.com/studio) (latest stable)
- JDK 17 or newer - JDK 17 or newer
- Android SDK platform 37 (`minSdk` 29, `targetSdk` 37)
**Steps** **Steps**
@@ -100,6 +104,34 @@ cd WeekFocus
The resulting APK is located in `app/build/outputs/apk/debug/`. The resulting APK is located in `app/build/outputs/apk/debug/`.
## Releases
Releases are built automatically with Gitea Actions. Pushing a tag that starts with `v` triggers the workflow, which builds and signs the APK and publishes it as a release together with the notes from `CHANGELOG.md`.
### Starting a release build
Create a tag and push it. The tag name determines the app version (`v1.1.3` builds version `1.1.3`):
```bash
git tag v1.1.3
git push origin v1.1.3
```
You can follow the build under **Actions** in the repository. When it finishes, the signed `WeekFocus-1.1.3.apk` appears on the [Releases](https://git.schamagusa.de/Schanbro/WeekFocus/releases) page.
### Release notes
The workflow takes the notes from the section of `CHANGELOG.md` whose heading starts with the version number:
```markdown
## [1.1.3] - 2026-10-03
- Added Weblate translations
- Fixed widget update at the start of a new week
```
If no matching section exists, the release gets a short placeholder text instead.
## Contributing ## Contributing
Contributions are welcome! Contributions are welcome!
@@ -117,3 +149,11 @@ Found a bug or have an idea? Please open an [issue](https://git.schamagusa.de/Sc
This project is licensed under the [GNU General Public License v3.0](LICENSE) (GPL-3.0). This project is licensed under the [GNU General Public License v3.0](LICENSE) (GPL-3.0).
You are free to use, modify and redistribute this software under the terms of the GPLv3. Derivative works must be released under the same license. You are free to use, modify and redistribute this software under the terms of the GPLv3. Derivative works must be released under the same license.
## Translations
~~WeekFocus is translated via [Weblate](https://weblate.schamagusa.de/engage/weekfocus/).
Help translate the app into your language!~~
<!--[![Translation status](https://weblate.schamagusa.de/widgets/weekfocus/-/multi-auto.svg)](https://weblate.schamagusa.de/engage/weekfocus/)-->
If you want to contribute with translation you would have to fork this repository, translate into the files directly and make an pull request back to this repository.
+27 -6
View File
@@ -5,7 +5,6 @@ plugins {
val tagVersion = (project.findProperty("versionNameOverride") as String?) ?: "0.0.0-dev" 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 val core = tagVersion
.removePrefix("v") .removePrefix("v")
.substringBefore("-") .substringBefore("-")
@@ -16,20 +15,28 @@ val patch = parts.getOrElse(2) { 0 }
android { android {
namespace = "de.schanbro.weekfocus" namespace = "de.schanbro.weekfocus"
compileSdk { compileSdk = 37
version = release(37)
}
defaultConfig { defaultConfig {
applicationId = "de.schanbro.weekfocus" applicationId = "de.schanbro.weekfocus"
minSdk = 29 minSdk = 29
targetSdk = 37 targetSdk = 37
versionCode = major * 10000 + minor * 100 + patch versionCode = (major * 10000 + minor * 100 + patch).coerceAtLeast(1)
versionName = tagVersion versionName = tagVersion
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
} }
// not necessary
/*splits {
abi {
isEnable = true
reset()
include("arm64-v8a", "armeabi-v7a", "x86", "x86_64")
isUniversalApk = true
}
}*/
signingConfigs { signingConfigs {
create("release") { create("release") {
val ksPath = System.getenv("KEYSTORE_PATH") val ksPath = System.getenv("KEYSTORE_PATH")
@@ -43,11 +50,20 @@ android {
} }
buildTypes { buildTypes {
debug {
applicationIdSuffix = ".debug"
versionNameSuffix = "-dev"
}
release { release {
signingConfig = signingConfigs.getByName("release") signingConfig = signingConfigs.getByName("release")
optimization { optimization {
enable = false enable = true
} }
isShrinkResources = true
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
} }
} }
compileOptions { compileOptions {
@@ -62,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)
@@ -75,4 +92,8 @@ dependencies {
androidTestImplementation(libs.androidx.junit) androidTestImplementation(libs.androidx.junit)
debugImplementation(libs.androidx.compose.ui.test.manifest) debugImplementation(libs.androidx.compose.ui.test.manifest)
debugImplementation(libs.androidx.compose.ui.tooling) debugImplementation(libs.androidx.compose.ui.tooling)
implementation(libs.androidx.material.icons.extended)
implementation("androidx.core:core-splashscreen:1.0.1")
implementation("androidx.lifecycle:lifecycle-runtime-compose:2.8.7")
implementation("androidx.navigation:navigation-compose:2.8.5")
} }
+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>
+22 -3
View File
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
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" />
<!-- used for auto-update -->
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<application <application
android:allowBackup="true" android:allowBackup="true"
@@ -15,7 +21,7 @@
android:name=".MainActivity" android:name=".MainActivity"
android:exported="true" android:exported="true"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/Theme.WeekFocus" android:theme="@style/Theme.WeekFocus.Splash"
android:windowSoftInputMode="adjustResize"> android:windowSoftInputMode="adjustResize">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@@ -28,11 +34,24 @@
android:exported="true"> android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> <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> </intent-filter>
<meta-data <meta-data
android:name="android.appwidget.provider" android:name="android.appwidget.provider"
android:resource="@xml/widget_info" /> android:resource="@xml/widget_info" />
</receiver> </receiver>
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
</provider>
</application> </application>
</manifest> </manifest>
@@ -5,124 +5,211 @@ import android.os.Bundle
import androidx.activity.ComponentActivity import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge import androidx.activity.enableEdgeToEdge
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.material.icons.Icons
import androidx.compose.foundation.lazy.items import androidx.compose.material.icons.automirrored.filled.ArrowBack
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.material3.*
import androidx.compose.runtime.* import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.input.nestedscroll.nestedScroll
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.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.navigation.NavGraph.Companion.findStartDestination
import androidx.navigation.compose.*
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import de.schanbro.weekfocus.screens.AboutScreen
import de.schanbro.weekfocus.screens.SettingsScreen
import de.schanbro.weekfocus.screens.WordListScreen
import de.schanbro.weekfocus.settings.SettingsRepository
import de.schanbro.weekfocus.settings.ThemeMode
import de.schanbro.weekfocus.ui.theme.WeekFocusTheme
import de.schanbro.weekfocus.update.NetworkPermissionGate
import de.schanbro.weekfocus.update.UpdateHandler
private object Routes {
const val HOME = "home"
const val WORDS = "words"
const val SETTINGS = "settings"
const val ABOUT = "about"
}
class MainActivity : ComponentActivity() { class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
installSplashScreen()
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
enableEdgeToEdge() enableEdgeToEdge()
setContent { setContent {
WeekFocusTheme { val settings = remember { SettingsRepository.get(applicationContext) }
Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding -> val darkTheme = when (settings.themeMode) {
WordListScreen( ThemeMode.SYSTEM -> isSystemInDarkTheme()
modifier = Modifier.padding(innerPadding) ThemeMode.LIGHT -> false
ThemeMode.DARK -> true
}
WeekFocusTheme(darkTheme = darkTheme) {
MainScreen()
NetworkPermissionGate {
UpdateHandler()
}
}
}
}
override fun onResume() {
super.onResume()
updateWidget(this)
}
}
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun MainScreen() {
val navController = rememberNavController()
val backStackEntry by navController.currentBackStackEntryAsState()
val currentRoute = backStackEntry?.destination?.route
val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
Scaffold(
modifier = Modifier
.fillMaxSize()
.nestedScroll(scrollBehavior.nestedScrollConnection),
topBar = {
LargeTopAppBar(
title = {
Text(
when (currentRoute) {
Routes.HOME -> stringResource(R.string.title_weekly_focus)
Routes.WORDS -> stringResource(R.string.title_words)
Routes.SETTINGS -> stringResource(R.string.title_settings)
Routes.ABOUT -> stringResource(R.string.title_about)
else -> stringResource(R.string.app_name)
}
)
},
navigationIcon = {
if (currentRoute == Routes.ABOUT) {
IconButton(onClick = { navController.popBackStack() }) {
Icon(
Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = stringResource(R.string.action_back)
)
}
}
},
scrollBehavior = scrollBehavior,
colors = TopAppBarDefaults.largeTopAppBarColors(
containerColor = MaterialTheme.colorScheme.surface,
scrolledContainerColor = MaterialTheme.colorScheme.surfaceContainer
)
)
},
bottomBar = {
if (currentRoute != Routes.ABOUT) {
NavigationBar {
NavigationBarItem(
selected = currentRoute == Routes.HOME,
onClick = {
navController.navigate(Routes.HOME) {
popUpTo(navController.graph.findStartDestination().id) {
saveState = true
}
launchSingleTop = true
restoreState = true
}
},
icon = {
Icon(
imageVector = if (currentRoute == Routes.HOME) Icons.Filled.Home else Icons.Outlined.Home,
contentDescription = stringResource(R.string.title_home)
)
},
label = { Text(stringResource(R.string.title_home)) }
)
NavigationBarItem(
selected = currentRoute == Routes.WORDS,
onClick = {
navController.navigate(Routes.WORDS) {
popUpTo(navController.graph.findStartDestination().id) {
saveState = true
}
launchSingleTop = true
restoreState = true
}
},
icon = {
Icon(
imageVector = if (currentRoute == Routes.WORDS) Icons.Filled.List else Icons.Outlined.List,
contentDescription = stringResource(R.string.title_words)
)
},
label = { Text(stringResource(R.string.title_words)) }
)
NavigationBarItem(
selected = currentRoute == Routes.SETTINGS,
onClick = {
navController.navigate(Routes.SETTINGS) {
popUpTo(navController.graph.findStartDestination().id) {
saveState = true
}
launchSingleTop = true
restoreState = true
}
},
icon = {
Icon(
imageVector = if (currentRoute == Routes.SETTINGS) 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
) {
NavHost(
navController = navController,
startDestination = Routes.HOME,
modifier = Modifier.fillMaxSize()
) {
composable(Routes.HOME) { PlaceholderScreen(title = stringResource(R.string.title_weekly_focus)) }
composable(Routes.WORDS) { WordListScreen() }
composable(Routes.SETTINGS) {
SettingsScreen(onOpenAbout = { navController.navigate(Routes.ABOUT) })
}
composable(Routes.ABOUT) { AboutScreen() }
}
}
} }
} }
@Composable @Composable
fun WordListScreen(modifier: Modifier = Modifier) { fun PlaceholderScreen(title: String) {
val context = LocalContext.current Box(
val sharedPrefs = remember { modifier = Modifier.fillMaxSize(),
context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE) contentAlignment = Alignment.Center
}
// 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)
) { ) {
// 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("Wort hinzufügen")
}
Spacer(modifier = Modifier.height(24.dp))
Text( Text(
text = "Gespeicherte Wörter:", text = title,
style = MaterialTheme.typography.titleMedium style = MaterialTheme.typography.headlineMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant
) )
Spacer(modifier = Modifier.height(8.dp))
// Liste der Wörter
if (wordList.isEmpty()) {
Text(
text = "Noch keine Wörter vorhanden.",
style = MaterialTheme.typography.bodyMedium
)
} else {
LazyColumn {
items(wordList) { word ->
Text(
text = "• $word",
style = MaterialTheme.typography.bodyLarge,
modifier = Modifier.padding(vertical = 4.dp)
)
}
}
}
} }
} }
// Hilfsfunktion zum Aktualisieren des Widgets
fun updateWidget(context: Context) { fun updateWidget(context: Context) {
val appWidgetManager = AppWidgetManager.getInstance(context) SimpleWidget.updateAllWidgets(context)
val componentName = ComponentName(context, SimpleWidget::class.java) }
val appWidgetIds = appWidgetManager.getAppWidgetIds(componentName)
for (appWidgetId in appWidgetIds) {
SimpleWidget.updateAppWidget(context, appWidgetManager, appWidgetId)
}
}
@@ -1,14 +1,35 @@
package de.schanbro.weekfocus package de.schanbro.weekfocus
import android.app.AlarmManager
import android.app.PendingIntent
import android.appwidget.AppWidgetManager import android.appwidget.AppWidgetManager
import android.appwidget.AppWidgetProvider import android.appwidget.AppWidgetProvider
import android.content.ComponentName
import android.content.Context import android.content.Context
import android.content.Intent
import android.widget.RemoteViews import android.widget.RemoteViews
import java.util.Calendar import java.time.DayOfWeek
import java.util.Random 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() { 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( override fun onUpdate(
context: Context, context: Context,
appWidgetManager: AppWidgetManager, appWidgetManager: AppWidgetManager,
@@ -17,40 +38,141 @@ class SimpleWidget : AppWidgetProvider() {
for (appWidgetId in appWidgetIds) { for (appWidgetId in appWidgetIds) {
updateAppWidget(context, appWidgetManager, appWidgetId) 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 { 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( fun updateAppWidget(
context: Context, context: Context,
appWidgetManager: AppWidgetManager, appWidgetManager: AppWidgetManager,
appWidgetId: Int appWidgetId: Int
) { ) {
// 1. SharedPreferences auslesen val displayText = resolveWordOfWeek(context)
val sharedPrefs = context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE) ?: context.getString(R.string.msg_no_words)
val savedSet = sharedPrefs.getStringSet("words_key", emptySet()) ?: emptySet()
val wordList = savedSet.toList()
// 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 {
"Keine Wörter"
}
// 4. RemoteViews aktualisieren
val views = RemoteViews(context.packageName, R.layout.widget_main) val views = RemoteViews(context.packageName, R.layout.widget_main)
views.setTextViewText(R.id.appwidget_text, displayText) views.setTextViewText(R.id.appwidget_text, displayText)
appWidgetManager.updateAppWidget(appWidgetId, views) 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,58 @@
package de.schanbro.weekfocus.components
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.selection.toggleable
import androidx.compose.material3.ListItem
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Switch
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.unit.dp
@Composable
internal fun SectionTitle(text: String) {
Text(
text = text,
style = MaterialTheme.typography.labelLarge,
color = MaterialTheme.colorScheme.primary,
modifier = Modifier.padding(start = 16.dp, end = 16.dp, top = 16.dp, bottom = 4.dp)
)
}
@Composable
internal fun SwitchRow(
title: String,
summary: String,
checked: Boolean,
onCheckedChange: (Boolean) -> Unit
) {
ListItem(
headlineContent = { Text(title) },
supportingContent = { Text(summary) },
trailingContent = { Switch(checked = checked, onCheckedChange = null) },
// Die ganze Zeile ist klickbar, der Switch selbst nur Anzeige (gut für TalkBack)
modifier = Modifier.toggleable(
value = checked,
role = Role.Switch,
onValueChange = onCheckedChange
)
)
}
@Composable
internal fun ClickRow(
title: String,
summary: String,
onClick: () -> Unit,
trailing: (@Composable () -> Unit)? = null
) {
ListItem(
headlineContent = { Text(title) },
supportingContent = { Text(summary) },
trailingContent = trailing,
modifier = Modifier.clickable(onClick = onClick)
)
}
@@ -0,0 +1,87 @@
package de.schanbro.weekfocus.screens
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material3.*
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalUriHandler
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import de.schanbro.weekfocus.R
import de.schanbro.weekfocus.components.ClickRow
import de.schanbro.weekfocus.components.SectionTitle
import de.schanbro.weekfocus.update.UpdateChecker
private const val REPO_URL = "https://git.schamagusa.de/robin/WeekFocus"
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun AboutScreen(
modifier: Modifier = Modifier
) {
val context = LocalContext.current
val uriHandler = LocalUriHandler.current
val version = remember { UpdateChecker.currentVersion(context) }
Column(modifier = modifier.fillMaxSize()) {
Column(
modifier = Modifier
.fillMaxSize()
.verticalScroll(rememberScrollState())
) {
Column(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 24.dp, vertical = 32.dp),
horizontalAlignment = Alignment.CenterHorizontally
) {
Text(
text = stringResource(R.string.app_name),
style = MaterialTheme.typography.headlineMedium
)
Spacer(Modifier.height(4.dp))
Text(
text = stringResource(R.string.about_version, version),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
Spacer(Modifier.height(16.dp))
Text(
text = stringResource(R.string.about_description),
style = MaterialTheme.typography.bodyLarge,
textAlign = TextAlign.Center
)
}
HorizontalDivider()
SectionTitle(stringResource(R.string.about_section_links))
ClickRow(
title = stringResource(R.string.settings_source_title),
summary = stringResource(R.string.settings_source_summary),
onClick = { uriHandler.openUri(REPO_URL) }
)
ClickRow(
title = stringResource(R.string.about_issues_title),
summary = stringResource(R.string.about_issues_summary),
onClick = { uriHandler.openUri("$REPO_URL/issues") }
)
ClickRow(
title = stringResource(R.string.about_releases_title),
summary = stringResource(R.string.about_releases_summary),
onClick = { uriHandler.openUri("$REPO_URL/releases") }
)
Spacer(Modifier.height(16.dp))
}
}
}
@@ -0,0 +1,192 @@
package de.schanbro.weekfocus.screens
import android.content.Intent
import android.net.Uri
import android.os.Build
import android.provider.Settings
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.selection.toggleable
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.hapticfeedback.HapticFeedbackType
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalHapticFeedback
import androidx.compose.ui.platform.LocalUriHandler
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.unit.dp
import de.schanbro.weekfocus.R
import de.schanbro.weekfocus.settings.SettingsRepository
import de.schanbro.weekfocus.settings.ThemeMode
import de.schanbro.weekfocus.update.ReleaseInfo
import de.schanbro.weekfocus.update.UpdateChecker
import de.schanbro.weekfocus.update.UpdateDialog
import kotlinx.coroutines.launch
import de.schanbro.weekfocus.components.SectionTitle
import de.schanbro.weekfocus.components.ClickRow
import de.schanbro.weekfocus.components.SwitchRow
private const val REPO_URL = "https://git.schamagusa.de/robin/WeekFocus"
private enum class CheckStatus { IDLE, CHECKING, UP_TO_DATE, FAILED, AVAILABLE }
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun SettingsScreen(
modifier: Modifier = Modifier,
onOpenAbout: () -> Unit
) {
val context = LocalContext.current
val settings = remember { SettingsRepository.get(context) }
val haptic = LocalHapticFeedback.current
val uriHandler = LocalUriHandler.current
val scope = rememberCoroutineScope()
val currentVersion = remember { UpdateChecker.currentVersion(context) }
var status by remember { mutableStateOf(CheckStatus.IDLE) }
var availableRelease by remember { mutableStateOf<ReleaseInfo?>(null) }
fun checkNow() {
if (status == CheckStatus.CHECKING) return
status = CheckStatus.CHECKING
scope.launch {
val latest = UpdateChecker.fetchLatestRelease(settings.includePrereleases)
status = when {
latest == null -> CheckStatus.FAILED
UpdateChecker.isNewer(latest.version, currentVersion) -> {
availableRelease = latest
CheckStatus.AVAILABLE
}
else -> CheckStatus.UP_TO_DATE
}
}
}
Column(
modifier = modifier
.fillMaxSize()
.verticalScroll(rememberScrollState())
) {
// ---------- Updates ----------
SectionTitle(stringResource(R.string.settings_section_updates))
SwitchRow(
title = stringResource(R.string.settings_auto_update_title),
summary = stringResource(R.string.settings_auto_update_summary),
checked = settings.autoCheckUpdates,
onCheckedChange = {
haptic.performHapticFeedback(
if (it) HapticFeedbackType.ToggleOn else HapticFeedbackType.ToggleOff
)
settings.updateAutoCheckUpdates(it)
}
)
SwitchRow(
title = stringResource(R.string.settings_prerelease_title),
summary = stringResource(R.string.settings_prerelease_summary),
checked = settings.includePrereleases,
onCheckedChange = {
haptic.performHapticFeedback(
if (it) HapticFeedbackType.ToggleOn else HapticFeedbackType.ToggleOff
)
settings.updateIncludePrereleases(it)
}
)
ClickRow(
title = stringResource(R.string.settings_check_now_title),
summary = when (status) {
CheckStatus.IDLE -> stringResource(R.string.settings_check_idle, currentVersion)
CheckStatus.CHECKING -> stringResource(R.string.settings_check_checking)
CheckStatus.UP_TO_DATE -> stringResource(R.string.settings_check_up_to_date)
CheckStatus.FAILED -> stringResource(R.string.settings_check_failed)
CheckStatus.AVAILABLE -> stringResource(R.string.settings_check_available)
},
onClick = { checkNow() },
trailing = {
if (status == CheckStatus.CHECKING) {
CircularProgressIndicator(
modifier = Modifier.size(24.dp),
strokeWidth = 3.dp
)
}
}
)
HorizontalDivider(Modifier.padding(vertical = 8.dp))
// ---------- Darstellung ----------
SectionTitle(stringResource(R.string.settings_section_appearance))
ListItem(headlineContent = { Text(stringResource(R.string.settings_theme_title)) })
val modes = listOf(
ThemeMode.SYSTEM to R.string.settings_theme_system,
ThemeMode.LIGHT to R.string.settings_theme_light,
ThemeMode.DARK to R.string.settings_theme_dark
)
SingleChoiceSegmentedButtonRow(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp)
) {
modes.forEachIndexed { index, (mode, labelRes) ->
SegmentedButton(
selected = settings.themeMode == mode,
onClick = {
if (settings.themeMode != mode) {
haptic.performHapticFeedback(HapticFeedbackType.ToggleOn)
settings.updateThemeMode(mode)
}
},
shape = SegmentedButtonDefaults.itemShape(index, modes.size)
) {
Text(stringResource(labelRes))
}
}
}
// Pro-App-Sprache gibt es erst ab Android 13
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
ClickRow(
title = stringResource(R.string.settings_language_title),
summary = stringResource(R.string.settings_language_summary),
onClick = {
try {
context.startActivity(
Intent(
Settings.ACTION_APP_LOCALE_SETTINGS,
Uri.fromParts("package", context.packageName, null)
)
)
} catch (_: Exception) {
// Gerät ohne diese Einstellungsseite: nichts tun
}
}
)
}
HorizontalDivider(Modifier.padding(vertical = 8.dp))
// ---------- Info ----------
SectionTitle(stringResource(R.string.settings_section_about))
ClickRow(
title = stringResource(R.string.title_about),
summary = stringResource(R.string.settings_about_summary),
onClick = onOpenAbout
)
Spacer(Modifier.height(16.dp))
}
// Dialog, wenn "Jetzt nach Updates suchen" etwas gefunden hat
availableRelease?.let { info ->
UpdateDialog(info = info, onDismiss = { availableRelease = null })
}
}
@@ -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 }
)
}
}
}
@@ -0,0 +1,54 @@
package de.schanbro.weekfocus.settings
import android.content.Context
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue
enum class ThemeMode { SYSTEM, LIGHT, DARK }
class SettingsRepository private constructor(context: Context) {
private val prefs = context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE)
var themeMode by mutableStateOf(
runCatching { ThemeMode.valueOf(prefs.getString(KEY_THEME, "") ?: "") }
.getOrDefault(ThemeMode.SYSTEM)
)
private set
var autoCheckUpdates by mutableStateOf(prefs.getBoolean(KEY_AUTO_UPDATE, true))
private set
var includePrereleases by mutableStateOf(prefs.getBoolean(KEY_PRERELEASE, false))
private set
fun updateThemeMode(mode: ThemeMode) {
themeMode = mode
prefs.edit().putString(KEY_THEME, mode.name).apply()
}
fun updateAutoCheckUpdates(value: Boolean) {
autoCheckUpdates = value
prefs.edit().putBoolean(KEY_AUTO_UPDATE, value).apply()
}
fun updateIncludePrereleases(value: Boolean) {
includePrereleases = value
prefs.edit().putBoolean(KEY_PRERELEASE, value).apply()
}
companion object {
private const val KEY_THEME = "theme_mode"
private const val KEY_AUTO_UPDATE = "auto_check_updates"
private const val KEY_PRERELEASE = "include_prereleases"
@Volatile
private var instance: SettingsRepository? = null
fun get(context: Context): SettingsRepository =
instance ?: synchronized(this) {
instance ?: SettingsRepository(context.applicationContext).also { instance = it }
}
}
}
@@ -0,0 +1,77 @@
package de.schanbro.weekfocus.update
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.provider.Settings
import androidx.core.content.FileProvider
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ensureActive
import kotlinx.coroutines.withContext
import java.io.File
import java.io.IOException
import java.net.HttpURLConnection
import java.net.URL
object ApkInstaller {
fun canInstall(context: Context): Boolean =
context.packageManager.canRequestPackageInstalls()
fun openInstallPermissionSettings(context: Context) {
val intent = Intent(
Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES,
Uri.parse("package:${context.packageName}")
).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
context.startActivity(intent)
}
suspend fun download(
context: Context,
url: String,
onProgress: (Float) -> Unit
): File = withContext(Dispatchers.IO) {
val dir = File(context.cacheDir, "updates").apply {
mkdirs()
listFiles()?.forEach { it.delete() } // alte Downloads aufräumen
}
val file = File(dir, "update.apk")
val conn = URL(url).openConnection() as HttpURLConnection
conn.connectTimeout = 15_000
conn.readTimeout = 15_000
try {
if (conn.responseCode != HttpURLConnection.HTTP_OK) {
throw IOException("HTTP ${conn.responseCode}")
}
val total = conn.contentLengthLong
conn.inputStream.use { input ->
file.outputStream().use { output ->
val buffer = ByteArray(16 * 1024)
var done = 0L
var read: Int
while (input.read(buffer).also { read = it } != -1) {
ensureActive() // macht den Abbruch möglich
output.write(buffer, 0, read)
done += read
if (total > 0) onProgress(done.toFloat() / total)
}
}
}
file
} finally {
conn.disconnect()
}
}
fun install(context: Context, apk: File) {
val uri = FileProvider.getUriForFile(
context, "${context.packageName}.fileprovider", apk
)
val intent = Intent(Intent.ACTION_VIEW).apply {
setDataAndType(uri, "application/vnd.android.package-archive")
addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK)
}
context.startActivity(intent)
}
}
@@ -0,0 +1,82 @@
package de.schanbro.weekfocus.update
import android.Manifest
import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
import android.net.Uri
import android.provider.Settings
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.*
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.core.content.ContextCompat
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.compose.LifecycleEventEffect
import de.schanbro.weekfocus.R
private const val KEY_HINT_DISMISSED = "network_hint_dismissed"
/** Zeigt [content] nur, wenn die App Netzwerkzugriff hat. Fragt sonst einmal danach. */
@Composable
fun NetworkPermissionGate(content: @Composable () -> Unit) {
val context = LocalContext.current
val prefs = remember {
context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE)
}
fun isGranted() = ContextCompat.checkSelfPermission(
context, Manifest.permission.INTERNET
) == PackageManager.PERMISSION_GRANTED
var granted by remember { mutableStateOf(isGranted()) }
var showDialog by remember {
mutableStateOf(!isGranted() && !prefs.getBoolean(KEY_HINT_DISMISSED, false))
}
val launcher = rememberLauncherForActivityResult(
ActivityResultContracts.RequestPermission()
) { result ->
granted = result || isGranted()
if (!granted) openAppSettings(context) // kein System-Dialog möglich → Einstellungen
}
// Nach Rückkehr aus den Einstellungen neu prüfen
LifecycleEventEffect(Lifecycle.Event.ON_RESUME) {
granted = isGranted()
}
if (granted) {
content()
} else if (showDialog) {
AlertDialog(
onDismissRequest = {},
title = { Text(stringResource(R.string.permission_network_title)) },
text = { Text(stringResource(R.string.permission_network_message)) },
confirmButton = {
TextButton(onClick = {
showDialog = false
launcher.launch(Manifest.permission.INTERNET)
}) { Text(stringResource(R.string.permission_allow)) }
},
dismissButton = {
TextButton(onClick = {
prefs.edit().putBoolean(KEY_HINT_DISMISSED, true).apply()
showDialog = false
}) { Text(stringResource(R.string.permission_not_now)) }
}
)
}
}
private fun openAppSettings(context: Context) {
val intent = Intent(
Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
Uri.fromParts("package", context.packageName, null)
).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
context.startActivity(intent)
}
@@ -0,0 +1,88 @@
package de.schanbro.weekfocus.update
import android.content.Context
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.json.JSONObject
import java.net.HttpURLConnection
import java.net.URL
import org.json.JSONArray
data class ReleaseInfo(
val version: String,
val notes: String,
val apkUrl: String
)
object UpdateChecker {
private const val RELEASES_URL =
"https://git.schamagusa.de/api/v1/repos/robin/WeekFocus/releases"
suspend fun fetchLatestRelease(includePrereleases: Boolean = false): ReleaseInfo? =
withContext(Dispatchers.IO) {
try {
if (includePrereleases) {
val body = httpGet("$RELEASES_URL?limit=10") ?: return@withContext null
val array = JSONArray(body)
(0 until array.length())
.map { array.getJSONObject(it) }
.firstNotNullOfOrNull { toRelease(it) }
} else {
val body = httpGet("$RELEASES_URL/latest") ?: return@withContext null
toRelease(JSONObject(body))
}
} catch (e: Exception) {
null
}
}
private fun httpGet(url: String): String? {
val conn = URL(url).openConnection() as HttpURLConnection
conn.connectTimeout = 10_000
conn.readTimeout = 10_000
conn.setRequestProperty("Accept", "application/json")
return try {
if (conn.responseCode == HttpURLConnection.HTTP_OK) {
conn.inputStream.bufferedReader().use { it.readText() }
} else null
} finally {
conn.disconnect()
}
}
private fun toRelease(json: JSONObject): ReleaseInfo? {
if (json.optBoolean("draft", false)) return null
val assets = json.getJSONArray("assets")
val apk = (0 until assets.length())
.map { assets.getJSONObject(it) }
.firstOrNull { it.getString("name").endsWith(".apk", ignoreCase = true) }
?: return null
return ReleaseInfo(
version = json.getString("tag_name"),
notes = json.optString("body", ""),
apkUrl = apk.getString("browser_download_url")
)
}
@Suppress("DEPRECATION")
fun currentVersion(context: Context): String =
context.packageManager.getPackageInfo(context.packageName, 0).versionName ?: "0"
/** Numerischer Vergleich pro Segment, damit 1.2.11 > 1.2.9 gilt. */
fun isNewer(remote: String, local: String): Boolean {
val r = parse(remote)
val l = parse(local)
for (i in 0 until maxOf(r.size, l.size)) {
val a = r.getOrElse(i) { 0 }
val b = l.getOrElse(i) { 0 }
if (a != b) return a > b
}
// Gleiche Nummer: stabiles Release ist neuer als eine installierte Beta
return local.contains("-") && !remote.contains("-")
}
private fun parse(version: String): List<Int> =
version.trim().removePrefix("v").substringBefore("-")
.split(".").map { it.toIntOrNull() ?: 0 }
}
@@ -0,0 +1,128 @@
package de.schanbro.weekfocus.update
import android.content.Context
import android.widget.Toast
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import de.schanbro.weekfocus.R
import de.schanbro.weekfocus.settings.SettingsRepository
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.Job
import kotlinx.coroutines.launch
private const val CHECK_INTERVAL_MS = 24L * 60 * 60 * 1000
@Composable
fun UpdateHandler() {
val context = LocalContext.current
val settings = remember { SettingsRepository.get(context) }
val prefs = remember {
context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE)
}
var release by remember { mutableStateOf<ReleaseInfo?>(null) }
LaunchedEffect(Unit) {
if (!settings.autoCheckUpdates) return@LaunchedEffect
val now = System.currentTimeMillis()
if (now - prefs.getLong("last_update_check", 0L) < CHECK_INTERVAL_MS) return@LaunchedEffect
val latest = UpdateChecker.fetchLatestRelease(settings.includePrereleases)
?: return@LaunchedEffect
prefs.edit().putLong("last_update_check", now).apply()
if (UpdateChecker.isNewer(latest.version, UpdateChecker.currentVersion(context))) {
release = latest
}
}
release?.let { UpdateDialog(info = it, onDismiss = { release = null }) }
}
@Composable
fun UpdateDialog(info: ReleaseInfo, onDismiss: () -> Unit) {
val context = LocalContext.current
val scope = rememberCoroutineScope()
var progress by remember { mutableStateOf<Float?>(null) } // null = kein Download
var downloadJob by remember { mutableStateOf<Job?>(null) }
val downloading = progress != null
AlertDialog(
onDismissRequest = { if (!downloading) onDismiss() },
title = { Text(stringResource(R.string.update_title)) },
text = {
Column(Modifier.verticalScroll(rememberScrollState())) {
Text(stringResource(R.string.update_message, info.version.removePrefix("v")))
if (info.notes.isNotBlank()) {
Spacer(Modifier.height(12.dp))
Text(
text = info.notes,
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
}
progress?.let { p ->
Spacer(Modifier.height(16.dp))
LinearProgressIndicator(
progress = { p },
modifier = Modifier.fillMaxWidth()
)
}
}
},
confirmButton = {
TextButton(
enabled = !downloading,
onClick = {
if (!ApkInstaller.canInstall(context)) {
Toast.makeText(
context, R.string.update_permission_hint, Toast.LENGTH_LONG
).show()
ApkInstaller.openInstallPermissionSettings(context)
} else {
downloadJob = scope.launch {
progress = 0f
try {
val apk = ApkInstaller.download(context, info.apkUrl) {
progress = it
}
progress = null
onDismiss()
ApkInstaller.install(context, apk)
} catch (e: CancellationException) {
throw e
} catch (e: Exception) {
progress = null
Toast.makeText(
context, R.string.update_failed, Toast.LENGTH_LONG
).show()
}
}
}
}
) { Text(stringResource(R.string.update_action)) }
},
dismissButton = {
TextButton(
onClick = {
downloadJob?.cancel()
progress = null
onDismiss()
}
) {
Text(
stringResource(
if (downloading) R.string.action_cancel else R.string.update_later
)
)
}
}
)
}
+2 -3
View File
@@ -11,10 +11,9 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="WOCHENFOKUS" android:text="@string/title_weekly_focus"
android:textSize="11sp" android:textSize="11sp"
android:letterSpacing="0.1" android:letterSpacing="0.1"
android:textAllCaps="true"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textStyle="bold" /> android:textStyle="bold" />
@@ -24,7 +23,7 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:text="Hallo" android:text="@string/msg_no_words"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="22sp" android:textSize="22sp"
android:textStyle="bold" /> android:textStyle="bold" />
+65 -3
View File
@@ -1,5 +1,67 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">WeekFocus</string> <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>
</resources> <string name="msg_no_words_yet">No words yet.</string>
<string name="msg_no_words">No words</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>
<string name="update_title">Update available</string>
<string name="update_message">Version %1$s is available. Download and install now?</string>
<string name="update_action">Update</string>
<string name="update_later">Later</string>
<string name="update_failed">Update failed. Please try again later.</string>
<string name="update_permission_hint">Please allow installs from this source, then tap “Update” again.</string>
<string name="permission_network_title">Network access needed</string>
<string name="permission_network_message">WeekFocus needs network access to check for updates. Without it the app keeps working, but won’t look for new versions.</string>
<string name="permission_allow">Allow</string>
<string name="permission_not_now">Not now</string>
<string name="settings_section_updates">Updates</string>
<string name="settings_auto_update_title">Check for updates automatically</string>
<string name="settings_auto_update_summary">On app start, at most once a day</string>
<string name="settings_prerelease_title">Include beta versions</string>
<string name="settings_prerelease_summary">Also offer pre-releases. These may contain bugs.</string>
<string name="settings_check_now_title">Check for updates now</string>
<string name="settings_check_idle">Installed version: %1$s</string>
<string name="settings_check_checking">Checking …</string>
<string name="settings_check_up_to_date">The app is up to date</string>
<string name="settings_check_failed">Check failed. Please check your network connection.</string>
<string name="settings_check_available">Update available</string>
<string name="settings_section_appearance">Appearance</string>
<string name="settings_theme_title">Theme</string>
<string name="settings_theme_system">System</string>
<string name="settings_theme_light">Light</string>
<string name="settings_theme_dark">Dark</string>
<string name="settings_language_title">Language</string>
<string name="settings_language_summary">Change in system settings</string>
<string name="settings_section_about">About</string>
<string name="settings_version_title">Version</string>
<string name="settings_source_title">Source code</string>
<string name="settings_source_summary">Open repository on Gitea</string>
<string name="action_back">Back</string>
<string name="settings_about_summary">Version, source code and more</string>
<string name="about_version">Version %1$s</string>
<string name="about_description">Keep your words of the week in view, right on your home screen.</string>
<string name="about_section_links">Links</string>
<string name="about_issues_title">Report a problem</string>
<string name="about_issues_summary">Bugs and requests in the issue tracker</string>
<string name="about_releases_title">Releases</string>
<string name="about_releases_summary">See all releases and changes</string>
</resources>
+4
View File
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="splash_background">#121212</color>
</resources>
+1
View File
@@ -7,4 +7,5 @@
<color name="teal_700">#FF018786</color> <color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color> <color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color> <color name="white">#FFFFFFFF</color>
<color name="splash_background">#FFFFFF</color>
</resources> </resources>
+71 -2
View File
@@ -1,5 +1,74 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">WeekFocus</string> <string name="app_name" translatable="false">WeekFocus</string>
<string name="hint_new_word">Neues Wort eingeben</string> <string name="hint_new_word">Neues Wort eingeben</string>
</resources> <string name="hint_add_word">Wort hinzufügen</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_weekly_focus">Wochenfokus</string>
<string name="title_settings">Einstellungen</string>
<string name="title_words">Wörter</string>
<string name="title_home">Start</string>
<string name="title_about">Über</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>
<!-- Auto-Update -->
<string name="update_title">Update verfügbar</string>
<string name="update_message">Version %1$s ist verfügbar. Jetzt herunterladen und installieren?</string>
<string name="update_action">Aktualisieren</string>
<string name="update_later">Später</string>
<string name="update_failed">Update fehlgeschlagen. Bitte später erneut versuchen.</string>
<string name="update_permission_hint">Bitte die Installation aus dieser Quelle erlauben und danach erneut auf „Aktualisieren“ tippen.</string>
<!-- Berechntigungen -->
<string name="permission_network_title">Netzwerkzugriff benötigt</string>
<string name="permission_network_message">WeekFocus braucht Netzwerkzugriff, um nach Updates zu suchen. Ohne Zugriff funktioniert die App weiterhin, sucht aber nicht nach neuen Versionen.</string>
<string name="permission_allow">Erlauben</string>
<string name="permission_not_now">Nicht jetzt</string>
<!-- Einstellungen -->
<string name="settings_section_updates">Updates</string>
<string name="settings_auto_update_title">Automatisch nach Updates suchen</string>
<string name="settings_auto_update_summary">Beim Start der App, höchstens einmal täglich</string>
<string name="settings_prerelease_title">Beta-Versionen einbeziehen</string>
<string name="settings_prerelease_summary">Auch Vorabversionen anbieten. Diese können Fehler enthalten.</string>
<string name="settings_check_now_title">Jetzt nach Updates suchen</string>
<string name="settings_check_idle">Installierte Version: %1$s</string>
<string name="settings_check_checking">Suche läuft …</string>
<string name="settings_check_up_to_date">Die App ist auf dem neuesten Stand</string>
<string name="settings_check_failed">Suche fehlgeschlagen. Bitte Netzwerkverbindung prüfen.</string>
<string name="settings_check_available">Update verfügbar</string>
<string name="settings_section_appearance">Darstellung</string>
<string name="settings_theme_title">Design</string>
<string name="settings_theme_system">System</string>
<string name="settings_theme_light">Hell</string>
<string name="settings_theme_dark">Dunkel</string>
<string name="settings_language_title">Sprache</string>
<string name="settings_language_summary">In den Systemeinstellungen ändern</string>
<string name="settings_section_about">Über die App</string>
<string name="settings_version_title">Version</string>
<string name="settings_source_title">Quellcode</string>
<string name="settings_source_summary">Repository auf Gitea öffnen</string>
<string name="action_back">Zurück</string>
<string name="settings_about_summary">Version, Quellcode und mehr</string>
<string name="about_version">Version %1$s</string>
<string name="about_description">Behalte deine Wörter der Woche im Blick, direkt auf dem Startbildschirm.</string>
<string name="about_section_links">Links</string>
<string name="about_issues_title">Fehler melden</string>
<string name="about_issues_summary">Probleme und Wünsche im Issue-Tracker</string>
<string name="about_releases_title">Versionen</string>
<string name="about_releases_summary">Alle Releases und Änderungen ansehen</string>
</resources>
+5 -1
View File
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="Theme.WeekFocus" parent="android:Theme.Material.Light.NoActionBar" /> <style name="Theme.WeekFocus" parent="android:Theme.Material.Light.NoActionBar" />
<style name="Theme.WeekFocus.Splash" parent="Theme.SplashScreen">
<item name="windowSplashScreenBackground">@color/splash_background</item>
<item name="windowSplashScreenAnimatedIcon">@mipmap/ic_launcher</item>
<item name="postSplashScreenTheme">@style/Theme.WeekFocus</item>
</style>
</resources> </resources>
+4
View File
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<paths>
<cache-path name="updates" path="updates/" />
</paths>
+1 -1
View File
@@ -7,5 +7,5 @@
android:resizeMode="horizontal|vertical" android:resizeMode="horizontal|vertical"
android:widgetCategory="home_screen" android:widgetCategory="home_screen"
android:targetCellWidth="2" android:targetCellWidth="2"
android:targetCellHeight="2"> android:targetCellHeight="1">
</appwidget-provider> </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] [versions]
agp = "9.4.1" agp = "9.4.1"
coreKtx = "1.10.1" coreKtx = "1.19.1"
junit = "4.13.2" junit = "4.13.2"
junitVersion = "1.1.5" junitVersion = "1.3.0"
espressoCore = "3.5.1" espressoCore = "3.7.0"
lifecycleRuntimeKtx = "2.6.1" lifecycleRuntimeKtx = "2.11.0"
activityCompose = "1.8.0" activityCompose = "1.13.0"
kotlin = "2.2.10" kotlin = "2.4.20"
composeBom = "2026.02.01" 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" }
@@ -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-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
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-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" }