From 5113359dc2dcca9a3f34250c4aad09a7ada510e3 Mon Sep 17 00:00:00 2001
From: Christopher Beckmann <chris.beckm@gmail.com>
Date: Mon, 14 May 2018 06:29:17 +0200
Subject: [PATCH] Default exercise duration increased to 30. Added Vibration
 when the exercises change.

---
 .../activities/ExerciseActivity.java            | 17 ++++++++++++++++-
 .../activities/tutorial/FirstLaunchManager.java |  2 +-
 app/src/main/res/values-de/strings.xml          |  2 +-
 app/src/main/res/values/strings.xml             |  2 +-
 app/src/main/res/xml/pref_exercise.xml          |  2 +-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/ExerciseActivity.java b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/ExerciseActivity.java
index 1706a5c..b703e86 100644
--- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/ExerciseActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/ExerciseActivity.java
@@ -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() {
diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/tutorial/FirstLaunchManager.java b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/tutorial/FirstLaunchManager.java
index ab57822..1161c00 100644
--- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/tutorial/FirstLaunchManager.java
+++ b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/tutorial/FirstLaunchManager.java
@@ -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)
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d26639e..5648e93 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -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">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index af7b7fa..c298ee0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -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>
diff --git a/app/src/main/res/xml/pref_exercise.xml b/app/src/main/res/xml/pref_exercise.xml
index 6313a4d..ebc6b29 100644
--- a/app/src/main/res/xml/pref_exercise.xml
+++ b/app/src/main/res/xml/pref_exercise.xml
@@ -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"