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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 1dd0d37..f27c9bd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,14 +2,13 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 28
- buildToolsVersion '27.0.3'
defaultConfig {
- applicationId "org.secuso.privacyfriendlypausinghealthily"
+ applicationId "org.secuso.aktivpause"
minSdkVersion 21
targetSdkVersion 27
- versionCode 7
- versionName "1.3"
+ versionCode 1
+ versionName "1.0"
vectorDrawables.useSupportLibrary = true
}
lintOptions {
@@ -38,13 +37,13 @@ repositories {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
- implementation 'com.android.support:appcompat-v7:28.0.0-alpha1'
- implementation 'com.android.support:design:28.0.0-alpha1'
- implementation 'com.github.bumptech.glide:glide:4.6.1'
- implementation 'com.android.support:support-v4:28.0.0-alpha1'
- implementation 'com.android.support:support-annotations:27.1.1'
- implementation 'com.android.support:cardview-v7:28.0.0-alpha1'
- implementation 'com.android.support.constraint:constraint-layout:1.1.2'
+ implementation 'com.android.support:appcompat-v7:28.0.0'
+ implementation 'com.android.support:design:28.0.0'
+ implementation 'com.github.bumptech.glide:glide:4.7.1'
+ implementation 'com.android.support:support-v4:28.0.0'
+ implementation 'com.android.support:support-annotations:28.0.0'
+ implementation 'com.android.support:cardview-v7:28.0.0'
+ implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'com.nex3z:flow-layout:1.0.0'
implementation 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.1'
testImplementation 'junit:junit:4.12'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4e37dc4..9bfc55c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
+ package="org.secuso.aktivpause">
@@ -15,16 +15,16 @@
android:supportsRtl="true"
android:theme="@style/AppTheme">
+ android:value="org.secuso.aktivpause.activities.TimerActivity" />
@@ -34,92 +34,91 @@
+ android:value="org.secuso.aktivpause.activities.TimerActivity" />
+ android:value="org.secuso.aktivpause.activities.TimerActivity" />
+ android:value="org.secuso.aktivpause.activities.TimerActivity" />
+ android:value="org.secuso.aktivpause.activities.ManageExerciseSetsActivity" />
- >
+ android:value="org.secuso.aktivpause.activities.EditExerciseSetActivity" />
+ android:value="org.secuso.aktivpause.activities.TimerActivity" />
+ android:value="org.secuso.aktivpause.activities.TimerActivity" />
-
+
-
+
diff --git a/app/src/main/assets/databases/exercises.sqlite b/app/src/main/assets/databases/exercises.sqlite
index a4f101e..1925704 100644
Binary files a/app/src/main/assets/databases/exercises.sqlite and b/app/src/main/assets/databases/exercises.sqlite differ
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/AboutActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/AboutActivity.java
similarity index 93%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/AboutActivity.java
rename to app/src/main/java/org/secuso/aktivpause/activities/AboutActivity.java
index 883637f..adabfe6 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/AboutActivity.java
+++ b/app/src/main/java/org/secuso/aktivpause/activities/AboutActivity.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlypausinghealthily.activities;
+package org.secuso.aktivpause.activities;
import android.os.Bundle;
import android.os.Handler;
@@ -9,8 +9,8 @@ import android.view.MenuItem;
import android.view.View;
import android.widget.TextView;
-import org.secuso.privacyfriendlypausinghealthily.BuildConfig;
-import org.secuso.privacyfriendlypausinghealthily.R;
+import org.secuso.aktivpause.BuildConfig;
+import org.secuso.aktivpause.R;
/**
* About Page :)
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/ChooseExerciseActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/ChooseExerciseActivity.java
similarity index 90%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/ChooseExerciseActivity.java
rename to app/src/main/java/org/secuso/aktivpause/activities/ChooseExerciseActivity.java
index 68f0144..b35e59a 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/ChooseExerciseActivity.java
+++ b/app/src/main/java/org/secuso/aktivpause/activities/ChooseExerciseActivity.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlypausinghealthily.activities;
+package org.secuso.aktivpause.activities;
import android.content.Intent;
import android.os.PersistableBundle;
@@ -16,17 +16,17 @@ import android.view.MenuItem;
import android.view.View;
import android.widget.TextView;
-import org.secuso.privacyfriendlypausinghealthily.R;
-import org.secuso.privacyfriendlypausinghealthily.activities.adapter.ExerciseAdapter;
-import org.secuso.privacyfriendlypausinghealthily.activities.helper.IExerciseTimeUpdateable;
-import org.secuso.privacyfriendlypausinghealthily.database.SQLiteHelper;
-import org.secuso.privacyfriendlypausinghealthily.exercises.ExerciseLocale;
-import org.secuso.privacyfriendlypausinghealthily.exercises.ExerciseSections;
+import org.secuso.aktivpause.R;
+import org.secuso.aktivpause.activities.adapter.ExerciseAdapter;
+import org.secuso.aktivpause.activities.helper.IExerciseTimeUpdateable;
+import org.secuso.aktivpause.database.SQLiteHelper;
+import org.secuso.aktivpause.exercises.ExerciseLocale;
+import org.secuso.aktivpause.exercises.ExerciseSections;
import java.util.ArrayList;
import java.util.List;
-import static org.secuso.privacyfriendlypausinghealthily.activities.adapter.ExerciseAdapter.ID_COMPARATOR;
+import static org.secuso.aktivpause.activities.adapter.ExerciseAdapter.ID_COMPARATOR;
/**
* This activity lets you choose exercises. The result is then sent back to {@link EditExerciseSetActivity}
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/EditExerciseSetActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/EditExerciseSetActivity.java
similarity index 94%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/EditExerciseSetActivity.java
rename to app/src/main/java/org/secuso/aktivpause/activities/EditExerciseSetActivity.java
index e72d814..f9f3f20 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/EditExerciseSetActivity.java
+++ b/app/src/main/java/org/secuso/aktivpause/activities/EditExerciseSetActivity.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlypausinghealthily.activities;
+package org.secuso.aktivpause.activities;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
@@ -25,18 +25,18 @@ import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
-import org.secuso.privacyfriendlypausinghealthily.activities.adapter.ExerciseAdapter;
-import org.secuso.privacyfriendlypausinghealthily.database.data.Exercise;
-import org.secuso.privacyfriendlypausinghealthily.exercises.ExerciseLocale;
-import org.secuso.privacyfriendlypausinghealthily.R;
-import org.secuso.privacyfriendlypausinghealthily.database.SQLiteHelper;
-import org.secuso.privacyfriendlypausinghealthily.database.data.ExerciseSet;
+import org.secuso.aktivpause.activities.adapter.ExerciseAdapter;
+import org.secuso.aktivpause.database.data.Exercise;
+import org.secuso.aktivpause.exercises.ExerciseLocale;
+import org.secuso.aktivpause.R;
+import org.secuso.aktivpause.database.SQLiteHelper;
+import org.secuso.aktivpause.database.data.ExerciseSet;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
-import static org.secuso.privacyfriendlypausinghealthily.activities.adapter.ExerciseAdapter.ID_COMPARATOR;
+import static org.secuso.aktivpause.activities.adapter.ExerciseAdapter.ID_COMPARATOR;
/**
* This activity lets you edit the name of an exercise set. To edit what exercises are in that set, {@link ChooseExerciseActivity} is called.
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/ExerciseActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/ExerciseActivity.java
similarity index 95%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/ExerciseActivity.java
rename to app/src/main/java/org/secuso/aktivpause/activities/ExerciseActivity.java
index 7d8105d..8611f8b 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/ExerciseActivity.java
+++ b/app/src/main/java/org/secuso/aktivpause/activities/ExerciseActivity.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlypausinghealthily.activities;
+package org.secuso.aktivpause.activities;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
@@ -33,14 +33,16 @@ import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
-import org.secuso.privacyfriendlypausinghealthily.R;
-import org.secuso.privacyfriendlypausinghealthily.activities.tutorial.FirstLaunchManager;
-import org.secuso.privacyfriendlypausinghealthily.database.SQLiteHelper;
-import org.secuso.privacyfriendlypausinghealthily.database.data.Exercise;
-import org.secuso.privacyfriendlypausinghealthily.database.data.ExerciseSet;
-import org.secuso.privacyfriendlypausinghealthily.dialog.ExerciseDialog;
-import org.secuso.privacyfriendlypausinghealthily.exercises.ExerciseLocale;
-import org.secuso.privacyfriendlypausinghealthily.service.TimerService;
+import com.bumptech.glide.Glide;
+
+import org.secuso.aktivpause.R;
+import org.secuso.aktivpause.activities.tutorial.FirstLaunchManager;
+import org.secuso.aktivpause.database.SQLiteHelper;
+import org.secuso.aktivpause.database.data.Exercise;
+import org.secuso.aktivpause.database.data.ExerciseSet;
+import org.secuso.aktivpause.dialog.ExerciseDialog;
+import org.secuso.aktivpause.exercises.ExerciseLocale;
+import org.secuso.aktivpause.service.TimerService;
import java.util.List;
import java.util.Locale;
@@ -48,7 +50,7 @@ import java.util.Random;
import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
import static android.view.Gravity.CENTER_HORIZONTAL;
-import static org.secuso.privacyfriendlypausinghealthily.service.TimerService.ACTION_STOP_TIMER;
+import static org.secuso.aktivpause.service.TimerService.ACTION_STOP_TIMER;
/**
* This activity handles showing the exercises and the exercise timer.
@@ -571,13 +573,24 @@ public class ExerciseActivity extends AppCompatActivity implements android.suppo
return false;
}
- private void showExercise(final Exercise e, int image) {
+ private void showExercise(final Exercise e, int currentExercisePart) {
int[] images = e.getImageResIds(this);
+ int[] durations = e.getDurations();
- if (image < 0 || image >= images.length) {
- image = 0;
+ int exerciseDuration = 30 * 1000;
+
+ if (currentExercisePart < 0 || currentExercisePart >= images.length) {
+ currentExercisePart = 0;
}
+ if(currentExercisePart >= durations.length || durations.length > 0) {
+ exerciseDuration = durations[0] * 1000;
+ } else {
+ exerciseDuration = durations[currentExercisePart] * 1000;
+ }
+
+ exerciseTime = exerciseDuration;
+
View.OnClickListener infoClickListener = new View.OnClickListener() {
@Override
public void onClick(View view) {
@@ -594,7 +607,7 @@ public class ExerciseActivity extends AppCompatActivity implements android.suppo
executionText.setText(e.getExecution());
descriptionText.setText(e.getDescription());
sectionText.setText(e.getSection(this));
- exerciseImage.setImageResource(e.getImageResIds(this)[image]);
+ Glide.with(this).load(e.getImageResIds(this)[currentExercisePart]).into(exerciseImage);
exerciseImage.setOnClickListener(infoClickListener);
exerciseInfoButton.setOnClickListener(infoClickListener);
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/HelpActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/HelpActivity.java
similarity index 85%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/HelpActivity.java
rename to app/src/main/java/org/secuso/aktivpause/activities/HelpActivity.java
index 2beb6ab..02132fd 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/HelpActivity.java
+++ b/app/src/main/java/org/secuso/aktivpause/activities/HelpActivity.java
@@ -1,11 +1,11 @@
-package org.secuso.privacyfriendlypausinghealthily.activities;
+package org.secuso.aktivpause.activities;
import android.os.Bundle;
import android.widget.ExpandableListView;
-import org.secuso.privacyfriendlypausinghealthily.R;
-import org.secuso.privacyfriendlypausinghealthily.activities.helper.BaseActivity;
-import org.secuso.privacyfriendlypausinghealthily.activities.helper.ExpandableListAdapter;
+import org.secuso.aktivpause.R;
+import org.secuso.aktivpause.activities.helper.BaseActivity;
+import org.secuso.aktivpause.activities.helper.ExpandableListAdapter;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/ManageExerciseSetsActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/ManageExerciseSetsActivity.java
similarity index 95%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/ManageExerciseSetsActivity.java
rename to app/src/main/java/org/secuso/aktivpause/activities/ManageExerciseSetsActivity.java
index 1875032..446d93d 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/ManageExerciseSetsActivity.java
+++ b/app/src/main/java/org/secuso/aktivpause/activities/ManageExerciseSetsActivity.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlypausinghealthily.activities;
+package org.secuso.aktivpause.activities;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
@@ -33,13 +33,13 @@ import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
-import org.secuso.privacyfriendlypausinghealthily.activities.tutorial.FirstLaunchManager;
-import org.secuso.privacyfriendlypausinghealthily.exercises.ExerciseLocale;
-import org.secuso.privacyfriendlypausinghealthily.R;
-import org.secuso.privacyfriendlypausinghealthily.activities.adapter.ExerciseSetListAdapter;
-import org.secuso.privacyfriendlypausinghealthily.activities.helper.BaseActivity;
-import org.secuso.privacyfriendlypausinghealthily.database.SQLiteHelper;
-import org.secuso.privacyfriendlypausinghealthily.database.data.ExerciseSet;
+import org.secuso.aktivpause.activities.tutorial.FirstLaunchManager;
+import org.secuso.aktivpause.exercises.ExerciseLocale;
+import org.secuso.aktivpause.R;
+import org.secuso.aktivpause.activities.adapter.ExerciseSetListAdapter;
+import org.secuso.aktivpause.activities.helper.BaseActivity;
+import org.secuso.aktivpause.database.SQLiteHelper;
+import org.secuso.aktivpause.database.data.ExerciseSet;
import java.util.List;
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/SettingsActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/SettingsActivity.java
similarity index 96%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/SettingsActivity.java
rename to app/src/main/java/org/secuso/aktivpause/activities/SettingsActivity.java
index 27d7b72..4703ff2 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/SettingsActivity.java
+++ b/app/src/main/java/org/secuso/aktivpause/activities/SettingsActivity.java
@@ -1,5 +1,5 @@
-package org.secuso.privacyfriendlypausinghealthily.activities;
+package org.secuso.aktivpause.activities;
import android.annotation.TargetApi;
@@ -16,9 +16,9 @@ import android.preference.PreferenceFragment;
import android.preference.PreferenceManager;
import android.view.MenuItem;
-import org.secuso.privacyfriendlypausinghealthily.R;
-import org.secuso.privacyfriendlypausinghealthily.activities.helper.AppCompatPreferenceActivity;
-import org.secuso.privacyfriendlypausinghealthily.receivers.TimerSchedulerReceiver;
+import org.secuso.aktivpause.R;
+import org.secuso.aktivpause.activities.helper.AppCompatPreferenceActivity;
+import org.secuso.aktivpause.receivers.TimerSchedulerReceiver;
import java.util.HashSet;
import java.util.List;
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/SplashActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/SplashActivity.java
similarity index 78%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/SplashActivity.java
rename to app/src/main/java/org/secuso/aktivpause/activities/SplashActivity.java
index b307ce7..9b20d6f 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/SplashActivity.java
+++ b/app/src/main/java/org/secuso/aktivpause/activities/SplashActivity.java
@@ -1,11 +1,11 @@
-package org.secuso.privacyfriendlypausinghealthily.activities;
+package org.secuso.aktivpause.activities;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
-import org.secuso.privacyfriendlypausinghealthily.activities.tutorial.FirstLaunchManager;
-import org.secuso.privacyfriendlypausinghealthily.activities.tutorial.TutorialActivity;
+import org.secuso.aktivpause.activities.tutorial.FirstLaunchManager;
+import org.secuso.aktivpause.activities.tutorial.TutorialActivity;
/**
* @author yonjuni
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/TimerActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/TimerActivity.java
similarity index 95%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/TimerActivity.java
rename to app/src/main/java/org/secuso/aktivpause/activities/TimerActivity.java
index 0e9fb55..f87d384 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/TimerActivity.java
+++ b/app/src/main/java/org/secuso/aktivpause/activities/TimerActivity.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlypausinghealthily.activities;
+package org.secuso.aktivpause.activities;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
@@ -28,14 +28,14 @@ import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
-import org.secuso.privacyfriendlypausinghealthily.activities.tutorial.FirstLaunchManager;
-import org.secuso.privacyfriendlypausinghealthily.exercises.ExerciseLocale;
-import org.secuso.privacyfriendlypausinghealthily.R;
-import org.secuso.privacyfriendlypausinghealthily.activities.adapter.ExerciseSetSpinnerAdapter;
-import org.secuso.privacyfriendlypausinghealthily.activities.helper.BaseActivity;
-import org.secuso.privacyfriendlypausinghealthily.database.SQLiteHelper;
-import org.secuso.privacyfriendlypausinghealthily.database.data.ExerciseSet;
-import org.secuso.privacyfriendlypausinghealthily.service.TimerService;
+import org.secuso.aktivpause.activities.tutorial.FirstLaunchManager;
+import org.secuso.aktivpause.exercises.ExerciseLocale;
+import org.secuso.aktivpause.R;
+import org.secuso.aktivpause.activities.adapter.ExerciseSetSpinnerAdapter;
+import org.secuso.aktivpause.activities.helper.BaseActivity;
+import org.secuso.aktivpause.database.SQLiteHelper;
+import org.secuso.aktivpause.database.data.ExerciseSet;
+import org.secuso.aktivpause.service.TimerService;
import com.shawnlin.numberpicker.NumberPicker;
@@ -43,8 +43,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
-import static org.secuso.privacyfriendlypausinghealthily.activities.tutorial.FirstLaunchManager.DEFAULT_EXERCISE_SET;
-import static org.secuso.privacyfriendlypausinghealthily.activities.tutorial.FirstLaunchManager.PAUSE_TIME;
+import static org.secuso.aktivpause.activities.tutorial.FirstLaunchManager.DEFAULT_EXERCISE_SET;
+import static org.secuso.aktivpause.activities.tutorial.FirstLaunchManager.PAUSE_TIME;
/**
* This is the main break reminder activity. It lets you choose exercise and work times, as well as the exercises you want to perform during the break.
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/adapter/ExerciseAdapter.java b/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseAdapter.java
similarity index 91%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/adapter/ExerciseAdapter.java
rename to app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseAdapter.java
index 05bc57b..755f5ca 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/adapter/ExerciseAdapter.java
+++ b/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseAdapter.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlypausinghealthily.activities.adapter;
+package org.secuso.aktivpause.activities.adapter;
import android.content.Context;
import android.graphics.drawable.Drawable;
@@ -18,11 +18,11 @@ import android.widget.ImageView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
-import org.secuso.privacyfriendlypausinghealthily.R;
-import org.secuso.privacyfriendlypausinghealthily.activities.helper.IExerciseTimeUpdateable;
-import org.secuso.privacyfriendlypausinghealthily.activities.tutorial.FirstLaunchManager;
-import org.secuso.privacyfriendlypausinghealthily.database.data.Exercise;
-import org.secuso.privacyfriendlypausinghealthily.dialog.ExerciseDialog;
+import org.secuso.aktivpause.R;
+import org.secuso.aktivpause.activities.helper.IExerciseTimeUpdateable;
+import org.secuso.aktivpause.activities.tutorial.FirstLaunchManager;
+import org.secuso.aktivpause.database.data.Exercise;
+import org.secuso.aktivpause.dialog.ExerciseDialog;
import java.util.ArrayList;
import java.util.Collections;
@@ -258,9 +258,25 @@ public class ExerciseAdapter extends RecyclerView.Adapter specificIds) {
- long exerciseDuration = Long.parseLong(PreferenceManager.getDefaultSharedPreferences(mContext).getString(FirstLaunchManager.EXERCISE_DURATION, "30"));
- int seconds = (int) (getExerciseCount(specificIds) * exerciseDuration);
- return String.format(Locale.getDefault(), "%02d:%02d", (seconds / 60), (seconds % 60));
+ List checkedExercises = new LinkedList();
+
+ for(int id : checkedIds) {
+ for(Exercise e : mAllExercises) {
+ if (e.getId() == id) {
+ checkedExercises.add(e);
+ }
+ }
+ }
+
+ long exerciseDuration = 0;
+
+ for(Exercise e : checkedExercises) {
+ for(int d : e.getDurations()) {
+ exerciseDuration += d;
+ }
+ }
+
+ return String.format(Locale.getDefault(), "%02d:%02d", (exerciseDuration / 60), (exerciseDuration % 60));
}
public class ExerciseViewHolder extends RecyclerView.ViewHolder {
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/adapter/ExerciseSetListAdapter.java b/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetListAdapter.java
similarity index 94%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/adapter/ExerciseSetListAdapter.java
rename to app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetListAdapter.java
index 7bcbcdf..345fa95 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/adapter/ExerciseSetListAdapter.java
+++ b/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetListAdapter.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlypausinghealthily.activities.adapter;
+package org.secuso.aktivpause.activities.adapter;
import android.content.Intent;
import android.preference.PreferenceManager;
@@ -16,11 +16,11 @@ import android.widget.Toast;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
-import org.secuso.privacyfriendlypausinghealthily.R;
-import org.secuso.privacyfriendlypausinghealthily.activities.EditExerciseSetActivity;
-import org.secuso.privacyfriendlypausinghealthily.activities.ManageExerciseSetsActivity;
-import org.secuso.privacyfriendlypausinghealthily.activities.tutorial.FirstLaunchManager;
-import org.secuso.privacyfriendlypausinghealthily.database.data.ExerciseSet;
+import org.secuso.aktivpause.R;
+import org.secuso.aktivpause.activities.EditExerciseSetActivity;
+import org.secuso.aktivpause.activities.ManageExerciseSetsActivity;
+import org.secuso.aktivpause.activities.tutorial.FirstLaunchManager;
+import org.secuso.aktivpause.database.data.ExerciseSet;
import java.util.Iterator;
import java.util.LinkedList;
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/adapter/ExerciseSetSpinnerAdapter.java b/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetSpinnerAdapter.java
similarity index 93%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/adapter/ExerciseSetSpinnerAdapter.java
rename to app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetSpinnerAdapter.java
index f47f25e..aca1836 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/adapter/ExerciseSetSpinnerAdapter.java
+++ b/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetSpinnerAdapter.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlypausinghealthily.activities.adapter;
+package org.secuso.aktivpause.activities.adapter;
import android.content.Context;
import android.preference.PreferenceManager;
@@ -16,9 +16,9 @@ import android.widget.TextView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
-import org.secuso.privacyfriendlypausinghealthily.R;
-import org.secuso.privacyfriendlypausinghealthily.activities.tutorial.FirstLaunchManager;
-import org.secuso.privacyfriendlypausinghealthily.database.data.ExerciseSet;
+import org.secuso.aktivpause.R;
+import org.secuso.aktivpause.activities.tutorial.FirstLaunchManager;
+import org.secuso.aktivpause.database.data.ExerciseSet;
import java.util.Iterator;
import java.util.List;
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/AppCompatPreferenceActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/helper/AppCompatPreferenceActivity.java
similarity index 97%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/AppCompatPreferenceActivity.java
rename to app/src/main/java/org/secuso/aktivpause/activities/helper/AppCompatPreferenceActivity.java
index aac1a3c..2e7a68c 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/AppCompatPreferenceActivity.java
+++ b/app/src/main/java/org/secuso/aktivpause/activities/helper/AppCompatPreferenceActivity.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlypausinghealthily.activities.helper;
+package org.secuso.aktivpause.activities.helper;
import android.content.res.Configuration;
import android.os.Bundle;
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/BaseActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/helper/BaseActivity.java
similarity index 92%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/BaseActivity.java
rename to app/src/main/java/org/secuso/aktivpause/activities/helper/BaseActivity.java
index 1733b0d..4177693 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/BaseActivity.java
+++ b/app/src/main/java/org/secuso/aktivpause/activities/helper/BaseActivity.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlypausinghealthily.activities.helper;
+package org.secuso.aktivpause.activities.helper;
import android.content.Intent;
import android.content.SharedPreferences;
@@ -16,13 +16,13 @@ import android.support.v7.widget.Toolbar;
import android.view.MenuItem;
import android.view.View;
-import org.secuso.privacyfriendlypausinghealthily.R;
-import org.secuso.privacyfriendlypausinghealthily.activities.AboutActivity;
-import org.secuso.privacyfriendlypausinghealthily.activities.HelpActivity;
-import org.secuso.privacyfriendlypausinghealthily.activities.ManageExerciseSetsActivity;
-import org.secuso.privacyfriendlypausinghealthily.activities.SettingsActivity;
-import org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity;
-import org.secuso.privacyfriendlypausinghealthily.activities.tutorial.TutorialActivity;
+import org.secuso.aktivpause.R;
+import org.secuso.aktivpause.activities.AboutActivity;
+import org.secuso.aktivpause.activities.HelpActivity;
+import org.secuso.aktivpause.activities.ManageExerciseSetsActivity;
+import org.secuso.aktivpause.activities.SettingsActivity;
+import org.secuso.aktivpause.activities.TimerActivity;
+import org.secuso.aktivpause.activities.tutorial.TutorialActivity;
import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/ExpandableListAdapter.java b/app/src/main/java/org/secuso/aktivpause/activities/helper/ExpandableListAdapter.java
similarity index 96%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/ExpandableListAdapter.java
rename to app/src/main/java/org/secuso/aktivpause/activities/helper/ExpandableListAdapter.java
index cc0e043..a27df96 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/ExpandableListAdapter.java
+++ b/app/src/main/java/org/secuso/aktivpause/activities/helper/ExpandableListAdapter.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlypausinghealthily.activities.helper;
+package org.secuso.aktivpause.activities.helper;
import android.content.Context;
import android.graphics.Typeface;
@@ -8,7 +8,7 @@ import android.view.ViewGroup;
import android.widget.BaseExpandableListAdapter;
import android.widget.TextView;
-import org.secuso.privacyfriendlypausinghealthily.R;
+import org.secuso.aktivpause.R;
import java.util.HashMap;
import java.util.List;
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/IExerciseTimeUpdateable.java b/app/src/main/java/org/secuso/aktivpause/activities/helper/IExerciseTimeUpdateable.java
similarity index 71%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/IExerciseTimeUpdateable.java
rename to app/src/main/java/org/secuso/aktivpause/activities/helper/IExerciseTimeUpdateable.java
index dd5ba95..d35db76 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/IExerciseTimeUpdateable.java
+++ b/app/src/main/java/org/secuso/aktivpause/activities/helper/IExerciseTimeUpdateable.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlypausinghealthily.activities.helper;
+package org.secuso.aktivpause.activities.helper;
/**
* @author Christopher Beckmann (Kamuno)
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/tutorial/FirstLaunchManager.java b/app/src/main/java/org/secuso/aktivpause/activities/tutorial/FirstLaunchManager.java
similarity index 96%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/tutorial/FirstLaunchManager.java
rename to app/src/main/java/org/secuso/aktivpause/activities/tutorial/FirstLaunchManager.java
index 6056aa5..8f68e38 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/tutorial/FirstLaunchManager.java
+++ b/app/src/main/java/org/secuso/aktivpause/activities/tutorial/FirstLaunchManager.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlypausinghealthily.activities.tutorial;
+package org.secuso.aktivpause.activities.tutorial;
import android.app.NotificationChannel;
import android.app.NotificationChannelGroup;
@@ -10,9 +10,9 @@ import android.os.Build;
import android.preference.PreferenceManager;
import android.support.annotation.RequiresApi;
-import org.secuso.privacyfriendlypausinghealthily.R;
-import org.secuso.privacyfriendlypausinghealthily.database.SQLiteHelper;
-import org.secuso.privacyfriendlypausinghealthily.database.columns.ExerciseSetColumns;
+import org.secuso.aktivpause.R;
+import org.secuso.aktivpause.database.SQLiteHelper;
+import org.secuso.aktivpause.database.columns.ExerciseSetColumns;
import java.util.ArrayList;
import java.util.Arrays;
@@ -90,7 +90,7 @@ public class FirstLaunchManager {
.putStringSet(PREF_SCHEDULE_EXERCISE_DAYS, new HashSet(Arrays.asList("Mo", "Di", "Mi", "Do", "Fr", "Sa", "So")))
.apply();
- loadInitialExerciseSets();
+ //TODO loadInitialExerciseSets();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/tutorial/TutorialActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/tutorial/TutorialActivity.java
similarity index 96%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/tutorial/TutorialActivity.java
rename to app/src/main/java/org/secuso/aktivpause/activities/tutorial/TutorialActivity.java
index e0ca6d3..c0451b5 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/tutorial/TutorialActivity.java
+++ b/app/src/main/java/org/secuso/aktivpause/activities/tutorial/TutorialActivity.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlypausinghealthily.activities.tutorial;
+package org.secuso.aktivpause.activities.tutorial;
import android.content.Context;
import android.content.Intent;
@@ -19,8 +19,8 @@ import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.TextView;
-import org.secuso.privacyfriendlypausinghealthily.R;
-import org.secuso.privacyfriendlypausinghealthily.activities.ManageExerciseSetsActivity;
+import org.secuso.aktivpause.R;
+import org.secuso.aktivpause.activities.ManageExerciseSetsActivity;
/**
* Class structure taken from tutorial at http://www.androidhive.info/2016/05/android-build-intro-slider-app/
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/SQLiteHelper.java b/app/src/main/java/org/secuso/aktivpause/database/SQLiteHelper.java
similarity index 95%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/SQLiteHelper.java
rename to app/src/main/java/org/secuso/aktivpause/database/SQLiteHelper.java
index 550477d..1b3c698 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/SQLiteHelper.java
+++ b/app/src/main/java/org/secuso/aktivpause/database/SQLiteHelper.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlypausinghealthily.database;
+package org.secuso.aktivpause.database;
import android.content.ContentValues;
@@ -9,11 +9,11 @@ import android.support.annotation.NonNull;
import com.readystatesoftware.sqliteasset.SQLiteAssetHelper;
-import org.secuso.privacyfriendlypausinghealthily.database.columns.ExerciseSetColumns;
-import org.secuso.privacyfriendlypausinghealthily.database.data.Exercise;
-import org.secuso.privacyfriendlypausinghealthily.database.columns.ExerciseColumns;
-import org.secuso.privacyfriendlypausinghealthily.database.columns.ExerciseLocalColumns;
-import org.secuso.privacyfriendlypausinghealthily.database.data.ExerciseSet;
+import org.secuso.aktivpause.database.columns.ExerciseSetColumns;
+import org.secuso.aktivpause.database.data.Exercise;
+import org.secuso.aktivpause.database.columns.ExerciseColumns;
+import org.secuso.aktivpause.database.columns.ExerciseLocalColumns;
+import org.secuso.aktivpause.database.data.ExerciseSet;
import java.util.ArrayList;
import java.util.LinkedList;
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/columns/ExerciseColumns.java b/app/src/main/java/org/secuso/aktivpause/database/columns/ExerciseColumns.java
similarity index 79%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/columns/ExerciseColumns.java
rename to app/src/main/java/org/secuso/aktivpause/database/columns/ExerciseColumns.java
index 0e3b0ce..9a0e6dd 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/columns/ExerciseColumns.java
+++ b/app/src/main/java/org/secuso/aktivpause/database/columns/ExerciseColumns.java
@@ -1,8 +1,8 @@
-package org.secuso.privacyfriendlypausinghealthily.database.columns;
+package org.secuso.aktivpause.database.columns;
import android.database.Cursor;
-import org.secuso.privacyfriendlypausinghealthily.database.data.Exercise;
+import org.secuso.aktivpause.database.data.Exercise;
/**
* Database representation of an exercise.
@@ -18,11 +18,13 @@ public final class ExerciseColumns {
public static final String _ID = "exercise_id";
public static final String SECTION = "section";
public static final String IMAGE_ID = "image_id";
+ public static final String DURATION = "duration";
public static final String[] PROJECTION = {
_ID,
SECTION,
IMAGE_ID,
+ DURATION,
};
public static final String SQL_DELETE_ENTRIES = "DROP TABLE IF EXISTS " + TABLE_NAME;
@@ -33,6 +35,7 @@ public final class ExerciseColumns {
e.setId(c.getInt(c.getColumnIndexOrThrow(ExerciseColumns._ID)));
e.setSection(c.getString(c.getColumnIndexOrThrow(ExerciseColumns.SECTION)));
e.setImageID(c.getString(c.getColumnIndexOrThrow(ExerciseColumns.IMAGE_ID)));
+ e.setDuration(c.getString(c.getColumnIndexOrThrow(ExerciseColumns.DURATION)));
return e;
}
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/columns/ExerciseLocalColumns.java b/app/src/main/java/org/secuso/aktivpause/database/columns/ExerciseLocalColumns.java
similarity index 93%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/columns/ExerciseLocalColumns.java
rename to app/src/main/java/org/secuso/aktivpause/database/columns/ExerciseLocalColumns.java
index 083a0c0..c461ca7 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/columns/ExerciseLocalColumns.java
+++ b/app/src/main/java/org/secuso/aktivpause/database/columns/ExerciseLocalColumns.java
@@ -1,9 +1,9 @@
-package org.secuso.privacyfriendlypausinghealthily.database.columns;
+package org.secuso.aktivpause.database.columns;
import android.content.ContentValues;
import android.database.Cursor;
-import org.secuso.privacyfriendlypausinghealthily.database.data.Exercise;
+import org.secuso.aktivpause.database.data.Exercise;
/**
* Localised strings of an exercise.
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/columns/ExerciseSetColumns.java b/app/src/main/java/org/secuso/aktivpause/database/columns/ExerciseSetColumns.java
similarity index 90%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/columns/ExerciseSetColumns.java
rename to app/src/main/java/org/secuso/aktivpause/database/columns/ExerciseSetColumns.java
index 307c28a..db3cce2 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/columns/ExerciseSetColumns.java
+++ b/app/src/main/java/org/secuso/aktivpause/database/columns/ExerciseSetColumns.java
@@ -1,9 +1,9 @@
-package org.secuso.privacyfriendlypausinghealthily.database.columns;
+package org.secuso.aktivpause.database.columns;
import android.content.ContentValues;
import android.database.Cursor;
-import org.secuso.privacyfriendlypausinghealthily.database.data.ExerciseSet;
+import org.secuso.aktivpause.database.data.ExerciseSet;
/**
* Database columns and utility methods for exercise sets.
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/data/Exercise.java b/app/src/main/java/org/secuso/aktivpause/database/data/Exercise.java
similarity index 78%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/data/Exercise.java
rename to app/src/main/java/org/secuso/aktivpause/database/data/Exercise.java
index 6b37d71..3c48425 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/data/Exercise.java
+++ b/app/src/main/java/org/secuso/aktivpause/database/data/Exercise.java
@@ -1,10 +1,10 @@
-package org.secuso.privacyfriendlypausinghealthily.database.data;
+package org.secuso.aktivpause.database.data;
import android.content.Context;
import android.support.annotation.DrawableRes;
-import org.secuso.privacyfriendlypausinghealthily.exercises.ExerciseSections;
+import org.secuso.aktivpause.exercises.ExerciseSections;
/**
* Model for an exercise.
@@ -14,6 +14,7 @@ import org.secuso.privacyfriendlypausinghealthily.exercises.ExerciseSections;
public class Exercise {
private int id;
private int localId;
+ private String duration = "30";
private String section = "";
private String execution = "";
private String description = "";
@@ -63,7 +64,7 @@ public class Exercise {
for(int i = 0; i < result.length; ++i) {
result[i] = context.getResources().getIdentifier(
- "breakreminder_" + imageIDSplit[i],
+ "image_" + imageIDSplit[i],
"drawable",
context.getPackageName());
}
@@ -71,6 +72,21 @@ public class Exercise {
return result;
}
+ public String getDurationString() {
+ return duration;
+ }
+
+ public int[] getDurations() {
+ String[] durationsSplit = this.duration.split(",");
+ int[] result = new int[durationsSplit.length];
+
+ for(int i = 0; i < durationsSplit.length; i++) {
+ result[i] = Integer.parseInt(durationsSplit[i]);
+ }
+
+ return result;
+ }
+
public String getSection(Context context) {
String section = this.section;
@@ -102,7 +118,8 @@ public class Exercise {
.append(description)
.append(name)
.append(imageID)
- .append(language);
+ .append(language)
+ .append(duration);
return sb.toString().hashCode();
}
@@ -119,6 +136,11 @@ public class Exercise {
&& this.description.equals(other.description)
&& this.name.equals(other.name)
&& this.imageID.equals(other.imageID)
- && this.language.equals(other.language);
+ && this.language.equals(other.language)
+ && this.duration.equals(other.duration);
+ }
+
+ public void setDuration(String duration) {
+ this.duration = duration;
}
}
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/data/ExerciseSet.java b/app/src/main/java/org/secuso/aktivpause/database/data/ExerciseSet.java
similarity index 78%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/data/ExerciseSet.java
rename to app/src/main/java/org/secuso/aktivpause/database/data/ExerciseSet.java
index 9e28858..54c59b2 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/data/ExerciseSet.java
+++ b/app/src/main/java/org/secuso/aktivpause/database/data/ExerciseSet.java
@@ -1,9 +1,6 @@
-package org.secuso.privacyfriendlypausinghealthily.database.data;
+package org.secuso.aktivpause.database.data;
import android.content.Context;
-import android.preference.PreferenceManager;
-
-import org.secuso.privacyfriendlypausinghealthily.activities.tutorial.FirstLaunchManager;
import java.util.ArrayList;
import java.util.List;
@@ -79,10 +76,13 @@ public class ExerciseSet {
public long getExerciseSetTime(Context context) {
int result = 0;
+
for(Exercise e : getExercises()) {
- result += e.getImageID().split(",").length;
+ for (int duration : e.getDurations()) {
+ result += duration;
+ }
}
- long exerciseDuration = Long.parseLong(PreferenceManager.getDefaultSharedPreferences(context).getString(FirstLaunchManager.EXERCISE_DURATION, "30"));
- return (result * exerciseDuration);
+
+ return (result);
}
}
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/dialog/ExerciseDialog.java b/app/src/main/java/org/secuso/aktivpause/dialog/ExerciseDialog.java
similarity index 93%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/dialog/ExerciseDialog.java
rename to app/src/main/java/org/secuso/aktivpause/dialog/ExerciseDialog.java
index a5300d5..2a497f7 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/dialog/ExerciseDialog.java
+++ b/app/src/main/java/org/secuso/aktivpause/dialog/ExerciseDialog.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlypausinghealthily.dialog;
+package org.secuso.aktivpause.dialog;
import android.content.Context;
import android.content.DialogInterface;
@@ -10,8 +10,8 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
-import org.secuso.privacyfriendlypausinghealthily.R;
-import org.secuso.privacyfriendlypausinghealthily.database.data.Exercise;
+import org.secuso.aktivpause.R;
+import org.secuso.aktivpause.database.data.Exercise;
/**
* @author Christopher Beckmann
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/exercises/ExerciseLocale.java b/app/src/main/java/org/secuso/aktivpause/exercises/ExerciseLocale.java
similarity index 92%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/exercises/ExerciseLocale.java
rename to app/src/main/java/org/secuso/aktivpause/exercises/ExerciseLocale.java
index bb9a1be..053187d 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/exercises/ExerciseLocale.java
+++ b/app/src/main/java/org/secuso/aktivpause/exercises/ExerciseLocale.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlypausinghealthily.exercises;
+package org.secuso.aktivpause.exercises;
import java.util.Arrays;
import java.util.HashSet;
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/exercises/ExerciseSections.java b/app/src/main/java/org/secuso/aktivpause/exercises/ExerciseSections.java
similarity index 89%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/exercises/ExerciseSections.java
rename to app/src/main/java/org/secuso/aktivpause/exercises/ExerciseSections.java
index 3706949..ad94946 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/exercises/ExerciseSections.java
+++ b/app/src/main/java/org/secuso/aktivpause/exercises/ExerciseSections.java
@@ -1,9 +1,9 @@
-package org.secuso.privacyfriendlypausinghealthily.exercises;
+package org.secuso.aktivpause.exercises;
import android.content.Context;
import android.support.annotation.StringRes;
-import org.secuso.privacyfriendlypausinghealthily.R;
+import org.secuso.aktivpause.R;
import java.util.Arrays;
import java.util.List;
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/preferences/TimePreference.java b/app/src/main/java/org/secuso/aktivpause/preferences/TimePreference.java
similarity index 97%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/preferences/TimePreference.java
rename to app/src/main/java/org/secuso/aktivpause/preferences/TimePreference.java
index 26113b3..dea49ed 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/preferences/TimePreference.java
+++ b/app/src/main/java/org/secuso/aktivpause/preferences/TimePreference.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlypausinghealthily.preferences;
+package org.secuso.aktivpause.preferences;
import android.content.Context;
import android.content.res.TypedArray;
@@ -9,7 +9,7 @@ import android.util.AttributeSet;
import android.view.View;
import android.widget.TimePicker;
-import org.secuso.privacyfriendlypausinghealthily.R;
+import org.secuso.aktivpause.R;
import java.util.Calendar;
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/NotificationCancelReceiver.java b/app/src/main/java/org/secuso/aktivpause/receivers/NotificationCancelReceiver.java
similarity index 84%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/NotificationCancelReceiver.java
rename to app/src/main/java/org/secuso/aktivpause/receivers/NotificationCancelReceiver.java
index 6070871..30e3958 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/NotificationCancelReceiver.java
+++ b/app/src/main/java/org/secuso/aktivpause/receivers/NotificationCancelReceiver.java
@@ -1,11 +1,11 @@
-package org.secuso.privacyfriendlypausinghealthily.receivers;
+package org.secuso.aktivpause.receivers;
import android.app.NotificationManager;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
-import org.secuso.privacyfriendlypausinghealthily.service.TimerService;
+import org.secuso.aktivpause.service.TimerService;
/**
* @author Christopher Beckmann
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/NotificationDeletedReceiver.java b/app/src/main/java/org/secuso/aktivpause/receivers/NotificationDeletedReceiver.java
similarity index 80%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/NotificationDeletedReceiver.java
rename to app/src/main/java/org/secuso/aktivpause/receivers/NotificationDeletedReceiver.java
index 18709d2..150410b 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/NotificationDeletedReceiver.java
+++ b/app/src/main/java/org/secuso/aktivpause/receivers/NotificationDeletedReceiver.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlypausinghealthily.receivers;
+package org.secuso.aktivpause.receivers;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -6,9 +6,9 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
-import org.secuso.privacyfriendlypausinghealthily.service.TimerService;
+import org.secuso.aktivpause.service.TimerService;
-import static org.secuso.privacyfriendlypausinghealthily.activities.tutorial.FirstLaunchManager.PREF_EXERCISE_CONTINUOUS;
+import static org.secuso.aktivpause.activities.tutorial.FirstLaunchManager.PREF_EXERCISE_CONTINUOUS;
/**
* @author Christopher Beckmann
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/OnBootCompletedReceiver.java b/app/src/main/java/org/secuso/aktivpause/receivers/OnBootCompletedReceiver.java
similarity index 89%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/OnBootCompletedReceiver.java
rename to app/src/main/java/org/secuso/aktivpause/receivers/OnBootCompletedReceiver.java
index e44e3e7..5d72a5e 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/OnBootCompletedReceiver.java
+++ b/app/src/main/java/org/secuso/aktivpause/receivers/OnBootCompletedReceiver.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlypausinghealthily.receivers;
+package org.secuso.aktivpause.receivers;
import android.content.BroadcastReceiver;
import android.content.Context;
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/TimerSchedulerReceiver.java b/app/src/main/java/org/secuso/aktivpause/receivers/TimerSchedulerReceiver.java
similarity index 88%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/TimerSchedulerReceiver.java
rename to app/src/main/java/org/secuso/aktivpause/receivers/TimerSchedulerReceiver.java
index bcda4ac..4ce3279 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/TimerSchedulerReceiver.java
+++ b/app/src/main/java/org/secuso/aktivpause/receivers/TimerSchedulerReceiver.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlypausinghealthily.receivers;
+package org.secuso.aktivpause.receivers;
import android.app.AlarmManager;
import android.app.PendingIntent;
@@ -13,18 +13,18 @@ import android.preference.PreferenceManager;
import android.support.annotation.NonNull;
import android.support.v4.content.WakefulBroadcastReceiver;
-import org.secuso.privacyfriendlypausinghealthily.service.TimerService;
+import org.secuso.aktivpause.service.TimerService;
import java.util.Arrays;
import java.util.Calendar;
import java.util.HashSet;
import java.util.Set;
-import static org.secuso.privacyfriendlypausinghealthily.activities.tutorial.FirstLaunchManager.PREF_SCHEDULE_EXERCISE_DAYS;
-import static org.secuso.privacyfriendlypausinghealthily.activities.tutorial.FirstLaunchManager.PREF_SCHEDULE_EXERCISE_DAYS_ENABLED;
-import static org.secuso.privacyfriendlypausinghealthily.activities.tutorial.FirstLaunchManager.PREF_SCHEDULE_EXERCISE_ENABLED;
-import static org.secuso.privacyfriendlypausinghealthily.activities.tutorial.FirstLaunchManager.PREF_SCHEDULE_EXERCISE_TIME;
-import static org.secuso.privacyfriendlypausinghealthily.activities.tutorial.FirstLaunchManager.WORK_TIME;
+import static org.secuso.aktivpause.activities.tutorial.FirstLaunchManager.PREF_SCHEDULE_EXERCISE_DAYS;
+import static org.secuso.aktivpause.activities.tutorial.FirstLaunchManager.PREF_SCHEDULE_EXERCISE_DAYS_ENABLED;
+import static org.secuso.aktivpause.activities.tutorial.FirstLaunchManager.PREF_SCHEDULE_EXERCISE_ENABLED;
+import static org.secuso.aktivpause.activities.tutorial.FirstLaunchManager.PREF_SCHEDULE_EXERCISE_TIME;
+import static org.secuso.aktivpause.activities.tutorial.FirstLaunchManager.WORK_TIME;
/**
* @author Christopher Beckmann
diff --git a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/service/TimerService.java b/app/src/main/java/org/secuso/aktivpause/service/TimerService.java
similarity index 94%
rename from app/src/main/java/org/secuso/privacyfriendlypausinghealthily/service/TimerService.java
rename to app/src/main/java/org/secuso/aktivpause/service/TimerService.java
index bccd388..fff70b7 100644
--- a/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/service/TimerService.java
+++ b/app/src/main/java/org/secuso/aktivpause/service/TimerService.java
@@ -1,4 +1,4 @@
-package org.secuso.privacyfriendlypausinghealthily.service;
+package org.secuso.aktivpause.service;
import android.app.Notification;
import android.app.NotificationManager;
@@ -17,21 +17,21 @@ import android.provider.Settings;
import android.support.v4.app.NotificationCompat;
import android.support.v4.content.ContextCompat;
-import org.secuso.privacyfriendlypausinghealthily.R;
-import org.secuso.privacyfriendlypausinghealthily.activities.ExerciseActivity;
-import org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity;
-import org.secuso.privacyfriendlypausinghealthily.receivers.NotificationCancelReceiver;
-import org.secuso.privacyfriendlypausinghealthily.receivers.NotificationDeletedReceiver;
+import org.secuso.aktivpause.R;
+import org.secuso.aktivpause.activities.ExerciseActivity;
+import org.secuso.aktivpause.activities.TimerActivity;
+import org.secuso.aktivpause.receivers.NotificationCancelReceiver;
+import org.secuso.aktivpause.receivers.NotificationDeletedReceiver;
import java.util.Locale;
import static android.app.PendingIntent.FLAG_CANCEL_CURRENT;
import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
-import static org.secuso.privacyfriendlypausinghealthily.activities.tutorial.FirstLaunchManager.PREF_EXERCISE_CONTINUOUS;
-import static org.secuso.privacyfriendlypausinghealthily.activities.tutorial.FirstLaunchManager.WORK_TIME;
-import static org.secuso.privacyfriendlypausinghealthily.receivers.NotificationCancelReceiver.ACTION_NOTIFICATION_CANCELED;
-import static org.secuso.privacyfriendlypausinghealthily.receivers.NotificationDeletedReceiver.ACTION_NOTIFICATION_DELETED;
+import static org.secuso.aktivpause.activities.tutorial.FirstLaunchManager.PREF_EXERCISE_CONTINUOUS;
+import static org.secuso.aktivpause.activities.tutorial.FirstLaunchManager.WORK_TIME;
+import static org.secuso.aktivpause.receivers.NotificationCancelReceiver.ACTION_NOTIFICATION_CANCELED;
+import static org.secuso.aktivpause.receivers.NotificationDeletedReceiver.ACTION_NOTIFICATION_DELETED;
/**
* The main timer service. It handles the work timer and sends updates to the notification and the {@link TimerActivity}.
diff --git a/app/src/main/res/drawable/breakreminder_0.png b/app/src/main/res/drawable/breakreminder_0.png
deleted file mode 100644
index f54422a..0000000
Binary files a/app/src/main/res/drawable/breakreminder_0.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_1.png b/app/src/main/res/drawable/breakreminder_1.png
deleted file mode 100644
index eb961b1..0000000
Binary files a/app/src/main/res/drawable/breakreminder_1.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_10.png b/app/src/main/res/drawable/breakreminder_10.png
deleted file mode 100644
index 84aeb6d..0000000
Binary files a/app/src/main/res/drawable/breakreminder_10.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_11.png b/app/src/main/res/drawable/breakreminder_11.png
deleted file mode 100644
index 6cf0f83..0000000
Binary files a/app/src/main/res/drawable/breakreminder_11.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_12.png b/app/src/main/res/drawable/breakreminder_12.png
deleted file mode 100644
index b858daa..0000000
Binary files a/app/src/main/res/drawable/breakreminder_12.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_13.png b/app/src/main/res/drawable/breakreminder_13.png
deleted file mode 100644
index fad8834..0000000
Binary files a/app/src/main/res/drawable/breakreminder_13.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_14.png b/app/src/main/res/drawable/breakreminder_14.png
deleted file mode 100644
index 93c623e..0000000
Binary files a/app/src/main/res/drawable/breakreminder_14.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_15.png b/app/src/main/res/drawable/breakreminder_15.png
deleted file mode 100644
index 0db85cd..0000000
Binary files a/app/src/main/res/drawable/breakreminder_15.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_16.png b/app/src/main/res/drawable/breakreminder_16.png
deleted file mode 100644
index 70541f9..0000000
Binary files a/app/src/main/res/drawable/breakreminder_16.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_17.png b/app/src/main/res/drawable/breakreminder_17.png
deleted file mode 100644
index 73eed99..0000000
Binary files a/app/src/main/res/drawable/breakreminder_17.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_18.png b/app/src/main/res/drawable/breakreminder_18.png
deleted file mode 100644
index 55161c5..0000000
Binary files a/app/src/main/res/drawable/breakreminder_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_19.png b/app/src/main/res/drawable/breakreminder_19.png
deleted file mode 100644
index cbe188d..0000000
Binary files a/app/src/main/res/drawable/breakreminder_19.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_2.png b/app/src/main/res/drawable/breakreminder_2.png
deleted file mode 100644
index a85f30f..0000000
Binary files a/app/src/main/res/drawable/breakreminder_2.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_20.png b/app/src/main/res/drawable/breakreminder_20.png
deleted file mode 100644
index b94fed5..0000000
Binary files a/app/src/main/res/drawable/breakreminder_20.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_21.png b/app/src/main/res/drawable/breakreminder_21.png
deleted file mode 100644
index 8712a6b..0000000
Binary files a/app/src/main/res/drawable/breakreminder_21.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_22.png b/app/src/main/res/drawable/breakreminder_22.png
deleted file mode 100644
index 5930f2a..0000000
Binary files a/app/src/main/res/drawable/breakreminder_22.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_23.png b/app/src/main/res/drawable/breakreminder_23.png
deleted file mode 100644
index 190a5dc..0000000
Binary files a/app/src/main/res/drawable/breakreminder_23.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_24.png b/app/src/main/res/drawable/breakreminder_24.png
deleted file mode 100644
index ca38983..0000000
Binary files a/app/src/main/res/drawable/breakreminder_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_25.png b/app/src/main/res/drawable/breakreminder_25.png
deleted file mode 100644
index 3688808..0000000
Binary files a/app/src/main/res/drawable/breakreminder_25.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_26.png b/app/src/main/res/drawable/breakreminder_26.png
deleted file mode 100644
index 7933a4d..0000000
Binary files a/app/src/main/res/drawable/breakreminder_26.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_27.png b/app/src/main/res/drawable/breakreminder_27.png
deleted file mode 100644
index 0169467..0000000
Binary files a/app/src/main/res/drawable/breakreminder_27.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_28.png b/app/src/main/res/drawable/breakreminder_28.png
deleted file mode 100644
index c4b801b..0000000
Binary files a/app/src/main/res/drawable/breakreminder_28.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_29.png b/app/src/main/res/drawable/breakreminder_29.png
deleted file mode 100644
index 8883b5e..0000000
Binary files a/app/src/main/res/drawable/breakreminder_29.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_3.png b/app/src/main/res/drawable/breakreminder_3.png
deleted file mode 100644
index b08b4c7..0000000
Binary files a/app/src/main/res/drawable/breakreminder_3.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_30.png b/app/src/main/res/drawable/breakreminder_30.png
deleted file mode 100644
index 7992104..0000000
Binary files a/app/src/main/res/drawable/breakreminder_30.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_31.png b/app/src/main/res/drawable/breakreminder_31.png
deleted file mode 100644
index be9bc0a..0000000
Binary files a/app/src/main/res/drawable/breakreminder_31.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_32.png b/app/src/main/res/drawable/breakreminder_32.png
deleted file mode 100644
index 9865633..0000000
Binary files a/app/src/main/res/drawable/breakreminder_32.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_33.png b/app/src/main/res/drawable/breakreminder_33.png
deleted file mode 100644
index 6d272ea..0000000
Binary files a/app/src/main/res/drawable/breakreminder_33.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_34.png b/app/src/main/res/drawable/breakreminder_34.png
deleted file mode 100644
index 1f88da5..0000000
Binary files a/app/src/main/res/drawable/breakreminder_34.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_35.png b/app/src/main/res/drawable/breakreminder_35.png
deleted file mode 100644
index cf39a64..0000000
Binary files a/app/src/main/res/drawable/breakreminder_35.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_36.png b/app/src/main/res/drawable/breakreminder_36.png
deleted file mode 100644
index 15450b7..0000000
Binary files a/app/src/main/res/drawable/breakreminder_36.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_37.png b/app/src/main/res/drawable/breakreminder_37.png
deleted file mode 100644
index 0f90a2a..0000000
Binary files a/app/src/main/res/drawable/breakreminder_37.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_38.png b/app/src/main/res/drawable/breakreminder_38.png
deleted file mode 100644
index 65c56bb..0000000
Binary files a/app/src/main/res/drawable/breakreminder_38.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_39.png b/app/src/main/res/drawable/breakreminder_39.png
deleted file mode 100644
index 8fd1c31..0000000
Binary files a/app/src/main/res/drawable/breakreminder_39.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_4.png b/app/src/main/res/drawable/breakreminder_4.png
deleted file mode 100644
index 30d062a..0000000
Binary files a/app/src/main/res/drawable/breakreminder_4.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_40.png b/app/src/main/res/drawable/breakreminder_40.png
deleted file mode 100644
index 6fb2d10..0000000
Binary files a/app/src/main/res/drawable/breakreminder_40.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_41.png b/app/src/main/res/drawable/breakreminder_41.png
deleted file mode 100644
index 0d1ac0f..0000000
Binary files a/app/src/main/res/drawable/breakreminder_41.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_42.png b/app/src/main/res/drawable/breakreminder_42.png
deleted file mode 100644
index b3fe9e8..0000000
Binary files a/app/src/main/res/drawable/breakreminder_42.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_43.png b/app/src/main/res/drawable/breakreminder_43.png
deleted file mode 100644
index 9dd8ecf..0000000
Binary files a/app/src/main/res/drawable/breakreminder_43.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_44.png b/app/src/main/res/drawable/breakreminder_44.png
deleted file mode 100644
index 8ee29de..0000000
Binary files a/app/src/main/res/drawable/breakreminder_44.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_45.png b/app/src/main/res/drawable/breakreminder_45.png
deleted file mode 100644
index 690d8b5..0000000
Binary files a/app/src/main/res/drawable/breakreminder_45.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_46.png b/app/src/main/res/drawable/breakreminder_46.png
deleted file mode 100644
index 326e5fe..0000000
Binary files a/app/src/main/res/drawable/breakreminder_46.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_47.png b/app/src/main/res/drawable/breakreminder_47.png
deleted file mode 100644
index f0179ef..0000000
Binary files a/app/src/main/res/drawable/breakreminder_47.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_48.png b/app/src/main/res/drawable/breakreminder_48.png
deleted file mode 100644
index ed558aa..0000000
Binary files a/app/src/main/res/drawable/breakreminder_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_49.png b/app/src/main/res/drawable/breakreminder_49.png
deleted file mode 100644
index 68c4ce6..0000000
Binary files a/app/src/main/res/drawable/breakreminder_49.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_5.png b/app/src/main/res/drawable/breakreminder_5.png
deleted file mode 100644
index 8403316..0000000
Binary files a/app/src/main/res/drawable/breakreminder_5.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_50.png b/app/src/main/res/drawable/breakreminder_50.png
deleted file mode 100644
index b818102..0000000
Binary files a/app/src/main/res/drawable/breakreminder_50.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_51.png b/app/src/main/res/drawable/breakreminder_51.png
deleted file mode 100644
index 89f72bc..0000000
Binary files a/app/src/main/res/drawable/breakreminder_51.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_52.png b/app/src/main/res/drawable/breakreminder_52.png
deleted file mode 100644
index 0f8e3c6..0000000
Binary files a/app/src/main/res/drawable/breakreminder_52.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_53.png b/app/src/main/res/drawable/breakreminder_53.png
deleted file mode 100644
index 67f4215..0000000
Binary files a/app/src/main/res/drawable/breakreminder_53.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_54.png b/app/src/main/res/drawable/breakreminder_54.png
deleted file mode 100644
index e22321e..0000000
Binary files a/app/src/main/res/drawable/breakreminder_54.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_55.png b/app/src/main/res/drawable/breakreminder_55.png
deleted file mode 100644
index db3fd57..0000000
Binary files a/app/src/main/res/drawable/breakreminder_55.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_56.png b/app/src/main/res/drawable/breakreminder_56.png
deleted file mode 100644
index 2b29ba9..0000000
Binary files a/app/src/main/res/drawable/breakreminder_56.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_6.png b/app/src/main/res/drawable/breakreminder_6.png
deleted file mode 100644
index d738c87..0000000
Binary files a/app/src/main/res/drawable/breakreminder_6.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_7.png b/app/src/main/res/drawable/breakreminder_7.png
deleted file mode 100644
index 8fcb15b..0000000
Binary files a/app/src/main/res/drawable/breakreminder_7.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_8.png b/app/src/main/res/drawable/breakreminder_8.png
deleted file mode 100644
index 658d328..0000000
Binary files a/app/src/main/res/drawable/breakreminder_8.png and /dev/null differ
diff --git a/app/src/main/res/drawable/breakreminder_9.png b/app/src/main/res/drawable/breakreminder_9.png
deleted file mode 100644
index 8ed1d82..0000000
Binary files a/app/src/main/res/drawable/breakreminder_9.png and /dev/null differ
diff --git a/app/src/main/res/layout/activity_choose_exercise.xml b/app/src/main/res/layout/activity_choose_exercise.xml
index 5618cc9..1e1ce1d 100644
--- a/app/src/main/res/layout/activity_choose_exercise.xml
+++ b/app/src/main/res/layout/activity_choose_exercise.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context="org.secuso.privacyfriendlypausinghealthily.activities.ChooseExerciseActivity">
+ tools:context="org.secuso.aktivpause.activities.ChooseExerciseActivity">
+ tools:context="org.secuso.aktivpause.activities.ExerciseActivity">
+ tools:context="org.secuso.aktivpause.activities.EditExerciseSetActivity">
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 769d4ad..006b4d0 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -11,7 +11,7 @@
+ tools:context="org.secuso.aktivpause.activities.EditExerciseSetActivity">
diff --git a/app/src/main/res/layout/activity_timer.xml b/app/src/main/res/layout/activity_timer.xml
index 1bbaf7e..d2ba8e8 100644
--- a/app/src/main/res/layout/activity_timer.xml
+++ b/app/src/main/res/layout/activity_timer.xml
@@ -12,7 +12,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
- tools:context="org.secuso.privacyfriendlypausinghealthily.activities.EditExerciseSetActivity">
+ tools:context="org.secuso.aktivpause.activities.EditExerciseSetActivity">
@@ -23,7 +23,7 @@
android:layout_margin="0dp"
android:padding="0dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
- tools:context="org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity">
+ tools:context="org.secuso.aktivpause.activities.TimerActivity">
+ app:srcCompat="@drawable/image_placeholder" />
+ app:srcCompat="@drawable/image_placeholder" />
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0a8d815..244111d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
-
-