diff --git a/app/src/main/assets/exercises.sqlite b/app/src/main/assets/exercises.sqlite index 2a1d9aa..68c6720 100644 Binary files a/app/src/main/assets/exercises.sqlite and b/app/src/main/assets/exercises.sqlite differ diff --git a/app/src/main/assets/exercises.sqlite-journal b/app/src/main/assets/exercises.sqlite-journal deleted file mode 100644 index 4b3e123..0000000 Binary files a/app/src/main/assets/exercises.sqlite-journal and /dev/null differ diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/AppWidget.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/AppWidget.java index f8d4d0d..c72937f 100644 --- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/AppWidget.java +++ b/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. 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 c8bf4c4..2a4f5d2 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 @@ -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; } diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakActivity_old.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakActivity_old.java index 7aad6d2..5c9fc55 100644 --- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakActivity_old.java +++ b/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: 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 acb7621..d05d3f5 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 @@ -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); diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/DBHandler.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/DBHandler.java index 1c018f9..a5969a2 100644 --- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/DBHandler.java +++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/DBHandler.java @@ -86,13 +86,15 @@ public class DBHandler extends SQLiteOpenHelper { List 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()) { diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/HelpActivity.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/HelpActivity.java index 35c861d..9f9bcc7 100644 --- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/HelpActivity.java +++ b/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); diff --git a/app/src/main/res/drawable/privacyfriendlyappslogo.png b/app/src/main/res/drawable/about_privacyfriendlyappslogo.png similarity index 100% rename from app/src/main/res/drawable/privacyfriendlyappslogo.png rename to app/src/main/res/drawable/about_privacyfriendlyappslogo.png diff --git a/app/src/main/res/drawable/secuso_logo_blau_blau.png b/app/src/main/res/drawable/about_secuso_logo_blau_blau.png similarity index 100% rename from app/src/main/res/drawable/secuso_logo_blau_blau.png rename to app/src/main/res/drawable/about_secuso_logo_blau_blau.png diff --git a/app/src/main/res/drawable/circle.xml b/app/src/main/res/drawable/circle_black.xml similarity index 100% rename from app/src/main/res/drawable/circle.xml rename to app/src/main/res/drawable/circle_black.xml diff --git a/app/src/main/res/drawable/white_circle.xml b/app/src/main/res/drawable/circle_white.xml similarity index 100% rename from app/src/main/res/drawable/white_circle.xml rename to app/src/main/res/drawable/circle_white.xml diff --git a/app/src/main/res/drawable/statistic_logo.png b/app/src/main/res/drawable/drawer_statistic_logo.png similarity index 100% rename from app/src/main/res/drawable/statistic_logo.png rename to app/src/main/res/drawable/drawer_statistic_logo.png diff --git a/app/src/main/res/drawable/exercise_0.png b/app/src/main/res/drawable/exercise_0.png new file mode 100644 index 0000000..207e71b Binary files /dev/null and b/app/src/main/res/drawable/exercise_0.png differ diff --git a/app/src/main/res/drawable/exercise_1.png b/app/src/main/res/drawable/exercise_1.png new file mode 100644 index 0000000..6638ec0 Binary files /dev/null and b/app/src/main/res/drawable/exercise_1.png differ diff --git a/app/src/main/res/drawable/exercise_10.png b/app/src/main/res/drawable/exercise_10.png new file mode 100644 index 0000000..cd5b654 Binary files /dev/null and b/app/src/main/res/drawable/exercise_10.png differ diff --git a/app/src/main/res/drawable/exercise_11.png b/app/src/main/res/drawable/exercise_11.png new file mode 100644 index 0000000..3abc147 Binary files /dev/null and b/app/src/main/res/drawable/exercise_11.png differ diff --git a/app/src/main/res/drawable/exercise_12.png b/app/src/main/res/drawable/exercise_12.png new file mode 100644 index 0000000..9d22afc Binary files /dev/null and b/app/src/main/res/drawable/exercise_12.png differ diff --git a/app/src/main/res/drawable/exercise_13.png b/app/src/main/res/drawable/exercise_13.png new file mode 100644 index 0000000..b5a2dca Binary files /dev/null and b/app/src/main/res/drawable/exercise_13.png differ diff --git a/app/src/main/res/drawable/exercise_14.png b/app/src/main/res/drawable/exercise_14.png new file mode 100644 index 0000000..5b5ffdf Binary files /dev/null and b/app/src/main/res/drawable/exercise_14.png differ diff --git a/app/src/main/res/drawable/exercise_15.png b/app/src/main/res/drawable/exercise_15.png new file mode 100644 index 0000000..b6b17ca Binary files /dev/null and b/app/src/main/res/drawable/exercise_15.png differ diff --git a/app/src/main/res/drawable/exercise_16.png b/app/src/main/res/drawable/exercise_16.png new file mode 100644 index 0000000..16da6cf Binary files /dev/null and b/app/src/main/res/drawable/exercise_16.png differ diff --git a/app/src/main/res/drawable/exercise_17.png b/app/src/main/res/drawable/exercise_17.png new file mode 100644 index 0000000..d4862f0 Binary files /dev/null and b/app/src/main/res/drawable/exercise_17.png differ diff --git a/app/src/main/res/drawable/exercise_18.png b/app/src/main/res/drawable/exercise_18.png new file mode 100644 index 0000000..724d175 Binary files /dev/null and b/app/src/main/res/drawable/exercise_18.png differ diff --git a/app/src/main/res/drawable/exercise_19.png b/app/src/main/res/drawable/exercise_19.png new file mode 100644 index 0000000..f43eaba Binary files /dev/null and b/app/src/main/res/drawable/exercise_19.png differ diff --git a/app/src/main/res/drawable/exercise_2.png b/app/src/main/res/drawable/exercise_2.png new file mode 100644 index 0000000..ebc44f7 Binary files /dev/null and b/app/src/main/res/drawable/exercise_2.png differ diff --git a/app/src/main/res/drawable/exercise_20.png b/app/src/main/res/drawable/exercise_20.png new file mode 100644 index 0000000..d8f076d Binary files /dev/null and b/app/src/main/res/drawable/exercise_20.png differ diff --git a/app/src/main/res/drawable/exercise_21.png b/app/src/main/res/drawable/exercise_21.png new file mode 100644 index 0000000..c129168 Binary files /dev/null and b/app/src/main/res/drawable/exercise_21.png differ diff --git a/app/src/main/res/drawable/exercise_22.png b/app/src/main/res/drawable/exercise_22.png new file mode 100644 index 0000000..958dc1d Binary files /dev/null and b/app/src/main/res/drawable/exercise_22.png differ diff --git a/app/src/main/res/drawable/exercise_23.png b/app/src/main/res/drawable/exercise_23.png new file mode 100644 index 0000000..c4d8a2e Binary files /dev/null and b/app/src/main/res/drawable/exercise_23.png differ diff --git a/app/src/main/res/drawable/exercise_24.png b/app/src/main/res/drawable/exercise_24.png new file mode 100644 index 0000000..43c0157 Binary files /dev/null and b/app/src/main/res/drawable/exercise_24.png differ diff --git a/app/src/main/res/drawable/exercise_25.png b/app/src/main/res/drawable/exercise_25.png new file mode 100644 index 0000000..aae1375 Binary files /dev/null and b/app/src/main/res/drawable/exercise_25.png differ diff --git a/app/src/main/res/drawable/exercise_26.png b/app/src/main/res/drawable/exercise_26.png new file mode 100644 index 0000000..4b9b467 Binary files /dev/null and b/app/src/main/res/drawable/exercise_26.png differ diff --git a/app/src/main/res/drawable/exercise_27.png b/app/src/main/res/drawable/exercise_27.png new file mode 100644 index 0000000..0a9e54d Binary files /dev/null and b/app/src/main/res/drawable/exercise_27.png differ diff --git a/app/src/main/res/drawable/exercise_28.png b/app/src/main/res/drawable/exercise_28.png new file mode 100644 index 0000000..000597c Binary files /dev/null and b/app/src/main/res/drawable/exercise_28.png differ diff --git a/app/src/main/res/drawable/exercise_29.png b/app/src/main/res/drawable/exercise_29.png new file mode 100644 index 0000000..7dedb0c Binary files /dev/null and b/app/src/main/res/drawable/exercise_29.png differ diff --git a/app/src/main/res/drawable/exercise_3.png b/app/src/main/res/drawable/exercise_3.png new file mode 100644 index 0000000..7b1d824 Binary files /dev/null and b/app/src/main/res/drawable/exercise_3.png differ diff --git a/app/src/main/res/drawable/exercise_30.png b/app/src/main/res/drawable/exercise_30.png new file mode 100644 index 0000000..5993d6e Binary files /dev/null and b/app/src/main/res/drawable/exercise_30.png differ diff --git a/app/src/main/res/drawable/exercise_31.png b/app/src/main/res/drawable/exercise_31.png new file mode 100644 index 0000000..9a96cab Binary files /dev/null and b/app/src/main/res/drawable/exercise_31.png differ diff --git a/app/src/main/res/drawable/exercise_32.png b/app/src/main/res/drawable/exercise_32.png new file mode 100644 index 0000000..f0e0d0c Binary files /dev/null and b/app/src/main/res/drawable/exercise_32.png differ diff --git a/app/src/main/res/drawable/exercise_33.png b/app/src/main/res/drawable/exercise_33.png new file mode 100644 index 0000000..6dbb1c3 Binary files /dev/null and b/app/src/main/res/drawable/exercise_33.png differ diff --git a/app/src/main/res/drawable/exercise_34.png b/app/src/main/res/drawable/exercise_34.png new file mode 100644 index 0000000..0e05196 Binary files /dev/null and b/app/src/main/res/drawable/exercise_34.png differ diff --git a/app/src/main/res/drawable/exercise_35.png b/app/src/main/res/drawable/exercise_35.png new file mode 100644 index 0000000..fee106d Binary files /dev/null and b/app/src/main/res/drawable/exercise_35.png differ diff --git a/app/src/main/res/drawable/exercise_36.png b/app/src/main/res/drawable/exercise_36.png new file mode 100644 index 0000000..530fced Binary files /dev/null and b/app/src/main/res/drawable/exercise_36.png differ diff --git a/app/src/main/res/drawable/exercise_37.png b/app/src/main/res/drawable/exercise_37.png new file mode 100644 index 0000000..302756b Binary files /dev/null and b/app/src/main/res/drawable/exercise_37.png differ diff --git a/app/src/main/res/drawable/exercise_38.png b/app/src/main/res/drawable/exercise_38.png new file mode 100644 index 0000000..a18a7cf Binary files /dev/null and b/app/src/main/res/drawable/exercise_38.png differ diff --git a/app/src/main/res/drawable/exercise_39.png b/app/src/main/res/drawable/exercise_39.png new file mode 100644 index 0000000..d03c4ad Binary files /dev/null and b/app/src/main/res/drawable/exercise_39.png differ diff --git a/app/src/main/res/drawable/exercise_4.png b/app/src/main/res/drawable/exercise_4.png new file mode 100644 index 0000000..871ddf4 Binary files /dev/null and b/app/src/main/res/drawable/exercise_4.png differ diff --git a/app/src/main/res/drawable/exercise_40.png b/app/src/main/res/drawable/exercise_40.png new file mode 100644 index 0000000..d3d49fb Binary files /dev/null and b/app/src/main/res/drawable/exercise_40.png differ diff --git a/app/src/main/res/drawable/exercise_41.png b/app/src/main/res/drawable/exercise_41.png new file mode 100644 index 0000000..ae81db1 Binary files /dev/null and b/app/src/main/res/drawable/exercise_41.png differ diff --git a/app/src/main/res/drawable/exercise_42.png b/app/src/main/res/drawable/exercise_42.png new file mode 100644 index 0000000..6b49f9f Binary files /dev/null and b/app/src/main/res/drawable/exercise_42.png differ diff --git a/app/src/main/res/drawable/exercise_43.png b/app/src/main/res/drawable/exercise_43.png new file mode 100644 index 0000000..d07a812 Binary files /dev/null and b/app/src/main/res/drawable/exercise_43.png differ diff --git a/app/src/main/res/drawable/exercise_44.png b/app/src/main/res/drawable/exercise_44.png new file mode 100644 index 0000000..2572c1a Binary files /dev/null and b/app/src/main/res/drawable/exercise_44.png differ diff --git a/app/src/main/res/drawable/exercise_45.png b/app/src/main/res/drawable/exercise_45.png new file mode 100644 index 0000000..6f3629d Binary files /dev/null and b/app/src/main/res/drawable/exercise_45.png differ diff --git a/app/src/main/res/drawable/exercise_46.png b/app/src/main/res/drawable/exercise_46.png new file mode 100644 index 0000000..c1582d0 Binary files /dev/null and b/app/src/main/res/drawable/exercise_46.png differ diff --git a/app/src/main/res/drawable/exercise_47.png b/app/src/main/res/drawable/exercise_47.png new file mode 100644 index 0000000..66e11f7 Binary files /dev/null and b/app/src/main/res/drawable/exercise_47.png differ diff --git a/app/src/main/res/drawable/exercise_48.png b/app/src/main/res/drawable/exercise_48.png new file mode 100644 index 0000000..2143534 Binary files /dev/null and b/app/src/main/res/drawable/exercise_48.png differ diff --git a/app/src/main/res/drawable/exercise_49.png b/app/src/main/res/drawable/exercise_49.png new file mode 100644 index 0000000..ad13ec6 Binary files /dev/null and b/app/src/main/res/drawable/exercise_49.png differ diff --git a/app/src/main/res/drawable/exercise_5.png b/app/src/main/res/drawable/exercise_5.png new file mode 100644 index 0000000..d4eb18a Binary files /dev/null and b/app/src/main/res/drawable/exercise_5.png differ diff --git a/app/src/main/res/drawable/exercise_50.png b/app/src/main/res/drawable/exercise_50.png new file mode 100644 index 0000000..b0011f9 Binary files /dev/null and b/app/src/main/res/drawable/exercise_50.png differ diff --git a/app/src/main/res/drawable/exercise_51.png b/app/src/main/res/drawable/exercise_51.png new file mode 100644 index 0000000..f578147 Binary files /dev/null and b/app/src/main/res/drawable/exercise_51.png differ diff --git a/app/src/main/res/drawable/exercise_52.png b/app/src/main/res/drawable/exercise_52.png new file mode 100644 index 0000000..98f1c8d Binary files /dev/null and b/app/src/main/res/drawable/exercise_52.png differ diff --git a/app/src/main/res/drawable/exercise_53.png b/app/src/main/res/drawable/exercise_53.png new file mode 100644 index 0000000..e6b7ecd Binary files /dev/null and b/app/src/main/res/drawable/exercise_53.png differ diff --git a/app/src/main/res/drawable/exercise_54.png b/app/src/main/res/drawable/exercise_54.png new file mode 100644 index 0000000..00084ed Binary files /dev/null and b/app/src/main/res/drawable/exercise_54.png differ diff --git a/app/src/main/res/drawable/exercise_55.png b/app/src/main/res/drawable/exercise_55.png new file mode 100644 index 0000000..6b0e7e1 Binary files /dev/null and b/app/src/main/res/drawable/exercise_55.png differ diff --git a/app/src/main/res/drawable/exercise_56.png b/app/src/main/res/drawable/exercise_56.png new file mode 100644 index 0000000..d562b40 Binary files /dev/null and b/app/src/main/res/drawable/exercise_56.png differ diff --git a/app/src/main/res/drawable/exercise_57.png b/app/src/main/res/drawable/exercise_57.png new file mode 100644 index 0000000..72841d9 Binary files /dev/null and b/app/src/main/res/drawable/exercise_57.png differ diff --git a/app/src/main/res/drawable/exercise_58.png b/app/src/main/res/drawable/exercise_58.png new file mode 100644 index 0000000..9019a9b Binary files /dev/null and b/app/src/main/res/drawable/exercise_58.png differ diff --git a/app/src/main/res/drawable/exercise_59.png b/app/src/main/res/drawable/exercise_59.png new file mode 100644 index 0000000..8be14b8 Binary files /dev/null and b/app/src/main/res/drawable/exercise_59.png differ diff --git a/app/src/main/res/drawable/exercise_6.png b/app/src/main/res/drawable/exercise_6.png new file mode 100644 index 0000000..b7a2a64 Binary files /dev/null and b/app/src/main/res/drawable/exercise_6.png differ diff --git a/app/src/main/res/drawable/exercise_60.png b/app/src/main/res/drawable/exercise_60.png new file mode 100644 index 0000000..4b9b4aa Binary files /dev/null and b/app/src/main/res/drawable/exercise_60.png differ diff --git a/app/src/main/res/drawable/exercise_61.png b/app/src/main/res/drawable/exercise_61.png new file mode 100644 index 0000000..e79a240 Binary files /dev/null and b/app/src/main/res/drawable/exercise_61.png differ diff --git a/app/src/main/res/drawable/exercise_62.png b/app/src/main/res/drawable/exercise_62.png new file mode 100644 index 0000000..e6d3c67 Binary files /dev/null and b/app/src/main/res/drawable/exercise_62.png differ diff --git a/app/src/main/res/drawable/exercise_63.png b/app/src/main/res/drawable/exercise_63.png new file mode 100644 index 0000000..7d12ac1 Binary files /dev/null and b/app/src/main/res/drawable/exercise_63.png differ diff --git a/app/src/main/res/drawable/exercise_64.png b/app/src/main/res/drawable/exercise_64.png new file mode 100644 index 0000000..febddb8 Binary files /dev/null and b/app/src/main/res/drawable/exercise_64.png differ diff --git a/app/src/main/res/drawable/exercise_7.png b/app/src/main/res/drawable/exercise_7.png new file mode 100644 index 0000000..5cdce5b Binary files /dev/null and b/app/src/main/res/drawable/exercise_7.png differ diff --git a/app/src/main/res/drawable/exercise_8.png b/app/src/main/res/drawable/exercise_8.png new file mode 100644 index 0000000..cdf5363 Binary files /dev/null and b/app/src/main/res/drawable/exercise_8.png differ diff --git a/app/src/main/res/drawable/exercise_9.png b/app/src/main/res/drawable/exercise_9.png new file mode 100644 index 0000000..c09dfc3 Binary files /dev/null and b/app/src/main/res/drawable/exercise_9.png differ diff --git a/app/src/main/res/drawable/break_screen.png b/app/src/main/res/drawable/help_break_screen.png similarity index 100% rename from app/src/main/res/drawable/break_screen.png rename to app/src/main/res/drawable/help_break_screen.png diff --git a/app/src/main/res/drawable/create_profile_screen.png b/app/src/main/res/drawable/help_create_profile_screen.png similarity index 100% rename from app/src/main/res/drawable/create_profile_screen.png rename to app/src/main/res/drawable/help_create_profile_screen.png diff --git a/app/src/main/res/drawable/general_screen.png b/app/src/main/res/drawable/help_general_screen.png similarity index 100% rename from app/src/main/res/drawable/general_screen.png rename to app/src/main/res/drawable/help_general_screen.png diff --git a/app/src/main/res/drawable/notification_screen.png b/app/src/main/res/drawable/help_notification_screen.png similarity index 100% rename from app/src/main/res/drawable/notification_screen.png rename to app/src/main/res/drawable/help_notification_screen.png diff --git a/app/src/main/res/drawable/settings_screen.png b/app/src/main/res/drawable/help_settings_screen.png similarity index 100% rename from app/src/main/res/drawable/settings_screen.png rename to app/src/main/res/drawable/help_settings_screen.png diff --git a/app/src/main/res/drawable/start_screen.png b/app/src/main/res/drawable/help_start_screen.png similarity index 100% rename from app/src/main/res/drawable/start_screen.png rename to app/src/main/res/drawable/help_start_screen.png diff --git a/app/src/main/res/drawable/train_left.png b/app/src/main/res/drawable/train_left.png deleted file mode 100644 index 33142c7..0000000 Binary files a/app/src/main/res/drawable/train_left.png and /dev/null differ diff --git a/app/src/main/res/drawable/train_middle.png b/app/src/main/res/drawable/train_middle.png deleted file mode 100644 index 2d58f42..0000000 Binary files a/app/src/main/res/drawable/train_middle.png and /dev/null differ diff --git a/app/src/main/res/drawable/train_right.png b/app/src/main/res/drawable/train_right.png deleted file mode 100644 index 472a5d4..0000000 Binary files a/app/src/main/res/drawable/train_right.png and /dev/null differ diff --git a/app/src/main/res/drawable/clock.png b/app/src/main/res/drawable/tutorial_clock.png similarity index 100% rename from app/src/main/res/drawable/clock.png rename to app/src/main/res/drawable/tutorial_clock.png diff --git a/app/src/main/res/drawable/play_button.png b/app/src/main/res/drawable/tutorial_play_button.png similarity index 100% rename from app/src/main/res/drawable/play_button.png rename to app/src/main/res/drawable/tutorial_play_button.png diff --git a/app/src/main/res/drawable/reset_button.png b/app/src/main/res/drawable/tutorial_reset_button.png similarity index 100% rename from app/src/main/res/drawable/reset_button.png rename to app/src/main/res/drawable/tutorial_reset_button.png diff --git a/app/src/main/res/drawable/spinner.png b/app/src/main/res/drawable/tutorial_spinner.png similarity index 100% rename from app/src/main/res/drawable/spinner.png rename to app/src/main/res/drawable/tutorial_spinner.png diff --git a/app/src/main/res/drawable/widget.png b/app/src/main/res/drawable/widget_preview.png similarity index 100% rename from app/src/main/res/drawable/widget.png rename to app/src/main/res/drawable/widget_preview.png diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml index 17cd520..d4b8ad7 100644 --- a/app/src/main/res/layout/about.xml +++ b/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" /> + android:src="@drawable/about_secuso_logo_blau_blau" /> - - - + --> + android:background="@drawable/circle_white"> + android:background="@drawable/circle_white"> + android:background="@drawable/circle_white"> + android:background="@drawable/circle_white"> + android:src="@drawable/tutorial_clock"/> + android:src="@drawable/tutorial_play_button"/> + android:src="@drawable/tutorial_reset_button"/> + android:src="@drawable/tutorial_spinner"/> + android:src="@drawable/help_start_screen" /> + android:src="@drawable/help_settings_screen" /> + android:src="@drawable/help_general_screen" /> + android:src="@drawable/help_notification_screen" /> + android:src="@drawable/help_create_profile_screen" /> + android:src="@drawable/help_break_screen"/> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 137f414..19fa358 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -65,4 +65,6 @@ Appuyez sur le bouton pour réinitialiser l\'horloge Type Écran principal + 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 + Pour voir les images en pleine grandeur, cliquer sure les images. Pour retourner a la grandeur initial re-cliquer sur l\'image. \ No newline at end of file diff --git a/app/src/main/res/xml/app_widget2x1_info.xml b/app/src/main/res/xml/app_widget2x1_info.xml index 38c67ab..d7f8223 100644 --- a/app/src/main/res/xml/app_widget2x1_info.xml +++ b/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"> \ No newline at end of file diff --git a/app/src/main/res/xml/app_widget2x2_info.xml b/app/src/main/res/xml/app_widget2x2_info.xml index a57b25e..654356d 100644 --- a/app/src/main/res/xml/app_widget2x2_info.xml +++ b/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"> \ No newline at end of file diff --git a/app/src/main/res/xml/app_widget3x3_info.xml b/app/src/main/res/xml/app_widget3x3_info.xml index 50ffe49..cb78e20 100644 --- a/app/src/main/res/xml/app_widget3x3_info.xml +++ b/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"> \ No newline at end of file diff --git a/app/src/main/res/xml/app_widget4x4_info.xml b/app/src/main/res/xml/app_widget4x4_info.xml index b15d101..046e5d4 100644 --- a/app/src/main/res/xml/app_widget4x4_info.xml +++ b/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"> \ No newline at end of file