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

Default exercise duration increased to 30. Added Vibration when the exercises change.

Browse source
This commit is contained in:
Christopher Beckmann 2018-05-14 06:29:17 +02:00
commit 5113359dc2
5 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/ExerciseActivity.java
View file

@ -10,6 +10,8 @@ import android.graphics.Color;
import android.os.Build;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.os.VibrationEffect;
import android.os.Vibrator;
import android.preference.PreferenceManager;
import android.support.constraint.ConstraintLayout;
import android.support.v4.app.ActivityCompat;
@ -458,7 +460,20 @@ public class ExerciseActivity extends AppCompatActivity implements android.suppo
}
private boolean next() {
return nextExercisePart() || nextExercise();
boolean result = nextExercisePart() || nextExercise();
if(result) vibrate();
return result;
}
private void vibrate() {
Vibrator v = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
v.vibrate(VibrationEffect.createOneShot(500,VibrationEffect.DEFAULT_AMPLITUDE));
}else{
v.vibrate(500);
}
}
private boolean nextExercise() {

2
app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/tutorial/FirstLaunchManager.java
View file

@ -74,7 +74,7 @@ public class FirstLaunchManager {
.putInt(PREF_PICKER_MINUTES, 0)
.putInt(PREF_PICKER_HOURS, 1)
.putLong(WORK_TIME, 1000L * 60L * 60L) // 1 hour
.putString(EXERCISE_DURATION, "20")
.putString(EXERCISE_DURATION, "30")
.putBoolean(PREF_SCHEDULE_EXERCISE_DAYS_ENABLED, false)
.putBoolean(PREF_SCHEDULE_EXERCISE_ENABLED, false)
.putLong(PREF_SCHEDULE_EXERCISE_TIME, 32400000L)

2
app/src/main/res/values-de/strings.xml
View file

@ -4,7 +4,7 @@
<!-- Tutorial -->
<string name="slide1_heading">Willkommen</string>
<string name="slide1_text">Willkommen bei Privacy Friendly Aktive Pause! Diese App erinnert Sie daran, regelmäßig während der Arbeit Pausen einzulegen. Zusätzlich können Sie sich Übungen aussuchen, mit denen Sie Ihre Pause aktiv gestalten können.</string>
<string name="slide1_text">Willkommen bei der Privacy Friendly Aktive Pause App. Diese App erinnert Sie daran, regelmäßig während der Arbeit Pausen einzulegen. Zusätzlich können Sie sich Übungen aussuchen, mit denen Sie Ihre Pause aktiv gestalten können.</string>
<string name="slide2_heading">Übungsset erstellen</string>
<string name="slide2_text">

2
app/src/main/res/values/strings.xml
View file

@ -4,7 +4,7 @@
<string name="navigation_drawer_close" translatable="false">Close navigation drawer</string>
<!-- Tutorial -->
<string name="slide1_heading">Welcome to the Privacy Friendly Pausing Healthily App!</string>
<string name="slide1_heading">Welcome to Privacy Friendly Pausing Healthily!</string>
<string name="slide1_text">This app reminds you to regularly take breaks during your work. Additionally, you can choose from a set of exercises, that can help you to spend your break more active.</string>
<string name="slide2_heading">Create Exercise Sets</string>

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

@ -8,7 +8,7 @@
android:title="@string/pref_keep_screen_on_during_exercise" />
<EditTextPreference
android:defaultValue="20"
android:defaultValue="30"
android:inputType="number"
android:numeric="integer"
android:maxLength="2"