From c98663337c9b32ff1115ccd86591a046611e55d8 Mon Sep 17 00:00:00 2001
From: aarnaude <antoine.arnaudet@polytech-lille.net>
Date: Wed, 7 Feb 2018 17:39:45 +0100
Subject: [PATCH] ajout scènes thème hygiene

---
 app/src/main/AndroidManifest.xml                  |  15 +++++++++++++++
 app/src/main/java/tonio/noa/Hygiene4Activity.java |   7 ++++++-
 app/src/main/java/tonio/noa/Hygiene5Activity.java |  72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app/src/main/java/tonio/noa/Hygiene6Activity.java | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app/src/main/res/drawable/brushing_teeth.png      | Bin 0 -> 127820 bytes
 app/src/main/res/drawable/marseille_soap.jpg      | Bin 0 -> 58258 bytes
 app/src/main/res/drawable/washing_hands.jpg       | Bin 0 -> 81273 bytes
 app/src/main/res/layout/hygiene1_display.xml      |   4 ++--
 app/src/main/res/layout/hygiene2_display.xml      |   4 ++--
 app/src/main/res/layout/hygiene3_display.xml      |   4 ++--
 app/src/main/res/layout/hygiene4_display.xml      |   3 ++-
 app/src/main/res/layout/hygiene5_display.xml      | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app/src/main/res/layout/hygiene6_display.xml      |  82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app/src/main/res/layout/tutorial1_display.xml     |   1 +
 app/src/main/res/layout/tutorial2_display.xml     |   6 +++---
 app/src/main/res/layout/tutorial3_display.xml     |  27 ++++++++++++++-------------
 app/src/main/res/layout/tutorial4_display.xml     |   3 ++-
 app/src/main/res/layout/tutorial5_display.xml     |   3 ++-
 18 files changed, 424 insertions(+), 26 deletions(-)
 create mode 100644 app/src/main/java/tonio/noa/Hygiene5Activity.java
 create mode 100644 app/src/main/java/tonio/noa/Hygiene6Activity.java
 create mode 100644 app/src/main/res/drawable/brushing_teeth.png
 create mode 100644 app/src/main/res/drawable/marseille_soap.jpg
 create mode 100644 app/src/main/res/drawable/washing_hands.jpg
 create mode 100644 app/src/main/res/layout/hygiene5_display.xml
 create mode 100644 app/src/main/res/layout/hygiene6_display.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5f7ca0d..dc90dd3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -76,6 +76,21 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".MainActivity" />
         </activity>
+
+        <activity
+            android:name=".Hygiene5Activity"
+            android:screenOrientation="userLandscape">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".MainActivity" />
+        </activity>
+        <activity
+            android:name=".Hygiene6Activity"
+            android:screenOrientation="userLandscape">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".MainActivity" />
+        </activity>
         <activity
             android:name=".TutorialScene1Activity"
             android:parentActivityName=".MainActivity"
diff --git a/app/src/main/java/tonio/noa/Hygiene4Activity.java b/app/src/main/java/tonio/noa/Hygiene4Activity.java
index a15fca7..43e876c 100644
--- a/app/src/main/java/tonio/noa/Hygiene4Activity.java
+++ b/app/src/main/java/tonio/noa/Hygiene4Activity.java
@@ -114,8 +114,13 @@ public class Hygiene4Activity extends MyPlayActivity implements View.OnTouchList
                         //stop displaying the view where it was before it was dragged
                         view.setVisibility(View.INVISIBLE);
                         win_counter++;
+                    } else {
+                        ImageView imageV = (ImageView) view;
+                        imageV.setColorFilter(Color.GRAY);
+                        view.setEnabled(false);
                     }
                 }
+
                 break;
         }
         return true;
@@ -124,6 +129,6 @@ public class Hygiene4Activity extends MyPlayActivity implements View.OnTouchList
 
     @Override
     protected void next() {
-
+        startActivity(new Intent(this, Hygiene5Activity.class));
     }
 }
diff --git a/app/src/main/java/tonio/noa/Hygiene5Activity.java b/app/src/main/java/tonio/noa/Hygiene5Activity.java
new file mode 100644
index 0000000..a25b130
--- /dev/null
+++ b/app/src/main/java/tonio/noa/Hygiene5Activity.java
@@ -0,0 +1,72 @@
+package tonio.noa;
+
+import android.content.Intent;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+/**
+ * Created by psyk on 24/01/18.
+ */
+
+public class Hygiene5Activity extends MyPlayActivity implements View.OnTouchListener {
+
+    private int win_counter = 0;
+    private boolean done = false;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        lanceConsigne("Maintenant tu dois toucher le shampoing, le savon et la brosse à dent.");
+    }
+
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        setContentView(R.layout.hygiene5_display);
+
+        TextView txtV = findViewById(R.id.cons_hyg5);
+        smallCons = "Touche le shampoing, le savon et la brosse à dent.";
+        txtV.setText(smallCons);
+        setTts();
+
+        findViewById(R.id.soap).setOnTouchListener(this);
+        findViewById(R.id.shampoo).setOnTouchListener(this);
+        findViewById(R.id.toothpaste).setOnTouchListener(this);
+        findViewById(R.id.blue_toothbrush_pic).setOnTouchListener(this);
+        findViewById(R.id.towel).setOnTouchListener(this);
+        findViewById(R.id.toilet_bag).setOnTouchListener(this);
+
+    }
+
+    @Override
+    public boolean onTouch(View view, MotionEvent event) {
+        if (event.getAction() == MotionEvent.ACTION_DOWN) {
+            if (view == findViewById(R.id.soap)
+                    || view == findViewById(R.id.shampoo)
+                    || view == findViewById(R.id.blue_toothbrush_pic)) {
+                view.setVisibility(View.INVISIBLE);
+                win_counter++;
+            } else {
+                ImageView imageV = (ImageView) view;
+                imageV.setColorFilter(Color.GRAY);
+                view.setEnabled(false);
+            }
+            return true;
+        }
+        if (win_counter == 3 && !done) {
+            done = true;
+            this.bravoPage(null);
+            return true;
+        } else
+            return false;
+    }
+
+    @Override
+    protected void next() {
+        startActivity(new Intent(this, Hygiene6Activity.class));
+    }
+}
diff --git a/app/src/main/java/tonio/noa/Hygiene6Activity.java b/app/src/main/java/tonio/noa/Hygiene6Activity.java
new file mode 100644
index 0000000..ee4f248
--- /dev/null
+++ b/app/src/main/java/tonio/noa/Hygiene6Activity.java
@@ -0,0 +1,118 @@
+package tonio.noa;
+
+import android.content.ClipData;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.DragEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+/**
+ * Created by psyk on 15/01/18.
+ */
+
+public class Hygiene6Activity extends MyPlayActivity implements View.OnTouchListener, View.OnDragListener {
+
+    private int win_counter = 0;
+    private boolean done = false;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        lanceConsigne("Cette fois, tu dois associer l'objet avec\nl'action qu'il permet de réaliser.");
+    }
+
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        setContentView(R.layout.hygiene6_display);
+
+        TextView txtV = findViewById(R.id.cons_hyg6);
+        smallCons = "Associe l'objet avec son action.";
+        txtV.setText(smallCons);
+        setTts();
+
+        findViewById(R.id.marseille_soap).setOnTouchListener(this);
+        findViewById(R.id.washing_hands).setOnTouchListener(this);
+        findViewById(R.id.blue_toothbrush_pic).setOnTouchListener(this);
+        findViewById(R.id.brushing_teeth).setOnTouchListener(this);
+
+        findViewById(R.id.marseille_soap).setOnDragListener(this);
+        findViewById(R.id.washing_hands).setOnDragListener(this);
+        findViewById(R.id.brushing_teeth).setOnDragListener(this);
+        findViewById(R.id.blue_toothbrush_pic).setOnDragListener(this);
+
+    }
+
+    @Override
+    public boolean onTouch(View view, MotionEvent event) {
+        if (event.getAction() == MotionEvent.ACTION_DOWN) {
+
+            View.DragShadowBuilder shadowBuilder = new View.DragShadowBuilder(view);
+            ClipData data = ClipData.newPlainText("id", view.getResources().getResourceEntryName(view.getId()));
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                view.startDragAndDrop(data, shadowBuilder, view, 0);
+            } else {
+                view.startDrag(data, shadowBuilder, view, 0);
+            }
+            return true;
+        } else
+            return false;
+    }
+
+    @Override
+    public boolean onDrag(View v, DragEvent event) {
+        switch (event.getAction()) {
+            // signal for the start of a drag and drop operation
+            case DragEvent.ACTION_DRAG_STARTED:
+                // do nothing
+                break;
+
+            // the drag point has entered the bounding box of the View
+            case DragEvent.ACTION_DRAG_ENTERED:
+                // do nothing
+                break;
+
+            // the user has moved the drag shadow outside the bounding box of the View
+            case DragEvent.ACTION_DRAG_EXITED:
+                // do nothing
+                break;
+
+            // the drag and drop operation has concluded
+            case DragEvent.ACTION_DRAG_ENDED:
+                if (win_counter == 2 && !done) {
+                    done = true;
+                    bravoPage(v);
+                }
+                break;
+
+            //drag shadow has been released,the drag point is within the bounding box of the View
+            case DragEvent.ACTION_DROP:
+                //handle the dragged view being dropped over a target view
+                View view = (View) event.getLocalState();
+                if (
+                        (v == findViewById(R.id.washing_hands) && view == findViewById(R.id.marseille_soap)) ||
+                                (v == findViewById(R.id.marseille_soap) && view == findViewById(R.id.washing_hands)) ||
+                                (v == findViewById(R.id.blue_toothbrush_pic) && view == findViewById(R.id.brushing_teeth)) ||
+                                (v == findViewById(R.id.brushing_teeth) && view == findViewById(R.id.blue_toothbrush_pic))
+                        ) {
+                    //stop displaying the view where it was before it was dragged
+                    view.setVisibility(View.INVISIBLE);
+                    v.setVisibility(View.INVISIBLE);
+                    win_counter++;
+                }
+                break;
+        }
+
+        return true;
+    }
+
+    @Override
+    protected void next() {
+        backHome(null);
+    }
+}
diff --git a/app/src/main/res/drawable/brushing_teeth.png b/app/src/main/res/drawable/brushing_teeth.png
new file mode 100644
index 0000000..c9c7776
Binary files /dev/null and b/app/src/main/res/drawable/brushing_teeth.png differ
diff --git a/app/src/main/res/drawable/marseille_soap.jpg b/app/src/main/res/drawable/marseille_soap.jpg
new file mode 100644
index 0000000..b4a2bb9
Binary files /dev/null and b/app/src/main/res/drawable/marseille_soap.jpg differ
diff --git a/app/src/main/res/drawable/washing_hands.jpg b/app/src/main/res/drawable/washing_hands.jpg
new file mode 100644
index 0000000..81c2571
Binary files /dev/null and b/app/src/main/res/drawable/washing_hands.jpg differ
diff --git a/app/src/main/res/layout/hygiene1_display.xml b/app/src/main/res/layout/hygiene1_display.xml
index 71a65d5..d42da24 100644
--- a/app/src/main/res/layout/hygiene1_display.xml
+++ b/app/src/main/res/layout/hygiene1_display.xml
@@ -12,7 +12,7 @@
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_margin="20dp"
-        android:maxWidth="500dp"
+        android:maxWidth="650dp"
         android:textAppearance="@style/TextFont" />
 
     <ImageView
@@ -44,7 +44,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"
-        android:layout_margin="10dp"
+        android:layout_margin="20dp"
         android:onClick="backHome"
         android:text="@string/home" />
 
diff --git a/app/src/main/res/layout/hygiene2_display.xml b/app/src/main/res/layout/hygiene2_display.xml
index 3f0be0b..1ec942b 100644
--- a/app/src/main/res/layout/hygiene2_display.xml
+++ b/app/src/main/res/layout/hygiene2_display.xml
@@ -12,7 +12,7 @@
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_margin="20dp"
-        android:maxWidth="500dp"
+        android:maxWidth="650dp"
         android:textAppearance="@style/TextFont" />
 
     <ImageView
@@ -43,7 +43,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"
-        android:layout_margin="10dp"
+        android:layout_margin="20dp"
         android:onClick="backHome"
         android:text="@string/home" />
 
diff --git a/app/src/main/res/layout/hygiene3_display.xml b/app/src/main/res/layout/hygiene3_display.xml
index 2b2ec60..3bee6c6 100644
--- a/app/src/main/res/layout/hygiene3_display.xml
+++ b/app/src/main/res/layout/hygiene3_display.xml
@@ -12,7 +12,7 @@
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_margin="20dp"
-        android:maxWidth="500dp"
+        android:maxWidth="650dp"
         android:textAppearance="@style/TextFont" />
 
     <ImageView
@@ -43,7 +43,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"
-        android:layout_margin="10dp"
+        android:layout_margin="20dp"
         android:onClick="backHome"
         android:text="@string/home" />
 
diff --git a/app/src/main/res/layout/hygiene4_display.xml b/app/src/main/res/layout/hygiene4_display.xml
index 80ec4cb..55c2dba 100644
--- a/app/src/main/res/layout/hygiene4_display.xml
+++ b/app/src/main/res/layout/hygiene4_display.xml
@@ -121,6 +121,7 @@
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_margin="20dp"
+        android:maxWidth="650dp"
         android:textAppearance="@style/TextFont" />
 
 
@@ -130,7 +131,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"
-        android:layout_margin="5dp"
+        android:layout_margin="20dp"
         android:onClick="backHome"
         android:text="@string/home" />
 
diff --git a/app/src/main/res/layout/hygiene5_display.xml b/app/src/main/res/layout/hygiene5_display.xml
new file mode 100644
index 0000000..f79623b
--- /dev/null
+++ b/app/src/main/res/layout/hygiene5_display.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/hyg5"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/soap"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_margin="50dp"
+        android:adjustViewBounds="true"
+        android:maxWidth="150dp"
+        android:src="@drawable/soap" />
+
+
+    <ImageView
+        android:id="@+id/shampoo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_margin="50dp"
+        android:adjustViewBounds="true"
+        android:maxWidth="120dp"
+        android:src="@drawable/shampoo" />
+
+    <ImageView
+        android:id="@+id/toothpaste"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/blue_toothbrush_pic"
+        android:layout_centerHorizontal="true"
+        android:layout_margin="50dp"
+        android:adjustViewBounds="true"
+        android:maxWidth="200dp"
+        android:src="@drawable/toothpaste" />
+
+    <ImageView
+        android:id="@+id/blue_toothbrush_pic"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_margin="50dp"
+        android:adjustViewBounds="true"
+        android:maxWidth="200dp"
+        android:src="@drawable/blue_toothbrush_pic" />
+
+    <ImageView
+        android:id="@+id/towel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/soap"
+        android:layout_margin="50dp"
+        android:adjustViewBounds="true"
+        android:maxWidth="150dp"
+        android:src="@drawable/towel" />
+
+    <ImageView
+        android:id="@+id/toilet_bag"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_below="@id/shampoo"
+        android:layout_margin="50dp"
+        android:adjustViewBounds="true"
+        android:maxWidth="200dp"
+        android:src="@drawable/toilet_bag" />
+
+    <TextView
+        android:id="@+id/cons_hyg5"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_margin="20dp"
+        android:maxWidth="650dp"
+        android:textAppearance="@style/TextFont" />
+
+    <Button
+        android:id="@+id/button_id_home"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentStart="true"
+        android:layout_margin="20dp"
+        android:onClick="backHome"
+        android:text="@string/home" />
+
+    <Button
+        android:id="@+id/announce_instruction"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
+        android:layout_margin="20dp"
+        android:onClick="enonceConsigne"
+        android:text="@string/instruction" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/hygiene6_display.xml b/app/src/main/res/layout/hygiene6_display.xml
new file mode 100644
index 0000000..46449a3
--- /dev/null
+++ b/app/src/main/res/layout/hygiene6_display.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/hyg6"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/marseille_soap"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_margin="50dp"
+        android:adjustViewBounds="true"
+        android:maxWidth="250dp"
+        android:src="@drawable/marseille_soap" />
+
+    <ImageView
+        android:id="@+id/washing_hands"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentTop="true"
+        android:layout_margin="50dp"
+        android:adjustViewBounds="true"
+        android:maxWidth="250dp"
+        android:src="@drawable/washing_hands" />
+
+    <ImageView
+        android:id="@+id/brushing_teeth"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_below="@id/marseille_soap"
+        android:layout_margin="50dp"
+        android:adjustViewBounds="true"
+        android:maxWidth="250dp"
+        android:src="@drawable/brushing_teeth" />
+
+    <ImageView
+        android:id="@+id/blue_toothbrush_pic"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_below="@id/washing_hands"
+        android:layout_margin="50dp"
+        android:adjustViewBounds="true"
+        android:maxWidth="250dp"
+        android:src="@drawable/blue_toothbrush_pic" />
+
+    <TextView
+        android:id="@+id/cons_hyg6"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_margin="20dp"
+        android:maxWidth="650dp"
+        android:textAppearance="@style/TextFont" />
+
+    <Button
+        android:id="@+id/button_id_home"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentStart="true"
+        android:layout_margin="20dp"
+        android:onClick="backHome"
+        android:text="@string/home" />
+
+    <Button
+        android:id="@+id/announce_instruction"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
+        android:layout_margin="20dp"
+        android:onClick="enonceConsigne"
+        android:text="@string/instruction" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tutorial1_display.xml b/app/src/main/res/layout/tutorial1_display.xml
index cad9f2e..f4eccdd 100644
--- a/app/src/main/res/layout/tutorial1_display.xml
+++ b/app/src/main/res/layout/tutorial1_display.xml
@@ -8,6 +8,7 @@
         android:id="@+id/cons_tut1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:maxWidth="650dp"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_margin="20dp"
diff --git a/app/src/main/res/layout/tutorial2_display.xml b/app/src/main/res/layout/tutorial2_display.xml
index 1bef748..3782ac4 100644
--- a/app/src/main/res/layout/tutorial2_display.xml
+++ b/app/src/main/res/layout/tutorial2_display.xml
@@ -11,8 +11,8 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:maxWidth="500dp"
         android:layout_margin="20dp"
+        android:maxWidth="650dp"
         android:textAppearance="@style/TextFont" />
 
     <ImageView
@@ -40,11 +40,11 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"
-        android:layout_margin="10dp"
+        android:layout_margin="20dp"
         android:onClick="backHome"
         android:text="@string/home" />
 
-        <Button
+    <Button
         android:id="@+id/announce_instruction"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/tutorial3_display.xml b/app/src/main/res/layout/tutorial3_display.xml
index a93d4c9..091017b 100644
--- a/app/src/main/res/layout/tutorial3_display.xml
+++ b/app/src/main/res/layout/tutorial3_display.xml
@@ -12,12 +12,13 @@
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_margin="20dp"
+        android:maxWidth="650dp"
         android:textAppearance="@style/TextFont" />
 
     <ImageView
         android:id="@+id/blue_rectangle31"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
         android:layout_alignParentStart="true"
         android:layout_margin="50dp"
         android:background="@drawable/blue_rectangle" />
@@ -25,8 +26,8 @@
 
     <ImageView
         android:id="@+id/red_rectangle31"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
         android:layout_alignParentEnd="true"
         android:layout_margin="50dp"
         android:background="@drawable/red_rectangle"
@@ -34,8 +35,8 @@
 
     <ImageView
         android:id="@+id/green_rectangle31"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
         android:layout_alignParentStart="true"
         android:layout_below="@id/blue_rectangle31"
         android:layout_margin="50dp"
@@ -44,8 +45,8 @@
 
     <ImageView
         android:id="@+id/red_rectangle32"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
         android:layout_alignParentEnd="true"
         android:layout_below="@id/red_rectangle31"
         android:layout_margin="50dp"
@@ -54,8 +55,8 @@
 
     <ImageView
         android:id="@+id/blue_rectangle32"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
         android:layout_alignParentStart="true"
         android:layout_below="@id/green_rectangle31"
         android:layout_margin="50dp"
@@ -63,8 +64,8 @@
 
     <ImageView
         android:id="@+id/green_rectangle32"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
         android:layout_alignParentEnd="true"
         android:layout_below="@id/red_rectangle32"
         android:layout_margin="50dp"
@@ -77,7 +78,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"
-        android:layout_margin="5dp"
+        android:layout_margin="20dp"
         android:onClick="backHome"
         android:text="@string/home" />
 
diff --git a/app/src/main/res/layout/tutorial4_display.xml b/app/src/main/res/layout/tutorial4_display.xml
index 9580e85..ad81f2d 100644
--- a/app/src/main/res/layout/tutorial4_display.xml
+++ b/app/src/main/res/layout/tutorial4_display.xml
@@ -157,6 +157,7 @@
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_margin="20dp"
+        android:maxWidth="650dp"
         android:textAppearance="@style/TextFont" />
 
 
@@ -166,7 +167,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"
-        android:layout_margin="5dp"
+        android:layout_margin="20dp"
         android:onClick="backHome"
         android:text="@string/home" />
 
diff --git a/app/src/main/res/layout/tutorial5_display.xml b/app/src/main/res/layout/tutorial5_display.xml
index 529fe77..6d2f8cd 100644
--- a/app/src/main/res/layout/tutorial5_display.xml
+++ b/app/src/main/res/layout/tutorial5_display.xml
@@ -119,6 +119,7 @@
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_margin="20dp"
+        android:maxWidth="650dp"
         android:textAppearance="@style/TextFont" />
 
 
@@ -128,7 +129,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"
-        android:layout_margin="5dp"
+        android:layout_margin="20dp"
         android:onClick="backHome"
         android:text="@string/home" />
 
--
libgit2 0.21.2