aarnaude / PFE

Commit c98663337c9b32ff1115ccd86591a046611e55d8

Authored by aarnaude
1 parent 4fbbe27a

ajout scènes thème hygiene

Showing 18 changed files with 424 additions and 26 deletions   Show diff stats
Inline Side-by-side
app/src/main/AndroidManifest.xml
  Show/Hide comments   View file @c986633
@@ -76,6 +76,21 @@ @@ -76,6 +76,21 @@
76 android:name="android.support.PARENT_ACTIVITY" 76 android:name="android.support.PARENT_ACTIVITY"
77 android:value=".MainActivity" /> 77 android:value=".MainActivity" />
78 </activity> 78 </activity>
  79 +
  80 + <activity
  81 + android:name=".Hygiene5Activity"
  82 + android:screenOrientation="userLandscape">
  83 + <meta-data
  84 + android:name="android.support.PARENT_ACTIVITY"
  85 + android:value=".MainActivity" />
  86 + </activity>
  87 + <activity
  88 + android:name=".Hygiene6Activity"
  89 + android:screenOrientation="userLandscape">
  90 + <meta-data
  91 + android:name="android.support.PARENT_ACTIVITY"
  92 + android:value=".MainActivity" />
  93 + </activity>
79 <activity 94 <activity
80 android:name=".TutorialScene1Activity" 95 android:name=".TutorialScene1Activity"
81 android:parentActivityName=".MainActivity" 96 android:parentActivityName=".MainActivity"
app/src/main/java/tonio/noa/Hygiene4Activity.java
  Show/Hide comments   View file @c986633
@@ -114,8 +114,13 @@ public class Hygiene4Activity extends MyPlayActivity implements View.OnTouchList @@ -114,8 +114,13 @@ public class Hygiene4Activity extends MyPlayActivity implements View.OnTouchList
114 //stop displaying the view where it was before it was dragged 114 //stop displaying the view where it was before it was dragged
115 view.setVisibility(View.INVISIBLE); 115 view.setVisibility(View.INVISIBLE);
116 win_counter++; 116 win_counter++;
  117 + } else {
  118 + ImageView imageV = (ImageView) view;
  119 + imageV.setColorFilter(Color.GRAY);
  120 + view.setEnabled(false);
117 } 121 }
118 } 122 }
  123 +
119 break; 124 break;
120 } 125 }
121 return true; 126 return true;
@@ -124,6 +129,6 @@ public class Hygiene4Activity extends MyPlayActivity implements View.OnTouchList @@ -124,6 +129,6 @@ public class Hygiene4Activity extends MyPlayActivity implements View.OnTouchList
124 129
125 @Override 130 @Override
126 protected void next() { 131 protected void next() {
127 - 132 + startActivity(new Intent(this, Hygiene5Activity.class));
128 } 133 }
129 } 134 }
app/src/main/java/tonio/noa/Hygiene5Activity.java 0 → 100644
  Show/Hide comments   View file @c986633
@@ -0,0 +1,72 @@ @@ -0,0 +1,72 @@
  1 +package tonio.noa;
  2 +
  3 +import android.content.Intent;
  4 +import android.graphics.Color;
  5 +import android.os.Bundle;
  6 +import android.view.MotionEvent;
  7 +import android.view.View;
  8 +import android.widget.ImageView;
  9 +import android.widget.TextView;
  10 +
  11 +/**
  12 + * Created by psyk on 24/01/18.
  13 + */
  14 +
  15 +public class Hygiene5Activity extends MyPlayActivity implements View.OnTouchListener {
  16 +
  17 + private int win_counter = 0;
  18 + private boolean done = false;
  19 +
  20 + @Override
  21 + protected void onCreate(Bundle savedInstanceState) {
  22 + super.onCreate(savedInstanceState);
  23 + lanceConsigne("Maintenant tu dois toucher le shampoing, le savon et la brosse à dent.");
  24 + }
  25 +
  26 + protected void onActivityResult(int requestCode, int resultCode, Intent data) {
  27 + super.onActivityResult(requestCode, resultCode, data);
  28 +
  29 + setContentView(R.layout.hygiene5_display);
  30 +
  31 + TextView txtV = findViewById(R.id.cons_hyg5);
  32 + smallCons = "Touche le shampoing, le savon et la brosse à dent.";
  33 + txtV.setText(smallCons);
  34 + setTts();
  35 +
  36 + findViewById(R.id.soap).setOnTouchListener(this);
  37 + findViewById(R.id.shampoo).setOnTouchListener(this);
  38 + findViewById(R.id.toothpaste).setOnTouchListener(this);
  39 + findViewById(R.id.blue_toothbrush_pic).setOnTouchListener(this);
  40 + findViewById(R.id.towel).setOnTouchListener(this);
  41 + findViewById(R.id.toilet_bag).setOnTouchListener(this);
  42 +
  43 + }
  44 +
  45 + @Override
  46 + public boolean onTouch(View view, MotionEvent event) {
  47 + if (event.getAction() == MotionEvent.ACTION_DOWN) {
  48 + if (view == findViewById(R.id.soap)
  49 + || view == findViewById(R.id.shampoo)
  50 + || view == findViewById(R.id.blue_toothbrush_pic)) {
  51 + view.setVisibility(View.INVISIBLE);
  52 + win_counter++;
  53 + } else {
  54 + ImageView imageV = (ImageView) view;
  55 + imageV.setColorFilter(Color.GRAY);
  56 + view.setEnabled(false);
  57 + }
  58 + return true;
  59 + }
  60 + if (win_counter == 3 && !done) {
  61 + done = true;
  62 + this.bravoPage(null);
  63 + return true;
  64 + } else
  65 + return false;
  66 + }
  67 +
  68 + @Override
  69 + protected void next() {
  70 + startActivity(new Intent(this, Hygiene6Activity.class));
  71 + }
  72 +}
app/src/main/java/tonio/noa/Hygiene6Activity.java 0 → 100644
  Show/Hide comments   View file @c986633
@@ -0,0 +1,118 @@ @@ -0,0 +1,118 @@
  1 +package tonio.noa;
  2 +
  3 +import android.content.ClipData;
  4 +import android.content.Intent;
  5 +import android.os.Build;
  6 +import android.os.Bundle;
  7 +import android.view.DragEvent;
  8 +import android.view.MotionEvent;
  9 +import android.view.View;
  10 +import android.widget.ImageView;
  11 +import android.widget.TextView;
  12 +
  13 +/**
  14 + * Created by psyk on 15/01/18.
  15 + */
  16 +
  17 +public class Hygiene6Activity extends MyPlayActivity implements View.OnTouchListener, View.OnDragListener {
  18 +
  19 + private int win_counter = 0;
  20 + private boolean done = false;
  21 +
  22 + @Override
  23 + protected void onCreate(Bundle savedInstanceState) {
  24 + super.onCreate(savedInstanceState);
  25 + lanceConsigne("Cette fois, tu dois associer l'objet avec\nl'action qu'il permet de réaliser.");
  26 + }
  27 +
  28 + protected void onActivityResult(int requestCode, int resultCode, Intent data) {
  29 + super.onActivityResult(requestCode, resultCode, data);
  30 +
  31 + setContentView(R.layout.hygiene6_display);
  32 +
  33 + TextView txtV = findViewById(R.id.cons_hyg6);
  34 + smallCons = "Associe l'objet avec son action.";
  35 + txtV.setText(smallCons);
  36 + setTts();
  37 +
  38 + findViewById(R.id.marseille_soap).setOnTouchListener(this);
  39 + findViewById(R.id.washing_hands).setOnTouchListener(this);
  40 + findViewById(R.id.blue_toothbrush_pic).setOnTouchListener(this);
  41 + findViewById(R.id.brushing_teeth).setOnTouchListener(this);
  42 +
  43 + findViewById(R.id.marseille_soap).setOnDragListener(this);
  44 + findViewById(R.id.washing_hands).setOnDragListener(this);
  45 + findViewById(R.id.brushing_teeth).setOnDragListener(this);
  46 + findViewById(R.id.blue_toothbrush_pic).setOnDragListener(this);
  47 +
  48 + }
  49 +
  50 + @Override
  51 + public boolean onTouch(View view, MotionEvent event) {
  52 + if (event.getAction() == MotionEvent.ACTION_DOWN) {
  53 +
  54 + View.DragShadowBuilder shadowBuilder = new View.DragShadowBuilder(view);
  55 + ClipData data = ClipData.newPlainText("id", view.getResources().getResourceEntryName(view.getId()));
  56 +
  57 + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
  58 + view.startDragAndDrop(data, shadowBuilder, view, 0);
  59 + } else {
  60 + view.startDrag(data, shadowBuilder, view, 0);
  61 + }
  62 + return true;
  63 + } else
  64 + return false;
  65 + }
  66 +
  67 + @Override
  68 + public boolean onDrag(View v, DragEvent event) {
  69 + switch (event.getAction()) {
  70 + // signal for the start of a drag and drop operation
  71 + case DragEvent.ACTION_DRAG_STARTED:
  72 + // do nothing
  73 + break;
  74 +
  75 + // the drag point has entered the bounding box of the View
  76 + case DragEvent.ACTION_DRAG_ENTERED:
  77 + // do nothing
  78 + break;
  79 +
  80 + // the user has moved the drag shadow outside the bounding box of the View
  81 + case DragEvent.ACTION_DRAG_EXITED:
  82 + // do nothing
  83 + break;
  84 +
  85 + // the drag and drop operation has concluded
  86 + case DragEvent.ACTION_DRAG_ENDED:
  87 + if (win_counter == 2 && !done) {
  88 + done = true;
  89 + bravoPage(v);
  90 + }
  91 + break;
  92 +
  93 + //drag shadow has been released,the drag point is within the bounding box of the View
  94 + case DragEvent.ACTION_DROP:
  95 + //handle the dragged view being dropped over a target view
  96 + View view = (View) event.getLocalState();
  97 + if (
  98 + (v == findViewById(R.id.washing_hands) && view == findViewById(R.id.marseille_soap)) ||
  99 + (v == findViewById(R.id.marseille_soap) && view == findViewById(R.id.washing_hands)) ||
  100 + (v == findViewById(R.id.blue_toothbrush_pic) && view == findViewById(R.id.brushing_teeth)) ||
  101 + (v == findViewById(R.id.brushing_teeth) && view == findViewById(R.id.blue_toothbrush_pic))
  102 + ) {
  103 + //stop displaying the view where it was before it was dragged
  104 + view.setVisibility(View.INVISIBLE);
  105 + v.setVisibility(View.INVISIBLE);
  106 + win_counter++;
  107 + }
  108 + break;
  109 + }
  110 +
  111 + return true;
  112 + }
  113 +
  114 + @Override
  115 + protected void next() {
  116 + backHome(null);
  117 + }
  118 +}
app/src/main/res/drawable/brushing_teeth.png 0 → 100644
View file @c986633

125 KB
app/src/main/res/drawable/marseille_soap.jpg 0 → 100644
View file @c986633

56.9 KB
app/src/main/res/drawable/washing_hands.jpg 0 → 100644
View file @c986633

79.4 KB
app/src/main/res/layout/hygiene1_display.xml
  Show/Hide comments   View file @c986633
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 android:layout_alignParentBottom="true" 12 android:layout_alignParentBottom="true"
13 android:layout_centerHorizontal="true" 13 android:layout_centerHorizontal="true"
14 android:layout_margin="20dp" 14 android:layout_margin="20dp"
15 - android:maxWidth="500dp" 15 + android:maxWidth="650dp"
16 android:textAppearance="@style/TextFont" /> 16 android:textAppearance="@style/TextFont" />
17 17
18 <ImageView 18 <ImageView
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 android:layout_height="wrap_content" 44 android:layout_height="wrap_content"
45 android:layout_alignParentBottom="true" 45 android:layout_alignParentBottom="true"
46 android:layout_alignParentStart="true" 46 android:layout_alignParentStart="true"
47 - android:layout_margin="10dp" 47 + android:layout_margin="20dp"
48 android:onClick="backHome" 48 android:onClick="backHome"
49 android:text="@string/home" /> 49 android:text="@string/home" />
50 50
app/src/main/res/layout/hygiene2_display.xml
  Show/Hide comments   View file @c986633
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 android:layout_alignParentBottom="true" 12 android:layout_alignParentBottom="true"
13 android:layout_centerHorizontal="true" 13 android:layout_centerHorizontal="true"
14 android:layout_margin="20dp" 14 android:layout_margin="20dp"
15 - android:maxWidth="500dp" 15 + android:maxWidth="650dp"
16 android:textAppearance="@style/TextFont" /> 16 android:textAppearance="@style/TextFont" />
17 17
18 <ImageView 18 <ImageView
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 android:layout_height="wrap_content" 43 android:layout_height="wrap_content"
44 android:layout_alignParentBottom="true" 44 android:layout_alignParentBottom="true"
45 android:layout_alignParentStart="true" 45 android:layout_alignParentStart="true"
46 - android:layout_margin="10dp" 46 + android:layout_margin="20dp"
47 android:onClick="backHome" 47 android:onClick="backHome"
48 android:text="@string/home" /> 48 android:text="@string/home" />
49 49
app/src/main/res/layout/hygiene3_display.xml
  Show/Hide comments   View file @c986633
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 android:layout_alignParentBottom="true" 12 android:layout_alignParentBottom="true"
13 android:layout_centerHorizontal="true" 13 android:layout_centerHorizontal="true"
14 android:layout_margin="20dp" 14 android:layout_margin="20dp"
15 - android:maxWidth="500dp" 15 + android:maxWidth="650dp"
16 android:textAppearance="@style/TextFont" /> 16 android:textAppearance="@style/TextFont" />
17 17
18 <ImageView 18 <ImageView
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 android:layout_height="wrap_content" 43 android:layout_height="wrap_content"
44 android:layout_alignParentBottom="true" 44 android:layout_alignParentBottom="true"
45 android:layout_alignParentStart="true" 45 android:layout_alignParentStart="true"
46 - android:layout_margin="10dp" 46 + android:layout_margin="20dp"
47 android:onClick="backHome" 47 android:onClick="backHome"
48 android:text="@string/home" /> 48 android:text="@string/home" />
49 49
app/src/main/res/layout/hygiene4_display.xml
  Show/Hide comments   View file @c986633
@@ -121,6 +121,7 @@ @@ -121,6 +121,7 @@
121 android:layout_alignParentBottom="true" 121 android:layout_alignParentBottom="true"
122 android:layout_centerHorizontal="true" 122 android:layout_centerHorizontal="true"
123 android:layout_margin="20dp" 123 android:layout_margin="20dp"
  124 + android:maxWidth="650dp"
124 android:textAppearance="@style/TextFont" /> 125 android:textAppearance="@style/TextFont" />
125 126
126 127
@@ -130,7 +131,7 @@ @@ -130,7 +131,7 @@
130 android:layout_height="wrap_content" 131 android:layout_height="wrap_content"
131 android:layout_alignParentBottom="true" 132 android:layout_alignParentBottom="true"
132 android:layout_alignParentStart="true" 133 android:layout_alignParentStart="true"
133 - android:layout_margin="5dp" 134 + android:layout_margin="20dp"
134 android:onClick="backHome" 135 android:onClick="backHome"
135 android:text="@string/home" /> 136 android:text="@string/home" />
136 137
app/src/main/res/layout/hygiene5_display.xml 0 → 100644
  Show/Hide comments   View file @c986633
@@ -0,0 +1,101 @@ @@ -0,0 +1,101 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:id="@+id/hyg5"
  4 + android:layout_width="match_parent"
  5 + android:layout_height="match_parent"
  6 + android:orientation="vertical">
  7 +
  8 + <ImageView
  9 + android:id="@+id/soap"
  10 + android:layout_width="wrap_content"
  11 + android:layout_height="wrap_content"
  12 + android:layout_alignParentStart="true"
  13 + android:layout_margin="50dp"
  14 + android:adjustViewBounds="true"
  15 + android:maxWidth="150dp"
  16 + android:src="@drawable/soap" />
  17 +
  18 +
  19 + <ImageView
  20 + android:id="@+id/shampoo"
  21 + android:layout_width="wrap_content"
  22 + android:layout_height="wrap_content"
  23 + android:layout_alignParentEnd="true"
  24 + android:layout_margin="50dp"
  25 + android:adjustViewBounds="true"
  26 + android:maxWidth="120dp"
  27 + android:src="@drawable/shampoo" />
  28 +
  29 + <ImageView
  30 + android:id="@+id/toothpaste"
  31 + android:layout_width="wrap_content"
  32 + android:layout_height="wrap_content"
  33 + android:layout_below="@id/blue_toothbrush_pic"
  34 + android:layout_centerHorizontal="true"
  35 + android:layout_margin="50dp"
  36 + android:adjustViewBounds="true"
  37 + android:maxWidth="200dp"
  38 + android:src="@drawable/toothpaste" />
  39 +
  40 + <ImageView
  41 + android:id="@+id/blue_toothbrush_pic"
  42 + android:layout_width="wrap_content"
  43 + android:layout_height="wrap_content"
  44 + android:layout_centerHorizontal="true"
  45 + android:layout_margin="50dp"
  46 + android:adjustViewBounds="true"
  47 + android:maxWidth="200dp"
  48 + android:src="@drawable/blue_toothbrush_pic" />
  49 +
  50 + <ImageView
  51 + android:id="@+id/towel"
  52 + android:layout_width="wrap_content"
  53 + android:layout_height="wrap_content"
  54 + android:layout_below="@id/soap"
  55 + android:layout_margin="50dp"
  56 + android:adjustViewBounds="true"
  57 + android:maxWidth="150dp"
  58 + android:src="@drawable/towel" />
  59 +
  60 + <ImageView
  61 + android:id="@+id/toilet_bag"
  62 + android:layout_width="wrap_content"
  63 + android:layout_height="wrap_content"
  64 + android:layout_alignParentEnd="true"
  65 + android:layout_below="@id/shampoo"
  66 + android:layout_margin="50dp"
  67 + android:adjustViewBounds="true"
  68 + android:maxWidth="200dp"
  69 + android:src="@drawable/toilet_bag" />
  70 +
  71 + <TextView
  72 + android:id="@+id/cons_hyg5"
  73 + android:layout_width="wrap_content"
  74 + android:layout_height="wrap_content"
  75 + android:layout_alignParentBottom="true"
  76 + android:layout_centerHorizontal="true"
  77 + android:layout_margin="20dp"
  78 + android:maxWidth="650dp"
  79 + android:textAppearance="@style/TextFont" />
  80 +
  81 + <Button
  82 + android:id="@+id/button_id_home"
  83 + android:layout_width="wrap_content"
  84 + android:layout_height="wrap_content"
  85 + android:layout_alignParentBottom="true"
  86 + android:layout_alignParentStart="true"
  87 + android:layout_margin="20dp"
  88 + android:onClick="backHome"
  89 + android:text="@string/home" />
  90 +
  91 + <Button
  92 + android:id="@+id/announce_instruction"
  93 + android:layout_width="wrap_content"
  94 + android:layout_height="wrap_content"
  95 + android:layout_alignParentBottom="true"
  96 + android:layout_alignParentEnd="true"
  97 + android:layout_margin="20dp"
  98 + android:onClick="enonceConsigne"
  99 + android:text="@string/instruction" />
  100 +
  101 +</RelativeLayout>
0 \ No newline at end of file 102 \ No newline at end of file
app/src/main/res/layout/hygiene6_display.xml 0 → 100644
  Show/Hide comments   View file @c986633
@@ -0,0 +1,82 @@ @@ -0,0 +1,82 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:id="@+id/hyg6"
  4 + android:layout_width="match_parent"
  5 + android:layout_height="match_parent"
  6 + android:orientation="vertical">
  7 +
  8 + <ImageView
  9 + android:id="@+id/marseille_soap"
  10 + android:layout_width="wrap_content"
  11 + android:layout_height="wrap_content"
  12 + android:layout_alignParentStart="true"
  13 + android:layout_alignParentTop="true"
  14 + android:layout_margin="50dp"
  15 + android:adjustViewBounds="true"
  16 + android:maxWidth="250dp"
  17 + android:src="@drawable/marseille_soap" />
  18 +
  19 + <ImageView
  20 + android:id="@+id/washing_hands"
  21 + android:layout_width="wrap_content"
  22 + android:layout_height="wrap_content"
  23 + android:layout_alignParentEnd="true"
  24 + android:layout_alignParentTop="true"
  25 + android:layout_margin="50dp"
  26 + android:adjustViewBounds="true"
  27 + android:maxWidth="250dp"
  28 + android:src="@drawable/washing_hands" />
  29 +
  30 + <ImageView
  31 + android:id="@+id/brushing_teeth"
  32 + android:layout_width="wrap_content"
  33 + android:layout_height="wrap_content"
  34 + android:layout_alignParentStart="true"
  35 + android:layout_below="@id/marseille_soap"
  36 + android:layout_margin="50dp"
  37 + android:adjustViewBounds="true"
  38 + android:maxWidth="250dp"
  39 + android:src="@drawable/brushing_teeth" />
  40 +
  41 + <ImageView
  42 + android:id="@+id/blue_toothbrush_pic"
  43 + android:layout_width="wrap_content"
  44 + android:layout_height="wrap_content"
  45 + android:layout_alignParentEnd="true"
  46 + android:layout_below="@id/washing_hands"
  47 + android:layout_margin="50dp"
  48 + android:adjustViewBounds="true"
  49 + android:maxWidth="250dp"
  50 + android:src="@drawable/blue_toothbrush_pic" />
  51 +
  52 + <TextView
  53 + android:id="@+id/cons_hyg6"
  54 + android:layout_width="wrap_content"
  55 + android:layout_height="wrap_content"
  56 + android:layout_alignParentBottom="true"
  57 + android:layout_centerHorizontal="true"
  58 + android:layout_margin="20dp"
  59 + android:maxWidth="650dp"
  60 + android:textAppearance="@style/TextFont" />
  61 +
  62 + <Button
  63 + android:id="@+id/button_id_home"
  64 + android:layout_width="wrap_content"
  65 + android:layout_height="wrap_content"
  66 + android:layout_alignParentBottom="true"
  67 + android:layout_alignParentStart="true"
  68 + android:layout_margin="20dp"
  69 + android:onClick="backHome"
  70 + android:text="@string/home" />
  71 +
  72 + <Button
  73 + android:id="@+id/announce_instruction"
  74 + android:layout_width="wrap_content"
  75 + android:layout_height="wrap_content"
  76 + android:layout_alignParentBottom="true"
  77 + android:layout_alignParentEnd="true"
  78 + android:layout_margin="20dp"
  79 + android:onClick="enonceConsigne"
  80 + android:text="@string/instruction" />
  81 +
  82 +</RelativeLayout>
0 \ No newline at end of file 83 \ No newline at end of file
app/src/main/res/layout/tutorial1_display.xml
  Show/Hide comments   View file @c986633
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 android:id="@+id/cons_tut1" 8 android:id="@+id/cons_tut1"
9 android:layout_width="wrap_content" 9 android:layout_width="wrap_content"
10 android:layout_height="wrap_content" 10 android:layout_height="wrap_content"
  11 + android:maxWidth="650dp"
11 android:layout_alignParentBottom="true" 12 android:layout_alignParentBottom="true"
12 android:layout_centerHorizontal="true" 13 android:layout_centerHorizontal="true"
13 android:layout_margin="20dp" 14 android:layout_margin="20dp"
app/src/main/res/layout/tutorial2_display.xml
  Show/Hide comments   View file @c986633
@@ -11,8 +11,8 @@ @@ -11,8 +11,8 @@
11 android:layout_height="wrap_content" 11 android:layout_height="wrap_content"
12 android:layout_alignParentBottom="true" 12 android:layout_alignParentBottom="true"
13 android:layout_centerHorizontal="true" 13 android:layout_centerHorizontal="true"
14 - android:maxWidth="500dp"  
15 android:layout_margin="20dp" 14 android:layout_margin="20dp"
  15 + android:maxWidth="650dp"
16 android:textAppearance="@style/TextFont" /> 16 android:textAppearance="@style/TextFont" />
17 17
18 <ImageView 18 <ImageView
@@ -40,11 +40,11 @@ @@ -40,11 +40,11 @@
40 android:layout_height="wrap_content" 40 android:layout_height="wrap_content"
41 android:layout_alignParentBottom="true" 41 android:layout_alignParentBottom="true"
42 android:layout_alignParentStart="true" 42 android:layout_alignParentStart="true"
43 - android:layout_margin="10dp" 43 + android:layout_margin="20dp"
44 android:onClick="backHome" 44 android:onClick="backHome"
45 android:text="@string/home" /> 45 android:text="@string/home" />
46 46
47 - <Button 47 + <Button
48 android:id="@+id/announce_instruction" 48 android:id="@+id/announce_instruction"
49 android:layout_width="wrap_content" 49 android:layout_width="wrap_content"
50 android:layout_height="wrap_content" 50 android:layout_height="wrap_content"
app/src/main/res/layout/tutorial3_display.xml
  Show/Hide comments   View file @c986633
@@ -12,12 +12,13 @@ @@ -12,12 +12,13 @@
12 android:layout_alignParentBottom="true" 12 android:layout_alignParentBottom="true"
13 android:layout_centerHorizontal="true" 13 android:layout_centerHorizontal="true"
14 android:layout_margin="20dp" 14 android:layout_margin="20dp"
  15 + android:maxWidth="650dp"
15 android:textAppearance="@style/TextFont" /> 16 android:textAppearance="@style/TextFont" />
16 17
17 <ImageView 18 <ImageView
18 android:id="@+id/blue_rectangle31" 19 android:id="@+id/blue_rectangle31"
19 - android:layout_width="50dp"  
20 - android:layout_height="50dp" 20 + android:layout_width="70dp"
  21 + android:layout_height="70dp"
21 android:layout_alignParentStart="true" 22 android:layout_alignParentStart="true"
22 android:layout_margin="50dp" 23 android:layout_margin="50dp"
23 android:background="@drawable/blue_rectangle" /> 24 android:background="@drawable/blue_rectangle" />
@@ -25,8 +26,8 @@ @@ -25,8 +26,8 @@
25 26
26 <ImageView 27 <ImageView
27 android:id="@+id/red_rectangle31" 28 android:id="@+id/red_rectangle31"
28 - android:layout_width="50dp"  
29 - android:layout_height="50dp" 29 + android:layout_width="70dp"
  30 + android:layout_height="70dp"
30 android:layout_alignParentEnd="true" 31 android:layout_alignParentEnd="true"
31 android:layout_margin="50dp" 32 android:layout_margin="50dp"
32 android:background="@drawable/red_rectangle" 33 android:background="@drawable/red_rectangle"
@@ -34,8 +35,8 @@ @@ -34,8 +35,8 @@
34 35
35 <ImageView 36 <ImageView
36 android:id="@+id/green_rectangle31" 37 android:id="@+id/green_rectangle31"
37 - android:layout_width="50dp"  
38 - android:layout_height="50dp" 38 + android:layout_width="70dp"
  39 + android:layout_height="70dp"
39 android:layout_alignParentStart="true" 40 android:layout_alignParentStart="true"
40 android:layout_below="@id/blue_rectangle31" 41 android:layout_below="@id/blue_rectangle31"
41 android:layout_margin="50dp" 42 android:layout_margin="50dp"
@@ -44,8 +45,8 @@ @@ -44,8 +45,8 @@
44 45
45 <ImageView 46 <ImageView
46 android:id="@+id/red_rectangle32" 47 android:id="@+id/red_rectangle32"
47 - android:layout_width="50dp"  
48 - android:layout_height="50dp" 48 + android:layout_width="70dp"
  49 + android:layout_height="70dp"
49 android:layout_alignParentEnd="true" 50 android:layout_alignParentEnd="true"
50 android:layout_below="@id/red_rectangle31" 51 android:layout_below="@id/red_rectangle31"
51 android:layout_margin="50dp" 52 android:layout_margin="50dp"
@@ -54,8 +55,8 @@ @@ -54,8 +55,8 @@
54 55
55 <ImageView 56 <ImageView
56 android:id="@+id/blue_rectangle32" 57 android:id="@+id/blue_rectangle32"
57 - android:layout_width="50dp"  
58 - android:layout_height="50dp" 58 + android:layout_width="70dp"
  59 + android:layout_height="70dp"
59 android:layout_alignParentStart="true" 60 android:layout_alignParentStart="true"
60 android:layout_below="@id/green_rectangle31" 61 android:layout_below="@id/green_rectangle31"
61 android:layout_margin="50dp" 62 android:layout_margin="50dp"
@@ -63,8 +64,8 @@ @@ -63,8 +64,8 @@
63 64
64 <ImageView 65 <ImageView
65 android:id="@+id/green_rectangle32" 66 android:id="@+id/green_rectangle32"
66 - android:layout_width="50dp"  
67 - android:layout_height="50dp" 67 + android:layout_width="70dp"
  68 + android:layout_height="70dp"
68 android:layout_alignParentEnd="true" 69 android:layout_alignParentEnd="true"
69 android:layout_below="@id/red_rectangle32" 70 android:layout_below="@id/red_rectangle32"
70 android:layout_margin="50dp" 71 android:layout_margin="50dp"
@@ -77,7 +78,7 @@ @@ -77,7 +78,7 @@
77 android:layout_height="wrap_content" 78 android:layout_height="wrap_content"
78 android:layout_alignParentBottom="true" 79 android:layout_alignParentBottom="true"
79 android:layout_alignParentStart="true" 80 android:layout_alignParentStart="true"
80 - android:layout_margin="5dp" 81 + android:layout_margin="20dp"
81 android:onClick="backHome" 82 android:onClick="backHome"
82 android:text="@string/home" /> 83 android:text="@string/home" />
83 84
app/src/main/res/layout/tutorial4_display.xml
  Show/Hide comments   View file @c986633
@@ -157,6 +157,7 @@ @@ -157,6 +157,7 @@
157 android:layout_alignParentBottom="true" 157 android:layout_alignParentBottom="true"
158 android:layout_centerHorizontal="true" 158 android:layout_centerHorizontal="true"
159 android:layout_margin="20dp" 159 android:layout_margin="20dp"
  160 + android:maxWidth="650dp"
160 android:textAppearance="@style/TextFont" /> 161 android:textAppearance="@style/TextFont" />
161 162
162 163
@@ -166,7 +167,7 @@ @@ -166,7 +167,7 @@
166 android:layout_height="wrap_content" 167 android:layout_height="wrap_content"
167 android:layout_alignParentBottom="true" 168 android:layout_alignParentBottom="true"
168 android:layout_alignParentStart="true" 169 android:layout_alignParentStart="true"
169 - android:layout_margin="5dp" 170 + android:layout_margin="20dp"
170 android:onClick="backHome" 171 android:onClick="backHome"
171 android:text="@string/home" /> 172 android:text="@string/home" />
172 173
app/src/main/res/layout/tutorial5_display.xml
  Show/Hide comments   View file @c986633
@@ -119,6 +119,7 @@ @@ -119,6 +119,7 @@
119 android:layout_alignParentBottom="true" 119 android:layout_alignParentBottom="true"
120 android:layout_centerHorizontal="true" 120 android:layout_centerHorizontal="true"
121 android:layout_margin="20dp" 121 android:layout_margin="20dp"
  122 + android:maxWidth="650dp"
122 android:textAppearance="@style/TextFont" /> 123 android:textAppearance="@style/TextFont" />
123 124
124 125
@@ -128,7 +129,7 @@ @@ -128,7 +129,7 @@
128 android:layout_height="wrap_content" 129 android:layout_height="wrap_content"
129 android:layout_alignParentBottom="true" 130 android:layout_alignParentBottom="true"
130 android:layout_alignParentStart="true" 131 android:layout_alignParentStart="true"
131 - android:layout_margin="5dp" 132 + android:layout_margin="20dp"
132 android:onClick="backHome" 133 android:onClick="backHome"
133 android:text="@string/home" /> 134 android:text="@string/home" />
134 135