Merge pull request #32 from SecUSo/development

Update to version 1.2.1

.github/workflows/android-test.yml

@@ -0,0 +1,51 @@
+name: Android Emulator Tests
+on: [push, pull_request]
+
+jobs:
+  check-if-tests-exist:
+    runs-on: ubuntu-latest
+    outputs:
+      status: ${{ steps.check-androidTest.outputs.NOT_EMPTY }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: "recursive"
+      - name: Check if androidTest folder is not empty
+        run: |
+          echo "NOT_EMPTY=$([ "$(ls -A app/src/androidTest)" ] && echo 'true' || echo 'false')"
+          echo "NOT_EMPTY=$([ "$(ls -A app/src/androidTest)" ] && echo 'true' || echo 'false')" >> $GITHUB_OUTPUT
+        id: check-androidTest
+  test:
+    needs: check-if-tests-exist
+    if: needs.check-if-tests-exist.outputs.status == 'true'
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        api-level: [29]
+        target: [default]
+        arch: [x86_64]
+    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: Gradle cache
+        uses: gradle/gradle-build-action@v2
+
+      - name: Run connected tests
+        uses: ReactiveCircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          target: ${{ matrix.target }}
+          arch: ${{ matrix.arch }}
+          profile: Nexus 6
+          disable-animations: true
+          script: ./gradlew :app:connectedCheck --stacktrace

.github/workflows/ci.yml

@@ -0,0 +1,49 @@
+name: Continuous Integration
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    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-20.04
+    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: Build the app
+        run: bash ./gradlew build --stacktrace

CHANGELOG.md

@@ -28,7 +28,7 @@
 <a name="v1.0"></a>
 ## [Privacy Friendly Circuit Training v1.0 (v1.0)](https://github.com/SecUSo/privacy-friendly-circuit-training-exercises/releases/tag/v1.0) - 29 Mar 2018
 
-Privacy Friendly Circuit Trainer is an Android App that supports the user during his/her circuit training session. It provides a configurable set of timers for the exercises and the rest phases as well as multiple other features.
+Privacy Friendly Circuit Trainer is an Android App that supports the user during their circuit training session. It provides a configurable set of timers for the exercises and the rest phases as well as multiple other features.
 
 [Changes][v1.0]
 

README.md

@@ -21,7 +21,7 @@
 
 This Android application manages the time during interval based training sessions, eg circuit training.
 It provides a configurable set of timers for the exercises and the rest phases.
-The user can create his own exercises and combine them into exercise set which can be used for circuit training.
+The user can create their own exercises and combine them into exercise set which can be used for circuit training.
 The app can remind the user about planned training sessions and offers statistics such as the time spend training or calories burnt.
 
 Privacy Friendly Circuit Trainer belongs to the group of Privacy Friendly Apps developed by the research group SECUSO at Technische Universität Darmstadt.
@@ -38,7 +38,7 @@ https://www.fitness-gesundheit.uni-wuppertal.de/fileadmin/fitness-gesundheit/pdf
 
 ### API Reference
 
-Mininum SDK: 21
+Minimum SDK: 21
 Target SDK: 32 
 
 ## License
@@ -59,7 +59,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 <http://www.gnu.org/licenses/>.
 
-The icons used in the nagivation drawer are licensed under the [CC BY 2.5](http://creativecommons.org/licenses/by/2.5/). In addition to them 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 icons and the splash icon) copyright [Technische Universtität Darmstadt](www.tu-darmstadt.de) (2017).
+The icons used in the navigation drawer are licensed under the [CC BY 2.5](http://creativecommons.org/licenses/by/2.5/). In addition to them 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 icons and the splash icon) copyright [Technische Universtität Darmstadt](www.tu-darmstadt.de) (2017).
 
 ## Contributors
 

app/build.gradle

@@ -3,14 +3,14 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "org.secuso.privacyfriendlycircuittraining"
         minSdkVersion 21
-        targetSdkVersion 32
-        versionCode 3
-        versionName "1.2.0"
+        targetSdkVersion 33
+        versionCode 4
+        versionName "1.2.1"
     }
     buildTypes {
         release {
@@ -33,8 +33,8 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
@@ -43,15 +43,15 @@ dependencies {
     annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
     testImplementation 'junit:junit:4.13.2'
 
-    def room_version = "2.4.3"
+    def room_version = "2.5.2"
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
 
     // Backup API
     implementation project(':backup-api')
-    def work_version = '2.7.1'
+    def work_version = '2.8.1'
     implementation "androidx.work:work-runtime:$work_version"
     implementation "androidx.work:work-runtime-ktx:$work_version"
     androidTestImplementation "androidx.work:work-testing:$work_version"