bitPickups/bitPicksAktivpause
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restructure and Fixed #26. Smoother animations.

Browse source
This commit is contained in:
Christopher Beckmann 2018-09-18 15:20:08 +02:00
commit 5a70021a3f
43 changed files with 322 additions and 357 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/src/androidTest/java/org/secuso/privacyfriendlybreakreminder/ApplicationTest.java
View file

@ -1,13 +0,0 @@
package org.secuso.privacyfriendlybreakreminder;
import android.app.Application;
import android.test.ApplicationTestCase;
/**
* <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
*/
public class ApplicationTest extends ApplicationTestCase<Application> {
public ApplicationTest() {
super(Application.class);
}
}

60
app/src/main/AndroidManifest.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.secuso.privacyfriendlybreakreminder">
package="org.secuso.privacyfriendlypausinghealthily">
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@ -15,16 +15,16 @@
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name=".activities.SettingsActivity"
android:name="org.secuso.privacyfriendlypausinghealthily.activities.SettingsActivity"
android:label="@string/title_activity_settings"
android:parentActivityName=".activities.TimerActivity"
android:parentActivityName="org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity"
android:screenOrientation="portrait">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="org.secuso.privacyfriendlybreakreminder.activities.TimerActivity" />
android:value="org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity" />
</activity>
<activity
android:name=".activities.SplashActivity"
android:name="org.secuso.privacyfriendlypausinghealthily.activities.SplashActivity"
android:screenOrientation="portrait"
android:theme="@style/SplashTheme">
<intent-filter>
@ -34,92 +34,92 @@
</intent-filter>
</activity>
<activity
android:name=".activities.tutorial.TutorialActivity"
android:parentActivityName=".activities.TimerActivity"
android:name="org.secuso.privacyfriendlypausinghealthily.activities.tutorial.TutorialActivity"
android:parentActivityName="org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="org.secuso.privacyfriendlybreakreminder.activities.TimerActivity" />
android:value="org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity" />
</activity>
<activity
android:name=".activities.TimerActivity"
android:name="org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity"
android:label="@string/activity_title_break_reminder"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".activities.ManageExerciseSetsActivity"
android:name="org.secuso.privacyfriendlypausinghealthily.activities.ManageExerciseSetsActivity"
android:label="@string/activity_title_manage_exercise_sets"
android:parentActivityName=".activities.TimerActivity"
android:parentActivityName="org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustResize">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="org.secuso.privacyfriendlybreakreminder.activities.TimerActivity" />
android:value="org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity" />
</activity>
<activity
android:name=".activities.ExerciseActivity"
android:name="org.secuso.privacyfriendlypausinghealthily.activities.ExerciseActivity"
android:label=""
android:parentActivityName=".activities.TimerActivity"
android:parentActivityName="org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity"
android:screenOrientation="portrait">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="org.secuso.privacyfriendlybreakreminder.activities.TimerActivity" />
android:value="org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity" />
</activity>
<activity
android:name=".activities.EditExerciseSetActivity"
android:name="org.secuso.privacyfriendlypausinghealthily.activities.EditExerciseSetActivity"
android:label="@string/activity_title_edit_exercise_set"
android:parentActivityName=".activities.ManageExerciseSetsActivity"
android:parentActivityName="org.secuso.privacyfriendlypausinghealthily.activities.ManageExerciseSetsActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustResize">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="org.secuso.privacyfriendlybreakreminder.activities.ManageExerciseSetsActivity" />
android:value="org.secuso.privacyfriendlypausinghealthily.activities.ManageExerciseSetsActivity" />
</activity>
<activity
android:name=".activities.ChooseExerciseActivity"
android:name="org.secuso.privacyfriendlypausinghealthily.activities.ChooseExerciseActivity"
android:label="@string/activity_title_choose_exercises"
android:parentActivityName=".activities.EditExerciseSetActivity"
android:parentActivityName="org.secuso.privacyfriendlypausinghealthily.activities.EditExerciseSetActivity"
android:screenOrientation="portrait">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="org.secuso.privacyfriendlybreakreminder.activities.EditExerciseSetActivity" />
android:value="org.secuso.privacyfriendlypausinghealthily.activities.EditExerciseSetActivity" />
>
</activity>
<activity
android:name=".activities.AboutActivity"
android:name="org.secuso.privacyfriendlypausinghealthily.activities.AboutActivity"
android:label="@string/activity_title_about"
android:parentActivityName=".activities.TimerActivity"
android:parentActivityName="org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity"
android:screenOrientation="portrait">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="org.secuso.privacyfriendlybreakreminder.activities.TimerActivity" />
android:value="org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity" />
</activity>
<activity
android:name=".activities.HelpActivity"
android:name="org.secuso.privacyfriendlypausinghealthily.activities.HelpActivity"
android:label="@string/activity_title_help"
android:parentActivityName=".activities.TimerActivity"
android:parentActivityName="org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="org.secuso.privacyfriendlybreakreminder.activities.TimerActivity" />
android:value="org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity" />
</activity>
<service
android:name=".service.TimerService"
android:name="org.secuso.privacyfriendlypausinghealthily.service.TimerService"
android:enabled="true"
android:exported="false" />
<receiver android:name=".receivers.OnBootCompletedReceiver">
<receiver android:name="org.secuso.privacyfriendlypausinghealthily.receivers.OnBootCompletedReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
</receiver>
<receiver android:name=".receivers.TimerSchedulerReceiver"/>
<receiver android:name="org.secuso.privacyfriendlypausinghealthily.receivers.TimerSchedulerReceiver"/>
</application>

6
app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/AboutActivity.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/AboutActivity.java
View file

@ -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 :)

18
app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/ChooseExerciseActivity.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/ChooseExerciseActivity.java
View file

@ -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}

27
app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/EditExerciseSetActivity.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/EditExerciseSetActivity.java
View file

@ -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.

21
app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/ExerciseActivity.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/ExerciseActivity.java
View file

@ -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.

13
app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/HelpActivity.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/HelpActivity.java
View file

@ -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;

17
app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/ManageExerciseSetsActivity.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/ManageExerciseSetsActivity.java
View file

@ -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;

8
app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/SettingsActivity.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/SettingsActivity.java
View file

@ -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;

6
app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/SplashActivity.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/SplashActivity.java
View file

@ -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

78
app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/TimerActivity.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/TimerActivity.java
View file

@ -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<ExerciseSet>());
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);
}
*/
}
}

18
app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseAdapter.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/adapter/ExerciseAdapter.java
View file

@ -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;

14
app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseSetListAdapter.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/adapter/ExerciseSetListAdapter.java
View file

@ -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;

10
app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/adapter/ExerciseSetSpinnerAdapter.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/adapter/ExerciseSetSpinnerAdapter.java
View file

@ -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;

2
app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/helper/AppCompatPreferenceActivity.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/AppCompatPreferenceActivity.java
View file

@ -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;

17
app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/helper/BaseActivity.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/BaseActivity.java
View file

@ -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;

4
app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/helper/ExpandableListAdapter.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/ExpandableListAdapter.java
View file

@ -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;

2
app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/helper/IExerciseTimeUpdateable.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/helper/IExerciseTimeUpdateable.java
View file

@ -1,4 +1,4 @@
package org.secuso.privacyfriendlybreakreminder.activities.helper;
package org.secuso.privacyfriendlypausinghealthily.activities.helper;
/**
* @author Christopher Beckmann (Kamuno)

11
app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/tutorial/FirstLaunchManager.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/tutorial/FirstLaunchManager.java
View file

@ -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;

6
app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/tutorial/TutorialActivity.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/activities/tutorial/TutorialActivity.java
View file

@ -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/

12
app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/SQLiteHelper.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/SQLiteHelper.java
View file

@ -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;

5
app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/columns/ExerciseColumns.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/columns/ExerciseColumns.java
View file

@ -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.

4
app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/columns/ExerciseLocalColumns.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/columns/ExerciseLocalColumns.java
View file

@ -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.

6
app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/columns/ExerciseSetColumns.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/columns/ExerciseSetColumns.java
View file

@ -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.

5
app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/data/Exercise.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/data/Exercise.java
View file

@ -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.

4
app/src/main/java/org/secuso/privacyfriendlybreakreminder/database/data/ExerciseSet.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/database/data/ExerciseSet.java
View file

@ -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;

6
app/src/main/java/org/secuso/privacyfriendlybreakreminder/dialog/ExerciseDialog.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/dialog/ExerciseDialog.java
View file

@ -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

2
app/src/main/java/org/secuso/privacyfriendlybreakreminder/exercises/ExerciseLocale.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/exercises/ExerciseLocale.java
View file

@ -1,4 +1,4 @@
package org.secuso.privacyfriendlybreakreminder.exercises;
package org.secuso.privacyfriendlypausinghealthily.exercises;
import java.util.Arrays;
import java.util.HashSet;

4
app/src/main/java/org/secuso/privacyfriendlybreakreminder/exercises/ExerciseSections.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/exercises/ExerciseSections.java
View file

@ -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;

4
app/src/main/java/org/secuso/privacyfriendlybreakreminder/preferences/TimePreference.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/preferences/TimePreference.java
View file

@ -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;

4
app/src/main/java/org/secuso/privacyfriendlybreakreminder/receivers/NotificationCancelReceiver.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/NotificationCancelReceiver.java
View file

@ -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

6
app/src/main/java/org/secuso/privacyfriendlybreakreminder/receivers/NotificationDeletedReceiver.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/NotificationDeletedReceiver.java
View file

@ -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

2
app/src/main/java/org/secuso/privacyfriendlybreakreminder/receivers/OnBootCompletedReceiver.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/OnBootCompletedReceiver.java
View file

@ -1,4 +1,4 @@
package org.secuso.privacyfriendlybreakreminder.receivers;
package org.secuso.privacyfriendlypausinghealthily.receivers;
import android.content.BroadcastReceiver;
import android.content.Context;

14
app/src/main/java/org/secuso/privacyfriendlybreakreminder/receivers/TimerSchedulerReceiver.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/receivers/TimerSchedulerReceiver.java
View file

@ -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

20
app/src/main/java/org/secuso/privacyfriendlybreakreminder/service/TimerService.java → app/src/main/java/org/secuso/privacyfriendlypausinghealthily/service/TimerService.java
View file

@ -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}.

2
app/src/main/res/layout/activity_choose_exercise.xml
View file

@ -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">
<android.support.design.chip.ChipGroup
android:id="@+id/layout_filter_buttons"

2
app/src/main/res/layout/activity_exercise.xml
View file

@ -5,7 +5,7 @@
android:id="@+id/main_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="org.secuso.privacyfriendlybreakreminder.activities.ExerciseActivity">
tools:context="org.secuso.privacyfriendlypausinghealthily.activities.ExerciseActivity">
<ImageButton
android:id="@+id/button_playPause"

2
app/src/main/res/layout/activity_manage_exercise_set.xml
View file

@ -12,7 +12,7 @@
android:id="@+id/coordinator_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="org.secuso.privacyfriendlybreakreminder.activities.EditExerciseSetActivity">
tools:context="org.secuso.privacyfriendlypausinghealthily.activities.EditExerciseSetActivity">
<include layout="@layout/layout_toolbar"/>

2
app/src/main/res/layout/activity_settings.xml
View file

@ -11,7 +11,7 @@
<android.support.design.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="org.secuso.privacyfriendlybreakreminder.activities.EditExerciseSetActivity">
tools:context="org.secuso.privacyfriendlypausinghealthily.activities.EditExerciseSetActivity">
<include layout="@layout/layout_toolbar"/>

217
app/src/main/res/layout/activity_timer.xml
View file

@ -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">
<include layout="@layout/layout_toolbar"/>
<android.support.constraint.ConstraintLayout
android:id="@+id/main_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="0dp"
android:id="@+id/main_content"
android:layout_margin="0dp"
android:padding="0dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="org.secuso.privacyfriendlybreakreminder.activities.TimerActivity">
tools:context="org.secuso.privacyfriendlypausinghealthily.activities.TimerActivity">
<android.support.v7.widget.AppCompatSpinner
android:id="@+id/spinner_choose_exercise_set"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:minHeight="100dp"
android:layout_marginRight="8dp"
app:layout_constraintRight_toRightOf="parent"
android:layout_marginLeft="8dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="8dp"
app:layout_constraintHorizontal_bias="0.0"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"/>
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" />
<!-- <android.support.design.widget.FloatingActionButton
android:id="@+id/button_chooseExercise"
@ -57,39 +55,22 @@
app:layout_constraintTop_toTopOf="@id/spinner_choose_exercise_set"
app:layout_constraintVertical_bias="0.0" /> -->
<android.support.constraint.ConstraintLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
app:layout_constraintLeft_toLeftOf="parent"
android:layout_marginStart="8dp"
android:layout_marginRight="8dp"
app:layout_constraintRight_toRightOf="parent"
android:id="@+id/progressBarLayout"
android:layout_marginEnd="8dp"
app:layout_constraintHorizontal_bias="0.0"
android:layout_marginTop="16dp"
app:layout_constraintTop_toBottomOf="@+id/spinner_choose_exercise_set">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/picker_layout"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginTop="8dp"
android:gravity="center"
android:orientation="vertical"
android:visibility="visible"
android:divider="@color/colorAccent"
android:dividerPadding="4dp"
android:gravity="center"
android:layout_marginRight="8dp"
app:layout_constraintRight_toRightOf="parent"
android:layout_marginLeft="8dp"
app:layout_constraintVertical_bias="0.2"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="8dp"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="8dp">
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/spinner_choose_exercise_set"
app:layout_constraintBottom_toBottomOf="parent">
<TextView
android:layout_width="wrap_content"
@ -115,7 +96,7 @@
android:clickable="false"
android:focusable="false"
app:np_max="23"
app:np_min="0"/>
app:np_min="0" />
<!-- <NumberPicker
android:id="@+id/hours_picker"
@ -129,11 +110,11 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="-2dp"
android:layout_marginStart="-3dp"
android:text=":"
android:textColor="@color/colorAccent"
android:textSize="@dimen/picker_selected_text_size"
android:layout_marginStart="-3dp"
android:layout_marginEnd="-2dp"
android:textStyle="bold"
android:theme="@style/AppTheme.NumberPicker" />
@ -145,7 +126,7 @@
android:clickable="false"
android:focusable="false"
app:np_max="59"
app:np_min="0"/>
app:np_min="0" />
<!-- <NumberPicker
android:id="@+id/minutes_picker"
@ -157,11 +138,11 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="-2dp"
android:layout_marginStart="-3dp"
android:text=":"
android:textColor="@color/colorAccent"
android:textSize="@dimen/picker_selected_text_size"
android:layout_marginStart="-3dp"
android:layout_marginEnd="-2dp"
android:textStyle="bold"
android:theme="@style/AppTheme.NumberPicker" />
@ -173,7 +154,7 @@
android:clickable="false"
android:focusable="false"
app:np_max="59"
app:np_min="0"/>
app:np_min="0" />
<!-- <NumberPicker
android:id="@+id/seconds_picker"
@ -188,8 +169,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/activity_timer_choose_break"
android:layout_marginTop="8dp"
android:text="@string/activity_timer_choose_break"
android:textSize="18sp"
android:textStyle="bold" />
@ -210,7 +191,7 @@
android:clickable="false"
android:focusable="false"
app:np_max="59"
app:np_min="0"/>
app:np_min="0" />
<!-- <NumberPicker
android:id="@+id/minutes_break_picker"
@ -224,8 +205,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="-3dp"
android:layout_marginEnd="-2dp"
android:layout_marginStart="-3dp"
android:text=":"
android:textColor="@color/colorAccent"
android:textSize="@dimen/picker_selected_text_size"
@ -240,7 +221,7 @@
android:clickable="false"
android:focusable="false"
app:np_max="59"
app:np_min="0"/>
app:np_min="0" />
<!-- <NumberPicker
android:id="@+id/seconds_break_picker2"
@ -253,96 +234,84 @@
</LinearLayout>
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dp"
android:layout_height="250dp"
android:layout_alignTop="@+id/timerText"
android:layout_centerHorizontal="true"
android:layout_marginBottom="0dp"
android:layout_marginLeft="0dp"
android:layout_marginRight="0dp"
android:layout_marginTop="0dp"
android:max="100"
android:onClick="onClick"
android:padding="16dp"
android:progress="66"
android:progressDrawable="@drawable/progress_circular"
android:rotation="270"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dp"
android:layout_height="260dp"
android:layout_centerHorizontal="true"
android:layout_marginBottom="0dp"
android:layout_marginEnd="0dp"
android:layout_marginStart="0dp"
android:layout_marginTop="0dp"
android:max="100"
android:onClick="onClick"
android:padding="16dp"
android:progress="66"
android:progressDrawable="@drawable/progress_circular"
android:rotation="270"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/timerText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:gravity="center"
android:text="00:00:00"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@color/colorPrimaryDark"
android:textSize="36sp"
android:textStyle="bold"
android:visibility="invisible"
app:layout_constraintTop_toTopOf="@+id/progressBar"
android:layout_marginTop="8dp"
android:layout_marginRight="8dp"
app:layout_constraintRight_toRightOf="@+id/progressBar"
android:layout_marginLeft="8dp"
app:layout_constraintLeft_toLeftOf="@+id/progressBar"
app:layout_constraintBottom_toBottomOf="@+id/progressBar"
android:layout_marginBottom="8dp" />
</android.support.constraint.ConstraintLayout>
<TextView
android:id="@+id/timerText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_marginBottom="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginTop="8dp"
android:gravity="center"
android:text="00:00:00"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@color/colorPrimaryDark"
android:textSize="36sp"
android:textStyle="bold"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@+id/progressBar"
app:layout_constraintLeft_toLeftOf="@+id/progressBar"
app:layout_constraintRight_toRightOf="@+id/progressBar"
app:layout_constraintTop_toTopOf="@+id/progressBar" />
<ImageButton
android:id="@+id/button_reset"
android:layout_width="wrap_content"
android:onClick="onClick"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_replay_black_48dp"
android:hapticFeedbackEnabled="true"
android:tint="@color/darkblue"
android:background="?android:selectableItemBackgroundBorderless"
android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@+id/progressBarLayout"
android:layout_marginRight="8dp"
app:layout_constraintRight_toRightOf="@+id/progressBarLayout"
android:layout_marginLeft="8dp"
app:layout_constraintLeft_toLeftOf="@+id/progressBarLayout"
app:layout_constraintHorizontal_bias="0.333"
android:layout_marginStart="8dp"
android:layout_marginBottom="16dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:background="?android:selectableItemBackgroundBorderless"
android:hapticFeedbackEnabled="true"
android:onClick="onClick"
android:tint="@color/darkblue"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="8dp"/>
app:layout_constraintHorizontal_bias="0.33"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="@drawable/ic_replay_black_48dp" />
<ImageButton
android:id="@+id/button_playPause"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="onClick"
android:layout_marginBottom="16dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:background="?android:selectableItemBackgroundBorderless"
android:hapticFeedbackEnabled="true"
android:onClick="onClick"
android:scaleType="fitXY"
android:tint="@color/darkblue"
app:srcCompat="@drawable/ic_play_arrow_black"
android:layout_marginRight="8dp"
app:layout_constraintRight_toRightOf="@+id/progressBarLayout"
android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@+id/progressBarLayout"
android:layout_marginLeft="8dp"
app:layout_constraintLeft_toLeftOf="@+id/progressBarLayout"
app:layout_constraintHorizontal_bias="0.666"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="8dp" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="@drawable/ic_play_arrow_black" />
</android.support.constraint.ConstraintLayout>

4
app/src/main/res/xml/pref_headers.xml
View file

@ -3,12 +3,12 @@
<!-- These settings headers are only used on tablets. -->
<header
android:fragment="org.secuso.privacyfriendlybreakreminder.activities.SettingsActivity$ExercisePreferenceFragment"
android:fragment="org.secuso.privacyfriendlypausinghealthily.activities.SettingsActivity$ExercisePreferenceFragment"
android:icon="@drawable/ic_info_black"
android:title="@string/pref_header_exercises" />
<header
android:fragment="org.secuso.privacyfriendlybreakreminder.activities.SettingsActivity$TimerSchedulePreferenceFragment"
android:fragment="org.secuso.privacyfriendlypausinghealthily.activities.SettingsActivity$TimerSchedulePreferenceFragment"
android:icon="@drawable/ic_alarm_black"
android:title="@string/pref_header_schedule" />

2
app/src/main/res/xml/pref_scheduler.xml
View file

@ -16,7 +16,7 @@
android:key="pref_schedule_exercise_time"
android:title="@string/pref_schedule_exercise_time"/> -->
<org.secuso.privacyfriendlybreakreminder.preferences.TimePreference
<org.secuso.privacyfriendlypausinghealthily.preferences.TimePreference
android:dependency="pref_schedule_exercise"
android:defaultValue="32400000"
android:key="pref_schedule_exercise_time"

3
app/src/test/java/org/secuso/privacyfriendlybreakreminder/ExampleUnitTest.java → app/src/test/java/org/secuso/privacyfriendlypausinghealthily/ExampleUnitTest.java
View file

@ -1,5 +1,6 @@
package org.secuso.privacyfriendlybreakreminder;
package org.secuso.privacyfriendlypausinghealthily;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;