From e098d8d288de78567307aa83219a4206c6a1b98b Mon Sep 17 00:00:00 2001 From: Franjo Lukezic Date: Mon, 13 Feb 2023 16:22:18 +0100 Subject: [PATCH 1/2] FIX typos --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 658b37b..cbbb8b9 100644 --- a/README.md +++ b/README.md @@ -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 . -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 From 0d4eddd6db7a130bdc11528ae7a3e4cfd69b1816 Mon Sep 17 00:00:00 2001 From: Franjo Lukezic Date: Mon, 13 Feb 2023 17:39:01 +0100 Subject: [PATCH 2/2] FIX bug that cannot start without Exercise Sets enabled; FEAT add new translation tag --- .../activities/MainActivity.java | 8 ++++++-- app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/secuso/privacyfriendlycircuittraining/activities/MainActivity.java b/app/src/main/java/org/secuso/privacyfriendlycircuittraining/activities/MainActivity.java index 2344712..82b22fb 100644 --- a/app/src/main/java/org/secuso/privacyfriendlycircuittraining/activities/MainActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlycircuittraining/activities/MainActivity.java @@ -275,8 +275,12 @@ public void onClick(View view) { setsPerRound = sets; } - if (setsPerRound == 0 || ExerciseIdsForRounds.size() == 0) { - Toast.makeText(this, R.string.exercise_set_has_no_exercises, Toast.LENGTH_SHORT).show(); + if (setsPerRound == 0) { + if (isExerciseMode && ExerciseIdsForRounds.size() == 0) { + Toast.makeText(this, R.string.exercise_set_has_no_exercises, Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(this, R.string.exercise_set_has_no_sets, Toast.LENGTH_SHORT).show(); + } return; } diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 71f506b..28b889e 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -228,5 +228,6 @@ Möchten Sie die ausgewählten Elemente löschen? Das gewählte Übungsset enthält keine Übungen. Um Ihnen Motivationsbenachrichtigungen senden zu können, wird die Erlaubnis benötigt, einen Alarm einzustellen. Möchten Sie die Erlaubnis jetzt erteilen? + Das gewählte Übungsset hat keine sets. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 81ec1f9..c97fa89 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -233,6 +233,7 @@ Please choose an exercise Do you want to delete the selected items? Chosen exercise set has no exercises. + Chosen exercise set has no sets. In order to send you motivation alerts, the permission to set an alarm is needed. Do you want to grant the permission now?