Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug fixes #21

Merged
merged 2 commits into from
Sep 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -228,5 +228,6 @@
<string name="dialog_exercise_set_confirm_delete_message">Möchten Sie die ausgewählten Elemente löschen?</string>
<string name="exercise_set_has_no_exercises">Das gewählte Übungsset enthält keine Übungen.</string>
<string name="request_schedule_exact_alarm_permission">Um Ihnen Motivationsbenachrichtigungen senden zu können, wird die Erlaubnis benötigt, einen Alarm einzustellen. Möchten Sie die Erlaubnis jetzt erteilen?</string>
<string name="exercise_set_has_no_sets">Das gewählte Übungsset hat keine sets.</string>

</resources>
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@
<string name="no_exercises">Please choose an exercise</string>
<string name="dialog_exercise_set_confirm_delete_message">Do you want to delete the selected items?</string>
<string name="exercise_set_has_no_exercises">Chosen exercise set has no exercises.</string>
<string name="exercise_set_has_no_sets">Chosen exercise set has no sets.</string>

<string name="request_schedule_exact_alarm_permission">In order to send you motivation alerts, the permission to set an alarm is needed. Do you want to grant the permission now?</string>

Expand Down