DB, New Images, Break Activity

DB en is corrected; fr and ru have been added; Image IDs are new
New image naming; new placeholder images for the exercises; cleaning of
the drawable folder
In break activity and dbHandler fixes to show the right images

app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/AppWidget.java

@@ -54,7 +54,7 @@ public class AppWidget extends AppWidgetProvider {
         views.setOnClickPendingIntent(R.id.appwidget_text, pendingIntent);
         views.setOnClickPendingIntent(R.id.time, pendingIntent);
 
-        // Instruct the widget manager to update the widget
+        // Instruct the widget_preview manager to update the widget_preview
         appWidgetManager.updateAppWidget(appWidgetId, views);
     }
 
@@ -69,12 +69,12 @@ public class AppWidget extends AppWidgetProvider {
 
     @Override
     public void onEnabled(Context context) {
-        // Enter relevant functionality for when the first widget is created
+        // Enter relevant functionality for when the first widget_preview is created
     }
 
     @Override
     public void onDisabled(Context context) {
-        // Enter relevant functionality for when the last widget is disabled
+        // Enter relevant functionality for when the last widget_preview is disabled
     }
 
     @Override
@@ -114,7 +114,7 @@ public class AppWidget extends AppWidgetProvider {
         views.setOnClickPendingIntent(R.id.appwidget_text, pendingIntent);
         views.setOnClickPendingIntent(R.id.time, pendingIntent);
 
-        // Obtain appropriate widget and update it.
+        // Obtain appropriate widget_preview and update it.
         appWidgetManager.updateAppWidget(appWidgetId, views);
 
         updateAppWidget(context,appWidgetManager,appWidgetId);
@@ -159,7 +159,7 @@ public class AppWidget extends AppWidgetProvider {
     }
 
     /**
-     * Returns number of cells needed for given size of the widget.
+     * Returns number of cells needed for given size of the widget_preview.
      *
      * @param size Widget size in dp.
      * @return Size in number of cells.

app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakActivity.java

@@ -9,7 +9,6 @@ import android.net.Uri;
 import android.os.CountDownTimer;
 import android.os.Vibrator;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
@@ -18,9 +17,7 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.ListIterator;
+import java.util.Collections;
 import java.util.Random;
 
 import java.util.ArrayList;
@@ -155,7 +152,7 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList
                     }
                     while (true) {
 
-                        currentExerciseSection = random.nextInt(allAvailableExercises.size());
+                        currentExerciseSection = currentExerciseSection + 1 % allAvailableExercises.size();
                         if (!sections.contains(currentExerciseSection)) {
                             sections.add(currentExerciseSection);
                             exerciseList = allAvailableExercises.get(currentExerciseSection);
@@ -170,7 +167,6 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList
                 description.setText(exerciseList.get(currentExercise).getDescription());
                 execution.setText(exerciseList.get(currentExercise).getExecution());
 
-                //FIXME
                 setExerciseImage();
 
                 //Update Timer
@@ -241,8 +237,14 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList
 
         editor.apply();
 
-        currentExerciseSection = random.nextInt(allAvailableExercises.size());
-        System.out.println("Random id for section election: " + currentExerciseSection);
+        currentExerciseSection = 0;
+        Collections.shuffle(allAvailableExercises.get(currentExerciseSection));
+
+        String allExe = "";
+        for (int i = 0; i< allAvailableExercises.get(currentExerciseSection).size();i++)
+            allExe += allAvailableExercises.get(currentExerciseSection).get(i).getImageID()+ " ";
+
+        System.out.println("Random list for section election: " + allExe);
 
         // Set exercise list to current section
         exerciseList = allAvailableExercises.get(currentExerciseSection);
@@ -269,13 +271,11 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList
         image = (ImageView) findViewById(R.id.imageMid);
         if (imageID.split(",").length == 1) {
             sideRepetition = getResources().getText(R.string.exercise_repetition).toString();
-            //FIXME Set correct image depending on imageID
+
             image1 = imageID;
-            //Hardcoded
-            image.setImageResource(R.drawable.train_left);
             exerciseSide = false;
-//            int imageResID = getResources().getIdentifier(image1, "drawable", getPackageName());
-//            image.setImageResource(imageResID);
+            int imageResID = getResources().getIdentifier("exercise_"+image1, "drawable", getPackageName());
+            image.setImageResource(imageResID);
         } else {
             // There are 2 sides for an exercise
             exerciseSide = true;
@@ -284,11 +284,9 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList
             image2 = imageID.split(",")[1];
             System.out.println("Id of first image: " + image1 + " , id of second: " + image2);
 
-            image.setImageResource(R.drawable.train_middle);
-
             //image ID from Resource
-//            int imageResID = getResources().getIdentifier(image1, "drawable", getPackageName());
-//            image.setImageResource(imageResID);
+            int imageResID = getResources().getIdentifier("exercise_"+image1, "drawable", getPackageName());
+            image.setImageResource(imageResID);
 
         }
     }
@@ -307,10 +305,8 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList
                 side_repetition.setText(R.string.exercise_break);
                 //If exercise contains 2 images, set ImageView to the second image
                 if (exerciseSide) {
-                    image.setImageResource(R.drawable.train_right);
-                    //image ID from Resource
-//                    int imageResID = getResources().getIdentifier(image2, "drawable", getPackageName());
-//                    image.setImageResource(imageResID);
+                    int imageResID = getResources().getIdentifier("exercise_"+image2, "drawable", getPackageName());
+                    image.setImageResource(imageResID);
                 }
                 break;
             case 40:
@@ -329,7 +325,7 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList
                     }
                     while (true) {
 
-                        currentExerciseSection = random.nextInt(allAvailableExercises.size());
+                        currentExerciseSection = currentExerciseSection + 1 % allAvailableExercises.size();
                         if (!sections.contains(currentExerciseSection)) {
                             sections.add(currentExerciseSection);
                             exerciseList = allAvailableExercises.get(currentExerciseSection);
@@ -342,7 +338,7 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList
                 description.setText(exerciseList.get(currentExercise).getDescription());
                 execution.setText(exerciseList.get(currentExercise).getExecution());
                 side_repetition.setText(R.string.exercise_break);
-                //FIXME
+
                 setExerciseImage();
                 break;
         }

app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakActivity_old.java

@@ -249,10 +249,9 @@ public class BreakActivity_old extends AppCompatActivity implements View.OnClick
             //FIXME Set correct image depending on imageID
             image1 = imageID;
             //Hardcoded
-            image.setImageResource(R.drawable.train_left);
             exerciseSide = false;
-//            int imageResID = getResources().getIdentifier(image1, "drawable", getPackageName());
-//            image.setImageResource(imageResID);
+            int imageResID = getResources().getIdentifier(image1, "drawable", getPackageName());
+            image.setImageResource(imageResID);
         } else {
             // There are 2 sides for an exercise
             exerciseSide = true;
@@ -261,11 +260,9 @@ public class BreakActivity_old extends AppCompatActivity implements View.OnClick
             image2 = imageID.split(",")[1];
             System.out.println("Id of first image: " + image1 + " , id of second: " + image2);
 
-            image.setImageResource(R.drawable.train_middle);
-
             //image ID from Resource
-//            int imageResID = getResources().getIdentifier(image1, "drawable", getPackageName());
-//            image.setImageResource(imageResID);
+            int imageResID = getResources().getIdentifier(image1, "drawable", getPackageName());
+            image.setImageResource(imageResID);
 
         }
     }
@@ -284,10 +281,9 @@ public class BreakActivity_old extends AppCompatActivity implements View.OnClick
                 side_repetition.setText(R.string.exercise_break);
                 //If exercise contains 2 images, set ImageView to the second image
                 if (exerciseSide) {
-                    image.setImageResource(R.drawable.train_right);
                     //image ID from Resource
-//                    int imageResID = getResources().getIdentifier(image2, "drawable", getPackageName());
-//                    image.setImageResource(imageResID);
+                    int imageResID = getResources().getIdentifier(image2, "drawable", getPackageName());
+                    image.setImageResource(imageResID);
                 }
                 break;
             case 40:

app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakReminder.java

@@ -189,7 +189,7 @@ public class BreakReminder extends AppCompatActivity
                     editor.putString("exercise_value", exercises);
                     editor.apply();
 
-                    //Update clock
+                    //Update tutorial_clock
                     String bufferZeroMinute = "";
                     int time = interval * 60 * 1000;
                     if (time / 1000 / 60 < 10)
@@ -229,7 +229,7 @@ public class BreakReminder extends AppCompatActivity
         //profileSpinner.setSelection(Arrays.asList(profileNames).indexOf(currentProfile));
         profileSpinner.setSelection(Integer.parseInt(sharedPrefs.getString("current_profile", "-1")));
 
-        //Update clock
+        //Update tutorial_clock
         String bufferZeroMinute = "";
         int time = interval * 60 * 1000;
         if (time / 1000 / 60 < 10)
@@ -363,7 +363,7 @@ public class BreakReminder extends AppCompatActivity
 
             case R.id.button_reset:
                 if (ct != null) {
-                    //Reset clock
+                    //Reset tutorial_clock
                     ct.cancel();
                     int interval = sharedPrefs.getInt("work_value", 1);
 

app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/DBHandler.java

@@ -86,13 +86,15 @@ public class DBHandler extends SQLiteOpenHelper {
         List<Exercise> exerciseList = new ArrayList<>();
         dataBase = this.getReadableDatabase();
 
-        //FIXME DES GRAUENS
         String table = "";
-        if(DEVICE_LANGUAGE.equals("fr"))
+        if(!DEVICE_LANGUAGE.equals("fr") && !DEVICE_LANGUAGE.equals("de") && !DEVICE_LANGUAGE.equals("ru"))
             table = "en";
         else
             table = DEVICE_LANGUAGE;
 
+        System.out.println("AKTUELLE GEWAEHLTE SPRACHE: " +table);
+        System.out.println("AKTUELLE SPRACHE: " +DEVICE_LANGUAGE);
+
         Cursor res = dataBase.rawQuery("SELECT * FROM EXERCISES_" + table + " WHERE " + EXERCISES_SECTION + " LIKE " + "\"%" + section + "%\"", null);
         res.moveToFirst();
         while (!res.isAfterLast()) {

app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/HelpActivity.java

@@ -1,8 +1,5 @@
 package orgprivacy_friendly_apps.secuso.privacyfriendlybreakreminder;
 
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
@@ -10,9 +7,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageView;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-
 public class HelpActivity extends AppCompatActivity {
 
     @Override
@@ -48,32 +42,32 @@ public class HelpActivity extends AppCompatActivity {
             case R.id.imageView:
                 setContentView(R.layout.help2);
                 ImageView img = (ImageView) findViewById(R.id.img_back);
-                img.setImageResource(R.drawable.start_screen);
+                img.setImageResource(R.drawable.help_start_screen);
                 break;
             case R.id.imageView1:
                 setContentView(R.layout.help2);
                 img = (ImageView) findViewById(R.id.img_back);
-                img.setImageResource(R.drawable.settings_screen);
+                img.setImageResource(R.drawable.help_settings_screen);
                 break;
             case R.id.imageView2:
                 setContentView(R.layout.help2);
                 img = (ImageView) findViewById(R.id.img_back);
-                img.setImageResource(R.drawable.create_profile_screen);
+                img.setImageResource(R.drawable.help_create_profile_screen);
                 break;
             case R.id.imageView3:
                 setContentView(R.layout.help2);
                 img = (ImageView) findViewById(R.id.img_back);
-                img.setImageResource(R.drawable.break_screen);
+                img.setImageResource(R.drawable.help_break_screen);
                 break;
             case R.id.imageView4:
                 setContentView(R.layout.help2);
                 img = (ImageView) findViewById(R.id.img_back);
-                img.setImageResource(R.drawable.general_screen);
+                img.setImageResource(R.drawable.help_general_screen);
                 break;
             case R.id.imageView5:
                 setContentView(R.layout.help2);
                 img = (ImageView) findViewById(R.id.img_back);
-                img.setImageResource(R.drawable.notification_screen);
+                img.setImageResource(R.drawable.help_notification_screen);
                 break;
             case R.id.img_back:
                 setContentView(R.layout.help);

app/src/main/res/layout/about.xml

@@ -23,7 +23,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:adjustViewBounds="true"
-            android:src="@drawable/privacyfriendlyappslogo" />
+            android:src="@drawable/about_privacyfriendlyappslogo" />
 
         <TextView
             android:id="@+id/appName"
@@ -73,7 +73,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:adjustViewBounds="true"
-            android:src="@drawable/secuso_logo_blau_blau" />
+            android:src="@drawable/about_secuso_logo_blau_blau" />
 
         <TextView
             android:layout_width="wrap_content"

app/src/main/res/layout/activity_break.xml

@@ -26,7 +26,7 @@
         android:layout_below="@+id/break_exercise_type"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="10dp"
-        android:background="@drawable/circle"
+        android:background="@drawable/circle_black"
         android:clickable="true"
         android:enabled="true"
         android:gravity="center"

app/src/main/res/layout/activity_break_no_exercises.xml

@@ -23,7 +23,7 @@
         android:layout_height="250dp"
         android:layout_centerHorizontal="true"
         android:layout_centerVertical="true"
-        android:background="@drawable/circle"
+        android:background="@drawable/circle_black"
         android:clickable="true"
         android:enabled="true"
         android:gravity="center"

app/src/main/res/layout/activity_break_reminder.xml

@@ -4,7 +4,7 @@
 
 <!--
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget_preview.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawer_layout"
@@ -19,7 +19,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <android.support.design.widget.NavigationView
+    <android.support.design.widget_preview.NavigationView
         android:id="@+id/nav_view"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
@@ -28,7 +28,7 @@
         app:headerLayout="@layout/nav_header_break_reminder"
         app:menu="@menu/activity_break_reminder_drawer" />
 
-</android.support.v4.widget.DrawerLayout>
+</android.support.v4.widget_preview.DrawerLayout>
 -->
 
 <android.support.design.widget.CoordinatorLayout

app/src/main/res/layout/app_widget2x1.xml

@@ -9,7 +9,7 @@
     <RelativeLayout
         android:layout_width="110dp"
         android:layout_height="48dp"
-        android:background="@drawable/white_circle">
+        android:background="@drawable/circle_white">
 
         <TextView
             android:id="@+id/appwidget_text"

app/src/main/res/layout/app_widget2x2.xml

@@ -9,7 +9,7 @@
     <RelativeLayout
         android:layout_width="110dp"
         android:layout_height="110dp"
-        android:background="@drawable/white_circle">
+        android:background="@drawable/circle_white">
 
         <TextView
             android:id="@+id/appwidget_text"

app/src/main/res/layout/app_widget3x3.xml

@@ -9,7 +9,7 @@
     <RelativeLayout
         android:layout_width="180dp"
         android:layout_height="180dp"
-        android:background="@drawable/white_circle">
+        android:background="@drawable/circle_white">
 
         <TextView
             android:id="@+id/appwidget_text"

app/src/main/res/layout/app_widget4x4.xml

@@ -9,7 +9,7 @@
     <RelativeLayout
         android:layout_width="250dp"
         android:layout_height="250dp"
-        android:background="@drawable/white_circle">
+        android:background="@drawable/circle_white">
 
         <TextView
             android:id="@+id/appwidget_text"

app/src/main/res/layout/content_break_reminder.xml

@@ -55,7 +55,7 @@
         android:layout_height="200dp"
         android:layout_centerHorizontal="true"
         android:layout_centerVertical="true"
-        android:background="@drawable/circle"
+        android:background="@drawable/circle_black"
         android:clickable="true"
         android:enabled="true"
         android:gravity="center"

app/src/main/res/layout/first_dialog.xml

@@ -33,7 +33,7 @@
                 android:layout_width="100dp"
                 android:layout_height="100dp"
                 android:layout_gravity="center"
-                android:src="@drawable/clock"/>
+                android:src="@drawable/tutorial_clock"/>
             <TextView
                 android:layout_width="60dp"
                 android:layout_height="100dp"
@@ -45,7 +45,7 @@
                 android:layout_width="100dp"
                 android:layout_height="100dp"
                 android:layout_gravity="center"
-                android:src="@drawable/play_button"/>
+                android:src="@drawable/tutorial_play_button"/>
         </LinearLayout>
         <TextView
             android:layout_width="wrap_content"
@@ -64,7 +64,7 @@
             android:layout_width="100dp"
             android:layout_height="80dp"
             android:layout_gravity="center"
-            android:src="@drawable/reset_button"/>
+            android:src="@drawable/tutorial_reset_button"/>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -83,7 +83,7 @@
             android:layout_width="120dp"
             android:layout_height="120dp"
             android:layout_gravity="center"
-            android:src="@drawable/spinner"/>
+            android:src="@drawable/tutorial_spinner"/>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

app/src/main/res/layout/help.xml

@@ -48,7 +48,7 @@
             android:maxHeight="190dp"
             android:maxWidth="130dp"
             android:onClick="clickHandler"
-            android:src="@drawable/start_screen" />
+            android:src="@drawable/help_start_screen" />
 
         <TextView
             android:id="@+id/textView9"
@@ -84,7 +84,7 @@
             android:maxHeight="190dp"
             android:maxWidth="200dp"
             android:onClick="clickHandler"
-            android:src="@drawable/settings_screen" />
+            android:src="@drawable/help_settings_screen" />
 
         <TextView
             android:id="@+id/textView12"
@@ -108,7 +108,7 @@
             android:maxHeight="190dp"
             android:maxWidth="130dp"
             android:onClick="clickHandler"
-            android:src="@drawable/general_screen" />
+            android:src="@drawable/help_general_screen" />
 
         <TextView
             android:id="@+id/textView18"
@@ -133,7 +133,7 @@
             android:maxHeight="190dp"
             android:maxWidth="130dp"
             android:onClick="clickHandler"
-            android:src="@drawable/notification_screen" />
+            android:src="@drawable/help_notification_screen" />
 
         <TextView
             android:id="@+id/textView19"
@@ -169,7 +169,7 @@
             android:maxHeight="190dp"
             android:maxWidth="130dp"
             android:onClick="clickHandler"
-            android:src="@drawable/create_profile_screen" />
+            android:src="@drawable/help_create_profile_screen" />
 
         <TextView
             android:id="@+id/textView14"
@@ -205,7 +205,7 @@
             android:maxHeight="190dp"
             android:maxWidth="130dp"
             android:onClick="clickHandler"
-            android:src="@drawable/break_screen"/>
+            android:src="@drawable/help_break_screen"/>
 
         <TextView
             android:id="@+id/textView16"

app/src/main/res/menu/activity_break_reminder_drawer.xml

@@ -11,7 +11,7 @@
             android:title="@string/title_activity_settings" />
         <item
             android:id="@+id/nav_statistics"
-            android:icon="@drawable/statistic_logo"
+            android:icon="@drawable/drawer_statistic_logo"
             android:title="@string/statistics" />
     </group>
 

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

@@ -65,4 +65,6 @@
     <string name="tutorial_reset_description">Appuyez sur le bouton pour réinitialiser l\'horloge</string>
     <string name="type">Type</string>
     <string name="help_start_screen_title">Écran principal</string>
+    <string name="help_break_screen">1. Région du corps de l\'exercise actuel\n2.L\'horloge montre le temps restant de la pause. Si vous cliquez dessus, le temps démarre ou il arrête.\n3.Si l\'écran montre \'pause\', vous êtes dans une pause de 10sec. Si c\'est montrer \'coté 1/2\' ou \'rèpétition 1/2\' il faut faire des exercise.\n4.Expliquation de la situation initiale.\n5. Description de l\'exercise</string>
+    <string name="help_click_information">Pour voir les images en pleine grandeur, cliquer sure les images. Pour retourner a la grandeur initial re-cliquer sur l\'image.</string>
 </resources>

app/src/main/res/xml/app_widget2x1_info.xml

@@ -4,7 +4,7 @@
     android:initialLayout="@layout/app_widget2x2"
     android:minHeight="40dp"
     android:minWidth="110dp"
-    android:previewImage="@drawable/widget"
+    android:previewImage="@drawable/widget_preview"
     android:resizeMode="horizontal|vertical"
     android:updatePeriodMillis="86400000"
     android:widgetCategory="home_screen"></appwidget-provider>

app/src/main/res/xml/app_widget2x2_info.xml

@@ -4,7 +4,7 @@
     android:initialLayout="@layout/app_widget2x2"
     android:minHeight="110dp"
     android:minWidth="110dp"
-    android:previewImage="@drawable/widget"
+    android:previewImage="@drawable/widget_preview"
     android:resizeMode="none"
     android:updatePeriodMillis="86400000"
     android:widgetCategory="home_screen"></appwidget-provider>

app/src/main/res/xml/app_widget3x3_info.xml

@@ -4,7 +4,7 @@
     android:initialLayout="@layout/app_widget3x3"
     android:minHeight="180dp"
     android:minWidth="180dp"
-    android:previewImage="@drawable/widget"
+    android:previewImage="@drawable/widget_preview"
     android:resizeMode="none"
     android:updatePeriodMillis="86400000"
     android:widgetCategory="home_screen"></appwidget-provider>

app/src/main/res/xml/app_widget4x4_info.xml

@@ -4,7 +4,7 @@
     android:initialLayout="@layout/app_widget4x4"
     android:minHeight="250dp"
     android:minWidth="250dp"
-    android:previewImage="@drawable/widget"
+    android:previewImage="@drawable/widget_preview"
     android:resizeMode="none"
     android:updatePeriodMillis="86400000"
     android:widgetCategory="home_screen"></appwidget-provider>