From 2edd147654288652dec799550c4c114a86158d7c Mon Sep 17 00:00:00 2001 From: Christopher Beckmann Date: Thu, 23 May 2019 16:54:05 +0200 Subject: [PATCH] Tested images and added custom exercise times per exercise. Refactoring. --- .idea/codeStyles/Project.xml | 49 -------------- app/build.gradle | 21 +++--- app/src/main/AndroidManifest.xml | 61 +++++++++--------- .../main/assets/databases/exercises.sqlite | Bin 240640 -> 240640 bytes .../activities/AboutActivity.java | 6 +- .../activities/ChooseExerciseActivity.java | 16 ++--- .../activities/EditExerciseSetActivity.java | 16 ++--- .../activities/ExerciseActivity.java | 41 ++++++++---- .../activities/HelpActivity.java | 8 +-- .../ManageExerciseSetsActivity.java | 16 ++--- .../activities/SettingsActivity.java | 8 +-- .../activities/SplashActivity.java | 6 +- .../activities/TimerActivity.java | 22 +++---- .../activities/adapter/ExerciseAdapter.java | 34 +++++++--- .../adapter/ExerciseSetListAdapter.java | 12 ++-- .../adapter/ExerciseSetSpinnerAdapter.java | 8 +-- .../helper/AppCompatPreferenceActivity.java | 2 +- .../activities/helper/BaseActivity.java | 16 ++--- .../helper/ExpandableListAdapter.java | 4 +- .../helper/IExerciseTimeUpdateable.java | 2 +- .../tutorial/FirstLaunchManager.java | 10 +-- .../activities/tutorial/TutorialActivity.java | 6 +- .../database/SQLiteHelper.java | 12 ++-- .../database/columns/ExerciseColumns.java | 7 +- .../columns/ExerciseLocalColumns.java | 4 +- .../database/columns/ExerciseSetColumns.java | 4 +- .../database/data/Exercise.java | 32 +++++++-- .../database/data/ExerciseSet.java | 14 ++-- .../dialog/ExerciseDialog.java | 6 +- .../exercises/ExerciseLocale.java | 2 +- .../exercises/ExerciseSections.java | 4 +- .../preferences/TimePreference.java | 4 +- .../receivers/NotificationCancelReceiver.java | 4 +- .../NotificationDeletedReceiver.java | 6 +- .../receivers/OnBootCompletedReceiver.java | 2 +- .../receivers/TimerSchedulerReceiver.java | 14 ++-- .../service/TimerService.java | 20 +++--- app/src/main/res/drawable/breakreminder_0.png | Bin 9723 -> 0 bytes app/src/main/res/drawable/breakreminder_1.png | Bin 10846 -> 0 bytes .../main/res/drawable/breakreminder_10.png | Bin 28531 -> 0 bytes .../main/res/drawable/breakreminder_11.png | Bin 15338 -> 0 bytes .../main/res/drawable/breakreminder_12.png | Bin 15187 -> 0 bytes .../main/res/drawable/breakreminder_13.png | Bin 12724 -> 0 bytes .../main/res/drawable/breakreminder_14.png | Bin 12797 -> 0 bytes .../main/res/drawable/breakreminder_15.png | Bin 14456 -> 0 bytes .../main/res/drawable/breakreminder_16.png | Bin 14335 -> 0 bytes .../main/res/drawable/breakreminder_17.png | Bin 20341 -> 0 bytes .../main/res/drawable/breakreminder_18.png | Bin 20480 -> 0 bytes .../main/res/drawable/breakreminder_19.png | Bin 23099 -> 0 bytes app/src/main/res/drawable/breakreminder_2.png | Bin 11443 -> 0 bytes .../main/res/drawable/breakreminder_20.png | Bin 15452 -> 0 bytes .../main/res/drawable/breakreminder_21.png | Bin 16261 -> 0 bytes .../main/res/drawable/breakreminder_22.png | Bin 11653 -> 0 bytes .../main/res/drawable/breakreminder_23.png | Bin 26666 -> 0 bytes .../main/res/drawable/breakreminder_24.png | Bin 18588 -> 0 bytes .../main/res/drawable/breakreminder_25.png | Bin 24614 -> 0 bytes .../main/res/drawable/breakreminder_26.png | Bin 13982 -> 0 bytes .../main/res/drawable/breakreminder_27.png | Bin 15580 -> 0 bytes .../main/res/drawable/breakreminder_28.png | Bin 15527 -> 0 bytes .../main/res/drawable/breakreminder_29.png | Bin 10754 -> 0 bytes app/src/main/res/drawable/breakreminder_3.png | Bin 10893 -> 0 bytes .../main/res/drawable/breakreminder_30.png | Bin 16867 -> 0 bytes .../main/res/drawable/breakreminder_31.png | Bin 15759 -> 0 bytes .../main/res/drawable/breakreminder_32.png | Bin 18148 -> 0 bytes .../main/res/drawable/breakreminder_33.png | Bin 15492 -> 0 bytes .../main/res/drawable/breakreminder_34.png | Bin 21734 -> 0 bytes .../main/res/drawable/breakreminder_35.png | Bin 20878 -> 0 bytes .../main/res/drawable/breakreminder_36.png | Bin 23965 -> 0 bytes .../main/res/drawable/breakreminder_37.png | Bin 24296 -> 0 bytes .../main/res/drawable/breakreminder_38.png | Bin 19601 -> 0 bytes .../main/res/drawable/breakreminder_39.png | Bin 20145 -> 0 bytes app/src/main/res/drawable/breakreminder_4.png | Bin 10846 -> 0 bytes .../main/res/drawable/breakreminder_40.png | Bin 20022 -> 0 bytes .../main/res/drawable/breakreminder_41.png | Bin 18697 -> 0 bytes .../main/res/drawable/breakreminder_42.png | Bin 23105 -> 0 bytes .../main/res/drawable/breakreminder_43.png | Bin 22764 -> 0 bytes .../main/res/drawable/breakreminder_44.png | Bin 23008 -> 0 bytes .../main/res/drawable/breakreminder_45.png | Bin 22488 -> 0 bytes .../main/res/drawable/breakreminder_46.png | Bin 17276 -> 0 bytes .../main/res/drawable/breakreminder_47.png | Bin 18782 -> 0 bytes .../main/res/drawable/breakreminder_48.png | Bin 18870 -> 0 bytes .../main/res/drawable/breakreminder_49.png | Bin 18702 -> 0 bytes app/src/main/res/drawable/breakreminder_5.png | Bin 11673 -> 0 bytes .../main/res/drawable/breakreminder_50.png | Bin 24098 -> 0 bytes .../main/res/drawable/breakreminder_51.png | Bin 25503 -> 0 bytes .../main/res/drawable/breakreminder_52.png | Bin 22545 -> 0 bytes .../main/res/drawable/breakreminder_53.png | Bin 21975 -> 0 bytes .../main/res/drawable/breakreminder_54.png | Bin 24983 -> 0 bytes .../main/res/drawable/breakreminder_55.png | Bin 24818 -> 0 bytes .../main/res/drawable/breakreminder_56.png | Bin 23074 -> 0 bytes app/src/main/res/drawable/breakreminder_6.png | Bin 12376 -> 0 bytes app/src/main/res/drawable/breakreminder_7.png | Bin 14649 -> 0 bytes app/src/main/res/drawable/breakreminder_8.png | Bin 10046 -> 0 bytes app/src/main/res/drawable/breakreminder_9.png | Bin 29223 -> 0 bytes .../res/layout/activity_choose_exercise.xml | 2 +- app/src/main/res/layout/activity_exercise.xml | 4 +- .../layout/activity_manage_exercise_set.xml | 2 +- app/src/main/res/layout/activity_settings.xml | 2 +- app/src/main/res/layout/activity_timer.xml | 4 +- app/src/main/res/layout/dialog_exercise.xml | 2 +- .../layout/layout_round_exercise_image.xml | 2 +- app/src/main/res/values/styles.xml | 4 +- app/src/main/res/xml/pref_headers.xml | 4 +- app/src/main/res/xml/pref_scheduler.xml | 2 +- .../ExampleUnitTest.java | 3 +- build.gradle | 3 +- gradle/wrapper/gradle-wrapper.properties | 5 +- 107 files changed, 270 insertions(+), 268 deletions(-) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/activities/AboutActivity.java (93%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/activities/ChooseExerciseActivity.java (90%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/activities/EditExerciseSetActivity.java (94%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/activities/ExerciseActivity.java (95%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/activities/HelpActivity.java (85%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/activities/ManageExerciseSetsActivity.java (95%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/activities/SettingsActivity.java (96%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/activities/SplashActivity.java (78%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/activities/TimerActivity.java (95%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/activities/adapter/ExerciseAdapter.java (91%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/activities/adapter/ExerciseSetListAdapter.java (94%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/activities/adapter/ExerciseSetSpinnerAdapter.java (93%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/activities/helper/AppCompatPreferenceActivity.java (97%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/activities/helper/BaseActivity.java (92%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/activities/helper/ExpandableListAdapter.java (96%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/activities/helper/IExerciseTimeUpdateable.java (71%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/activities/tutorial/FirstLaunchManager.java (96%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/activities/tutorial/TutorialActivity.java (96%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/database/SQLiteHelper.java (95%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/database/columns/ExerciseColumns.java (79%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/database/columns/ExerciseLocalColumns.java (93%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/database/columns/ExerciseSetColumns.java (90%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/database/data/Exercise.java (78%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/database/data/ExerciseSet.java (78%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/dialog/ExerciseDialog.java (93%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/exercises/ExerciseLocale.java (92%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/exercises/ExerciseSections.java (89%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/preferences/TimePreference.java (97%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/receivers/NotificationCancelReceiver.java (84%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/receivers/NotificationDeletedReceiver.java (80%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/receivers/OnBootCompletedReceiver.java (89%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/receivers/TimerSchedulerReceiver.java (88%) rename app/src/main/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/service/TimerService.java (94%) delete mode 100644 app/src/main/res/drawable/breakreminder_0.png delete mode 100644 app/src/main/res/drawable/breakreminder_1.png delete mode 100644 app/src/main/res/drawable/breakreminder_10.png delete mode 100644 app/src/main/res/drawable/breakreminder_11.png delete mode 100644 app/src/main/res/drawable/breakreminder_12.png delete mode 100644 app/src/main/res/drawable/breakreminder_13.png delete mode 100644 app/src/main/res/drawable/breakreminder_14.png delete mode 100644 app/src/main/res/drawable/breakreminder_15.png delete mode 100644 app/src/main/res/drawable/breakreminder_16.png delete mode 100644 app/src/main/res/drawable/breakreminder_17.png delete mode 100644 app/src/main/res/drawable/breakreminder_18.png delete mode 100644 app/src/main/res/drawable/breakreminder_19.png delete mode 100644 app/src/main/res/drawable/breakreminder_2.png delete mode 100644 app/src/main/res/drawable/breakreminder_20.png delete mode 100644 app/src/main/res/drawable/breakreminder_21.png delete mode 100644 app/src/main/res/drawable/breakreminder_22.png delete mode 100644 app/src/main/res/drawable/breakreminder_23.png delete mode 100644 app/src/main/res/drawable/breakreminder_24.png delete mode 100644 app/src/main/res/drawable/breakreminder_25.png delete mode 100644 app/src/main/res/drawable/breakreminder_26.png delete mode 100644 app/src/main/res/drawable/breakreminder_27.png delete mode 100644 app/src/main/res/drawable/breakreminder_28.png delete mode 100644 app/src/main/res/drawable/breakreminder_29.png delete mode 100644 app/src/main/res/drawable/breakreminder_3.png delete mode 100644 app/src/main/res/drawable/breakreminder_30.png delete mode 100644 app/src/main/res/drawable/breakreminder_31.png delete mode 100644 app/src/main/res/drawable/breakreminder_32.png delete mode 100644 app/src/main/res/drawable/breakreminder_33.png delete mode 100644 app/src/main/res/drawable/breakreminder_34.png delete mode 100644 app/src/main/res/drawable/breakreminder_35.png delete mode 100644 app/src/main/res/drawable/breakreminder_36.png delete mode 100644 app/src/main/res/drawable/breakreminder_37.png delete mode 100644 app/src/main/res/drawable/breakreminder_38.png delete mode 100644 app/src/main/res/drawable/breakreminder_39.png delete mode 100644 app/src/main/res/drawable/breakreminder_4.png delete mode 100644 app/src/main/res/drawable/breakreminder_40.png delete mode 100644 app/src/main/res/drawable/breakreminder_41.png delete mode 100644 app/src/main/res/drawable/breakreminder_42.png delete mode 100644 app/src/main/res/drawable/breakreminder_43.png delete mode 100644 app/src/main/res/drawable/breakreminder_44.png delete mode 100644 app/src/main/res/drawable/breakreminder_45.png delete mode 100644 app/src/main/res/drawable/breakreminder_46.png delete mode 100644 app/src/main/res/drawable/breakreminder_47.png delete mode 100644 app/src/main/res/drawable/breakreminder_48.png delete mode 100644 app/src/main/res/drawable/breakreminder_49.png delete mode 100644 app/src/main/res/drawable/breakreminder_5.png delete mode 100644 app/src/main/res/drawable/breakreminder_50.png delete mode 100644 app/src/main/res/drawable/breakreminder_51.png delete mode 100644 app/src/main/res/drawable/breakreminder_52.png delete mode 100644 app/src/main/res/drawable/breakreminder_53.png delete mode 100644 app/src/main/res/drawable/breakreminder_54.png delete mode 100644 app/src/main/res/drawable/breakreminder_55.png delete mode 100644 app/src/main/res/drawable/breakreminder_56.png delete mode 100644 app/src/main/res/drawable/breakreminder_6.png delete mode 100644 app/src/main/res/drawable/breakreminder_7.png delete mode 100644 app/src/main/res/drawable/breakreminder_8.png delete mode 100644 app/src/main/res/drawable/breakreminder_9.png rename app/src/test/java/org/secuso/{privacyfriendlypausinghealthily => aktivpause}/ExampleUnitTest.java (78%) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index d5ec3da..565c347 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -24,54 +24,5 @@