From 5fbf46211004ff78ef6cfd2b4373f251706b7c39 Mon Sep 17 00:00:00 2001
From: udenr <98773052+udenr@users.noreply.github.com>
Date: Thu, 23 Nov 2023 11:37:47 +0100
Subject: [PATCH 01/30] Update README.md
---
README.md | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index d8077ee..d83e040 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,17 @@
+[][PFA]
+[][Twitter]
+[][Mastodon]
+
+[PFA]: https://secuso.org/pfa
+[Mastodon]: https://xn--baw-joa.social/@SECUSO_Research
+[Twitter]: https://twitter.com/SECUSOResearch
+
+
+
## Aktivpause
The Aktivpause to Go App allows you to integrate planned breaks into your daily work. You can decide when, where and for how long you want to take breaks and this app will help shape your break in a healthy way. It offers a wide variety of exercises from the well-established Aktivpause program at KIT and was developed by Scientists at the Institute of Sports and Sports Science (IfSS) of KIT. Exercises are currently only provided in german.
@@ -43,8 +57,6 @@ App Icon:
Exercise Icons:
- KIT - Institut für Sport und Sportwissenschaft
-Authors (Github-Users):
-- Christopher Beckmann (Kamuno)
-- Jonathan Diener
-- (Badric)
-- (Lechendary)
+
+
+
From cbb03cca452b95d0975fd1bfd23e79b5347e4784 Mon Sep 17 00:00:00 2001
From: jahway603 <64485701+jahway603@users.noreply.github.com>
Date: Fri, 8 Dec 2023 17:22:28 -0500
Subject: [PATCH 02/30] documentation: Added info re: Privacy Friendly Backup
documentation: Added info re: Privacy Friendly Backup
---
README.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/README.md b/README.md
index d83e040..8aeb834 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,10 @@ Further development requires Android Studio, we recommend to use the latest vers
Mininum SDK: 21
Target SDK: 28
+## Application Data Backup
+
+This application does not natively have a data backup feature. Please install and use the [SECUSO Privacy Friendly Backup](https://github.com/SecUSo/privacy-friendly-backup) to backup and restore this application's data. This feature is required when a user migrates their data to a new phone.
+
## License
Aktivpause is licensed under the GPLv3.
From cab0ebf2b5e59d9a239b6f5b232055fa32622ef3 Mon Sep 17 00:00:00 2001
From: jahway603 <64485701+jahway603@users.noreply.github.com>
Date: Tue, 16 Jan 2024 22:09:44 -0500
Subject: [PATCH 03/30] documentation: Added updated info re: Privacy Friendly
Backup
documentation: Added updated info re: Privacy Friendly Backup
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 8aeb834..2695271 100644
--- a/README.md
+++ b/README.md
@@ -29,9 +29,9 @@ Further development requires Android Studio, we recommend to use the latest vers
Mininum SDK: 21
Target SDK: 28
-## Application Data Backup
+## Data Backup
-This application does not natively have a data backup feature. Please install and use the [SECUSO Privacy Friendly Backup](https://github.com/SecUSo/privacy-friendly-backup) to backup and restore this application's data. This feature is required when a user migrates their data to a new phone.
+You can use the [Privacy Friendly Backup app](https://github.com/SecUSo/privacy-friendly-backup) to backup and restore this application's data. This can also be used to migrate your data to a new phone.
## License
From 10faa51902f8c59daf8b696754538ae0ecc9016a Mon Sep 17 00:00:00 2001
From: Patrick Schneider
Date: Mon, 19 Feb 2024 13:53:34 +0100
Subject: [PATCH 04/30] Added SECUSO links to fastlane
---
.../metadata/android/de-DE/long_description.txt | 13 ++++++-------
.../metadata/android/en-US/long_description.txt | 11 ++++-------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/fastlane/metadata/android/de-DE/long_description.txt b/fastlane/metadata/android/de-DE/long_description.txt
index f0a9c58..c313f6e 100644
--- a/fastlane/metadata/android/de-DE/long_description.txt
+++ b/fastlane/metadata/android/de-DE/long_description.txt
@@ -1,7 +1,6 @@
-Die Aktivpause-App ermöglicht es Ihnen, selbstständig Bewegungspausen durchzuführen und so ganz individuell eine gezielte Auszeit in Ihren Arbeitsalltag zu integrieren. Wann, wo und wie lange Sie aktive Pausen machen, können Sie somit für sich persönlich entscheiden. Das breite Übungsspektrum stammt aus dem etablierten Aktivpause-Programm am KIT und wurde von Wissenschaftler*innen am Institut für Sport und Sportwissenschaft des KIT zusammengestellt.
-Folgende Features bietet die Aktivpause-App:
-1. Auswahl und Erstellung von Übungssets: Aus den vorhandenen Übungen lassen sich individuelle Übungssets zusammenstellen, die für die Pausen ausgewählt werden können. Es stehen auch vordefinierte Übungssets zur Verfügung, die Ihnen den Start erleichtern.
-2. Das Übungsspektrum reicht von Übungen zur Aktivierung des Herz-Kreislauf-Systems über Dehnungs- und Kräftigungs- bis hin zu Entspannungsübungen.
-3. Mit der Filterfunktion können Sie gezielt Übungen nach Körperregion auswählen und etwaige Beschwerden vorbeugen.
-4. Pausen-Timer: Über das Hauptmenü lässt sich festlegen, wann und wie lange Sie Ihre Aktivpause durchführen möchten. Sobald es an der Zeit ist, bekommen Sie eine Benachrichtigung. Sie haben dann die Möglichkeit, die Aktivpause zu starten oder zu verschieben.
-5. Integrieren Sie die Aktivpause in Ihren Alltag: Sie können mit einem selbst bestimmten Zeitplan festlegen, um wie viel Uhr und an welchem Tag Sie automatisch an die Pause erinnert werden.
+
+
+Kontaktieren Sie uns gerne ber:
+Twitter - @SECUSOResearch https://twitter.com/secusoresearc)
+Mastodon - @SECUSO_Research@baw .social https://xn--baw-joa.social/@SECUSO_Research/
+Offene Stellen - https://secuso.aifb.kit.edu/83_1557.php
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/long_description.txt b/fastlane/metadata/android/en-US/long_description.txt
index 3620c50..8c38e44 100644
--- a/fastlane/metadata/android/en-US/long_description.txt
+++ b/fastlane/metadata/android/en-US/long_description.txt
@@ -1,8 +1,5 @@
-The Aktivpause to Go App allows you to integrate planned breaks into your daily work. You can decide when, where and for how long you want to take breaks and this app will help shape your break in a healthy way. It offers a wide variety of exercises from the well-established Aktivpause program at KIT and was developed by Scientists at the Institute of Sports and Sports Science (IfSS) of KIT. Exercises are currently only provided in german.
-The following features are provided by the app:
-1. Creation and Choice of exercise sets: Individual exercise sets can be created. This makes it easier to complete your favorite exercises faster. The exercise sets can then be chosen to perform during breaks. There are also predefined exercise sets to ease the start into the app.
-2. There are a wide variety of exercises: Exercises to activate the cardiovascular system, stretching, strength, and relaxation exercises.
-3. The filter feature lets you easily choose exercises for specific body regions that may help you prevent potential complaints.
-4. Pause timer: You can choose work and break intervals via the main menu. After the work time is up you will be reminded to take a break. You then are able to start, skip, or postpone the break.
-5. Integrate the Aktivpause break into your daily routine. You can schedule breaks to start at specific times and days, so you don’t have to think about starting the timer manually to be reminded to take breaks.
\ No newline at end of file
+
+Twitter - @SECUSOResearch https://twitter.com/secusoresearch
+Mastodon - @SECUSO_Research@baw .social https://xn--baw-joa.social/@SECUSO_Research/
+Job opening - https://secuso.aifb.kit.edu/english/Job_Offers_1557.php
\ No newline at end of file
From d0e0755bf64118a4c94137f3b706e624b1ae611c Mon Sep 17 00:00:00 2001
From: Patrick Schneider
Date: Mon, 19 Feb 2024 14:42:59 +0100
Subject: [PATCH 05/30] Updated copyright
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 2695271..0658ef2 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ 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 .
-The app uses icons from [Google Design Material Icons](https://design.google.com/icons/index.html) licensed under Apache License Version 2.0. All other images (the logo of Privacy Friendly Apps, the SECUSO logo, the App icon and the exercise Images) copyright [Karlsruhe Institute of Technology (KIT)](https://www.kit.edu) (2019).
+The app uses icons from [Google Design Material Icons](https://design.google.com/icons/index.html) licensed under Apache License Version 2.0. All other images (the logo of Privacy Friendly Apps, the SECUSO logo, the App icon and the exercise Images) copyright [SECUSO](www.secuso.org) (2019).
## Contributors
From b8e2755acbd0b41d9c3a115817d5dfff8105fb42 Mon Sep 17 00:00:00 2001
From: Patrick Schneider
Date: Tue, 20 Feb 2024 10:47:55 +0100
Subject: [PATCH 06/30] Updates fastlane info to match copyright
---
fastlane/metadata/android/de-DE/long_description.txt | 6 ++++++
fastlane/metadata/android/en-US/long_description.txt | 7 ++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/fastlane/metadata/android/de-DE/long_description.txt b/fastlane/metadata/android/de-DE/long_description.txt
index f0a9c58..4fc8fec 100644
--- a/fastlane/metadata/android/de-DE/long_description.txt
+++ b/fastlane/metadata/android/de-DE/long_description.txt
@@ -5,3 +5,9 @@ Folgende Features bietet die Aktivpause-App:
3. Mit der Filterfunktion können Sie gezielt Übungen nach Körperregion auswählen und etwaige Beschwerden vorbeugen.
4. Pausen-Timer: Über das Hauptmenü lässt sich festlegen, wann und wie lange Sie Ihre Aktivpause durchführen möchten. Sobald es an der Zeit ist, bekommen Sie eine Benachrichtigung. Sie haben dann die Möglichkeit, die Aktivpause zu starten oder zu verschieben.
5. Integrieren Sie die Aktivpause in Ihren Alltag: Sie können mit einem selbst bestimmten Zeitplan festlegen, um wie viel Uhr und an welchem Tag Sie automatisch an die Pause erinnert werden.
+
+
+Kontaktieren Sie uns gerne über:
+Twitter - @SECUSOResearch https://twitter.com/secusoresearc)
+Mastodon - @SECUSO_Research@bawü.social https://xn--baw-joa.social/@SECUSO_Research/
+Offene Stellen - https://secuso.aifb.kit.edu/83_1557.php
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/long_description.txt b/fastlane/metadata/android/en-US/long_description.txt
index 3620c50..3b46081 100644
--- a/fastlane/metadata/android/en-US/long_description.txt
+++ b/fastlane/metadata/android/en-US/long_description.txt
@@ -5,4 +5,9 @@ The following features are provided by the app:
2. There are a wide variety of exercises: Exercises to activate the cardiovascular system, stretching, strength, and relaxation exercises.
3. The filter feature lets you easily choose exercises for specific body regions that may help you prevent potential complaints.
4. Pause timer: You can choose work and break intervals via the main menu. After the work time is up you will be reminded to take a break. You then are able to start, skip, or postpone the break.
-5. Integrate the Aktivpause break into your daily routine. You can schedule breaks to start at specific times and days, so you don’t have to think about starting the timer manually to be reminded to take breaks.
\ No newline at end of file
+5. Integrate the Aktivpause break into your daily routine. You can schedule breaks to start at specific times and days, so you don’t have to think about starting the timer manually to be reminded to take breaks.
+
+Feel free to contact us via:
+Twitter - @SECUSOResearch https://twitter.com/secusoresearch
+Mastodon - @SECUSO_Research@bawü.social https://xn--baw-joa.social/@SECUSO_Research/
+Job opening - https://secuso.aifb.kit.edu/english/Job_Offers_1557.php
\ No newline at end of file
From 3b50f0fd091130d014f9ec42f898aa14165b8fef Mon Sep 17 00:00:00 2001
From: coderPaddyS <48881352+coderPaddyS@users.noreply.github.com>
Date: Mon, 11 Mar 2024 23:04:14 +0100
Subject: [PATCH 07/30] Update long_description.txt
Readds fastlane desc
---
fastlane/metadata/android/en-US/long_description.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fastlane/metadata/android/en-US/long_description.txt b/fastlane/metadata/android/en-US/long_description.txt
index 166c9aa..3dbcc0a 100644
--- a/fastlane/metadata/android/en-US/long_description.txt
+++ b/fastlane/metadata/android/en-US/long_description.txt
@@ -1,3 +1,4 @@
+The Aktivpause to Go App allows you to integrate planned breaks into your daily work. You can decide when, where and for how long you want to take breaks and this app will help shape your break in a healthy way. It offers a wide variety of exercises from the well-established Aktivpause program at KIT and was developed by Scientists at the Institute of Sports and Sports Science (IfSS) of KIT. Exercises are currently only provided in german.
The following features are provided by the app:
1. Creation and Choice of exercise sets: Individual exercise sets can be created. This makes it easier to complete your favorite exercises faster. The exercise sets can then be chosen to perform during breaks. There are also predefined exercise sets to ease the start into the app.
@@ -9,4 +10,4 @@ The following features are provided by the app:
Feel free to contact us via:
Twitter - @SECUSOResearch https://twitter.com/secusoresearch
Mastodon - @SECUSO_Research@bawü.social https://xn--baw-joa.social/@SECUSO_Research/
-Job opening - https://secuso.aifb.kit.edu/english/Job_Offers_1557.php
\ No newline at end of file
+Job opening - https://secuso.aifb.kit.edu/english/Job_Offers_1557.php
From cad3cbedb8244e62ad62e4bde43c72c6cddb7c10 Mon Sep 17 00:00:00 2001
From: coderPaddyS
Date: Fri, 15 Nov 2024 09:54:46 +0100
Subject: [PATCH 08/30] [fix] migrates from jcenter to maven central.
---
app/build.gradle | 2 +-
build.gradle | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index af10d90..96b69ef 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -49,7 +49,7 @@ dependencies {
implementation 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.1'
testImplementation 'junit:junit:4.12'
// https://github.com/ShawnLin013/NumberPicker
- implementation 'com.shawnlin:number-picker:2.4.4'
+ implementation 'io.github.ShawnLin013:number-picker:2.4.13'
// Backup
implementation project(path: ':backup-api')
diff --git a/build.gradle b/build.gradle
index 5905cb1..bce7a4c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
buildscript {
repositories {
- jcenter()
+ mavenCentral()
maven {
url 'https://maven.google.com/'
name 'Google'
@@ -22,7 +22,7 @@ buildscript {
allprojects {
repositories {
- jcenter()
+ mavenCentral()
google()
}
}
From 4676c9c1bb97039ad319f2f179adcdf2c7b72609 Mon Sep 17 00:00:00 2001
From: coderPaddyS
Date: Fri, 15 Nov 2024 10:05:01 +0100
Subject: [PATCH 09/30] [chore] updates java version and updates backup api.
---
app/build.gradle | 4 ++--
libs/privacy-friendly-backup-api | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 96b69ef..a0c17d8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,8 +20,8 @@ android {
}
}
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
+ sourceCompatibility JavaVersion.VERSION_17
+ targetCompatibility JavaVersion.VERSION_17
}
namespace 'org.secuso.aktivpause'
lint {
diff --git a/libs/privacy-friendly-backup-api b/libs/privacy-friendly-backup-api
index d9e4a62..14ee29f 160000
--- a/libs/privacy-friendly-backup-api
+++ b/libs/privacy-friendly-backup-api
@@ -1 +1 @@
-Subproject commit d9e4a62a7c667de2538681c39394c828f8d26a37
+Subproject commit 14ee29f59bc7c3fbaa765cb1be0fcaab4f948b88
From 4686b377bee8bcd2cc7fcdfeb9b54d69ad913f9e Mon Sep 17 00:00:00 2001
From: coderPaddyS
Date: Fri, 15 Nov 2024 10:18:55 +0100
Subject: [PATCH 10/30] [update] updates target sdk to 34. Updates AGP and
gradlew.
---
app/build.gradle | 6 +++---
app/src/main/java/org/secuso/aktivpause/PFAktivpause.kt | 4 ++--
build.gradle | 2 +-
gradle.properties | 3 +++
gradle/wrapper/gradle-wrapper.properties | 2 +-
5 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index a0c17d8..c0bec61 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,14 +3,14 @@ apply plugin: 'kotlin-android'
android {
- compileSdkVersion 33
+ compileSdkVersion 34
defaultConfig {
applicationId "org.secuso.aktivpause"
minSdkVersion 21
- targetSdkVersion 33
+ targetSdkVersion 34
versionCode 10
- versionName "1.2.0"
+ versionName "1.2.1"
vectorDrawables.useSupportLibrary = true
}
buildTypes {
diff --git a/app/src/main/java/org/secuso/aktivpause/PFAktivpause.kt b/app/src/main/java/org/secuso/aktivpause/PFAktivpause.kt
index 05b7dd9..28e489a 100644
--- a/app/src/main/java/org/secuso/aktivpause/PFAktivpause.kt
+++ b/app/src/main/java/org/secuso/aktivpause/PFAktivpause.kt
@@ -15,7 +15,7 @@ class PFAktivpause : Application(), Configuration.Provider {
BackupManager.backupRestorer = BackupRestorer()
}
- override fun getWorkManagerConfiguration(): Configuration {
- return Configuration.Builder().setMinimumLoggingLevel(Log.INFO).build()
+ override val workManagerConfiguration by lazy {
+ Configuration.Builder().setMinimumLoggingLevel(Log.INFO).build()
}
}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index bce7a4c..548d68f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
ext.kotlin_version = "1.7.20"
dependencies {
- classpath 'com.android.tools.build:gradle:7.4.2'
+ classpath 'com.android.tools.build:gradle:8.3.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle.properties b/gradle.properties
index 915f0e6..10c8f5e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,5 +16,8 @@
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
+android.defaults.buildfeatures.buildconfig=true
android.enableJetifier=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
android.useAndroidX=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b32f7f6..5047464 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Wed May 24 23:28:16 CEST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
From e7feedb61eb2b464219134e86ca1a97f6014f199 Mon Sep 17 00:00:00 2001
From: coderPaddyS
Date: Fri, 15 Nov 2024 11:55:30 +0100
Subject: [PATCH 11/30] [fix] the exercise gets started automatically if the
timer finishes with active app.
---
app/src/main/AndroidManifest.xml | 4 +++-
.../secuso/aktivpause/activities/TimerActivity.java | 10 +++-------
.../org/secuso/aktivpause/service/TimerService.java | 10 +++++++---
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9707c46..88e8f33 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,6 +11,7 @@
+
+ android:exported="false"
+ android:foregroundServiceType="specialUse"/>
Date: Fri, 15 Nov 2024 11:57:09 +0100
Subject: [PATCH 12/30] [chore] removes .idea from versioning.
---
.gitignore | 3 +-
.idea/codeStyles/Project.xml | 137 -----------------------------------
.idea/compiler.xml | 6 --
.idea/gradle.xml | 21 ------
.idea/jarRepositories.xml | 40 ----------
.idea/kotlinc.xml | 6 --
.idea/misc.xml | 4 -
.idea/vcs.xml | 7 --
8 files changed, 1 insertion(+), 223 deletions(-)
delete mode 100644 .idea/codeStyles/Project.xml
delete mode 100644 .idea/compiler.xml
delete mode 100644 .idea/gradle.xml
delete mode 100644 .idea/jarRepositories.xml
delete mode 100644 .idea/kotlinc.xml
delete mode 100644 .idea/misc.xml
delete mode 100644 .idea/vcs.xml
diff --git a/.gitignore b/.gitignore
index c6cbe56..5f94008 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,7 @@
*.iml
.gradle
/local.properties
-/.idea/workspace.xml
-/.idea/libraries
+/.idea
.DS_Store
/build
/captures
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 0c51a83..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- xmlns:android
-
- ^$
-
-
-
-
-
-
-
-
- xmlns:.*
-
- ^$
-
-
- BY_NAME
-
-
-
-
-
-
- .*:id
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- .*:name
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- name
-
- ^$
-
-
-
-
-
-
-
-
- style
-
- ^$
-
-
-
-
-
-
-
-
- .*
-
- ^$
-
-
- BY_NAME
-
-
-
-
-
-
- .*
-
- http://schemas.android.com/apk/res/android
-
-
- ANDROID_ATTRIBUTE_ORDER
-
-
-
-
-
-
- .*
-
- .*
-
-
- BY_NAME
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index fb7f4a8..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index 7d3c403..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index f2eacce..0000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
deleted file mode 100644
index e1eea1d..0000000
--- a/.idea/kotlinc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index e9a58ca..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 7df27e1..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
From 13db73c0e1799d84e6b243575f0b4b10252a0640 Mon Sep 17 00:00:00 2001
From: coderPaddyS
Date: Thu, 9 Jan 2025 12:56:31 +0100
Subject: [PATCH 13/30] [chore] update kotlin version. Adds default config.
---
app/build.gradle | 14 ++++++++++++--
app/lint.xml | 6 ++++++
build.gradle | 2 +-
3 files changed, 19 insertions(+), 3 deletions(-)
create mode 100644 app/lint.xml
diff --git a/app/build.gradle b/app/build.gradle
index c0bec61..6bdad17 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,8 +3,9 @@ apply plugin: 'kotlin-android'
android {
- compileSdkVersion 34
+ compileSdk 34
+ namespace 'org.secuso.aktivpause'
defaultConfig {
applicationId "org.secuso.aktivpause"
minSdkVersion 21
@@ -19,12 +20,21 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
+ buildFeatures {
+ buildConfig true
+ }
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
- namespace 'org.secuso.aktivpause'
+ kotlinOptions {
+ jvmTarget = JavaVersion.VERSION_17.toString()
+ }
+ kotlin {
+ jvmToolchain(17)
+ }
lint {
+ lintConfig = file("lint.xml")
abortOnError false
checkReleaseBuilds false
}
diff --git a/app/lint.xml b/app/lint.xml
new file mode 100644
index 0000000..1da88bd
--- /dev/null
+++ b/app/lint.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/build.gradle b/build.gradle
index 548d68f..a8e5d0e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
google()
}
- ext.kotlin_version = "1.7.20"
+ ext.kotlin_version = "2.0.21"
dependencies {
classpath 'com.android.tools.build:gradle:8.3.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
From a0e725d87ff0a7f5b4851c75291b7a43c70d4877 Mon Sep 17 00:00:00 2001
From: udenr <98773052+udenr@users.noreply.github.com>
Date: Fri, 6 Jun 2025 16:28:52 +0200
Subject: [PATCH 14/30] Remove link to Google Play from `README.md`
---
README.md | 4 ----
1 file changed, 4 deletions(-)
diff --git a/README.md b/README.md
index 0658ef2..8bdae37 100644
--- a/README.md
+++ b/README.md
@@ -16,10 +16,6 @@
The Aktivpause to Go App allows you to integrate planned breaks into your daily work. You can decide when, where and for how long you want to take breaks and this app will help shape your break in a healthy way. It offers a wide variety of exercises from the well-established Aktivpause program at KIT and was developed by Scientists at the Institute of Sports and Sports Science (IfSS) of KIT. Exercises are currently only provided in german.
-[](https://play.google.com/store/apps/details?id=org.secuso.aktivpause)
-
## Download and more Information
Further development requires Android Studio, we recommend to use the latest version.
From fabd358fd34486d6af6574342290e998b19a91f4 Mon Sep 17 00:00:00 2001
From: Patrick Schneider
Date: Tue, 1 Jul 2025 10:47:46 +0200
Subject: [PATCH 15/30] Unifies ci workflows to match default workflows
---
.github/workflows/changelog.yml | 24 ++++++++++++
.github/workflows/ci.yml | 67 +++++++++++++++++++++++++++++++++
2 files changed, 91 insertions(+)
create mode 100644 .github/workflows/changelog.yml
create mode 100644 .github/workflows/ci.yml
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
new file mode 100644
index 0000000..6e50db1
--- /dev/null
+++ b/.github/workflows/changelog.yml
@@ -0,0 +1,24 @@
+name: Changelog Generation
+
+on:
+ release:
+ types: [published]
+ workflow_dispatch:
+
+jobs:
+ changelog:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ submodules: 'recursive'
+ ref: master
+ - uses: rhysd/changelog-from-release/action@v3
+ with:
+ file: CHANGELOG.md
+ pull_request: true
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ commit_summary_template: 'update changelog for %s changes'
+ args: -l 2
+ header: |
+ # Changelog
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..d2bce09
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,67 @@
+name: Continuous Integration
+on: [push, pull_request]
+
+jobs:
+ test:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+ with:
+ submodules: "recursive"
+
+ - name: Set up JDK environment
+ uses: actions/setup-java@v3
+ with:
+ distribution: "zulu"
+ java-version: 17
+
+ - name: Make gradlew executable
+ run: chmod +x ./gradlew
+
+ - name: Setup Gradle
+ uses: gradle/gradle-build-action@v2
+
+ - name: Run local unit tests
+ run: bash ./gradlew test --stacktrace
+
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+ with:
+ submodules: "recursive"
+
+ - name: Set up JDK environment
+ uses: actions/setup-java@v3
+ with:
+ distribution: "zulu"
+ java-version: 17
+
+ - name: Make gradlew executable
+ run: chmod +x ./gradlew
+
+ - name: Setup Gradle
+ uses: gradle/gradle-build-action@v2
+
+ - name: Run lint check
+ run: bash ./gradlew lint
+
+ - name: Upload lint result
+ uses: actions/upload-artifact@v4
+ with:
+ name: lint-results-debug
+ path: app/build/reports/lint-results-debug.html
+
+ - name: Build the app
+ run: bash ./gradlew build --stacktrace
+
+ - name: Build debug apk
+ run: bash ./gradlew assembleDebug
+
+ - name: Upload debug apk
+ uses: actions/upload-artifact@v4
+ with:
+ name: debug-apk
+ path: app/build/outputs/apk/debug/*.apk
\ No newline at end of file
From a0a68dfd06bef1ff7e5870cba06787efdd2d6efc Mon Sep 17 00:00:00 2001
From: coderPaddyS <48881352+coderPaddyS@users.noreply.github.com>
Date: Mon, 14 Jul 2025 12:55:54 +0200
Subject: [PATCH 16/30] Adapts app info to match current expectation of
f-droid.
---
.../android/de-DE/{long_description.txt => full_description.txt} | 0
.../android/en-US/{long_description.txt => full_description.txt} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename fastlane/metadata/android/de-DE/{long_description.txt => full_description.txt} (100%)
rename fastlane/metadata/android/en-US/{long_description.txt => full_description.txt} (100%)
diff --git a/fastlane/metadata/android/de-DE/long_description.txt b/fastlane/metadata/android/de-DE/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/de-DE/long_description.txt
rename to fastlane/metadata/android/de-DE/full_description.txt
diff --git a/fastlane/metadata/android/en-US/long_description.txt b/fastlane/metadata/android/en-US/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/long_description.txt
rename to fastlane/metadata/android/en-US/full_description.txt
From 2a7ab7d4c871761072d19e56200ea8e32398cdc2 Mon Sep 17 00:00:00 2001
From: Patrick Schneider
Date: Sun, 16 Mar 2025 17:42:10 +0100
Subject: [PATCH 17/30] [update] changes secuso socials and links
---
README.md | 4 ++--
fastlane/metadata/android/de-DE/long_description.txt | 4 ++--
fastlane/metadata/android/en-US/long_description.txt | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index 8bdae37..acdf54c 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
[][PFA]
-[][Twitter]
+[][Bluesky]
[][Mastodon]
[PFA]: https://secuso.org/pfa
[Mastodon]: https://xn--baw-joa.social/@SECUSO_Research
-[Twitter]: https://twitter.com/SECUSOResearch
+[Bluesky]: https://bsky.app/profile/secusoresearch.bsky.social
Date: Sun, 16 Mar 2025 22:03:25 +0100
Subject: [PATCH 18/30] [chore] update secuso logo
---
.../main/res/drawable/secuso_logo_black.xml | 264 ++++++++++++++++++
.../main/res/drawable/secuso_logo_white.xml | 256 +++++++++++++++++
app/src/main/res/layout/activity_about.xml | 2 +-
app/src/main/res/values/attrs.xml | 3 +
app/src/main/res/values/styles.xml | 1 +
5 files changed, 525 insertions(+), 1 deletion(-)
create mode 100644 app/src/main/res/drawable/secuso_logo_black.xml
create mode 100644 app/src/main/res/drawable/secuso_logo_white.xml
diff --git a/app/src/main/res/drawable/secuso_logo_black.xml b/app/src/main/res/drawable/secuso_logo_black.xml
new file mode 100644
index 0000000..8a84e65
--- /dev/null
+++ b/app/src/main/res/drawable/secuso_logo_black.xml
@@ -0,0 +1,264 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/secuso_logo_white.xml b/app/src/main/res/drawable/secuso_logo_white.xml
new file mode 100644
index 0000000..41d391a
--- /dev/null
+++ b/app/src/main/res/drawable/secuso_logo_white.xml
@@ -0,0 +1,256 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index df87f10..a575210 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -116,7 +116,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
- android:src="@drawable/secuso_logo_gruen" />
+ android:src="?attr/secusoLogoDrawable" />
+
+
+
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 483ff70..02fdf03 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,6 +2,7 @@
+
+
## Aktivpause
The Aktivpause to Go App allows you to integrate planned breaks into your daily work. You can decide when, where and for how long you want to take breaks and this app will help shape your break in a healthy way. It offers a wide variety of exercises from the well-established Aktivpause program at KIT and was developed by Scientists at the Institute of Sports and Sports Science (IfSS) of KIT. Exercises are currently only provided in german.
@@ -43,8 +57,6 @@ App Icon: 
](https://play.google.com/store/apps/details?id=org.secuso.aktivpause)
-
## Download and more Information
Further development requires Android Studio, we recommend to use the latest version.
From fabd358fd34486d6af6574342290e998b19a91f4 Mon Sep 17 00:00:00 2001
From: Patrick Schneider