App Icon and small changes

- New App Icon
- Small timer while exercising in breaks
- About string changes

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

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;

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" />
 
-        <TextView
-            android:id="@+id/textFieldContributors"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="4dp"
-            android:layout_toEndOf="@+id/textFieldAuthorNames"
-            android:text="@string/about_author_contributors" />
-
     </RelativeLayout>
 
 
@@ -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" />
 

app/src/main/res/values-de/strings.xml

@@ -119,4 +119,5 @@
     <string name="help_support_clock_title">Interaktive Uhr</string>
     <string name="help_support_next">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.</string>
     <string name="help_support_title">Bedienungsanleitung</string>
+    <string name="about_author_names">Sergej Alexeev, Jannik Schildknecht und Mitwirkende</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -119,5 +119,6 @@
     <string name="help_support_clock_title">Horloge interactive</string>
     <string name="help_support_clock_descr"> En appuyant sur l\'horloge à chaque étape de cette application, l\'horloge peut être démarré et arrêté .</string>
     <string name="help_support_next">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.</string>
+    <string name="about_author_names">Sergej Alexeev, Jannik Schildknecht et contributeurs</string>
 
 </resources>

app/src/main/res/values-ru/strings.xml

@@ -118,4 +118,5 @@
     <string name="help_support_next">При нажатии на кнопку \'Next\', приложение будет выбрать новое упражнение в текущей области тела. В то же время часы будут сброшены на следующую полную минуту, чтобы провестить время полностью на упражнениях.</string>
     <string name="help_support_clock_title">Интерактивные часы</string>
     <string name="help_support_clock_descr">При нажатии на часы возможно их запустить или остановить.</string>
+    <string name="about_author_names">Sergej Alexeev, Jannik Schildknecht и соучастники</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -75,7 +75,7 @@
     <string name="app_name_long" translatable="false">Privacy Friendly Break Reminder</string>
     <string name="version_number" translatable="false">Version 1.0</string>
     <string name="about_author">Authors:</string>
-    <string name="about_author_names" translatable="false">Sergej Alexeev, Jannik Schildknecht</string>
+    <string name="about_author_names">Sergej Alexeev, Jannik Schildknecht and contributors.</string>
     <string name="about_author_contributors">and contributors.</string>
     <string name="about_affiliation">In affiliation with</string>
     <string name="more_info">More Information can be found on:</string>