diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakActivity.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakActivity.java index 0422d1c..2412264 100644 --- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakActivity.java +++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakActivity.java @@ -99,6 +99,7 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList breakTimeLeft = 10; SecBreak = (TextView) findViewById(R.id.textViewBreakTime); SecBreak.setText("" + breakTimeLeft); + SecBreak.setTextColor(getResources().getColor(R.color.red)); } //Keep screen on while on break @@ -174,6 +175,7 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList breakTimeLeft = 10; SecBreak = (TextView) findViewById(R.id.textViewBreakTime); SecBreak.setText("" + breakTimeLeft); + SecBreak.setTextColor(getResources().getColor(R.color.red)); builder.setMessage("10sec " + getResources().getText(R.string.exercise_break).toString()); //ad = builder.show(); @@ -324,21 +326,22 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList - if((breakTime >= 0 && breakTime <= 10) || (breakTime >= 30 && breakTime <= 40)) { - breakTimeLeft--; - SecBreak = (TextView) findViewById(R.id.textViewBreakTime); - SecBreak.setText("" + breakTimeLeft); - } + breakTimeLeft--; + + SecBreak = (TextView) findViewById(R.id.textViewBreakTime); + SecBreak.setText("" + breakTimeLeft); + switch (breakTime) { case 10: side_repetition.setText(sideRepetition + " 1"); // Cancel dialog - + breakTimeLeft = 20; SecBreak = (TextView) findViewById(R.id.textViewBreakTime); - SecBreak.setText(""); + SecBreak.setText("" + breakTimeLeft); + SecBreak.setTextColor(getResources().getColor(R.color.black)); break; case 30: @@ -347,6 +350,7 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList breakTimeLeft = 10; SecBreak = (TextView) findViewById(R.id.textViewBreakTime); SecBreak.setText(""+ breakTimeLeft); + SecBreak.setTextColor(getResources().getColor(R.color.red)); side_repetition.setText(R.string.exercise_break); //If exercise contains 2 images, set ImageView to the second image @@ -357,8 +361,10 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList break; case 40: // Cancel dialog + breakTimeLeft = 20; SecBreak = (TextView) findViewById(R.id.textViewBreakTime); - SecBreak.setText(""); + SecBreak.setText("" + breakTimeLeft); + SecBreak.setTextColor(getResources().getColor(R.color.black)); side_repetition.setText(sideRepetition + " 2"); break; @@ -386,10 +392,10 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList description.setText(exerciseList.get(currentExercise).getDescription()); execution.setText(exerciseList.get(currentExercise).getExecution()); - // FIXME Set additional 10 Sek Countdown breakTimeLeft = 10; SecBreak = (TextView) findViewById(R.id.textViewBreakTime); SecBreak.setText(""+ breakTimeLeft); + SecBreak.setTextColor(getResources().getColor(R.color.red)); side_repetition.setText(R.string.exercise_break); diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakReminder.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakReminder.java index 6d59611..fb4e681 100644 --- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakReminder.java +++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakReminder.java @@ -14,7 +14,6 @@ import android.content.SharedPreferences; import android.media.Ringtone; import android.media.RingtoneManager; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.os.CountDownTimer; import android.os.Vibrator; diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml index 565c3fb..a474d74 100644 --- a/app/src/main/res/layout/about.xml +++ b/app/src/main/res/layout/about.xml @@ -62,16 +62,9 @@ android:id="@+id/textFieldAuthorNames" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:gravity="center" android:text="@string/about_author_names" /> - - @@ -80,7 +73,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:layout_marginTop="30dp" + android:layout_marginTop="28dp" android:text="@string/about_affiliation" android:textStyle="bold" /> diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index cde69bc..1059fe5 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index c133a0c..02ec742 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index bfa42f0..bb292ff 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 324e72c..a0db396 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index aee44e1..6eb7426 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7e9d59a..a1b2004 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -119,4 +119,5 @@ Interaktive Uhr Beim Klicken auf \'Next\' wird eine andere Übung aus der aktuellen Körperregion ausgewählt. Zugleich wird die Uhr wieder auf die letzte volle Minute gesetzt. Somit geht keine Zeit für die Übungen verloren. Bedienungsanleitung + Sergej Alexeev, Jannik Schildknecht und Mitwirkende \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 322477d..9ab0792 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -119,5 +119,6 @@ Horloge interactive En appuyant sur l\'horloge à chaque étape de cette application, l\'horloge peut être démarré et arrêté . En cliquant sur le bouton \'next\', l\'application va choisir un nouvel exercice dans la région du corps actuel. Dans le même temps l\'horloge sera remise à zéro sur la minute d\'avant, que le temps sera dépenser pleinement sur les exercices. + Sergej Alexeev, Jannik Schildknecht et contributeurs \ No newline at end of file diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 2df71c9..d5566fd 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -118,4 +118,5 @@ При нажатии на кнопку \'Next\', приложение будет выбрать новое упражнение в текущей области тела. В то же время часы будут сброшены на следующую полную минуту, чтобы провестить время полностью на упражнениях. Интерактивные часы При нажатии на часы возможно их запустить или остановить. + Sergej Alexeev, Jannik Schildknecht и соучастники \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 27cc383..b22041b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -75,7 +75,7 @@ Privacy Friendly Break Reminder Version 1.0 Authors: - Sergej Alexeev, Jannik Schildknecht + Sergej Alexeev, Jannik Schildknecht and contributors. and contributors. In affiliation with More Information can be found on: