diff --git a/app/src/androidTest/java/org/secuso/privacyfriendlybreakreminder/ApplicationTest.java b/app/src/androidTest/java/org/secuso/privacyfriendlybreakreminder/ApplicationTest.java deleted file mode 100644 index 1f81edc..0000000 --- a/app/src/androidTest/java/org/secuso/privacyfriendlybreakreminder/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.secuso.privacyfriendlybreakreminder; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 39c7de0..4e37dc4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="org.secuso.privacyfriendlypausinghealthily"> @@ -15,16 +15,16 @@ android:supportsRtl="true" android:theme="@style/AppTheme"> + android:value="org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity" /> @@ -34,92 +34,92 @@ + android:value="org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity" /> + android:value="org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity" /> + android:value="org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity" /> + android:value="org.secuso.privacyfriendlypausinghealthily.activities.ManageExerciseSetsActivity" /> + android:value="org.secuso.privacyfriendlypausinghealthily.activities.EditExerciseSetActivity" /> > + android:value="org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity" /> + android:value="org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity" /> - + - + diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/AboutActivity.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/AboutActivity.java similarity index 93% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/AboutActivity.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/AboutActivity.java index 534b72e..883637f 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/AboutActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/AboutActivity.java @@ -1,4 +1,4 @@ -package org.secuso.privacyfriendlybreakreminder.activities; +package org.secuso.privacyfriendlypausinghealthily.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.privacyfriendlybreakreminder.BuildConfig; -import org.secuso.privacyfriendlybreakreminder.R; +import org.secuso.privacyfriendlypausinghealthily.BuildConfig; +import org.secuso.privacyfriendlypausinghealthily.R; /** * About Page :) diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/ChooseExerciseActivity.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/ChooseExerciseActivity.java similarity index 89% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/ChooseExerciseActivity.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/ChooseExerciseActivity.java index 38d2654..68f0144 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/ChooseExerciseActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/ChooseExerciseActivity.java @@ -1,4 +1,4 @@ -package org.secuso.privacyfriendlybreakreminder.activities; +package org.secuso.privacyfriendlypausinghealthily.activities; import android.content.Intent; import android.os.PersistableBundle; @@ -12,23 +12,21 @@ import android.os.Bundle; import android.support.v7.widget.CardView; import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; import android.widget.TextView; -import org.secuso.privacyfriendlybreakreminder.R; -import org.secuso.privacyfriendlybreakreminder.activities.adapter.ExerciseAdapter; -import org.secuso.privacyfriendlybreakreminder.activities.helper.IExerciseTimeUpdateable; -import org.secuso.privacyfriendlybreakreminder.database.SQLiteHelper; -import org.secuso.privacyfriendlybreakreminder.exercises.ExerciseLocale; -import org.secuso.privacyfriendlybreakreminder.exercises.ExerciseSections; +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 java.util.ArrayList; import java.util.List; -import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; -import static org.secuso.privacyfriendlybreakreminder.activities.adapter.ExerciseAdapter.ID_COMPARATOR; +import static org.secuso.privacyfriendlypausinghealthily.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/privacyfriendlybreakreminder/activities/EditExerciseSetActivity.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/EditExerciseSetActivity.java similarity index 91% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/EditExerciseSetActivity.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/EditExerciseSetActivity.java index 2ad5c96..e72d814 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/EditExerciseSetActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/EditExerciseSetActivity.java @@ -1,10 +1,9 @@ -package org.secuso.privacyfriendlybreakreminder.activities; +package org.secuso.privacyfriendlypausinghealthily.activities; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.content.DialogInterface; import android.content.Intent; -import android.preference.PreferenceManager; import android.support.v4.content.AsyncTaskLoader; import android.support.v4.content.Loader; import android.support.v7.app.ActionBar; @@ -12,7 +11,6 @@ import android.support.v7.app.AlertDialog; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.Toolbar; import android.text.Editable; @@ -27,27 +25,18 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; -import org.secuso.privacyfriendlybreakreminder.activities.adapter.ExerciseAdapter; -import org.secuso.privacyfriendlybreakreminder.activities.helper.IExerciseTimeUpdateable; -import org.secuso.privacyfriendlybreakreminder.activities.tutorial.FirstLaunchManager; -import org.secuso.privacyfriendlybreakreminder.database.data.Exercise; -import org.secuso.privacyfriendlybreakreminder.exercises.ExerciseLocale; -import org.secuso.privacyfriendlybreakreminder.R; -import org.secuso.privacyfriendlybreakreminder.database.SQLiteHelper; -import org.secuso.privacyfriendlybreakreminder.database.data.ExerciseSet; +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 java.util.ArrayList; -import java.util.Calendar; -import java.util.GregorianCalendar; import java.util.LinkedList; import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import javax.xml.datatype.Duration; - -import static org.secuso.privacyfriendlybreakreminder.activities.adapter.ExerciseAdapter.ID_COMPARATOR; +import static org.secuso.privacyfriendlypausinghealthily.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/privacyfriendlybreakreminder/activities/ExerciseActivity.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/ExerciseActivity.java similarity index 97% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/ExerciseActivity.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/ExerciseActivity.java index 26c5960..5467072 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/ExerciseActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/ExerciseActivity.java @@ -1,4 +1,4 @@ -package org.secuso.privacyfriendlybreakreminder.activities; +package org.secuso.privacyfriendlypausinghealthily.activities; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -23,7 +23,6 @@ import android.support.v4.view.MenuItemCompat; import android.support.v7.app.ActionBar; import android.support.v7.app.AlertDialog; import android.support.v7.app.AppCompatActivity; -import android.view.Gravity; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -34,20 +33,20 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; -import org.secuso.privacyfriendlybreakreminder.R; -import org.secuso.privacyfriendlybreakreminder.activities.tutorial.FirstLaunchManager; -import org.secuso.privacyfriendlybreakreminder.database.SQLiteHelper; -import org.secuso.privacyfriendlybreakreminder.database.data.Exercise; -import org.secuso.privacyfriendlybreakreminder.database.data.ExerciseSet; -import org.secuso.privacyfriendlybreakreminder.dialog.ExerciseDialog; -import org.secuso.privacyfriendlybreakreminder.exercises.ExerciseLocale; -import org.secuso.privacyfriendlybreakreminder.service.TimerService; +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 java.util.Locale; import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; import static android.view.Gravity.CENTER_HORIZONTAL; -import static org.secuso.privacyfriendlybreakreminder.service.TimerService.ACTION_STOP_TIMER; +import static org.secuso.privacyfriendlypausinghealthily.service.TimerService.ACTION_STOP_TIMER; /** * This activity handles showing the exercises and the exercise timer. diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/HelpActivity.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/HelpActivity.java similarity index 79% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/HelpActivity.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/HelpActivity.java index 18736d1..2beb6ab 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/HelpActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/HelpActivity.java @@ -1,18 +1,13 @@ -package org.secuso.privacyfriendlybreakreminder.activities; +package org.secuso.privacyfriendlypausinghealthily.activities; import android.os.Bundle; -import android.preference.PreferenceFragment; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.view.MenuItem; import android.widget.ExpandableListView; -import org.secuso.privacyfriendlybreakreminder.R; -import org.secuso.privacyfriendlybreakreminder.activities.helper.BaseActivity; -import org.secuso.privacyfriendlybreakreminder.activities.helper.ExpandableListAdapter; +import org.secuso.privacyfriendlypausinghealthily.R; +import org.secuso.privacyfriendlypausinghealthily.activities.helper.BaseActivity; +import org.secuso.privacyfriendlypausinghealthily.activities.helper.ExpandableListAdapter; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/ManageExerciseSetsActivity.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/ManageExerciseSetsActivity.java similarity index 95% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/ManageExerciseSetsActivity.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/ManageExerciseSetsActivity.java index 0fd9372..1875032 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/ManageExerciseSetsActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/ManageExerciseSetsActivity.java @@ -1,4 +1,4 @@ -package org.secuso.privacyfriendlybreakreminder.activities; +package org.secuso.privacyfriendlypausinghealthily.activities; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -33,16 +33,15 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; -import org.secuso.privacyfriendlybreakreminder.activities.tutorial.FirstLaunchManager; -import org.secuso.privacyfriendlybreakreminder.exercises.ExerciseLocale; -import org.secuso.privacyfriendlybreakreminder.R; -import org.secuso.privacyfriendlybreakreminder.activities.adapter.ExerciseSetListAdapter; -import org.secuso.privacyfriendlybreakreminder.activities.helper.BaseActivity; -import org.secuso.privacyfriendlybreakreminder.database.SQLiteHelper; -import org.secuso.privacyfriendlybreakreminder.database.data.ExerciseSet; +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 java.util.List; -import java.util.Set; import static android.view.View.GONE; import static android.view.View.VISIBLE; diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/SettingsActivity.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/SettingsActivity.java similarity index 96% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/SettingsActivity.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/SettingsActivity.java index c415827..27d7b72 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/SettingsActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/SettingsActivity.java @@ -1,5 +1,5 @@ -package org.secuso.privacyfriendlybreakreminder.activities; +package org.secuso.privacyfriendlypausinghealthily.activities; import android.annotation.TargetApi; @@ -16,9 +16,9 @@ import android.preference.PreferenceFragment; import android.preference.PreferenceManager; import android.view.MenuItem; -import org.secuso.privacyfriendlybreakreminder.R; -import org.secuso.privacyfriendlybreakreminder.activities.helper.AppCompatPreferenceActivity; -import org.secuso.privacyfriendlybreakreminder.receivers.TimerSchedulerReceiver; +import org.secuso.privacyfriendlypausinghealthily.R; +import org.secuso.privacyfriendlypausinghealthily.activities.helper.AppCompatPreferenceActivity; +import org.secuso.privacyfriendlypausinghealthily.receivers.TimerSchedulerReceiver; import java.util.HashSet; import java.util.List; diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/SplashActivity.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/SplashActivity.java similarity index 78% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/SplashActivity.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/SplashActivity.java index 8dfa309..b307ce7 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/SplashActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/SplashActivity.java @@ -1,11 +1,11 @@ -package org.secuso.privacyfriendlybreakreminder.activities; +package org.secuso.privacyfriendlypausinghealthily.activities; import android.content.Intent; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; -import org.secuso.privacyfriendlybreakreminder.activities.tutorial.FirstLaunchManager; -import org.secuso.privacyfriendlybreakreminder.activities.tutorial.TutorialActivity; +import org.secuso.privacyfriendlypausinghealthily.activities.tutorial.FirstLaunchManager; +import org.secuso.privacyfriendlypausinghealthily.activities.tutorial.TutorialActivity; /** * @author yonjuni diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/TimerActivity.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/TimerActivity.java similarity index 84% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/TimerActivity.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/TimerActivity.java index 4ed3abb..88fda7d 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/TimerActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/TimerActivity.java @@ -1,4 +1,4 @@ -package org.secuso.privacyfriendlybreakreminder.activities; +package org.secuso.privacyfriendlypausinghealthily.activities; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -11,14 +11,16 @@ import android.content.IntentFilter; import android.content.ServiceConnection; import android.content.SharedPreferences; import android.graphics.drawable.Drawable; -import android.os.Build; import android.os.IBinder; import android.preference.PreferenceManager; +import android.support.constraint.ConstraintLayout; +import android.support.constraint.ConstraintSet; import android.support.v4.app.ActivityCompat; import android.support.v4.content.AsyncTaskLoader; import android.support.v4.content.Loader; import android.os.Bundle; import android.support.v7.app.AlertDialog; +import android.transition.TransitionManager; import android.view.View; import android.widget.AdapterView; import android.widget.ImageButton; @@ -28,14 +30,14 @@ import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; -import org.secuso.privacyfriendlybreakreminder.activities.tutorial.FirstLaunchManager; -import org.secuso.privacyfriendlybreakreminder.exercises.ExerciseLocale; -import org.secuso.privacyfriendlybreakreminder.R; -import org.secuso.privacyfriendlybreakreminder.activities.adapter.ExerciseSetSpinnerAdapter; -import org.secuso.privacyfriendlybreakreminder.activities.helper.BaseActivity; -import org.secuso.privacyfriendlybreakreminder.database.SQLiteHelper; -import org.secuso.privacyfriendlybreakreminder.database.data.ExerciseSet; -import org.secuso.privacyfriendlybreakreminder.service.TimerService; +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 com.shawnlin.numberpicker.NumberPicker; @@ -43,8 +45,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Locale; -import static org.secuso.privacyfriendlybreakreminder.activities.tutorial.FirstLaunchManager.DEFAULT_EXERCISE_SET; -import static org.secuso.privacyfriendlybreakreminder.activities.tutorial.FirstLaunchManager.PAUSE_TIME; +import static org.secuso.privacyfriendlypausinghealthily.activities.tutorial.FirstLaunchManager.DEFAULT_EXERCISE_SET; +import static org.secuso.privacyfriendlypausinghealthily.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. @@ -57,6 +59,7 @@ public class TimerActivity extends BaseActivity implements android.support.v4.ap private static final String TAG = TimerActivity.class.getSimpleName(); // UI + private ConstraintLayout mainContent; private ProgressBar progressBar; private TextView timerText; private ImageButton playButton; @@ -185,9 +188,11 @@ public class TimerActivity extends BaseActivity implements android.support.v4.ap private void initResources() { final SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this); + mShortAnimationDuration = getResources().getInteger(android.R.integer.config_shortAnimTime); exerciseSetAdapter = new ExerciseSetSpinnerAdapter(this, R.layout.layout_exercise_set, new LinkedList()); + mainContent = findViewById(R.id.main_content); progressBar = (ProgressBar) findViewById(R.id.progressBar); timerText = (TextView) findViewById(R.id.timerText); playButton = (ImageButton) findViewById(R.id.button_playPause); @@ -386,12 +391,34 @@ public class TimerActivity extends BaseActivity implements android.support.v4.ap private synchronized void showPicker(final boolean showPicker) { if(showPicker != currentStatusIsPickerVisible) { - pickerLayout.clearAnimation(); - timerText.clearAnimation(); - progressBar.clearAnimation(); + ConstraintSet constraintSet1 = new ConstraintSet(); + constraintSet1.clone(mainContent); + constraintSet1.setHorizontalBias(R.id.button_playPause, 0.5f); + constraintSet1.setVisibility(R.id.button_reset, View.INVISIBLE); + constraintSet1.setVisibility(R.id.picker_layout, View.VISIBLE); + constraintSet1.setVisibility(R.id.progressBar, View.INVISIBLE); + constraintSet1.setVisibility(R.id.timerText, View.INVISIBLE); + + + ConstraintSet constraintSet2 = new ConstraintSet(); + constraintSet2.clone(mainContent); + constraintSet2.setHorizontalBias(R.id.button_playPause, 0.66f); + constraintSet2.setVisibility(R.id.button_reset, View.VISIBLE); + constraintSet2.setVisibility(R.id.picker_layout, View.INVISIBLE); + constraintSet2.setVisibility(R.id.progressBar, View.VISIBLE); + constraintSet2.setVisibility(R.id.timerText, View.VISIBLE); + + TransitionManager.beginDelayedTransition(mainContent); + ConstraintSet constraint = showPicker ? constraintSet1 : constraintSet2; + constraint.applyTo(mainContent); + + //pickerLayout.clearAnimation(); + //timerText.clearAnimation(); + //progressBar.clearAnimation(); currentStatusIsPickerVisible = showPicker; + /* if (showPicker) { pickerLayout.setAlpha(0f); pickerLayout.setVisibility(View.VISIBLE); @@ -423,6 +450,18 @@ public class TimerActivity extends BaseActivity implements android.support.v4.ap } }); + resetButton.animate() + .alpha(0f) + .setDuration(mShortAnimationDuration) + .setListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + super.onAnimationEnd(animation); + if(currentStatusIsPickerVisible) + resetButton.setVisibility(View.GONE); + } + }); + } else { pickerLayout.animate() .alpha(0f) @@ -447,9 +486,16 @@ public class TimerActivity extends BaseActivity implements android.support.v4.ap progressBar.animate() .alpha(1f) .setDuration(mShortAnimationDuration) - //.setStartDelay(mShortAnimationDuration) + .setListener(null); + + resetButton.setAlpha(0f); + resetButton.setVisibility(View.VISIBLE); + resetButton.animate() + .alpha(1f) + .setDuration(mShortAnimationDuration) .setListener(null); } + */ } } diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseAdapter.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/adapter/ExerciseAdapter.java similarity index 92% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseAdapter.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/adapter/ExerciseAdapter.java index a900e04..05bc57b 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseAdapter.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/adapter/ExerciseAdapter.java @@ -1,4 +1,4 @@ -package org.secuso.privacyfriendlybreakreminder.activities.adapter; +package org.secuso.privacyfriendlypausinghealthily.activities.adapter; import android.content.Context; import android.graphics.drawable.Drawable; @@ -6,8 +6,6 @@ import android.preference.PreferenceManager; import android.support.annotation.NonNull; import android.support.constraint.ConstraintLayout; import android.support.v4.app.ActivityCompat; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; import android.support.v7.util.SortedList; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -16,19 +14,15 @@ import android.view.ViewGroup; import android.widget.CheckBox; import android.widget.ImageButton; import android.widget.ImageView; -import android.widget.TextView; -import android.widget.Toast; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions; -import org.secuso.privacyfriendlybreakreminder.R; -import org.secuso.privacyfriendlybreakreminder.activities.ChooseExerciseActivity; -import org.secuso.privacyfriendlybreakreminder.activities.helper.IExerciseTimeUpdateable; -import org.secuso.privacyfriendlybreakreminder.activities.tutorial.FirstLaunchManager; -import org.secuso.privacyfriendlybreakreminder.database.data.Exercise; -import org.secuso.privacyfriendlybreakreminder.database.data.ExerciseSet; -import org.secuso.privacyfriendlybreakreminder.dialog.ExerciseDialog; +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 java.util.ArrayList; import java.util.Collections; diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseSetListAdapter.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/adapter/ExerciseSetListAdapter.java similarity index 92% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseSetListAdapter.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/adapter/ExerciseSetListAdapter.java index 66e8417..7bcbcdf 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseSetListAdapter.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/adapter/ExerciseSetListAdapter.java @@ -1,8 +1,7 @@ -package org.secuso.privacyfriendlybreakreminder.activities.adapter; +package org.secuso.privacyfriendlypausinghealthily.activities.adapter; import android.content.Intent; import android.preference.PreferenceManager; -import android.support.v4.content.ContextCompat; import android.support.v7.widget.CardView; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -17,12 +16,11 @@ import android.widget.Toast; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions; -import org.secuso.privacyfriendlybreakreminder.R; -import org.secuso.privacyfriendlybreakreminder.activities.EditExerciseSetActivity; -import org.secuso.privacyfriendlybreakreminder.activities.ManageExerciseSetsActivity; -import org.secuso.privacyfriendlybreakreminder.activities.tutorial.FirstLaunchManager; -import org.secuso.privacyfriendlybreakreminder.database.data.Exercise; -import org.secuso.privacyfriendlybreakreminder.database.data.ExerciseSet; +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 java.util.Iterator; import java.util.LinkedList; diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseSetSpinnerAdapter.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/adapter/ExerciseSetSpinnerAdapter.java similarity index 91% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseSetSpinnerAdapter.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/adapter/ExerciseSetSpinnerAdapter.java index dcca7c4..f47f25e 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseSetSpinnerAdapter.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/adapter/ExerciseSetSpinnerAdapter.java @@ -1,10 +1,9 @@ -package org.secuso.privacyfriendlybreakreminder.activities.adapter; +package org.secuso.privacyfriendlypausinghealthily.activities.adapter; import android.content.Context; import android.preference.PreferenceManager; import android.support.annotation.LayoutRes; import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; import android.support.v7.widget.CardView; import android.view.LayoutInflater; import android.view.View; @@ -17,10 +16,9 @@ import android.widget.TextView; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions; -import org.secuso.privacyfriendlybreakreminder.R; -import org.secuso.privacyfriendlybreakreminder.activities.tutorial.FirstLaunchManager; -import org.secuso.privacyfriendlybreakreminder.database.data.Exercise; -import org.secuso.privacyfriendlybreakreminder.database.data.ExerciseSet; +import org.secuso.privacyfriendlypausinghealthily.R; +import org.secuso.privacyfriendlypausinghealthily.activities.tutorial.FirstLaunchManager; +import org.secuso.privacyfriendlypausinghealthily.database.data.ExerciseSet; import java.util.Iterator; import java.util.List; diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/helper/AppCompatPreferenceActivity.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/AppCompatPreferenceActivity.java similarity index 97% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/helper/AppCompatPreferenceActivity.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/AppCompatPreferenceActivity.java index 2f7948b..aac1a3c 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/helper/AppCompatPreferenceActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/AppCompatPreferenceActivity.java @@ -1,4 +1,4 @@ -package org.secuso.privacyfriendlybreakreminder.activities.helper; +package org.secuso.privacyfriendlypausinghealthily.activities.helper; import android.content.res.Configuration; import android.os.Bundle; diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/helper/BaseActivity.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/BaseActivity.java similarity index 91% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/helper/BaseActivity.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/BaseActivity.java index 2b971cb..1733b0d 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/helper/BaseActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/BaseActivity.java @@ -1,10 +1,9 @@ -package org.secuso.privacyfriendlybreakreminder.activities.helper; +package org.secuso.privacyfriendlypausinghealthily.activities.helper; import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; import android.os.Handler; -import android.preference.PreferenceActivity; import android.preference.PreferenceManager; import android.support.design.widget.NavigationView; import android.support.design.widget.NavigationView.OnNavigationItemSelectedListener; @@ -17,13 +16,13 @@ import android.support.v7.widget.Toolbar; import android.view.MenuItem; import android.view.View; -import org.secuso.privacyfriendlybreakreminder.R; -import org.secuso.privacyfriendlybreakreminder.activities.AboutActivity; -import org.secuso.privacyfriendlybreakreminder.activities.HelpActivity; -import org.secuso.privacyfriendlybreakreminder.activities.ManageExerciseSetsActivity; -import org.secuso.privacyfriendlybreakreminder.activities.SettingsActivity; -import org.secuso.privacyfriendlybreakreminder.activities.TimerActivity; -import org.secuso.privacyfriendlybreakreminder.activities.tutorial.TutorialActivity; +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 static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/helper/ExpandableListAdapter.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/ExpandableListAdapter.java similarity index 96% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/helper/ExpandableListAdapter.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/ExpandableListAdapter.java index 03528af..cc0e043 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/helper/ExpandableListAdapter.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/ExpandableListAdapter.java @@ -1,4 +1,4 @@ -package org.secuso.privacyfriendlybreakreminder.activities.helper; +package org.secuso.privacyfriendlypausinghealthily.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.privacyfriendlybreakreminder.R; +import org.secuso.privacyfriendlypausinghealthily.R; import java.util.HashMap; import java.util.List; diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/helper/IExerciseTimeUpdateable.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/IExerciseTimeUpdateable.java similarity index 71% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/helper/IExerciseTimeUpdateable.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/IExerciseTimeUpdateable.java index ace2cef..dd5ba95 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/helper/IExerciseTimeUpdateable.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/IExerciseTimeUpdateable.java @@ -1,4 +1,4 @@ -package org.secuso.privacyfriendlybreakreminder.activities.helper; +package org.secuso.privacyfriendlypausinghealthily.activities.helper; /** * @author Christopher Beckmann (Kamuno) diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/tutorial/FirstLaunchManager.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/tutorial/FirstLaunchManager.java similarity index 95% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/tutorial/FirstLaunchManager.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/tutorial/FirstLaunchManager.java index 803f482..49650eb 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/tutorial/FirstLaunchManager.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/tutorial/FirstLaunchManager.java @@ -1,21 +1,18 @@ -package org.secuso.privacyfriendlybreakreminder.activities.tutorial; +package org.secuso.privacyfriendlypausinghealthily.activities.tutorial; -import android.app.Notification; import android.app.NotificationChannel; import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.content.SharedPreferences; import android.database.Cursor; -import android.graphics.Color; import android.os.Build; import android.preference.PreferenceManager; import android.support.annotation.RequiresApi; -import android.support.v4.app.NotificationCompat; -import org.secuso.privacyfriendlybreakreminder.R; -import org.secuso.privacyfriendlybreakreminder.database.SQLiteHelper; -import org.secuso.privacyfriendlybreakreminder.database.columns.ExerciseSetColumns; +import org.secuso.privacyfriendlypausinghealthily.R; +import org.secuso.privacyfriendlypausinghealthily.database.SQLiteHelper; +import org.secuso.privacyfriendlypausinghealthily.database.columns.ExerciseSetColumns; import java.util.ArrayList; import java.util.Arrays; diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/tutorial/TutorialActivity.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/tutorial/TutorialActivity.java similarity index 96% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/tutorial/TutorialActivity.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/tutorial/TutorialActivity.java index 250e3f3..e0ca6d3 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/tutorial/TutorialActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/tutorial/TutorialActivity.java @@ -1,4 +1,4 @@ -package org.secuso.privacyfriendlybreakreminder.activities.tutorial; +package org.secuso.privacyfriendlypausinghealthily.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.privacyfriendlybreakreminder.R; -import org.secuso.privacyfriendlybreakreminder.activities.ManageExerciseSetsActivity; +import org.secuso.privacyfriendlypausinghealthily.R; +import org.secuso.privacyfriendlypausinghealthily.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/privacyfriendlybreakreminder/database/SQLiteHelper.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/SQLiteHelper.java similarity index 95% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/SQLiteHelper.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/SQLiteHelper.java index 0db9c3c..945a712 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/SQLiteHelper.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/SQLiteHelper.java @@ -1,4 +1,4 @@ -package org.secuso.privacyfriendlybreakreminder.database; +package org.secuso.privacyfriendlypausinghealthily.database; import android.content.ContentValues; @@ -9,11 +9,11 @@ import android.support.annotation.NonNull; import com.readystatesoftware.sqliteasset.SQLiteAssetHelper; -import org.secuso.privacyfriendlybreakreminder.database.columns.ExerciseSetColumns; -import org.secuso.privacyfriendlybreakreminder.database.data.Exercise; -import org.secuso.privacyfriendlybreakreminder.database.columns.ExerciseColumns; -import org.secuso.privacyfriendlybreakreminder.database.columns.ExerciseLocalColumns; -import org.secuso.privacyfriendlybreakreminder.database.data.ExerciseSet; +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 java.util.ArrayList; import java.util.LinkedList; diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/columns/ExerciseColumns.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/columns/ExerciseColumns.java similarity index 85% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/columns/ExerciseColumns.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/columns/ExerciseColumns.java index 65c9725..0e3b0ce 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/columns/ExerciseColumns.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/columns/ExerciseColumns.java @@ -1,9 +1,8 @@ -package org.secuso.privacyfriendlybreakreminder.database.columns; +package org.secuso.privacyfriendlypausinghealthily.database.columns; -import android.content.ContentValues; import android.database.Cursor; -import org.secuso.privacyfriendlybreakreminder.database.data.Exercise; +import org.secuso.privacyfriendlypausinghealthily.database.data.Exercise; /** * Database representation of an exercise. diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/columns/ExerciseLocalColumns.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/columns/ExerciseLocalColumns.java similarity index 93% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/columns/ExerciseLocalColumns.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/columns/ExerciseLocalColumns.java index 74dd2f9..083a0c0 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/columns/ExerciseLocalColumns.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/columns/ExerciseLocalColumns.java @@ -1,9 +1,9 @@ -package org.secuso.privacyfriendlybreakreminder.database.columns; +package org.secuso.privacyfriendlypausinghealthily.database.columns; import android.content.ContentValues; import android.database.Cursor; -import org.secuso.privacyfriendlybreakreminder.database.data.Exercise; +import org.secuso.privacyfriendlypausinghealthily.database.data.Exercise; /** * Localised strings of an exercise. diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/columns/ExerciseSetColumns.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/columns/ExerciseSetColumns.java similarity index 85% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/columns/ExerciseSetColumns.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/columns/ExerciseSetColumns.java index f81885c..307c28a 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/columns/ExerciseSetColumns.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/columns/ExerciseSetColumns.java @@ -1,11 +1,9 @@ -package org.secuso.privacyfriendlybreakreminder.database.columns; +package org.secuso.privacyfriendlypausinghealthily.database.columns; import android.content.ContentValues; import android.database.Cursor; -import android.provider.BaseColumns; -import org.secuso.privacyfriendlybreakreminder.database.data.Exercise; -import org.secuso.privacyfriendlybreakreminder.database.data.ExerciseSet; +import org.secuso.privacyfriendlypausinghealthily.database.data.ExerciseSet; /** * Database columns and utility methods for exercise sets. diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/data/Exercise.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/data/Exercise.java similarity index 94% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/data/Exercise.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/data/Exercise.java index ff1d5f9..6b37d71 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/data/Exercise.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/data/Exercise.java @@ -1,11 +1,10 @@ -package org.secuso.privacyfriendlybreakreminder.database.data; +package org.secuso.privacyfriendlypausinghealthily.database.data; import android.content.Context; import android.support.annotation.DrawableRes; -import android.support.annotation.IdRes; -import org.secuso.privacyfriendlybreakreminder.exercises.ExerciseSections; +import org.secuso.privacyfriendlypausinghealthily.exercises.ExerciseSections; /** * Model for an exercise. diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/data/ExerciseSet.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/data/ExerciseSet.java similarity index 92% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/data/ExerciseSet.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/data/ExerciseSet.java index f7f8064..9e28858 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/data/ExerciseSet.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/data/ExerciseSet.java @@ -1,9 +1,9 @@ -package org.secuso.privacyfriendlybreakreminder.database.data; +package org.secuso.privacyfriendlypausinghealthily.database.data; import android.content.Context; import android.preference.PreferenceManager; -import org.secuso.privacyfriendlybreakreminder.activities.tutorial.FirstLaunchManager; +import org.secuso.privacyfriendlypausinghealthily.activities.tutorial.FirstLaunchManager; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/dialog/ExerciseDialog.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/dialog/ExerciseDialog.java similarity index 93% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/dialog/ExerciseDialog.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/dialog/ExerciseDialog.java index b46b62f..a5300d5 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/dialog/ExerciseDialog.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/dialog/ExerciseDialog.java @@ -1,4 +1,4 @@ -package org.secuso.privacyfriendlybreakreminder.dialog; +package org.secuso.privacyfriendlypausinghealthily.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.privacyfriendlybreakreminder.R; -import org.secuso.privacyfriendlybreakreminder.database.data.Exercise; +import org.secuso.privacyfriendlypausinghealthily.R; +import org.secuso.privacyfriendlypausinghealthily.database.data.Exercise; /** * @author Christopher Beckmann diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/exercises/ExerciseLocale.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/exercises/ExerciseLocale.java similarity index 92% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/exercises/ExerciseLocale.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/exercises/ExerciseLocale.java index 47e39c0..24febed 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/exercises/ExerciseLocale.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/exercises/ExerciseLocale.java @@ -1,4 +1,4 @@ -package org.secuso.privacyfriendlybreakreminder.exercises; +package org.secuso.privacyfriendlypausinghealthily.exercises; import java.util.Arrays; import java.util.HashSet; diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/exercises/ExerciseSections.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/exercises/ExerciseSections.java similarity index 89% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/exercises/ExerciseSections.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/exercises/ExerciseSections.java index ca8467a..3706949 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/exercises/ExerciseSections.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/exercises/ExerciseSections.java @@ -1,9 +1,9 @@ -package org.secuso.privacyfriendlybreakreminder.exercises; +package org.secuso.privacyfriendlypausinghealthily.exercises; import android.content.Context; import android.support.annotation.StringRes; -import org.secuso.privacyfriendlybreakreminder.R; +import org.secuso.privacyfriendlypausinghealthily.R; import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/preferences/TimePreference.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/preferences/TimePreference.java similarity index 97% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/preferences/TimePreference.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/preferences/TimePreference.java index 0ef818f..26113b3 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/preferences/TimePreference.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/preferences/TimePreference.java @@ -1,4 +1,4 @@ -package org.secuso.privacyfriendlybreakreminder.preferences; +package org.secuso.privacyfriendlypausinghealthily.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.privacyfriendlybreakreminder.R; +import org.secuso.privacyfriendlypausinghealthily.R; import java.util.Calendar; diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/receivers/NotificationCancelReceiver.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/NotificationCancelReceiver.java similarity index 84% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/receivers/NotificationCancelReceiver.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/NotificationCancelReceiver.java index 753d735..e318517 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/receivers/NotificationCancelReceiver.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/NotificationCancelReceiver.java @@ -1,11 +1,11 @@ -package org.secuso.privacyfriendlybreakreminder.receivers; +package org.secuso.privacyfriendlypausinghealthily.receivers; import android.app.NotificationManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import org.secuso.privacyfriendlybreakreminder.service.TimerService; +import org.secuso.privacyfriendlypausinghealthily.service.TimerService; /** * @author Christopher Beckmann diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/receivers/NotificationDeletedReceiver.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/NotificationDeletedReceiver.java similarity index 80% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/receivers/NotificationDeletedReceiver.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/NotificationDeletedReceiver.java index beae57e..18709d2 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/receivers/NotificationDeletedReceiver.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/NotificationDeletedReceiver.java @@ -1,4 +1,4 @@ -package org.secuso.privacyfriendlybreakreminder.receivers; +package org.secuso.privacyfriendlypausinghealthily.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.privacyfriendlybreakreminder.service.TimerService; +import org.secuso.privacyfriendlypausinghealthily.service.TimerService; -import static org.secuso.privacyfriendlybreakreminder.activities.tutorial.FirstLaunchManager.PREF_EXERCISE_CONTINUOUS; +import static org.secuso.privacyfriendlypausinghealthily.activities.tutorial.FirstLaunchManager.PREF_EXERCISE_CONTINUOUS; /** * @author Christopher Beckmann diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/receivers/OnBootCompletedReceiver.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/OnBootCompletedReceiver.java similarity index 89% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/receivers/OnBootCompletedReceiver.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/OnBootCompletedReceiver.java index 213eb7d..e44e3e7 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/receivers/OnBootCompletedReceiver.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/OnBootCompletedReceiver.java @@ -1,4 +1,4 @@ -package org.secuso.privacyfriendlybreakreminder.receivers; +package org.secuso.privacyfriendlypausinghealthily.receivers; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/receivers/TimerSchedulerReceiver.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/TimerSchedulerReceiver.java similarity index 88% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/receivers/TimerSchedulerReceiver.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/TimerSchedulerReceiver.java index 59560f9..85d1c15 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/receivers/TimerSchedulerReceiver.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/TimerSchedulerReceiver.java @@ -1,4 +1,4 @@ -package org.secuso.privacyfriendlybreakreminder.receivers; +package org.secuso.privacyfriendlypausinghealthily.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.privacyfriendlybreakreminder.service.TimerService; +import org.secuso.privacyfriendlypausinghealthily.service.TimerService; import java.util.Arrays; import java.util.Calendar; import java.util.HashSet; import java.util.Set; -import static org.secuso.privacyfriendlybreakreminder.activities.tutorial.FirstLaunchManager.PREF_SCHEDULE_EXERCISE_DAYS; -import static org.secuso.privacyfriendlybreakreminder.activities.tutorial.FirstLaunchManager.PREF_SCHEDULE_EXERCISE_DAYS_ENABLED; -import static org.secuso.privacyfriendlybreakreminder.activities.tutorial.FirstLaunchManager.PREF_SCHEDULE_EXERCISE_ENABLED; -import static org.secuso.privacyfriendlybreakreminder.activities.tutorial.FirstLaunchManager.PREF_SCHEDULE_EXERCISE_TIME; -import static org.secuso.privacyfriendlybreakreminder.activities.tutorial.FirstLaunchManager.WORK_TIME; +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; /** * @author Christopher Beckmann diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/service/TimerService.java b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/service/TimerService.java similarity index 93% rename from app/src/main/java/org/secuso/privacyfriendlybreakreminder/service/TimerService.java rename to app/src/main/java/org/secuso/privacyfriendlypausinghealthily/service/TimerService.java index 954cb98..c469dea 100644 --- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/service/TimerService.java +++ b/app/src/main/java/org/secuso/privacyfriendlypausinghealthily/service/TimerService.java @@ -1,4 +1,4 @@ -package org.secuso.privacyfriendlybreakreminder.service; +package org.secuso.privacyfriendlypausinghealthily.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.privacyfriendlybreakreminder.R; -import org.secuso.privacyfriendlybreakreminder.activities.ExerciseActivity; -import org.secuso.privacyfriendlybreakreminder.activities.TimerActivity; -import org.secuso.privacyfriendlybreakreminder.receivers.NotificationCancelReceiver; -import org.secuso.privacyfriendlybreakreminder.receivers.NotificationDeletedReceiver; +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 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.privacyfriendlybreakreminder.activities.tutorial.FirstLaunchManager.PREF_EXERCISE_CONTINUOUS; -import static org.secuso.privacyfriendlybreakreminder.activities.tutorial.FirstLaunchManager.WORK_TIME; -import static org.secuso.privacyfriendlybreakreminder.receivers.NotificationCancelReceiver.ACTION_NOTIFICATION_CANCELED; -import static org.secuso.privacyfriendlybreakreminder.receivers.NotificationDeletedReceiver.ACTION_NOTIFICATION_DELETED; +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; /** * 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/layout/activity_choose_exercise.xml b/app/src/main/res/layout/activity_choose_exercise.xml index 85306d9..5618cc9 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.privacyfriendlybreakreminder.activities.ChooseExerciseActivity"> + tools:context="org.secuso.privacyfriendlypausinghealthily.activities.ChooseExerciseActivity"> + tools:context="org.secuso.privacyfriendlypausinghealthily.activities.ExerciseActivity"> + tools:context="org.secuso.privacyfriendlypausinghealthily.activities.EditExerciseSetActivity"> diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 2596181..769d4ad 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.privacyfriendlypausinghealthily.activities.EditExerciseSetActivity"> diff --git a/app/src/main/res/layout/activity_timer.xml b/app/src/main/res/layout/activity_timer.xml index 73c1293..8299b21 100644 --- a/app/src/main/res/layout/activity_timer.xml +++ b/app/src/main/res/layout/activity_timer.xml @@ -12,33 +12,31 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" - tools:context="org.secuso.privacyfriendlybreakreminder.activities.EditExerciseSetActivity"> + tools:context="org.secuso.privacyfriendlypausinghealthily.activities.EditExerciseSetActivity"> + tools:context="org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity"> + android:layout_marginTop="8dp" + android:minHeight="100dp" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - - + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toBottomOf="@+id/spinner_choose_exercise_set" + app:layout_constraintBottom_toBottomOf="parent"> + app:np_min="0" />
diff --git a/app/src/main/res/xml/pref_scheduler.xml b/app/src/main/res/xml/pref_scheduler.xml index 73f7b5c..9c446ce 100644 --- a/app/src/main/res/xml/pref_scheduler.xml +++ b/app/src/main/res/xml/pref_scheduler.xml @@ -16,7 +16,7 @@ android:key="pref_schedule_exercise_time" android:title="@string/pref_schedule_exercise_time"/> --> -