Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bd3946a638 |
No files matched your search
+15
-158
@@ -3,177 +3,34 @@ name: Build & Release Android App
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
tags:
|
tags:
|
||||||
- 'v*'
|
- 'v*' # Startet bei Tags wie v1.0.0, v1.0.1 etc.
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Secrets prüfen
|
|
||||||
run: |
|
|
||||||
[ -n "$KEYSTORE_PASSWORD" ] && echo "KEYSTORE_PASSWORD gesetzt" || echo "KEYSTORE_PASSWORD LEER"
|
|
||||||
[ -n "$KEY_ALIAS" ] && echo "KEY_ALIAS gesetzt" || echo "KEY_ALIAS LEER"
|
|
||||||
[ -n "$KEY_PASSWORD" ] && echo "KEY_PASSWORD gesetzt" || echo "KEY_PASSWORD LEER"
|
|
||||||
env:
|
|
||||||
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
|
|
||||||
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
|
|
||||||
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
|
|
||||||
|
|
||||||
- name: Code auschecken
|
- name: Code auschecken
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Java/JDK 17 einrichten
|
# HIER IST DIE LÖSUNG: Java 25 statt 17 bereitstellen
|
||||||
uses: actions/setup-java@v5
|
- name: Java/JDK 25 einrichten
|
||||||
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
java-version: '17'
|
java-version: '25'
|
||||||
distribution: 'temurin'
|
distribution: 'temurin'
|
||||||
cache: gradle
|
|
||||||
|
|
||||||
- name: Rechte für gradlew setzen
|
- name: Gradle einrichten
|
||||||
run: chmod +x gradlew
|
uses: gradle/actions/setup-gradle@v3
|
||||||
|
|
||||||
- name: Android SDK einrichten
|
|
||||||
run: |
|
|
||||||
SDK_PATH="$HOME/android-sdk"
|
|
||||||
SDKMANAGER="$SDK_PATH/cmdline-tools/latest/bin/sdkmanager"
|
|
||||||
|
|
||||||
if [ ! -x "$SDKMANAGER" ]; then
|
|
||||||
echo "Installiere Android cmdline-tools..."
|
|
||||||
mkdir -p "$SDK_PATH/cmdline-tools"
|
|
||||||
curl -sSL -o /tmp/tools.zip https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip
|
|
||||||
unzip -q /tmp/tools.zip -d "$SDK_PATH/cmdline-tools"
|
|
||||||
mv "$SDK_PATH/cmdline-tools/cmdline-tools" "$SDK_PATH/cmdline-tools/latest"
|
|
||||||
rm /tmp/tools.zip
|
|
||||||
fi
|
|
||||||
|
|
||||||
"$SDKMANAGER" --sdk_root="$SDK_PATH" --licenses < <(yes) > /dev/null
|
|
||||||
|
|
||||||
"$SDKMANAGER" --sdk_root="$SDK_PATH" \
|
|
||||||
"platform-tools" \
|
|
||||||
"platforms;android-35" \
|
|
||||||
"build-tools;35.0.0"
|
|
||||||
|
|
||||||
echo "ANDROID_HOME=$SDK_PATH" >> $GITHUB_ENV
|
|
||||||
echo "ANDROID_SDK_ROOT=$SDK_PATH" >> $GITHUB_ENV
|
|
||||||
echo "sdk.dir=$SDK_PATH" > "$GITHUB_WORKSPACE/local.properties"
|
|
||||||
|
|
||||||
- name: Keystore dekodieren
|
|
||||||
env:
|
|
||||||
KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
|
|
||||||
run: |
|
|
||||||
echo "$KEYSTORE_BASE64" | base64 -d > "$RUNNER_TEMP/release.keystore"
|
|
||||||
echo "KEYSTORE_PATH=$RUNNER_TEMP/release.keystore" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Android Release APK bauen
|
- name: Android Release APK bauen
|
||||||
|
# Keine fehleranfälligen Flags mehr nötig!
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
chmod +x gradlew
|
||||||
|
./gradlew assembleRelease
|
||||||
|
|
||||||
VERSION="${GITHUB_REF_NAME#v}"
|
- name: Release in Gitea erstellen
|
||||||
echo "Baue Version: $VERSION"
|
uses: softprops/action-gh-release@v2
|
||||||
|
with:
|
||||||
./gradlew assembleRelease \
|
files: app/build/outputs/apk/release/*.apk
|
||||||
--no-daemon \
|
|
||||||
-Dorg.gradle.java.home="$JAVA_HOME" \
|
|
||||||
-Porg.gradle.java.installations.auto-download=false \
|
|
||||||
-PversionNameOverride="$VERSION"
|
|
||||||
|
|
||||||
APK_DIR="app/build/outputs/apk/release"
|
|
||||||
|
|
||||||
echo "Gefundene APKs in $APK_DIR:"
|
|
||||||
ls -lh "$APK_DIR"
|
|
||||||
|
|
||||||
SRC="$APK_DIR/app-release.apk"
|
|
||||||
if [ ! -f "$SRC" ]; then
|
|
||||||
echo "app-release.apk nicht gefunden (evtl. unsigniert oder anderer Name)"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
TARGET_PATH="$APK_DIR/WeekFocus-${VERSION}.apk"
|
|
||||||
mv "$SRC" "$TARGET_PATH"
|
|
||||||
|
|
||||||
echo "Signatur prüfen für $(basename "$TARGET_PATH")..."
|
|
||||||
"$ANDROID_HOME/build-tools/35.0.0/apksigner" verify --verbose "$TARGET_PATH"
|
|
||||||
|
|
||||||
echo "Finale Release-APK:"
|
|
||||||
ls -lh "$TARGET_PATH"
|
|
||||||
env:
|
env:
|
||||||
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
|
|
||||||
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
|
|
||||||
|
|
||||||
- name: Release-Notes aus CHANGELOG.md extrahieren
|
|
||||||
run: |
|
|
||||||
VERSION="${GITHUB_REF_NAME#v}"
|
|
||||||
NOTES_FILE="$RUNNER_TEMP/release_notes.md"
|
|
||||||
|
|
||||||
if [ -f CHANGELOG.md ]; then
|
|
||||||
awk -v ver="$VERSION" '
|
|
||||||
/^##[[:space:]]/ {
|
|
||||||
if (found) exit
|
|
||||||
line = $0
|
|
||||||
sub(/^##[[:space:]]+/, "", line)
|
|
||||||
sub(/^\[?v?/, "", line)
|
|
||||||
if (substr(line, 1, length(ver)) == ver) {
|
|
||||||
rest = substr(line, length(ver) + 1)
|
|
||||||
if (rest ~ /^([^0-9.]|$)/) { found = 1 }
|
|
||||||
}
|
|
||||||
next
|
|
||||||
}
|
|
||||||
found { print }
|
|
||||||
' CHANGELOG.md > "$NOTES_FILE"
|
|
||||||
else
|
|
||||||
: > "$NOTES_FILE"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! grep -q '[^[:space:]]' "$NOTES_FILE"; then
|
|
||||||
echo "Keine Release-Notes für Version $VERSION vorhanden." > "$NOTES_FILE"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Release-Notes:"
|
|
||||||
cat "$NOTES_FILE"
|
|
||||||
|
|
||||||
- name: Release in Gitea erstellen und APK hochladen
|
|
||||||
env:
|
|
||||||
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
-2
@@ -1,14 +1,13 @@
|
|||||||
*.iml
|
*.iml
|
||||||
.gradle
|
.gradle
|
||||||
|
.idea
|
||||||
/local.properties
|
/local.properties
|
||||||
/.idea
|
|
||||||
/.idea/caches
|
/.idea/caches
|
||||||
/.idea/libraries
|
/.idea/libraries
|
||||||
/.idea/modules.xml
|
/.idea/modules.xml
|
||||||
/.idea/workspace.xml
|
/.idea/workspace.xml
|
||||||
/.idea/navEditor.xml
|
/.idea/navEditor.xml
|
||||||
/.idea/assetWizardSettings.xml
|
/.idea/assetWizardSettings.xml
|
||||||
/.idea/misc.xml
|
|
||||||
.DS_Store
|
.DS_Store
|
||||||
/build
|
/build
|
||||||
/captures
|
/captures
|
||||||
|
|||||||
Generated
+1
-1
@@ -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_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7">
|
||||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectType">
|
<component name="ProjectType">
|
||||||
|
|||||||
@@ -1,41 +0,0 @@
|
|||||||
# Changelog
|
|
||||||
|
|
||||||
## [1.3.0] - 30.10.2026
|
|
||||||
### 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
|
|
||||||
- chore: auto-generate apk files #6
|
|
||||||
@@ -1,674 +0,0 @@
|
|||||||
GNU GENERAL PUBLIC LICENSE
|
|
||||||
Version 3, 29 June 2007
|
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
Preamble
|
|
||||||
|
|
||||||
The GNU General Public License is a free, copyleft license for
|
|
||||||
software and other kinds of works.
|
|
||||||
|
|
||||||
The licenses for most software and other practical works are designed
|
|
||||||
to take away your freedom to share and change the works. By contrast,
|
|
||||||
the GNU General Public License is intended to guarantee your freedom to
|
|
||||||
share and change all versions of a program--to make sure it remains free
|
|
||||||
software for all its users. We, the Free Software Foundation, use the
|
|
||||||
GNU General Public License for most of our software; it applies also to
|
|
||||||
any other work released this way by its authors. You can apply it to
|
|
||||||
your programs, too.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
them if you wish), that you receive source code or can get it if you
|
|
||||||
want it, that you can change the software or use pieces of it in new
|
|
||||||
free programs, and that you know you can do these things.
|
|
||||||
|
|
||||||
To protect your rights, we need to prevent others from denying you
|
|
||||||
these rights or asking you to surrender the rights. Therefore, you have
|
|
||||||
certain responsibilities if you distribute copies of the software, or if
|
|
||||||
you modify it: responsibilities to respect the freedom of others.
|
|
||||||
|
|
||||||
For example, if you distribute copies of such a program, whether
|
|
||||||
gratis or for a fee, you must pass on to the recipients the same
|
|
||||||
freedoms that you received. You must make sure that they, too, receive
|
|
||||||
or can get the source code. And you must show them these terms so they
|
|
||||||
know their rights.
|
|
||||||
|
|
||||||
Developers that use the GNU GPL protect your rights with two steps:
|
|
||||||
(1) assert copyright on the software, and (2) offer you this License
|
|
||||||
giving you legal permission to copy, distribute and/or modify it.
|
|
||||||
|
|
||||||
For the developers' and authors' protection, the GPL clearly explains
|
|
||||||
that there is no warranty for this free software. For both users' and
|
|
||||||
authors' sake, the GPL requires that modified versions be marked as
|
|
||||||
changed, so that their problems will not be attributed erroneously to
|
|
||||||
authors of previous versions.
|
|
||||||
|
|
||||||
Some devices are designed to deny users access to install or run
|
|
||||||
modified versions of the software inside them, although the manufacturer
|
|
||||||
can do so. This is fundamentally incompatible with the aim of
|
|
||||||
protecting users' freedom to change the software. The systematic
|
|
||||||
pattern of such abuse occurs in the area of products for individuals to
|
|
||||||
use, which is precisely where it is most unacceptable. Therefore, we
|
|
||||||
have designed this version of the GPL to prohibit the practice for those
|
|
||||||
products. If such problems arise substantially in other domains, we
|
|
||||||
stand ready to extend this provision to those domains in future versions
|
|
||||||
of the GPL, as needed to protect the freedom of users.
|
|
||||||
|
|
||||||
Finally, every program is threatened constantly by software patents.
|
|
||||||
States should not allow patents to restrict development and use of
|
|
||||||
software on general-purpose computers, but in those that do, we wish to
|
|
||||||
avoid the special danger that patents applied to a free program could
|
|
||||||
make it effectively proprietary. To prevent this, the GPL assures that
|
|
||||||
patents cannot be used to render the program non-free.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
0. Definitions.
|
|
||||||
|
|
||||||
"This License" refers to version 3 of the GNU General Public License.
|
|
||||||
|
|
||||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
|
||||||
works, such as semiconductor masks.
|
|
||||||
|
|
||||||
"The Program" refers to any copyrightable work licensed under this
|
|
||||||
License. Each licensee is addressed as "you". "Licensees" and
|
|
||||||
"recipients" may be individuals or organizations.
|
|
||||||
|
|
||||||
To "modify" a work means to copy from or adapt all or part of the work
|
|
||||||
in a fashion requiring copyright permission, other than the making of an
|
|
||||||
exact copy. The resulting work is called a "modified version" of the
|
|
||||||
earlier work or a work "based on" the earlier work.
|
|
||||||
|
|
||||||
A "covered work" means either the unmodified Program or a work based
|
|
||||||
on the Program.
|
|
||||||
|
|
||||||
To "propagate" a work means to do anything with it that, without
|
|
||||||
permission, would make you directly or secondarily liable for
|
|
||||||
infringement under applicable copyright law, except executing it on a
|
|
||||||
computer or modifying a private copy. Propagation includes copying,
|
|
||||||
distribution (with or without modification), making available to the
|
|
||||||
public, and in some countries other activities as well.
|
|
||||||
|
|
||||||
To "convey" a work means any kind of propagation that enables other
|
|
||||||
parties to make or receive copies. Mere interaction with a user through
|
|
||||||
a computer network, with no transfer of a copy, is not conveying.
|
|
||||||
|
|
||||||
An interactive user interface displays "Appropriate Legal Notices"
|
|
||||||
to the extent that it includes a convenient and prominently visible
|
|
||||||
feature that (1) displays an appropriate copyright notice, and (2)
|
|
||||||
tells the user that there is no warranty for the work (except to the
|
|
||||||
extent that warranties are provided), that licensees may convey the
|
|
||||||
work under this License, and how to view a copy of this License. If
|
|
||||||
the interface presents a list of user commands or options, such as a
|
|
||||||
menu, a prominent item in the list meets this criterion.
|
|
||||||
|
|
||||||
1. Source Code.
|
|
||||||
|
|
||||||
The "source code" for a work means the preferred form of the work
|
|
||||||
for making modifications to it. "Object code" means any non-source
|
|
||||||
form of a work.
|
|
||||||
|
|
||||||
A "Standard Interface" means an interface that either is an official
|
|
||||||
standard defined by a recognized standards body, or, in the case of
|
|
||||||
interfaces specified for a particular programming language, one that
|
|
||||||
is widely used among developers working in that language.
|
|
||||||
|
|
||||||
The "System Libraries" of an executable work include anything, other
|
|
||||||
than the work as a whole, that (a) is included in the normal form of
|
|
||||||
packaging a Major Component, but which is not part of that Major
|
|
||||||
Component, and (b) serves only to enable use of the work with that
|
|
||||||
Major Component, or to implement a Standard Interface for which an
|
|
||||||
implementation is available to the public in source code form. A
|
|
||||||
"Major Component", in this context, means a major essential component
|
|
||||||
(kernel, window system, and so on) of the specific operating system
|
|
||||||
(if any) on which the executable work runs, or a compiler used to
|
|
||||||
produce the work, or an object code interpreter used to run it.
|
|
||||||
|
|
||||||
The "Corresponding Source" for a work in object code form means all
|
|
||||||
the source code needed to generate, install, and (for an executable
|
|
||||||
work) run the object code and to modify the work, including scripts to
|
|
||||||
control those activities. However, it does not include the work's
|
|
||||||
System Libraries, or general-purpose tools or generally available free
|
|
||||||
programs which are used unmodified in performing those activities but
|
|
||||||
which are not part of the work. For example, Corresponding Source
|
|
||||||
includes interface definition files associated with source files for
|
|
||||||
the work, and the source code for shared libraries and dynamically
|
|
||||||
linked subprograms that the work is specifically designed to require,
|
|
||||||
such as by intimate data communication or control flow between those
|
|
||||||
subprograms and other parts of the work.
|
|
||||||
|
|
||||||
The Corresponding Source need not include anything that users
|
|
||||||
can regenerate automatically from other parts of the Corresponding
|
|
||||||
Source.
|
|
||||||
|
|
||||||
The Corresponding Source for a work in source code form is that
|
|
||||||
same work.
|
|
||||||
|
|
||||||
2. Basic Permissions.
|
|
||||||
|
|
||||||
All rights granted under this License are granted for the term of
|
|
||||||
copyright on the Program, and are irrevocable provided the stated
|
|
||||||
conditions are met. This License explicitly affirms your unlimited
|
|
||||||
permission to run the unmodified Program. The output from running a
|
|
||||||
covered work is covered by this License only if the output, given its
|
|
||||||
content, constitutes a covered work. This License acknowledges your
|
|
||||||
rights of fair use or other equivalent, as provided by copyright law.
|
|
||||||
|
|
||||||
You may make, run and propagate covered works that you do not
|
|
||||||
convey, without conditions so long as your license otherwise remains
|
|
||||||
in force. You may convey covered works to others for the sole purpose
|
|
||||||
of having them make modifications exclusively for you, or provide you
|
|
||||||
with facilities for running those works, provided that you comply with
|
|
||||||
the terms of this License in conveying all material for which you do
|
|
||||||
not control copyright. Those thus making or running the covered works
|
|
||||||
for you must do so exclusively on your behalf, under your direction
|
|
||||||
and control, on terms that prohibit them from making any copies of
|
|
||||||
your copyrighted material outside their relationship with you.
|
|
||||||
|
|
||||||
Conveying under any other circumstances is permitted solely under
|
|
||||||
the conditions stated below. Sublicensing is not allowed; section 10
|
|
||||||
makes it unnecessary.
|
|
||||||
|
|
||||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
|
||||||
|
|
||||||
No covered work shall be deemed part of an effective technological
|
|
||||||
measure under any applicable law fulfilling obligations under article
|
|
||||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
|
||||||
similar laws prohibiting or restricting circumvention of such
|
|
||||||
measures.
|
|
||||||
|
|
||||||
When you convey a covered work, you waive any legal power to forbid
|
|
||||||
circumvention of technological measures to the extent such circumvention
|
|
||||||
is effected by exercising rights under this License with respect to
|
|
||||||
the covered work, and you disclaim any intention to limit operation or
|
|
||||||
modification of the work as a means of enforcing, against the work's
|
|
||||||
users, your or third parties' legal rights to forbid circumvention of
|
|
||||||
technological measures.
|
|
||||||
|
|
||||||
4. Conveying Verbatim Copies.
|
|
||||||
|
|
||||||
You may convey verbatim copies of the Program's source code as you
|
|
||||||
receive it, in any medium, provided that you conspicuously and
|
|
||||||
appropriately publish on each copy an appropriate copyright notice;
|
|
||||||
keep intact all notices stating that this License and any
|
|
||||||
non-permissive terms added in accord with section 7 apply to the code;
|
|
||||||
keep intact all notices of the absence of any warranty; and give all
|
|
||||||
recipients a copy of this License along with the Program.
|
|
||||||
|
|
||||||
You may charge any price or no price for each copy that you convey,
|
|
||||||
and you may offer support or warranty protection for a fee.
|
|
||||||
|
|
||||||
5. Conveying Modified Source Versions.
|
|
||||||
|
|
||||||
You may convey a work based on the Program, or the modifications to
|
|
||||||
produce it from the Program, in the form of source code under the
|
|
||||||
terms of section 4, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) The work must carry prominent notices stating that you modified
|
|
||||||
it, and giving a relevant date.
|
|
||||||
|
|
||||||
b) The work must carry prominent notices stating that it is
|
|
||||||
released under this License and any conditions added under section
|
|
||||||
7. This requirement modifies the requirement in section 4 to
|
|
||||||
"keep intact all notices".
|
|
||||||
|
|
||||||
c) You must license the entire work, as a whole, under this
|
|
||||||
License to anyone who comes into possession of a copy. This
|
|
||||||
License will therefore apply, along with any applicable section 7
|
|
||||||
additional terms, to the whole of the work, and all its parts,
|
|
||||||
regardless of how they are packaged. This License gives no
|
|
||||||
permission to license the work in any other way, but it does not
|
|
||||||
invalidate such permission if you have separately received it.
|
|
||||||
|
|
||||||
d) If the work has interactive user interfaces, each must display
|
|
||||||
Appropriate Legal Notices; however, if the Program has interactive
|
|
||||||
interfaces that do not display Appropriate Legal Notices, your
|
|
||||||
work need not make them do so.
|
|
||||||
|
|
||||||
A compilation of a covered work with other separate and independent
|
|
||||||
works, which are not by their nature extensions of the covered work,
|
|
||||||
and which are not combined with it such as to form a larger program,
|
|
||||||
in or on a volume of a storage or distribution medium, is called an
|
|
||||||
"aggregate" if the compilation and its resulting copyright are not
|
|
||||||
used to limit the access or legal rights of the compilation's users
|
|
||||||
beyond what the individual works permit. Inclusion of a covered work
|
|
||||||
in an aggregate does not cause this License to apply to the other
|
|
||||||
parts of the aggregate.
|
|
||||||
|
|
||||||
6. Conveying Non-Source Forms.
|
|
||||||
|
|
||||||
You may convey a covered work in object code form under the terms
|
|
||||||
of sections 4 and 5, provided that you also convey the
|
|
||||||
machine-readable Corresponding Source under the terms of this License,
|
|
||||||
in one of these ways:
|
|
||||||
|
|
||||||
a) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by the
|
|
||||||
Corresponding Source fixed on a durable physical medium
|
|
||||||
customarily used for software interchange.
|
|
||||||
|
|
||||||
b) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by a
|
|
||||||
written offer, valid for at least three years and valid for as
|
|
||||||
long as you offer spare parts or customer support for that product
|
|
||||||
model, to give anyone who possesses the object code either (1) a
|
|
||||||
copy of the Corresponding Source for all the software in the
|
|
||||||
product that is covered by this License, on a durable physical
|
|
||||||
medium customarily used for software interchange, for a price no
|
|
||||||
more than your reasonable cost of physically performing this
|
|
||||||
conveying of source, or (2) access to copy the
|
|
||||||
Corresponding Source from a network server at no charge.
|
|
||||||
|
|
||||||
c) Convey individual copies of the object code with a copy of the
|
|
||||||
written offer to provide the Corresponding Source. This
|
|
||||||
alternative is allowed only occasionally and noncommercially, and
|
|
||||||
only if you received the object code with such an offer, in accord
|
|
||||||
with subsection 6b.
|
|
||||||
|
|
||||||
d) Convey the object code by offering access from a designated
|
|
||||||
place (gratis or for a charge), and offer equivalent access to the
|
|
||||||
Corresponding Source in the same way through the same place at no
|
|
||||||
further charge. You need not require recipients to copy the
|
|
||||||
Corresponding Source along with the object code. If the place to
|
|
||||||
copy the object code is a network server, the Corresponding Source
|
|
||||||
may be on a different server (operated by you or a third party)
|
|
||||||
that supports equivalent copying facilities, provided you maintain
|
|
||||||
clear directions next to the object code saying where to find the
|
|
||||||
Corresponding Source. Regardless of what server hosts the
|
|
||||||
Corresponding Source, you remain obligated to ensure that it is
|
|
||||||
available for as long as needed to satisfy these requirements.
|
|
||||||
|
|
||||||
e) Convey the object code using peer-to-peer transmission, provided
|
|
||||||
you inform other peers where the object code and Corresponding
|
|
||||||
Source of the work are being offered to the general public at no
|
|
||||||
charge under subsection 6d.
|
|
||||||
|
|
||||||
A separable portion of the object code, whose source code is excluded
|
|
||||||
from the Corresponding Source as a System Library, need not be
|
|
||||||
included in conveying the object code work.
|
|
||||||
|
|
||||||
A "User Product" is either (1) a "consumer product", which means any
|
|
||||||
tangible personal property which is normally used for personal, family,
|
|
||||||
or household purposes, or (2) anything designed or sold for incorporation
|
|
||||||
into a dwelling. In determining whether a product is a consumer product,
|
|
||||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
|
||||||
product received by a particular user, "normally used" refers to a
|
|
||||||
typical or common use of that class of product, regardless of the status
|
|
||||||
of the particular user or of the way in which the particular user
|
|
||||||
actually uses, or expects or is expected to use, the product. A product
|
|
||||||
is a consumer product regardless of whether the product has substantial
|
|
||||||
commercial, industrial or non-consumer uses, unless such uses represent
|
|
||||||
the only significant mode of use of the product.
|
|
||||||
|
|
||||||
"Installation Information" for a User Product means any methods,
|
|
||||||
procedures, authorization keys, or other information required to install
|
|
||||||
and execute modified versions of a covered work in that User Product from
|
|
||||||
a modified version of its Corresponding Source. The information must
|
|
||||||
suffice to ensure that the continued functioning of the modified object
|
|
||||||
code is in no case prevented or interfered with solely because
|
|
||||||
modification has been made.
|
|
||||||
|
|
||||||
If you convey an object code work under this section in, or with, or
|
|
||||||
specifically for use in, a User Product, and the conveying occurs as
|
|
||||||
part of a transaction in which the right of possession and use of the
|
|
||||||
User Product is transferred to the recipient in perpetuity or for a
|
|
||||||
fixed term (regardless of how the transaction is characterized), the
|
|
||||||
Corresponding Source conveyed under this section must be accompanied
|
|
||||||
by the Installation Information. But this requirement does not apply
|
|
||||||
if neither you nor any third party retains the ability to install
|
|
||||||
modified object code on the User Product (for example, the work has
|
|
||||||
been installed in ROM).
|
|
||||||
|
|
||||||
The requirement to provide Installation Information does not include a
|
|
||||||
requirement to continue to provide support service, warranty, or updates
|
|
||||||
for a work that has been modified or installed by the recipient, or for
|
|
||||||
the User Product in which it has been modified or installed. Access to a
|
|
||||||
network may be denied when the modification itself materially and
|
|
||||||
adversely affects the operation of the network or violates the rules and
|
|
||||||
protocols for communication across the network.
|
|
||||||
|
|
||||||
Corresponding Source conveyed, and Installation Information provided,
|
|
||||||
in accord with this section must be in a format that is publicly
|
|
||||||
documented (and with an implementation available to the public in
|
|
||||||
source code form), and must require no special password or key for
|
|
||||||
unpacking, reading or copying.
|
|
||||||
|
|
||||||
7. Additional Terms.
|
|
||||||
|
|
||||||
"Additional permissions" are terms that supplement the terms of this
|
|
||||||
License by making exceptions from one or more of its conditions.
|
|
||||||
Additional permissions that are applicable to the entire Program shall
|
|
||||||
be treated as though they were included in this License, to the extent
|
|
||||||
that they are valid under applicable law. If additional permissions
|
|
||||||
apply only to part of the Program, that part may be used separately
|
|
||||||
under those permissions, but the entire Program remains governed by
|
|
||||||
this License without regard to the additional permissions.
|
|
||||||
|
|
||||||
When you convey a copy of a covered work, you may at your option
|
|
||||||
remove any additional permissions from that copy, or from any part of
|
|
||||||
it. (Additional permissions may be written to require their own
|
|
||||||
removal in certain cases when you modify the work.) You may place
|
|
||||||
additional permissions on material, added by you to a covered work,
|
|
||||||
for which you have or can give appropriate copyright permission.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, for material you
|
|
||||||
add to a covered work, you may (if authorized by the copyright holders of
|
|
||||||
that material) supplement the terms of this License with terms:
|
|
||||||
|
|
||||||
a) Disclaiming warranty or limiting liability differently from the
|
|
||||||
terms of sections 15 and 16 of this License; or
|
|
||||||
|
|
||||||
b) Requiring preservation of specified reasonable legal notices or
|
|
||||||
author attributions in that material or in the Appropriate Legal
|
|
||||||
Notices displayed by works containing it; or
|
|
||||||
|
|
||||||
c) Prohibiting misrepresentation of the origin of that material, or
|
|
||||||
requiring that modified versions of such material be marked in
|
|
||||||
reasonable ways as different from the original version; or
|
|
||||||
|
|
||||||
d) Limiting the use for publicity purposes of names of licensors or
|
|
||||||
authors of the material; or
|
|
||||||
|
|
||||||
e) Declining to grant rights under trademark law for use of some
|
|
||||||
trade names, trademarks, or service marks; or
|
|
||||||
|
|
||||||
f) Requiring indemnification of licensors and authors of that
|
|
||||||
material by anyone who conveys the material (or modified versions of
|
|
||||||
it) with contractual assumptions of liability to the recipient, for
|
|
||||||
any liability that these contractual assumptions directly impose on
|
|
||||||
those licensors and authors.
|
|
||||||
|
|
||||||
All other non-permissive additional terms are considered "further
|
|
||||||
restrictions" within the meaning of section 10. If the Program as you
|
|
||||||
received it, or any part of it, contains a notice stating that it is
|
|
||||||
governed by this License along with a term that is a further
|
|
||||||
restriction, you may remove that term. If a license document contains
|
|
||||||
a further restriction but permits relicensing or conveying under this
|
|
||||||
License, you may add to a covered work material governed by the terms
|
|
||||||
of that license document, provided that the further restriction does
|
|
||||||
not survive such relicensing or conveying.
|
|
||||||
|
|
||||||
If you add terms to a covered work in accord with this section, you
|
|
||||||
must place, in the relevant source files, a statement of the
|
|
||||||
additional terms that apply to those files, or a notice indicating
|
|
||||||
where to find the applicable terms.
|
|
||||||
|
|
||||||
Additional terms, permissive or non-permissive, may be stated in the
|
|
||||||
form of a separately written license, or stated as exceptions;
|
|
||||||
the above requirements apply either way.
|
|
||||||
|
|
||||||
8. Termination.
|
|
||||||
|
|
||||||
You may not propagate or modify a covered work except as expressly
|
|
||||||
provided under this License. Any attempt otherwise to propagate or
|
|
||||||
modify it is void, and will automatically terminate your rights under
|
|
||||||
this License (including any patent licenses granted under the third
|
|
||||||
paragraph of section 11).
|
|
||||||
|
|
||||||
However, if you cease all violation of this License, then your
|
|
||||||
license from a particular copyright holder is reinstated (a)
|
|
||||||
provisionally, unless and until the copyright holder explicitly and
|
|
||||||
finally terminates your license, and (b) permanently, if the copyright
|
|
||||||
holder fails to notify you of the violation by some reasonable means
|
|
||||||
prior to 60 days after the cessation.
|
|
||||||
|
|
||||||
Moreover, your license from a particular copyright holder is
|
|
||||||
reinstated permanently if the copyright holder notifies you of the
|
|
||||||
violation by some reasonable means, this is the first time you have
|
|
||||||
received notice of violation of this License (for any work) from that
|
|
||||||
copyright holder, and you cure the violation prior to 30 days after
|
|
||||||
your receipt of the notice.
|
|
||||||
|
|
||||||
Termination of your rights under this section does not terminate the
|
|
||||||
licenses of parties who have received copies or rights from you under
|
|
||||||
this License. If your rights have been terminated and not permanently
|
|
||||||
reinstated, you do not qualify to receive new licenses for the same
|
|
||||||
material under section 10.
|
|
||||||
|
|
||||||
9. Acceptance Not Required for Having Copies.
|
|
||||||
|
|
||||||
You are not required to accept this License in order to receive or
|
|
||||||
run a copy of the Program. Ancillary propagation of a covered work
|
|
||||||
occurring solely as a consequence of using peer-to-peer transmission
|
|
||||||
to receive a copy likewise does not require acceptance. However,
|
|
||||||
nothing other than this License grants you permission to propagate or
|
|
||||||
modify any covered work. These actions infringe copyright if you do
|
|
||||||
not accept this License. Therefore, by modifying or propagating a
|
|
||||||
covered work, you indicate your acceptance of this License to do so.
|
|
||||||
|
|
||||||
10. Automatic Licensing of Downstream Recipients.
|
|
||||||
|
|
||||||
Each time you convey a covered work, the recipient automatically
|
|
||||||
receives a license from the original licensors, to run, modify and
|
|
||||||
propagate that work, subject to this License. You are not responsible
|
|
||||||
for enforcing compliance by third parties with this License.
|
|
||||||
|
|
||||||
An "entity transaction" is a transaction transferring control of an
|
|
||||||
organization, or substantially all assets of one, or subdividing an
|
|
||||||
organization, or merging organizations. If propagation of a covered
|
|
||||||
work results from an entity transaction, each party to that
|
|
||||||
transaction who receives a copy of the work also receives whatever
|
|
||||||
licenses to the work the party's predecessor in interest had or could
|
|
||||||
give under the previous paragraph, plus a right to possession of the
|
|
||||||
Corresponding Source of the work from the predecessor in interest, if
|
|
||||||
the predecessor has it or can get it with reasonable efforts.
|
|
||||||
|
|
||||||
You may not impose any further restrictions on the exercise of the
|
|
||||||
rights granted or affirmed under this License. For example, you may
|
|
||||||
not impose a license fee, royalty, or other charge for exercise of
|
|
||||||
rights granted under this License, and you may not initiate litigation
|
|
||||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
|
||||||
any patent claim is infringed by making, using, selling, offering for
|
|
||||||
sale, or importing the Program or any portion of it.
|
|
||||||
|
|
||||||
11. Patents.
|
|
||||||
|
|
||||||
A "contributor" is a copyright holder who authorizes use under this
|
|
||||||
License of the Program or a work on which the Program is based. The
|
|
||||||
work thus licensed is called the contributor's "contributor version".
|
|
||||||
|
|
||||||
A contributor's "essential patent claims" are all patent claims
|
|
||||||
owned or controlled by the contributor, whether already acquired or
|
|
||||||
hereafter acquired, that would be infringed by some manner, permitted
|
|
||||||
by this License, of making, using, or selling its contributor version,
|
|
||||||
but do not include claims that would be infringed only as a
|
|
||||||
consequence of further modification of the contributor version. For
|
|
||||||
purposes of this definition, "control" includes the right to grant
|
|
||||||
patent sublicenses in a manner consistent with the requirements of
|
|
||||||
this License.
|
|
||||||
|
|
||||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
|
||||||
patent license under the contributor's essential patent claims, to
|
|
||||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
|
||||||
propagate the contents of its contributor version.
|
|
||||||
|
|
||||||
In the following three paragraphs, a "patent license" is any express
|
|
||||||
agreement or commitment, however denominated, not to enforce a patent
|
|
||||||
(such as an express permission to practice a patent or covenant not to
|
|
||||||
sue for patent infringement). To "grant" such a patent license to a
|
|
||||||
party means to make such an agreement or commitment not to enforce a
|
|
||||||
patent against the party.
|
|
||||||
|
|
||||||
If you convey a covered work, knowingly relying on a patent license,
|
|
||||||
and the Corresponding Source of the work is not available for anyone
|
|
||||||
to copy, free of charge and under the terms of this License, through a
|
|
||||||
publicly available network server or other readily accessible means,
|
|
||||||
then you must either (1) cause the Corresponding Source to be so
|
|
||||||
available, or (2) arrange to deprive yourself of the benefit of the
|
|
||||||
patent license for this particular work, or (3) arrange, in a manner
|
|
||||||
consistent with the requirements of this License, to extend the patent
|
|
||||||
license to downstream recipients. "Knowingly relying" means you have
|
|
||||||
actual knowledge that, but for the patent license, your conveying the
|
|
||||||
covered work in a country, or your recipient's use of the covered work
|
|
||||||
in a country, would infringe one or more identifiable patents in that
|
|
||||||
country that you have reason to believe are valid.
|
|
||||||
|
|
||||||
If, pursuant to or in connection with a single transaction or
|
|
||||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
|
||||||
covered work, and grant a patent license to some of the parties
|
|
||||||
receiving the covered work authorizing them to use, propagate, modify
|
|
||||||
or convey a specific copy of the covered work, then the patent license
|
|
||||||
you grant is automatically extended to all recipients of the covered
|
|
||||||
work and works based on it.
|
|
||||||
|
|
||||||
A patent license is "discriminatory" if it does not include within
|
|
||||||
the scope of its coverage, prohibits the exercise of, or is
|
|
||||||
conditioned on the non-exercise of one or more of the rights that are
|
|
||||||
specifically granted under this License. You may not convey a covered
|
|
||||||
work if you are a party to an arrangement with a third party that is
|
|
||||||
in the business of distributing software, under which you make payment
|
|
||||||
to the third party based on the extent of your activity of conveying
|
|
||||||
the work, and under which the third party grants, to any of the
|
|
||||||
parties who would receive the covered work from you, a discriminatory
|
|
||||||
patent license (a) in connection with copies of the covered work
|
|
||||||
conveyed by you (or copies made from those copies), or (b) primarily
|
|
||||||
for and in connection with specific products or compilations that
|
|
||||||
contain the covered work, unless you entered into that arrangement,
|
|
||||||
or that patent license was granted, prior to 28 March 2007.
|
|
||||||
|
|
||||||
Nothing in this License shall be construed as excluding or limiting
|
|
||||||
any implied license or other defenses to infringement that may
|
|
||||||
otherwise be available to you under applicable patent law.
|
|
||||||
|
|
||||||
12. No Surrender of Others' Freedom.
|
|
||||||
|
|
||||||
If conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot convey a
|
|
||||||
covered work so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you may
|
|
||||||
not convey it at all. For example, if you agree to terms that obligate you
|
|
||||||
to collect a royalty for further conveying from those to whom you convey
|
|
||||||
the Program, the only way you could satisfy both those terms and this
|
|
||||||
License would be to refrain entirely from conveying the Program.
|
|
||||||
|
|
||||||
13. Use with the GNU Affero General Public License.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, you have
|
|
||||||
permission to link or combine any covered work with a work licensed
|
|
||||||
under version 3 of the GNU Affero General Public License into a single
|
|
||||||
combined work, and to convey the resulting work. The terms of this
|
|
||||||
License will continue to apply to the part which is the covered work,
|
|
||||||
but the special requirements of the GNU Affero General Public License,
|
|
||||||
section 13, concerning interaction through a network will apply to the
|
|
||||||
combination as such.
|
|
||||||
|
|
||||||
14. Revised Versions of this License.
|
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions of
|
|
||||||
the GNU General Public License from time to time. Such new versions will
|
|
||||||
be similar in spirit to the present version, but may differ in detail to
|
|
||||||
address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the
|
|
||||||
Program specifies that a certain numbered version of the GNU General
|
|
||||||
Public License "or any later version" applies to it, you have the
|
|
||||||
option of following the terms and conditions either of that numbered
|
|
||||||
version or of any later version published by the Free Software
|
|
||||||
Foundation. If the Program does not specify a version number of the
|
|
||||||
GNU General Public License, you may choose any version ever published
|
|
||||||
by the Free Software Foundation.
|
|
||||||
|
|
||||||
If the Program specifies that a proxy can decide which future
|
|
||||||
versions of the GNU General Public License can be used, that proxy's
|
|
||||||
public statement of acceptance of a version permanently authorizes you
|
|
||||||
to choose that version for the Program.
|
|
||||||
|
|
||||||
Later license versions may give you additional or different
|
|
||||||
permissions. However, no additional obligations are imposed on any
|
|
||||||
author or copyright holder as a result of your choosing to follow a
|
|
||||||
later version.
|
|
||||||
|
|
||||||
15. Disclaimer of Warranty.
|
|
||||||
|
|
||||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
|
||||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
|
||||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
|
||||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
|
||||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
|
||||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
|
||||||
|
|
||||||
16. Limitation of Liability.
|
|
||||||
|
|
||||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
|
||||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
|
||||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
|
||||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
|
||||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
|
||||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
|
||||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
|
||||||
SUCH DAMAGES.
|
|
||||||
|
|
||||||
17. Interpretation of Sections 15 and 16.
|
|
||||||
|
|
||||||
If the disclaimer of warranty and limitation of liability provided
|
|
||||||
above cannot be given local legal effect according to their terms,
|
|
||||||
reviewing courts shall apply local law that most closely approximates
|
|
||||||
an absolute waiver of all civil liability in connection with the
|
|
||||||
Program, unless a warranty or assumption of liability accompanies a
|
|
||||||
copy of the Program in return for a fee.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
state the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
<one line to give the program's name and a brief idea of what it does.>
|
|
||||||
Copyright (C) <year> <name of author>
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If the program does terminal interaction, make it output a short
|
|
||||||
notice like this when it starts in an interactive mode:
|
|
||||||
|
|
||||||
<program> Copyright (C) <year> <name of author>
|
|
||||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
|
||||||
This is free software, and you are welcome to redistribute it
|
|
||||||
under certain conditions; type `show c' for details.
|
|
||||||
|
|
||||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
|
||||||
parts of the General Public License. Of course, your program's commands
|
|
||||||
might be different; for a GUI interface, you would use an "about box".
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or school,
|
|
||||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
|
||||||
For more information on this, and how to apply and follow the GNU GPL, see
|
|
||||||
<https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
The GNU General Public License does not permit incorporating your program
|
|
||||||
into proprietary programs. If your program is a subroutine library, you
|
|
||||||
may consider it more useful to permit linking proprietary applications with
|
|
||||||
the library. If this is what you want to do, use the GNU Lesser General
|
|
||||||
Public License instead of this License. But first, please read
|
|
||||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
|
||||||
@@ -1,158 +0,0 @@
|
|||||||
> [!IMPORTANT]
|
|
||||||
> This app is under heavy development currently.
|
|
||||||
|
|
||||||
<div align="center">
|
|
||||||
|
|
||||||
# WeekFocus
|
|
||||||
|
|
||||||
**One word. One week. One quality to grow.**
|
|
||||||
|
|
||||||
<a href="https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22de.schanbro.weekfocus%22%2C%22url%22%3A%22https%3A%2F%2Fgit.schamagusa.de%2FSchanbro%2FWeekFocus%22%2C%22author%22%3A%22Schanbro%22%2C%22name%22%3A%22WeekFocus%22%2C%22overrideSource%22%3A%22Codeberg%22%7D">
|
|
||||||
<img src="https://raw.githubusercontent.com/ImranR98/Obtainium/main/assets/graphics/badge_obtainium.png" alt="Get it on Obtainium" height="64">
|
|
||||||
</a>
|
|
||||||
|
|
||||||
[](https://git.schamagusa.de/Schanbro/WeekFocus/releases)
|
|
||||||
[](LICENSE)
|
|
||||||
<!--[](https://weblate.schamagusa.de/engage/weekfocus/)-->
|
|
||||||
|
|
||||||

|
|
||||||

|
|
||||||

|
|
||||||

|
|
||||||
|
|
||||||
<!--[](https://git.schamagusa.de/Schanbro/WeekFocus)
|
|
||||||
[](https://git.schamagusa.de/Schanbro/WeekFocus)-->
|
|
||||||
[](https://git.schamagusa.de/Schanbro/WeekFocus/issues)
|
|
||||||
[](https://git.schamagusa.de/Schanbro/WeekFocus)
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Table of Contents
|
|
||||||
|
|
||||||
- [About](#about)
|
|
||||||
- [How It Works](#how-it-works)
|
|
||||||
- [Features](#features)
|
|
||||||
- [Installation](#installation)
|
|
||||||
- [Building from Source](#building-from-source)
|
|
||||||
- [Releases](#releases)
|
|
||||||
- [Contributing](#contributing)
|
|
||||||
- [License](#license)
|
|
||||||
- [Translations](#translations)
|
|
||||||
|
|
||||||
## About
|
|
||||||
|
|
||||||
WeekFocus is a minimalist Android app built around a simple idea: personal growth works best in small, focused steps.
|
|
||||||
|
|
||||||
Each week, a single positive quality, such as *patience*, *gratitude* or *courage*, is displayed as one word on a home screen widget. Throughout the week, you consciously focus on living that quality. When the week ends, a new one takes its place.
|
|
||||||
|
|
||||||
No streaks, no pressure, no clutter. Just a gentle daily reminder of what you want to cultivate.
|
|
||||||
|
|
||||||
## How It Works
|
|
||||||
|
|
||||||
1. **Add the widget** to your home screen.
|
|
||||||
2. **See your quality of the week** every time you unlock your phone.
|
|
||||||
3. **Focus on it** in your daily life for seven days.
|
|
||||||
4. **Next week**, a new quality appears and the cycle continues.
|
|
||||||
|
|
||||||
## Features
|
|
||||||
|
|
||||||
- 🧩 Home screen widget showing your current quality of the week
|
|
||||||
- 🔄 Automatic weekly rotation to a new quality
|
|
||||||
- 🌙 Light and dark theme support
|
|
||||||
- 🔒 No ads, no tracking, no unnecessary permissions
|
|
||||||
- ⚡ Lightweight and battery-friendly
|
|
||||||
|
|
||||||
## Installation
|
|
||||||
|
|
||||||
### Recommended: Obtainium
|
|
||||||
|
|
||||||
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.
|
|
||||||
2. Tap the badge above.
|
|
||||||
3. Confirm and install the app.
|
|
||||||
|
|
||||||
Alternatively, tap **Add App** in Obtainium and paste this URL:
|
|
||||||
|
|
||||||
```
|
|
||||||
https://git.schamagusa.de/Schanbro/WeekFocus
|
|
||||||
```
|
|
||||||
|
|
||||||
### Manual APK Install
|
|
||||||
|
|
||||||
1. Open the [Releases](https://git.schamagusa.de/Schanbro/WeekFocus/releases) page.
|
|
||||||
2. Download the latest `.apk` file.
|
|
||||||
3. If prompted, allow installation from unknown sources, then install the APK.
|
|
||||||
|
|
||||||
## Building from Source
|
|
||||||
|
|
||||||
**Requirements**
|
|
||||||
|
|
||||||
- [Android Studio](https://developer.android.com/studio) (latest stable)
|
|
||||||
- JDK 17 or newer
|
|
||||||
- Android SDK platform 37 (`minSdk` 29, `targetSdk` 37)
|
|
||||||
|
|
||||||
**Steps**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git clone https://git.schamagusa.de/Schanbro/WeekFocus.git
|
|
||||||
cd WeekFocus
|
|
||||||
./gradlew assembleDebug
|
|
||||||
```
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
- 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
|
|
||||||
|
|
||||||
Contributions are welcome!
|
|
||||||
|
|
||||||
1. Fork the repository
|
|
||||||
2. Create a feature branch: `git checkout -b feature/my-feature`
|
|
||||||
3. Commit your changes: `git commit -m "Describe your change"`
|
|
||||||
4. Push the branch: `git push origin feature/my-feature`
|
|
||||||
5. Open a merge request
|
|
||||||
|
|
||||||
Found a bug or have an idea? Please open an [issue](https://git.schamagusa.de/Schanbro/WeekFocus/issues).
|
|
||||||
|
|
||||||
## License
|
|
||||||
|
|
||||||
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.
|
|
||||||
|
|
||||||
## Translations
|
|
||||||
|
|
||||||
WeekFocus is translated via [Weblate](https://weblate.schamagusa.de/engage/weekfocus/).
|
|
||||||
Help translate the app into your language!
|
|
||||||
|
|
||||||
[](https://weblate.schamagusa.de/engage/weekfocus/)
|
|
||||||
+12
-52
@@ -3,82 +3,45 @@ plugins {
|
|||||||
alias(libs.plugins.kotlin.compose)
|
alias(libs.plugins.kotlin.compose)
|
||||||
}
|
}
|
||||||
|
|
||||||
val tagVersion = (project.findProperty("versionNameOverride") as String?) ?: "0.0.0-dev"
|
|
||||||
|
|
||||||
val core = tagVersion
|
|
||||||
.removePrefix("v")
|
|
||||||
.substringBefore("-")
|
|
||||||
val parts = core.split(".").map { it.toIntOrNull() ?: 0 }
|
|
||||||
val major = parts.getOrElse(0) { 0 }
|
|
||||||
val minor = parts.getOrElse(1) { 0 }
|
|
||||||
val patch = parts.getOrElse(2) { 0 }
|
|
||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = "de.schanbro.weekfocus"
|
namespace = "de.schanbro.weekfocus"
|
||||||
compileSdk = 37
|
compileSdk {
|
||||||
|
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).coerceAtLeast(1)
|
versionCode = 1
|
||||||
versionName = tagVersion
|
versionName = "1.0"
|
||||||
|
|
||||||
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 {
|
|
||||||
create("release") {
|
|
||||||
val ksPath = System.getenv("KEYSTORE_PATH")
|
|
||||||
if (ksPath != null) {
|
|
||||||
storeFile = file(ksPath)
|
|
||||||
storePassword = System.getenv("KEYSTORE_PASSWORD")
|
|
||||||
keyAlias = System.getenv("KEY_ALIAS")
|
|
||||||
keyPassword = System.getenv("KEY_PASSWORD")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
debug {
|
|
||||||
applicationIdSuffix = ".debug"
|
|
||||||
versionNameSuffix = "-dev"
|
|
||||||
}
|
|
||||||
release {
|
release {
|
||||||
signingConfig = signingConfigs.getByName("release")
|
|
||||||
optimization {
|
optimization {
|
||||||
enable = true
|
enable = false
|
||||||
}
|
}
|
||||||
isShrinkResources = true
|
|
||||||
proguardFiles(
|
|
||||||
getDefaultProguardFile("proguard-android-optimize.txt"),
|
|
||||||
"proguard-rules.pro"
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility = JavaVersion.VERSION_11
|
sourceCompatibility = JavaVersion.VERSION_25
|
||||||
targetCompatibility = JavaVersion.VERSION_11
|
targetCompatibility = JavaVersion.VERSION_25
|
||||||
}
|
}
|
||||||
buildFeatures {
|
buildFeatures {
|
||||||
compose = true
|
compose = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
kotlin {
|
||||||
|
jvmToolchain(25)
|
||||||
|
}
|
||||||
|
|
||||||
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)
|
||||||
@@ -92,7 +55,4 @@ 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")
|
|
||||||
}
|
}
|
||||||
Vendored
-6
@@ -1,6 +0,0 @@
|
|||||||
# 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
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<string name="app_name" translatable="false">WeekFocus-dev</string>
|
|
||||||
</resources>
|
|
||||||
@@ -1,12 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-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" />
|
|
||||||
|
|
||||||
<!-- 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"
|
||||||
@@ -21,7 +15,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.Splash"
|
android:theme="@style/Theme.WeekFocus"
|
||||||
android:windowSoftInputMode="adjustResize">
|
android:windowSoftInputMode="adjustResize">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
@@ -29,29 +23,6 @@
|
|||||||
<category android:name="android.intent.category.LAUNCHER" />
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
<receiver
|
|
||||||
android:name=".SimpleWidget"
|
|
||||||
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"
|
|
||||||
android:resource="@xml/widget_info" />
|
|
||||||
</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>
|
||||||
@@ -1,152 +1,47 @@
|
|||||||
package de.schanbro.weekfocus
|
package de.schanbro.weekfocus
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import android.os.Bundle
|
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.layout.*
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.material.icons.filled.Home
|
import androidx.compose.material3.Scaffold
|
||||||
import androidx.compose.material.icons.filled.List
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.material.icons.filled.Settings
|
import androidx.compose.runtime.Composable
|
||||||
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.Modifier
|
||||||
import androidx.compose.ui.input.nestedscroll.nestedScroll
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
import androidx.compose.ui.res.stringResource
|
|
||||||
import de.schanbro.weekfocus.ui.theme.WeekFocusTheme
|
import de.schanbro.weekfocus.ui.theme.WeekFocusTheme
|
||||||
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
|
|
||||||
import de.schanbro.weekfocus.screens.WordListScreen
|
|
||||||
import de.schanbro.weekfocus.update.NetworkPermissionGate
|
|
||||||
import de.schanbro.weekfocus.update.UpdateHandler
|
|
||||||
|
|
||||||
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 {
|
WeekFocusTheme {
|
||||||
MainScreen()
|
Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
|
||||||
NetworkPermissionGate {
|
Greeting(
|
||||||
UpdateHandler()
|
name = "Android",
|
||||||
}
|
modifier = Modifier.padding(innerPadding)
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
@Composable
|
||||||
fun PlaceholderScreen(title: String) {
|
fun Greeting(name: String, modifier: Modifier = Modifier) {
|
||||||
Box(
|
|
||||||
modifier = Modifier.fillMaxSize(),
|
|
||||||
contentAlignment = Alignment.Center
|
|
||||||
) {
|
|
||||||
Text(
|
Text(
|
||||||
text = title,
|
text = "Hello $name!",
|
||||||
style = MaterialTheme.typography.headlineMedium,
|
modifier = modifier
|
||||||
color = MaterialTheme.colorScheme.onSurfaceVariant
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
@Preview(showBackground = true)
|
||||||
* Bleibt als Top-Level-Funktion erhalten, damit WordListScreen unverändert weiter funktioniert.
|
@Composable
|
||||||
*/
|
fun GreetingPreview() {
|
||||||
fun updateWidget(context: Context) {
|
WeekFocusTheme {
|
||||||
SimpleWidget.updateAllWidgets(context)
|
Greeting("Android")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,178 +0,0 @@
|
|||||||
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 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,
|
|
||||||
appWidgetIds: IntArray
|
|
||||||
) {
|
|
||||||
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
|
|
||||||
) {
|
|
||||||
val displayText = resolveWordOfWeek(context)
|
|
||||||
?: context.getString(R.string.msg_no_words)
|
|
||||||
|
|
||||||
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
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,328 +0,0 @@
|
|||||||
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,77 +0,0 @@
|
|||||||
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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,82 +0,0 @@
|
|||||||
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)
|
|
||||||
}
|
|
||||||
@@ -1,71 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
data class ReleaseInfo(
|
|
||||||
val version: String,
|
|
||||||
val notes: String,
|
|
||||||
val apkUrl: String
|
|
||||||
)
|
|
||||||
|
|
||||||
object UpdateChecker {
|
|
||||||
|
|
||||||
private const val LATEST_RELEASE_URL =
|
|
||||||
"https://git.schamagusa.de/api/v1/repos/robin/WeekFocus/releases/latest"
|
|
||||||
|
|
||||||
/** Liefert das neueste stabile Release oder null (bei Fehler / ohne APK). */
|
|
||||||
suspend fun fetchLatestRelease(): ReleaseInfo? = withContext(Dispatchers.IO) {
|
|
||||||
try {
|
|
||||||
val conn = URL(LATEST_RELEASE_URL).openConnection() as HttpURLConnection
|
|
||||||
conn.connectTimeout = 10_000
|
|
||||||
conn.readTimeout = 10_000
|
|
||||||
conn.setRequestProperty("Accept", "application/json")
|
|
||||||
try {
|
|
||||||
if (conn.responseCode != HttpURLConnection.HTTP_OK) return@withContext null
|
|
||||||
|
|
||||||
val json = JSONObject(conn.inputStream.bufferedReader().use { it.readText() })
|
|
||||||
val assets = json.getJSONArray("assets")
|
|
||||||
val apk = (0 until assets.length())
|
|
||||||
.map { assets.getJSONObject(it) }
|
|
||||||
.firstOrNull { it.getString("name").endsWith(".apk", ignoreCase = true) }
|
|
||||||
?: return@withContext null
|
|
||||||
|
|
||||||
ReleaseInfo(
|
|
||||||
version = json.getString("tag_name"),
|
|
||||||
notes = json.optString("body", ""),
|
|
||||||
apkUrl = apk.getString("browser_download_url")
|
|
||||||
)
|
|
||||||
} finally {
|
|
||||||
conn.disconnect()
|
|
||||||
}
|
|
||||||
} catch (e: Exception) {
|
|
||||||
null // Netzwerk- oder Parse-Fehler: still ignorieren
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@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 }
|
|
||||||
}
|
|
||||||
@@ -1,121 +0,0 @@
|
|||||||
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 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 scope = rememberCoroutineScope()
|
|
||||||
val prefs = remember {
|
|
||||||
context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE)
|
|
||||||
}
|
|
||||||
|
|
||||||
var release by remember { mutableStateOf<ReleaseInfo?>(null) }
|
|
||||||
var progress by remember { mutableStateOf<Float?>(null) } // null = kein Download
|
|
||||||
var downloadJob by remember { mutableStateOf<Job?>(null) }
|
|
||||||
|
|
||||||
// Einmal pro Start, höchstens alle 24 Stunden
|
|
||||||
LaunchedEffect(Unit) {
|
|
||||||
val now = System.currentTimeMillis()
|
|
||||||
if (now - prefs.getLong("last_update_check", 0L) < CHECK_INTERVAL_MS) return@LaunchedEffect
|
|
||||||
|
|
||||||
val latest = UpdateChecker.fetchLatestRelease() ?: return@LaunchedEffect
|
|
||||||
prefs.edit().putLong("last_update_check", now).apply()
|
|
||||||
|
|
||||||
if (UpdateChecker.isNewer(latest.version, UpdateChecker.currentVersion(context))) {
|
|
||||||
release = latest
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
release?.let { info ->
|
|
||||||
val downloading = progress != null
|
|
||||||
|
|
||||||
AlertDialog(
|
|
||||||
onDismissRequest = { if (!downloading) release = null },
|
|
||||||
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
|
|
||||||
release = null
|
|
||||||
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
|
|
||||||
release = null
|
|
||||||
}
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
stringResource(
|
|
||||||
if (downloading) R.string.action_cancel else R.string.update_later
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:shape="rectangle">
|
|
||||||
<corners android:radius="28dp" />
|
|
||||||
<solid android:color="?android:attr/colorBackgroundFloating" />
|
|
||||||
</shape>
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:theme="@android:style/Theme.DeviceDefault.DayNight"
|
|
||||||
android:background="@drawable/widget_background"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:padding="16dp"
|
|
||||||
android:gravity="center">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/title_weekly_focus"
|
|
||||||
android:textSize="11sp"
|
|
||||||
android:letterSpacing="0.1"
|
|
||||||
android:textColor="?android:attr/textColorSecondary"
|
|
||||||
android:textStyle="bold" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/appwidget_text"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:gravity="center"
|
|
||||||
android:text="@string/msg_no_words"
|
|
||||||
android:textColor="?android:attr/textColorPrimary"
|
|
||||||
android:textSize="22sp"
|
|
||||||
android:textStyle="bold" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<string name="hint_new_word">Enter new word</string>
|
|
||||||
<string name="hint_add_word">Add word</string>
|
|
||||||
<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>
|
|
||||||
</resources>
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<color name="splash_background">#121212</color>
|
|
||||||
</resources>
|
|
||||||
@@ -7,5 +7,4 @@
|
|||||||
<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>
|
||||||
@@ -1,36 +1,3 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
<resources>
|
||||||
<string name="app_name" translatable="false">WeekFocus</string>
|
<string name="app_name">WeekFocus</string>
|
||||||
<string name="hint_new_word">Neues Wort eingeben</string>
|
|
||||||
<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>
|
|
||||||
|
|
||||||
<!-- 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>
|
|
||||||
</resources>
|
</resources>
|
||||||
@@ -1,9 +1,5 @@
|
|||||||
<?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>
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<paths>
|
|
||||||
<cache-path name="updates" path="updates/" />
|
|
||||||
</paths>
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:minWidth="130dp"
|
|
||||||
android:minHeight="80dp"
|
|
||||||
android:updatePeriodMillis="86400000"
|
|
||||||
android:initialLayout="@layout/widget_main"
|
|
||||||
android:resizeMode="horizontal|vertical"
|
|
||||||
android:widgetCategory="home_screen"
|
|
||||||
android:targetCellWidth="2"
|
|
||||||
android:targetCellHeight="1">
|
|
||||||
</appwidget-provider>
|
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
#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
|
||||||
@@ -1,14 +1,13 @@
|
|||||||
[versions]
|
[versions]
|
||||||
agp = "9.4.1"
|
agp = "9.4.0"
|
||||||
coreKtx = "1.19.1"
|
coreKtx = "1.10.1"
|
||||||
junit = "4.13.2"
|
junit = "4.13.2"
|
||||||
junitVersion = "1.3.0"
|
junitVersion = "1.1.5"
|
||||||
espressoCore = "3.7.0"
|
espressoCore = "3.5.1"
|
||||||
lifecycleRuntimeKtx = "2.11.0"
|
lifecycleRuntimeKtx = "2.6.1"
|
||||||
activityCompose = "1.13.0"
|
activityCompose = "1.8.0"
|
||||||
kotlin = "2.4.20"
|
kotlin = "2.2.10"
|
||||||
composeBom = "2026.09.00"
|
composeBom = "2026.02.01"
|
||||||
animation = "1.12.1"
|
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
|
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
|
||||||
@@ -25,8 +24,6 @@ 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" }
|
||||||
|
|||||||
Vendored
BIN
Binary file not shown.
+3
-3
@@ -1,9 +1,9 @@
|
|||||||
|
#Fri Sep 18 14:50:25 CEST 2026
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
|
distributionSha256Sum=bbaeb2fef8710818cf0e261201dab964c572f92b942812df0c3620d62a529a01
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
retries=0
|
|
||||||
retryBackOffMs=500
|
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
# gradlew start up script for POSIX generated by Gradle.
|
# Gradle start up script for POSIX generated by Gradle.
|
||||||
#
|
#
|
||||||
# Important for running:
|
# Important for running:
|
||||||
#
|
#
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
# bash, then to run this script, type that shell name before the whole
|
# bash, then to run this script, type that shell name before the whole
|
||||||
# command line, like:
|
# command line, like:
|
||||||
#
|
#
|
||||||
# ksh gradlew
|
# ksh Gradle
|
||||||
#
|
#
|
||||||
# Busybox and similar reduced shells will NOT work, because this script
|
# Busybox and similar reduced shells will NOT work, because this script
|
||||||
# requires all of these POSIX shell features:
|
# requires all of these POSIX shell features:
|
||||||
@@ -57,7 +57,7 @@
|
|||||||
# Darwin, MinGW, and NonStop.
|
# Darwin, MinGW, and NonStop.
|
||||||
#
|
#
|
||||||
# (3) This script is generated from the Groovy template
|
# (3) This script is generated from the Groovy template
|
||||||
# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
# within the Gradle project.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
@@ -114,6 +114,7 @@ case "$( uname )" in #(
|
|||||||
NONSTOP* ) nonstop=true ;;
|
NONSTOP* ) nonstop=true ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
CLASSPATH="\\\"\\\""
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
# Determine the Java command to use to start the JVM.
|
||||||
@@ -171,6 +172,7 @@ fi
|
|||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||||
if "$cygwin" || "$msys" ; then
|
if "$cygwin" || "$msys" ; then
|
||||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||||
|
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||||
|
|
||||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||||
|
|
||||||
@@ -210,6 +212,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|||||||
|
|
||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
|
-classpath "$CLASSPATH" \
|
||||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||||
"$@"
|
"$@"
|
||||||
|
|
||||||
|
|||||||
Vendored
+24
-12
@@ -19,12 +19,12 @@
|
|||||||
@if "%DEBUG%"=="" @echo off
|
@if "%DEBUG%"=="" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
@rem
|
@rem
|
||||||
@rem gradlew startup script for Windows
|
@rem Gradle startup script for Windows
|
||||||
@rem
|
@rem
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
|
|
||||||
@rem Set local scope for the variables, and ensure extensions are enabled
|
@rem Set local scope for the variables with windows NT shell
|
||||||
setlocal EnableExtensions
|
if "%OS%"=="Windows_NT" setlocal
|
||||||
|
|
||||||
set DIRNAME=%~dp0
|
set DIRNAME=%~dp0
|
||||||
if "%DIRNAME%"=="" set DIRNAME=.
|
if "%DIRNAME%"=="" set DIRNAME=.
|
||||||
@@ -51,7 +51,7 @@ echo. 1>&2
|
|||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation. 1>&2
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
"%COMSPEC%" /c exit 1
|
goto fail
|
||||||
|
|
||||||
:findJavaFromJavaHome
|
:findJavaFromJavaHome
|
||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
@@ -65,18 +65,30 @@ echo. 1>&2
|
|||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation. 1>&2
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
"%COMSPEC%" /c exit 1
|
goto fail
|
||||||
|
|
||||||
:execute
|
:execute
|
||||||
@rem Setup the command line
|
@rem Setup the command line
|
||||||
|
|
||||||
|
set CLASSPATH=
|
||||||
|
|
||||||
|
|
||||||
@rem Execute gradlew
|
@rem Execute Gradle
|
||||||
@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||||
@rem which allows us to clear the local environment before executing the java command
|
|
||||||
endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
|
|
||||||
|
|
||||||
:exitWithErrorLevel
|
:end
|
||||||
@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
|
@rem End local scope for the variables with windows NT shell
|
||||||
"%COMSPEC%" /c exit %ERRORLEVEL%
|
if %ERRORLEVEL% equ 0 goto mainEnd
|
||||||
|
|
||||||
|
:fail
|
||||||
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||||
|
rem the _cmd.exe /c_ return code!
|
||||||
|
set EXIT_CODE=%ERRORLEVEL%
|
||||||
|
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
||||||
|
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
||||||
|
exit /b %EXIT_CODE%
|
||||||
|
|
||||||
|
:mainEnd
|
||||||
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
|
||||||
|
:omega
|
||||||
Reference in new issue
Block a user