aarnaude / PFE

Commit d87c7c33fc6c128f61305ad79d801f1874505f1d

Authored by aarnaude
1 parent a5c66bd7

last commit?

Showing 31 changed files with 524 additions and 302 deletions   Show diff stats
Inline Side-by-side
app/src/main/AndroidManifest.xml
  Show/Hide comments   View file @d87c7c3
@@ -145,6 +145,14 @@ @@ -145,6 +145,14 @@
145 </activity> 145 </activity>
146 146
147 <activity 147 <activity
  148 + android:name=".Security1Activity"
  149 + android:screenOrientation="userLandscape">
  150 + <meta-data
  151 + android:name="android.support.PARENT_ACTIVITY"
  152 + android:value=".MainActivity" />
  153 + </activity>
  154 +
  155 + <activity
148 android:name=".BravoActivity" 156 android:name=".BravoActivity"
149 android:screenOrientation="userLandscape"></activity> 157 android:screenOrientation="userLandscape"></activity>
150 158
app/src/main/java/tonio/noa/Food1Activity.java
  Show/Hide comments   View file @d87c7c3
@@ -129,6 +129,5 @@ public class Food1Activity extends MyPlayActivity implements View.OnTouchListene @@ -129,6 +129,5 @@ public class Food1Activity extends MyPlayActivity implements View.OnTouchListene
129 129
130 @Override 130 @Override
131 protected void next() { 131 protected void next() {
132 - //startActivity(new Intent(this, TutorialScene5Activity.class));  
133 } 132 }
134 } 133 }
app/src/main/java/tonio/noa/Security1Activity.java 0 → 100644
  Show/Hide comments   View file @d87c7c3
@@ -0,0 +1,76 @@ @@ -0,0 +1,76 @@
  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 Security1Activity 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("Montre moi les objets qui peuvent être dangereux.");
  24 + }
  25 +
  26 + protected void onActivityResult(int requestCode, int resultCode, Intent data) {
  27 + super.onActivityResult(requestCode, resultCode, data);
  28 +
  29 + setContentView(R.layout.security1_display);
  30 +
  31 + TextView txtV = findViewById(R.id.cons_sec1);
  32 + smallCons = "Touche les objets dangereux.";
  33 + txtV.setText(smallCons);
  34 + setTts();
  35 +
  36 +
  37 + findViewById(R.id.water).setOnTouchListener(this);
  38 + findViewById(R.id.knife).setOnTouchListener(this);
  39 + findViewById(R.id.bear).setOnTouchListener(this);
  40 + findViewById(R.id.pan).setOnTouchListener(this);
  41 + findViewById(R.id.pen).setOnTouchListener(this);
  42 + findViewById(R.id.bleach).setOnTouchListener(this);
  43 + findViewById(R.id.drugs).setOnTouchListener(this);
  44 + findViewById(R.id.iron).setOnTouchListener(this);
  45 +
  46 + }
  47 +
  48 + @Override
  49 + public boolean onTouch(View view, MotionEvent event) {
  50 + if (event.getAction() == MotionEvent.ACTION_DOWN) {
  51 + if (view == findViewById(R.id.iron)
  52 + || view == findViewById(R.id.knife)
  53 + || view == findViewById(R.id.pan)
  54 + || view == findViewById(R.id.bleach)
  55 + || view == findViewById(R.id.drugs)) {
  56 + view.setVisibility(View.INVISIBLE);
  57 + win_counter++;
  58 + } else {
  59 + ((ImageView) view).setColorFilter(Color.GRAY);
  60 + view.setEnabled(false);
  61 + }
  62 + return true;
  63 + }
  64 + if (win_counter == 5 && !done) {
  65 + done = true;
  66 + this.bravoPage(null);
  67 + return true;
  68 + } else
  69 + return false;
  70 + }
  71 +
  72 + @Override
  73 + protected void next() {
  74 + this.backHome(null);
  75 + }
  76 +}
app/src/main/java/tonio/noa/ThemeActivity.java
  Show/Hide comments   View file @d87c7c3
@@ -62,6 +62,11 @@ public class ThemeActivity extends Activity implements View.OnLongClickListener @@ -62,6 +62,11 @@ public class ThemeActivity extends Activity implements View.OnLongClickListener
62 startActivity(new Intent(this, Food1Activity.class)); 62 startActivity(new Intent(this, Food1Activity.class));
63 } 63 }
64 64
  65 + public void securityPage(View view) {
  66 +
  67 + startActivity(new Intent(this, Security1Activity.class));
  68 + }
  69 +
65 public void backHome(View view) { 70 public void backHome(View view) {
66 71
67 startActivity(new Intent(this, MainActivity.class)); 72 startActivity(new Intent(this, MainActivity.class));
app/src/main/res/drawable/app_menu.png 0 → 100644
View file @d87c7c3

21.1 KB
app/src/main/res/drawable/bear.png 0 → 100644
View file @d87c7c3

57.9 KB
app/src/main/res/drawable/bleach.png 0 → 100644
View file @d87c7c3

242 KB
app/src/main/res/drawable/drugs.png 0 → 100644
View file @d87c7c3

98.5 KB
app/src/main/res/drawable/iron.png 0 → 100644
View file @d87c7c3

90 KB
app/src/main/res/drawable/knife.png 0 → 100644
View file @d87c7c3

18.4 KB
app/src/main/res/drawable/pan.png 0 → 100644
View file @d87c7c3

39.9 KB
app/src/main/res/drawable/pen.png 0 → 100644
View file @d87c7c3

90.4 KB
app/src/main/res/drawable/speech_icon.png 0 → 100644
View file @d87c7c3

70.5 KB
app/src/main/res/drawable/water.png 0 → 100644
View file @d87c7c3

96.7 KB
app/src/main/res/layout/activity_main.xml
  Show/Hide comments   View file @d87c7c3
@@ -20,9 +20,9 @@ @@ -20,9 +20,9 @@
20 android:layout_marginStart="130dp" 20 android:layout_marginStart="130dp"
21 android:layout_marginTop="160dp" 21 android:layout_marginTop="160dp"
22 android:onClick="themePage" 22 android:onClick="themePage"
23 - android:padding="70dp" 23 + android:padding="50dp"
24 android:text="@string/play" 24 android:text="@string/play"
25 - android:textAppearance="@style/TextFont" /> 25 + android:textAppearance="@style/TextButtonFont" />
26 26
27 <Button 27 <Button
28 android:id="@+id/button_id_tutorial" 28 android:id="@+id/button_id_tutorial"
@@ -33,9 +33,9 @@ @@ -33,9 +33,9 @@
33 android:layout_alignParentEnd="true" 33 android:layout_alignParentEnd="true"
34 android:layout_marginEnd="130dp" 34 android:layout_marginEnd="130dp"
35 android:onClick="tutorialPage" 35 android:onClick="tutorialPage"
36 - android:padding="70dp" 36 + android:padding="50dp"
37 android:text="@string/tutorial" 37 android:text="@string/tutorial"
38 - android:textAppearance="@style/TextFont" /> 38 + android:textAppearance="@style/TextButtonFont" />
39 39
40 <Button 40 <Button
41 android:id="@+id/button_id_configure" 41 android:id="@+id/button_id_configure"
@@ -45,6 +45,6 @@ @@ -45,6 +45,6 @@
45 android:layout_margin="20dp" 45 android:layout_margin="20dp"
46 android:onClick="configurePage" 46 android:onClick="configurePage"
47 android:text="@string/configure" 47 android:text="@string/configure"
48 - android:textAppearance="@style/TextFont" /> 48 + android:textAppearance="@style/TextButtonFont" />
49 49
50 </RelativeLayout> 50 </RelativeLayout>
app/src/main/res/layout/food1_display.xml
  Show/Hide comments   View file @d87c7c3
@@ -5,30 +5,25 @@ @@ -5,30 +5,25 @@
5 android:layout_height="match_parent" 5 android:layout_height="match_parent"
6 android:orientation="vertical"> 6 android:orientation="vertical">
7 7
8 - <LinearLayout  
9 - android:id="@+id/linear1"  
10 - android:layout_width="wrap_content"  
11 - android:layout_height="match_parent"  
12 - android:layout_above="@id/linear2" 8 + <ImageView
  9 + android:id="@+id/sugar"
  10 + android:layout_width="230dp"
  11 + android:layout_height="wrap_content"
13 android:layout_alignParentEnd="true" 12 android:layout_alignParentEnd="true"
14 - android:orientation="vertical"  
15 - android:weightSum="2">  
16 -  
17 - <ImageView  
18 - android:id="@+id/sugar"  
19 - android:layout_width="230dp"  
20 - android:layout_height="match_parent"  
21 - android:layout_weight="1"  
22 - android:src="@drawable/sugar" />  
23 -  
24 - <ImageView  
25 - android:id="@+id/salt"  
26 - android:layout_width="230dp"  
27 - android:layout_height="match_parent"  
28 - android:layout_weight="1"  
29 - android:src="@drawable/salt" /> 13 + android:layout_alignParentTop="true"
  14 + android:layout_margin="10dp"
  15 + android:adjustViewBounds="true"
  16 + android:src="@drawable/sugar" />
30 17
31 - </LinearLayout> 18 + <ImageView
  19 + android:id="@+id/salt"
  20 + android:layout_width="230dp"
  21 + android:layout_height="wrap_content"
  22 + android:layout_above="@id/announce_instruction"
  23 + android:layout_alignParentEnd="true"
  24 + android:layout_margin="10dp"
  25 + android:adjustViewBounds="true"
  26 + android:src="@drawable/salt" />
32 27
33 <ImageView 28 <ImageView
34 android:id="@+id/bacon" 29 android:id="@+id/bacon"
@@ -36,6 +31,7 @@ @@ -36,6 +31,7 @@
36 android:layout_height="wrap_content" 31 android:layout_height="wrap_content"
37 android:layout_alignParentStart="true" 32 android:layout_alignParentStart="true"
38 android:layout_alignParentTop="true" 33 android:layout_alignParentTop="true"
  34 + android:layout_margin="10dp"
39 android:adjustViewBounds="true" 35 android:adjustViewBounds="true"
40 android:maxWidth="200dp" 36 android:maxWidth="200dp"
41 android:src="@drawable/bacon" /> 37 android:src="@drawable/bacon" />
@@ -45,6 +41,7 @@ @@ -45,6 +41,7 @@
45 android:layout_width="wrap_content" 41 android:layout_width="wrap_content"
46 android:layout_height="wrap_content" 42 android:layout_height="wrap_content"
47 android:layout_alignParentTop="true" 43 android:layout_alignParentTop="true"
  44 + android:layout_margin="10dp"
48 android:layout_toEndOf="@id/bacon" 45 android:layout_toEndOf="@id/bacon"
49 android:adjustViewBounds="true" 46 android:adjustViewBounds="true"
50 android:maxWidth="190dp" 47 android:maxWidth="190dp"
@@ -55,6 +52,7 @@ @@ -55,6 +52,7 @@
55 android:layout_width="wrap_content" 52 android:layout_width="wrap_content"
56 android:layout_height="wrap_content" 53 android:layout_height="wrap_content"
57 android:layout_alignParentTop="true" 54 android:layout_alignParentTop="true"
  55 + android:layout_margin="10dp"
58 android:layout_toEndOf="@id/apple" 56 android:layout_toEndOf="@id/apple"
59 android:adjustViewBounds="true" 57 android:adjustViewBounds="true"
60 android:maxWidth="190dp" 58 android:maxWidth="190dp"
@@ -64,8 +62,9 @@ @@ -64,8 +62,9 @@
64 android:id="@+id/hot_dog" 62 android:id="@+id/hot_dog"
65 android:layout_width="wrap_content" 63 android:layout_width="wrap_content"
66 android:layout_height="wrap_content" 64 android:layout_height="wrap_content"
67 - android:layout_alignParentTop="true"  
68 - android:layout_toEndOf="@id/cake" 65 + android:layout_alignParentStart="true"
  66 + android:layout_below="@id/cheese"
  67 + android:layout_margin="10dp"
69 android:adjustViewBounds="true" 68 android:adjustViewBounds="true"
70 android:maxWidth="200dp" 69 android:maxWidth="200dp"
71 android:src="@drawable/hot_dog" /> 70 android:src="@drawable/hot_dog" />
@@ -74,8 +73,9 @@ @@ -74,8 +73,9 @@
74 android:id="@+id/cheese" 73 android:id="@+id/cheese"
75 android:layout_width="wrap_content" 74 android:layout_width="wrap_content"
76 android:layout_height="wrap_content" 75 android:layout_height="wrap_content"
77 - android:layout_above="@id/linear2"  
78 android:layout_alignParentStart="true" 76 android:layout_alignParentStart="true"
  77 + android:layout_below="@id/bacon"
  78 + android:layout_margin="10dp"
79 android:adjustViewBounds="true" 79 android:adjustViewBounds="true"
80 android:maxWidth="200dp" 80 android:maxWidth="200dp"
81 android:src="@drawable/cheese" /> 81 android:src="@drawable/cheese" />
@@ -84,7 +84,8 @@ @@ -84,7 +84,8 @@
84 android:id="@+id/muskmelon" 84 android:id="@+id/muskmelon"
85 android:layout_width="wrap_content" 85 android:layout_width="wrap_content"
86 android:layout_height="wrap_content" 86 android:layout_height="wrap_content"
87 - android:layout_above="@id/linear2" 87 + android:layout_below="@id/apple"
  88 + android:layout_margin="10dp"
88 android:layout_toEndOf="@id/cheese" 89 android:layout_toEndOf="@id/cheese"
89 android:adjustViewBounds="true" 90 android:adjustViewBounds="true"
90 android:maxWidth="200dp" 91 android:maxWidth="200dp"
@@ -94,7 +95,8 @@ @@ -94,7 +95,8 @@
94 android:id="@+id/fries" 95 android:id="@+id/fries"
95 android:layout_width="wrap_content" 96 android:layout_width="wrap_content"
96 android:layout_height="wrap_content" 97 android:layout_height="wrap_content"
97 - android:layout_above="@id/linear2" 98 + android:layout_below="@id/cake"
  99 + android:layout_margin="10dp"
98 android:layout_toEndOf="@id/muskmelon" 100 android:layout_toEndOf="@id/muskmelon"
99 android:adjustViewBounds="true" 101 android:adjustViewBounds="true"
100 android:maxWidth="180dp" 102 android:maxWidth="180dp"
@@ -104,44 +106,41 @@ @@ -104,44 +106,41 @@
104 android:id="@+id/muffin" 106 android:id="@+id/muffin"
105 android:layout_width="wrap_content" 107 android:layout_width="wrap_content"
106 android:layout_height="wrap_content" 108 android:layout_height="wrap_content"
107 - android:layout_above="@id/linear2"  
108 - android:layout_toEndOf="@id/fries" 109 + android:layout_below="@id/muskmelon"
  110 + android:layout_margin="10dp"
  111 + android:layout_toEndOf="@id/hot_dog"
109 android:adjustViewBounds="true" 112 android:adjustViewBounds="true"
110 android:maxWidth="200dp" 113 android:maxWidth="200dp"
111 android:src="@drawable/muffin" /> 114 android:src="@drawable/muffin" />
112 115
113 - <LinearLayout  
114 - android:id="@+id/linear2" 116 + <Button
  117 + android:id="@+id/button_id_home"
  118 + android:layout_width="80dp"
  119 + android:layout_height="80dp"
  120 + android:layout_alignParentBottom="true"
  121 + android:layout_alignParentStart="true"
  122 + android:layout_margin="10dp"
  123 + android:background="@drawable/app_menu"
  124 + android:onClick="backHome" />
  125 +
  126 + <TextView
  127 + android:id="@+id/cons_food1"
115 android:layout_width="wrap_content" 128 android:layout_width="wrap_content"
116 android:layout_height="wrap_content" 129 android:layout_height="wrap_content"
117 - android:layout_alignParentBottom="true">  
118 -  
119 - <Button  
120 - android:id="@+id/button_id_home"  
121 - android:layout_width="wrap_content"  
122 - android:layout_height="wrap_content"  
123 - android:layout_margin="20dp"  
124 - android:onClick="backHome"  
125 - android:text="@string/home"  
126 - android:textAppearance="@style/TextFont" />  
127 -  
128 - <TextView  
129 - android:id="@+id/cons_food1"  
130 - android:layout_width="wrap_content"  
131 - android:layout_height="wrap_content"  
132 - android:layout_margin="20dp"  
133 - android:maxWidth="650dp"  
134 - android:textAppearance="@style/TextFont" />  
135 -  
136 - <Button  
137 - android:id="@+id/announce_instruction"  
138 - android:layout_width="wrap_content"  
139 - android:layout_height="wrap_content"  
140 - android:layout_margin="20dp"  
141 - android:onClick="enonceConsigne"  
142 - android:text="@string/instruction"  
143 - android:textAppearance="@style/TextFont" />  
144 -  
145 - </LinearLayout> 130 + android:layout_alignParentBottom="true"
  131 + android:layout_margin="10dp"
  132 + android:layout_toEndOf="@id/button_id_home"
  133 + android:layout_toStartOf="@id/announce_instruction"
  134 + android:gravity="center"
  135 + android:textAppearance="@style/TextFont" />
  136 +
  137 + <Button
  138 + android:id="@+id/announce_instruction"
  139 + android:layout_width="80dp"
  140 + android:layout_height="80dp"
  141 + android:layout_alignParentBottom="true"
  142 + android:layout_alignParentEnd="true"
  143 + android:layout_margin="10dp"
  144 + android:onClick="enonceConsigne" />
146 145
147 </RelativeLayout> 146 </RelativeLayout>
148 \ No newline at end of file 147 \ No newline at end of file
app/src/main/res/layout/hygiene1_display.xml
  Show/Hide comments   View file @d87c7c3
@@ -5,16 +5,6 @@ @@ -5,16 +5,6 @@
5 android:layout_height="match_parent" 5 android:layout_height="match_parent"
6 android:orientation="vertical"> 6 android:orientation="vertical">
7 7
8 - <TextView  
9 - android:id="@+id/cons_hyg1"  
10 - android:layout_width="wrap_content"  
11 - android:layout_height="wrap_content"  
12 - android:layout_alignParentBottom="true"  
13 - android:layout_centerHorizontal="true"  
14 - android:layout_margin="20dp"  
15 - android:maxWidth="650dp"  
16 - android:textAppearance="@style/TextFont" />  
17 -  
18 <ImageView 8 <ImageView
19 android:id="@+id/blue_toothbrush" 9 android:id="@+id/blue_toothbrush"
20 android:layout_width="wrap_content" 10 android:layout_width="wrap_content"
@@ -40,23 +30,33 @@ @@ -40,23 +30,33 @@
40 30
41 <Button 31 <Button
42 android:id="@+id/button_id_home" 32 android:id="@+id/button_id_home"
  33 + android:layout_width="80dp"
  34 + android:layout_height="80dp"
  35 + android:layout_alignParentBottom="true"
  36 + android:layout_alignParentStart="true"
  37 + android:layout_margin="10dp"
  38 + android:background="@drawable/app_menu"
  39 + android:onClick="backHome" />
  40 +
  41 + <TextView
  42 + android:id="@+id/cons_hyg1"
43 android:layout_width="wrap_content" 43 android:layout_width="wrap_content"
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"  
47 - android:layout_margin="20dp"  
48 - android:onClick="backHome"  
49 - android:textAppearance="@style/TextFont"  
50 - android:text="@string/home" /> 46 + android:layout_margin="10dp"
  47 + android:layout_toEndOf="@id/button_id_home"
  48 + android:layout_toStartOf="@id/announce_instruction"
  49 + android:gravity="center"
  50 + android:textAppearance="@style/TextFont" />
51 51
52 <Button 52 <Button
53 android:id="@+id/announce_instruction" 53 android:id="@+id/announce_instruction"
54 - android:layout_width="wrap_content"  
55 - android:layout_height="wrap_content" 54 + android:layout_width="80dp"
  55 + android:layout_height="80dp"
56 android:layout_alignParentBottom="true" 56 android:layout_alignParentBottom="true"
57 android:layout_alignParentEnd="true" 57 android:layout_alignParentEnd="true"
58 - android:layout_margin="20dp"  
59 - android:onClick="enonceConsigne"  
60 - android:textAppearance="@style/TextFont"  
61 - android:text="@string/instruction" /> 58 + android:layout_margin="10dp"
  59 + android:background="@drawable/speech_icon"
  60 + android:onClick="enonceConsigne" />
  61 +
62 </RelativeLayout> 62 </RelativeLayout>
63 \ No newline at end of file 63 \ No newline at end of file
app/src/main/res/layout/hygiene2_display.xml
  Show/Hide comments   View file @d87c7c3
@@ -5,16 +5,6 @@ @@ -5,16 +5,6 @@
5 android:layout_height="match_parent" 5 android:layout_height="match_parent"
6 android:orientation="vertical"> 6 android:orientation="vertical">
7 7
8 - <TextView  
9 - android:id="@+id/cons_hyg2"  
10 - android:layout_width="wrap_content"  
11 - android:layout_height="wrap_content"  
12 - android:layout_alignParentBottom="true"  
13 - android:layout_centerHorizontal="true"  
14 - android:layout_margin="20dp"  
15 - android:maxWidth="650dp"  
16 - android:textAppearance="@style/TextFont" />  
17 -  
18 <ImageView 8 <ImageView
19 android:id="@+id/blue_toothbrush" 9 android:id="@+id/blue_toothbrush"
20 android:layout_width="wrap_content" 10 android:layout_width="wrap_content"
@@ -39,23 +29,33 @@ @@ -39,23 +29,33 @@
39 29
40 <Button 30 <Button
41 android:id="@+id/button_id_home" 31 android:id="@+id/button_id_home"
  32 + android:layout_width="80dp"
  33 + android:layout_height="80dp"
  34 + android:layout_alignParentBottom="true"
  35 + android:layout_alignParentStart="true"
  36 + android:layout_margin="10dp"
  37 + android:background="@drawable/app_menu"
  38 + android:onClick="backHome" />
  39 +
  40 + <TextView
  41 + android:id="@+id/cons_hyg2"
42 android:layout_width="wrap_content" 42 android:layout_width="wrap_content"
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"  
46 - android:layout_margin="20dp"  
47 - android:onClick="backHome"  
48 - android:textAppearance="@style/TextFont"  
49 - android:text="@string/home" /> 45 + android:layout_margin="10dp"
  46 + android:layout_toEndOf="@id/button_id_home"
  47 + android:layout_toStartOf="@id/announce_instruction"
  48 + android:gravity="center"
  49 + android:textAppearance="@style/TextFont" />
50 50
51 <Button 51 <Button
52 android:id="@+id/announce_instruction" 52 android:id="@+id/announce_instruction"
53 - android:layout_width="wrap_content"  
54 - android:layout_height="wrap_content" 53 + android:layout_width="80dp"
  54 + android:layout_height="80dp"
55 android:layout_alignParentBottom="true" 55 android:layout_alignParentBottom="true"
56 android:layout_alignParentEnd="true" 56 android:layout_alignParentEnd="true"
57 - android:layout_margin="20dp"  
58 - android:onClick="enonceConsigne"  
59 - android:textAppearance="@style/TextFont"  
60 - android:text="@string/instruction" /> 57 + android:layout_margin="10dp"
  58 + android:background="@drawable/speech_icon"
  59 + android:onClick="enonceConsigne" />
  60 +
61 </RelativeLayout> 61 </RelativeLayout>
62 \ No newline at end of file 62 \ No newline at end of file
app/src/main/res/layout/hygiene3_display.xml
  Show/Hide comments   View file @d87c7c3
@@ -5,16 +5,6 @@ @@ -5,16 +5,6 @@
5 android:layout_height="match_parent" 5 android:layout_height="match_parent"
6 android:orientation="vertical"> 6 android:orientation="vertical">
7 7
8 - <TextView  
9 - android:id="@+id/cons_hyg3"  
10 - android:layout_width="wrap_content"  
11 - android:layout_height="wrap_content"  
12 - android:layout_alignParentBottom="true"  
13 - android:layout_centerHorizontal="true"  
14 - android:layout_margin="20dp"  
15 - android:maxWidth="650dp"  
16 - android:textAppearance="@style/TextFont" />  
17 -  
18 <ImageView 8 <ImageView
19 android:id="@+id/blue_toothbrush" 9 android:id="@+id/blue_toothbrush"
20 android:layout_width="wrap_content" 10 android:layout_width="wrap_content"
@@ -39,23 +29,33 @@ @@ -39,23 +29,33 @@
39 29
40 <Button 30 <Button
41 android:id="@+id/button_id_home" 31 android:id="@+id/button_id_home"
  32 + android:layout_width="80dp"
  33 + android:layout_height="80dp"
  34 + android:layout_alignParentBottom="true"
  35 + android:layout_alignParentStart="true"
  36 + android:layout_margin="10dp"
  37 + android:background="@drawable/app_menu"
  38 + android:onClick="backHome" />
  39 +
  40 + <TextView
  41 + android:id="@+id/cons_hyg3"
42 android:layout_width="wrap_content" 42 android:layout_width="wrap_content"
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"  
46 - android:layout_margin="20dp"  
47 - android:onClick="backHome"  
48 - android:textAppearance="@style/TextFont"  
49 - android:text="@string/home" /> 45 + android:layout_margin="10dp"
  46 + android:layout_toEndOf="@id/button_id_home"
  47 + android:layout_toStartOf="@id/announce_instruction"
  48 + android:gravity="center"
  49 + android:textAppearance="@style/TextFont" />
50 50
51 <Button 51 <Button
52 android:id="@+id/announce_instruction" 52 android:id="@+id/announce_instruction"
53 - android:layout_width="wrap_content"  
54 - android:layout_height="wrap_content" 53 + android:layout_width="80dp"
  54 + android:layout_height="80dp"
55 android:layout_alignParentBottom="true" 55 android:layout_alignParentBottom="true"
56 android:layout_alignParentEnd="true" 56 android:layout_alignParentEnd="true"
57 - android:layout_margin="20dp"  
58 - android:onClick="enonceConsigne"  
59 - android:textAppearance="@style/TextFont"  
60 - android:text="@string/instruction" /> 57 + android:layout_margin="10dp"
  58 + android:background="@drawable/speech_icon"
  59 + android:onClick="enonceConsigne" />
  60 +
61 </RelativeLayout> 61 </RelativeLayout>
62 \ No newline at end of file 62 \ No newline at end of file
app/src/main/res/layout/hygiene4_display.xml
  Show/Hide comments   View file @d87c7c3
@@ -114,37 +114,35 @@ @@ -114,37 +114,35 @@
114 android:maxWidth="230dp" 114 android:maxWidth="230dp"
115 android:src="@drawable/trumpet" /> 115 android:src="@drawable/trumpet" />
116 116
  117 + <Button
  118 + android:id="@+id/button_id_home"
  119 + android:layout_width="80dp"
  120 + android:layout_height="80dp"
  121 + android:layout_alignParentBottom="true"
  122 + android:layout_alignParentStart="true"
  123 + android:layout_margin="10dp"
  124 + android:background="@drawable/app_menu"
  125 + android:onClick="backHome" />
  126 +
117 <TextView 127 <TextView
118 android:id="@+id/cons_hyg4" 128 android:id="@+id/cons_hyg4"
119 android:layout_width="wrap_content" 129 android:layout_width="wrap_content"
120 android:layout_height="wrap_content" 130 android:layout_height="wrap_content"
121 android:layout_alignParentBottom="true" 131 android:layout_alignParentBottom="true"
122 - android:layout_centerHorizontal="true"  
123 - android:layout_margin="20dp"  
124 - android:maxWidth="650dp" 132 + android:layout_margin="10dp"
  133 + android:layout_toEndOf="@id/button_id_home"
  134 + android:layout_toStartOf="@id/announce_instruction"
  135 + android:gravity="center"
125 android:textAppearance="@style/TextFont" /> 136 android:textAppearance="@style/TextFont" />
126 137
127 -  
128 - <Button  
129 - android:id="@+id/button_id_home"  
130 - android:layout_width="wrap_content"  
131 - android:layout_height="wrap_content"  
132 - android:layout_alignParentBottom="true"  
133 - android:layout_alignParentStart="true"  
134 - android:layout_margin="20dp"  
135 - android:onClick="backHome"  
136 - android:textAppearance="@style/TextFont"  
137 - android:text="@string/home" />  
138 -  
139 <Button 138 <Button
140 android:id="@+id/announce_instruction" 139 android:id="@+id/announce_instruction"
141 - android:layout_width="wrap_content"  
142 - android:layout_height="wrap_content" 140 + android:layout_width="80dp"
  141 + android:layout_height="80dp"
143 android:layout_alignParentBottom="true" 142 android:layout_alignParentBottom="true"
144 android:layout_alignParentEnd="true" 143 android:layout_alignParentEnd="true"
145 - android:layout_margin="20dp"  
146 - android:onClick="enonceConsigne"  
147 - android:textAppearance="@style/TextFont"  
148 - android:text="@string/instruction" /> 144 + android:layout_margin="10dp"
  145 + android:background="@drawable/speech_icon"
  146 + android:onClick="enonceConsigne" />
149 147
150 </RelativeLayout> 148 </RelativeLayout>
151 \ No newline at end of file 149 \ No newline at end of file
app/src/main/res/layout/hygiene5_display.xml
  Show/Hide comments   View file @d87c7c3
@@ -68,36 +68,35 @@ @@ -68,36 +68,35 @@
68 android:maxWidth="200dp" 68 android:maxWidth="200dp"
69 android:src="@drawable/toilet_bag" /> 69 android:src="@drawable/toilet_bag" />
70 70
  71 + <Button
  72 + android:id="@+id/button_id_home"
  73 + android:layout_width="80dp"
  74 + android:layout_height="80dp"
  75 + android:layout_alignParentBottom="true"
  76 + android:layout_alignParentStart="true"
  77 + android:layout_margin="10dp"
  78 + android:background="@drawable/app_menu"
  79 + android:onClick="backHome" />
  80 +
71 <TextView 81 <TextView
72 android:id="@+id/cons_hyg5" 82 android:id="@+id/cons_hyg5"
73 android:layout_width="wrap_content" 83 android:layout_width="wrap_content"
74 android:layout_height="wrap_content" 84 android:layout_height="wrap_content"
75 android:layout_alignParentBottom="true" 85 android:layout_alignParentBottom="true"
76 - android:layout_centerHorizontal="true"  
77 - android:layout_margin="20dp"  
78 - android:maxWidth="650dp" 86 + android:layout_margin="10dp"
  87 + android:layout_toEndOf="@id/button_id_home"
  88 + android:layout_toStartOf="@id/announce_instruction"
  89 + android:gravity="center"
79 android:textAppearance="@style/TextFont" /> 90 android:textAppearance="@style/TextFont" />
80 91
81 <Button 92 <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:textAppearance="@style/TextFont"  
90 - android:text="@string/home" />  
91 -  
92 - <Button  
93 android:id="@+id/announce_instruction" 93 android:id="@+id/announce_instruction"
94 - android:layout_width="wrap_content"  
95 - android:layout_height="wrap_content" 94 + android:layout_width="80dp"
  95 + android:layout_height="80dp"
96 android:layout_alignParentBottom="true" 96 android:layout_alignParentBottom="true"
97 android:layout_alignParentEnd="true" 97 android:layout_alignParentEnd="true"
98 - android:layout_margin="20dp"  
99 - android:onClick="enonceConsigne"  
100 - android:textAppearance="@style/TextFont"  
101 - android:text="@string/instruction" /> 98 + android:layout_margin="10dp"
  99 + android:background="@drawable/speech_icon"
  100 + android:onClick="enonceConsigne" />
102 101
103 </RelativeLayout> 102 </RelativeLayout>
104 \ No newline at end of file 103 \ No newline at end of file
app/src/main/res/layout/hygiene6_display.xml
  Show/Hide comments   View file @d87c7c3
@@ -49,36 +49,35 @@ @@ -49,36 +49,35 @@
49 android:maxWidth="250dp" 49 android:maxWidth="250dp"
50 android:src="@drawable/blue_toothbrush_pic" /> 50 android:src="@drawable/blue_toothbrush_pic" />
51 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 52 <Button
63 android:id="@+id/button_id_home" 53 android:id="@+id/button_id_home"
  54 + android:layout_width="80dp"
  55 + android:layout_height="80dp"
  56 + android:layout_alignParentBottom="true"
  57 + android:layout_alignParentStart="true"
  58 + android:layout_margin="10dp"
  59 + android:background="@drawable/app_menu"
  60 + android:onClick="backHome" />
  61 +
  62 + <TextView
  63 + android:id="@+id/cons_hyg6"
64 android:layout_width="wrap_content" 64 android:layout_width="wrap_content"
65 android:layout_height="wrap_content" 65 android:layout_height="wrap_content"
66 android:layout_alignParentBottom="true" 66 android:layout_alignParentBottom="true"
67 - android:layout_alignParentStart="true"  
68 - android:layout_margin="20dp"  
69 - android:onClick="backHome"  
70 - android:text="@string/home" 67 + android:layout_margin="10dp"
  68 + android:layout_toEndOf="@id/button_id_home"
  69 + android:layout_toStartOf="@id/announce_instruction"
  70 + android:gravity="center"
71 android:textAppearance="@style/TextFont" /> 71 android:textAppearance="@style/TextFont" />
72 72
73 <Button 73 <Button
74 android:id="@+id/announce_instruction" 74 android:id="@+id/announce_instruction"
75 - android:layout_width="wrap_content"  
76 - android:layout_height="wrap_content" 75 + android:layout_width="80dp"
  76 + android:layout_height="80dp"
77 android:layout_alignParentBottom="true" 77 android:layout_alignParentBottom="true"
78 android:layout_alignParentEnd="true" 78 android:layout_alignParentEnd="true"
79 - android:layout_margin="20dp"  
80 - android:onClick="enonceConsigne"  
81 - android:text="@string/instruction"  
82 - android:textAppearance="@style/TextFont" /> 79 + android:layout_margin="10dp"
  80 + android:background="@drawable/speech_icon"
  81 + android:onClick="enonceConsigne" />
83 82
84 </RelativeLayout> 83 </RelativeLayout>
85 \ No newline at end of file 84 \ No newline at end of file
app/src/main/res/layout/security1_display.xml 0 → 100644
  Show/Hide comments   View file @d87c7c3
@@ -0,0 +1,131 @@ @@ -0,0 +1,131 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:id="@+id/sec1"
  4 + android:layout_width="match_parent"
  5 + android:layout_height="match_parent"
  6 + android:orientation="vertical">
  7 +
  8 + <LinearLayout
  9 + android:id="@+id/l1"
  10 + android:layout_width="match_parent"
  11 + android:layout_height="200dp"
  12 + android:layout_alignParentTop="true"
  13 + android:layout_marginTop="20dp"
  14 + android:orientation="horizontal"
  15 + android:showDividers="middle"
  16 + android:weightSum="4">
  17 +
  18 + <ImageView
  19 + android:id="@+id/water"
  20 + android:layout_width="0dp"
  21 + android:layout_height="wrap_content"
  22 + android:layout_weight="1"
  23 + android:adjustViewBounds="true"
  24 + android:src="@drawable/water" />
  25 +
  26 + <ImageView
  27 + android:id="@+id/knife"
  28 + android:layout_width="0dp"
  29 + android:layout_height="wrap_content"
  30 + android:layout_weight="1"
  31 + android:adjustViewBounds="true"
  32 + android:src="@drawable/knife" />
  33 +
  34 + <ImageView
  35 + android:id="@+id/iron"
  36 + android:layout_width="0dp"
  37 + android:layout_height="wrap_content"
  38 + android:layout_weight="1"
  39 + android:adjustViewBounds="true"
  40 + android:src="@drawable/iron" />
  41 +
  42 + <ImageView
  43 + android:id="@+id/bleach"
  44 + android:layout_width="0dp"
  45 + android:layout_height="wrap_content"
  46 + android:layout_weight="1"
  47 + android:adjustViewBounds="true"
  48 + android:src="@drawable/bleach" />
  49 +
  50 + </LinearLayout>
  51 +
  52 +
  53 + <LinearLayout
  54 + android:id="@+id/l2"
  55 + android:layout_width="match_parent"
  56 + android:layout_height="200dp"
  57 + android:layout_below="@id/l1"
  58 + android:layout_marginTop="20dp"
  59 + android:orientation="horizontal"
  60 + android:showDividers="middle"
  61 + android:weightSum="4">
  62 +
  63 + <ImageView
  64 + android:id="@+id/pan"
  65 + android:layout_width="0dp"
  66 + android:layout_height="wrap_content"
  67 + android:layout_gravity="bottom"
  68 + android:layout_weight="1"
  69 + android:adjustViewBounds="true"
  70 + android:src="@drawable/pan" />
  71 +
  72 + <ImageView
  73 + android:id="@+id/pen"
  74 + android:layout_width="wrap_content"
  75 + android:layout_height="wrap_content"
  76 + android:layout_weight="1"
  77 + android:adjustViewBounds="true"
  78 + android:src="@drawable/pen" />
  79 +
  80 + <ImageView
  81 + android:id="@+id/drugs"
  82 + android:layout_width="wrap_content"
  83 + android:layout_height="wrap_content"
  84 + android:layout_weight="1"
  85 + android:adjustViewBounds="true"
  86 + android:src="@drawable/drugs" />
  87 +
  88 + <ImageView
  89 + android:id="@+id/bear"
  90 + android:layout_width="wrap_content"
  91 + android:layout_height="wrap_content"
  92 + android:layout_weight="1"
  93 + android:adjustViewBounds="true"
  94 + android:src="@drawable/bear" />
  95 + </LinearLayout>
  96 +
  97 + <LinearLayout
  98 + android:id="@+id/ll"
  99 + android:layout_width="match_parent"
  100 + android:layout_height="wrap_content"
  101 + android:layout_margin="10dp"
  102 + android:weightSum="12"
  103 + android:layout_alignParentBottom="true">
  104 +
  105 + <Button
  106 + android:id="@+id/button_id_home"
  107 + android:layout_width="wrap_content"
  108 + android:layout_height="wrap_content"
  109 + android:layout_weight="1"
  110 + android:onClick="backHome"
  111 + android:text="@string/home"
  112 + android:textAppearance="@style/TextButtonFont" />
  113 +
  114 + <TextView
  115 + android:id="@+id/cons_sec1"
  116 + android:layout_width="wrap_content"
  117 + android:layout_height="wrap_content"
  118 + android:layout_weight="10"
  119 + android:textAppearance="@style/TextFont" />
  120 +
  121 + <Button
  122 + android:id="@+id/announce_instruction"
  123 + android:layout_width="wrap_content"
  124 + android:layout_height="wrap_content"
  125 + android:onClick="enonceConsigne"
  126 + android:layout_weight="1"
  127 + android:text="@string/instruction"
  128 + android:textAppearance="@style/TextButtonFont" />
  129 + </LinearLayout>
  130 +
  131 +</RelativeLayout>
0 \ No newline at end of file 132 \ No newline at end of file
app/src/main/res/layout/theme_display.xml
  Show/Hide comments   View file @d87c7c3
@@ -25,15 +25,16 @@ @@ -25,15 +25,16 @@
25 android:layout_weight="1" 25 android:layout_weight="1"
26 android:onClick="healthPage" 26 android:onClick="healthPage"
27 android:text="@string/health" 27 android:text="@string/health"
28 - android:textAppearance="@style/TextFont" /> 28 + android:textAppearance="@style/TextButtonFont" />
29 29
30 <Button 30 <Button
31 android:id="@+id/button_id_security" 31 android:id="@+id/button_id_security"
32 android:layout_width="match_parent" 32 android:layout_width="match_parent"
33 android:layout_height="0dp" 33 android:layout_height="0dp"
34 android:layout_weight="1" 34 android:layout_weight="1"
  35 + android:onClick="securityPage"
35 android:text="@string/security" 36 android:text="@string/security"
36 - android:textAppearance="@style/TextFont" /> 37 + android:textAppearance="@style/TextButtonFont" />
37 38
38 <Button 39 <Button
39 android:id="@+id/button_id_sociability" 40 android:id="@+id/button_id_sociability"
@@ -41,7 +42,7 @@ @@ -41,7 +42,7 @@
41 android:layout_height="0dp" 42 android:layout_height="0dp"
42 android:layout_weight="1" 43 android:layout_weight="1"
43 android:text="@string/sociability" 44 android:text="@string/sociability"
44 - android:textAppearance="@style/TextFont" /> 45 + android:textAppearance="@style/TextButtonFont" />
45 46
46 </LinearLayout> 47 </LinearLayout>
47 48
@@ -59,7 +60,7 @@ @@ -59,7 +60,7 @@
59 android:layout_weight="1" 60 android:layout_weight="1"
60 android:onClick="hygienePage" 61 android:onClick="hygienePage"
61 android:text="@string/hygiene" 62 android:text="@string/hygiene"
62 - android:textAppearance="@style/TextFont" /> 63 + android:textAppearance="@style/TextButtonFont" />
63 64
64 65
65 <Button 66 <Button
@@ -68,7 +69,7 @@ @@ -68,7 +69,7 @@
68 android:layout_height="0dp" 69 android:layout_height="0dp"
69 android:layout_weight="1" 70 android:layout_weight="1"
70 android:text="@string/independence" 71 android:text="@string/independence"
71 - android:textAppearance="@style/TextFont" /> 72 + android:textAppearance="@style/TextButtonFont" />
72 73
73 74
74 <Button 75 <Button
@@ -78,7 +79,7 @@ @@ -78,7 +79,7 @@
78 android:layout_weight="1" 79 android:layout_weight="1"
79 android:onClick="foodPage" 80 android:onClick="foodPage"
80 android:text="@string/food" 81 android:text="@string/food"
81 - android:textAppearance="@style/TextFont" /> 82 + android:textAppearance="@style/TextButtonFont" />
82 83
83 </LinearLayout> 84 </LinearLayout>
84 </LinearLayout> 85 </LinearLayout>
@@ -90,6 +91,6 @@ @@ -90,6 +91,6 @@
90 android:layout_alignParentBottom="true" 91 android:layout_alignParentBottom="true"
91 android:onClick="backHome" 92 android:onClick="backHome"
92 android:text="@string/home" 93 android:text="@string/home"
93 - android:textAppearance="@style/TextFont" /> 94 + android:textAppearance="@style/TextButtonFont" />
94 95
95 </RelativeLayout> 96 </RelativeLayout>
96 \ No newline at end of file 97 \ No newline at end of file
app/src/main/res/layout/tutorial1_display.xml
  Show/Hide comments   View file @d87c7c3
@@ -4,16 +4,6 @@ @@ -4,16 +4,6 @@
4 android:layout_height="match_parent" 4 android:layout_height="match_parent"
5 android:orientation="vertical"> 5 android:orientation="vertical">
6 6
7 - <TextView  
8 - android:id="@+id/cons_tut1"  
9 - android:layout_width="wrap_content"  
10 - android:layout_height="wrap_content"  
11 - android:layout_alignParentBottom="true"  
12 - android:layout_centerHorizontal="true"  
13 - android:layout_margin="20dp"  
14 - android:maxWidth="650dp"  
15 - android:textAppearance="@style/TextFont" />  
16 -  
17 <ImageButton 7 <ImageButton
18 android:layout_width="wrap_content" 8 android:layout_width="wrap_content"
19 android:layout_height="wrap_content" 9 android:layout_height="wrap_content"
@@ -24,24 +14,33 @@ @@ -24,24 +14,33 @@
24 14
25 <Button 15 <Button
26 android:id="@+id/button_id_home" 16 android:id="@+id/button_id_home"
  17 + android:layout_width="80dp"
  18 + android:layout_height="80dp"
  19 + android:layout_alignParentBottom="true"
  20 + android:layout_alignParentStart="true"
  21 + android:layout_margin="10dp"
  22 + android:background="@drawable/app_menu"
  23 + android:onClick="backHome" />
  24 +
  25 + <TextView
  26 + android:id="@+id/cons_tut1"
27 android:layout_width="wrap_content" 27 android:layout_width="wrap_content"
28 android:layout_height="wrap_content" 28 android:layout_height="wrap_content"
29 android:layout_alignParentBottom="true" 29 android:layout_alignParentBottom="true"
30 - android:layout_alignParentStart="true"  
31 - android:layout_margin="20dp"  
32 - android:onClick="backHome"  
33 - android:text="@string/home" 30 + android:layout_margin="10dp"
  31 + android:layout_toEndOf="@id/button_id_home"
  32 + android:layout_toStartOf="@id/announce_instruction"
  33 + android:gravity="center"
34 android:textAppearance="@style/TextFont" /> 34 android:textAppearance="@style/TextFont" />
35 35
36 <Button 36 <Button
37 android:id="@+id/announce_instruction" 37 android:id="@+id/announce_instruction"
38 - android:layout_width="wrap_content"  
39 - android:layout_height="wrap_content" 38 + android:layout_width="80dp"
  39 + android:layout_height="80dp"
40 android:layout_alignParentBottom="true" 40 android:layout_alignParentBottom="true"
41 android:layout_alignParentEnd="true" 41 android:layout_alignParentEnd="true"
42 - android:layout_margin="20dp"  
43 - android:onClick="enonceConsigne"  
44 - android:text="@string/instruction"  
45 - android:textAppearance="@style/TextFont" /> 42 + android:layout_margin="10dp"
  43 + android:background="@drawable/speech_icon"
  44 + android:onClick="enonceConsigne" />
46 45
47 </RelativeLayout> 46 </RelativeLayout>
48 \ No newline at end of file 47 \ No newline at end of file
app/src/main/res/layout/tutorial2_display.xml
  Show/Hide comments   View file @d87c7c3
@@ -5,16 +5,6 @@ @@ -5,16 +5,6 @@
5 android:layout_height="match_parent" 5 android:layout_height="match_parent"
6 android:orientation="vertical"> 6 android:orientation="vertical">
7 7
8 - <TextView  
9 - android:id="@+id/cons_tut2"  
10 - android:layout_width="wrap_content"  
11 - android:layout_height="wrap_content"  
12 - android:layout_alignParentBottom="true"  
13 - android:layout_centerHorizontal="true"  
14 - android:layout_margin="20dp"  
15 - android:maxWidth="650dp"  
16 - android:textAppearance="@style/TextFont" />  
17 -  
18 <ImageView 8 <ImageView
19 android:id="@+id/blue_rectangle" 9 android:id="@+id/blue_rectangle"
20 android:layout_width="70dp" 10 android:layout_width="70dp"
@@ -36,24 +26,34 @@ @@ -36,24 +26,34 @@
36 26
37 <Button 27 <Button
38 android:id="@+id/button_id_home" 28 android:id="@+id/button_id_home"
  29 + android:layout_width="80dp"
  30 + android:layout_height="80dp"
  31 + android:layout_alignParentBottom="true"
  32 + android:layout_alignParentStart="true"
  33 + android:layout_margin="10dp"
  34 + android:background="@drawable/app_menu"
  35 + android:onClick="backHome" />
  36 +
  37 + <TextView
  38 + android:id="@+id/cons_tut2"
39 android:layout_width="wrap_content" 39 android:layout_width="wrap_content"
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"  
43 - android:layout_margin="20dp"  
44 - android:onClick="backHome"  
45 - android:text="@string/home" 42 + android:gravity="center"
  43 + android:layout_margin="10dp"
  44 + android:layout_toEndOf="@id/button_id_home"
  45 + android:layout_toStartOf="@id/announce_instruction"
46 android:textAppearance="@style/TextFont" /> 46 android:textAppearance="@style/TextFont" />
47 47
48 <Button 48 <Button
49 android:id="@+id/announce_instruction" 49 android:id="@+id/announce_instruction"
50 - android:layout_width="wrap_content"  
51 - android:layout_height="wrap_content" 50 + android:layout_width="80dp"
  51 + android:layout_height="80dp"
52 android:layout_alignParentBottom="true" 52 android:layout_alignParentBottom="true"
53 android:layout_alignParentEnd="true" 53 android:layout_alignParentEnd="true"
54 - android:layout_margin="20dp"  
55 - android:onClick="enonceConsigne"  
56 - android:text="@string/instruction"  
57 - android:textAppearance="@style/TextFont" /> 54 + android:layout_margin="10dp"
  55 + android:background="@drawable/speech_icon"
  56 + android:onClick="enonceConsigne" />
  57 +
58 58
59 </RelativeLayout> 59 </RelativeLayout>
60 \ No newline at end of file 60 \ No newline at end of file
app/src/main/res/layout/tutorial3_display.xml
  Show/Hide comments   View file @d87c7c3
@@ -5,15 +5,6 @@ @@ -5,15 +5,6 @@
5 android:layout_height="match_parent" 5 android:layout_height="match_parent"
6 android:orientation="vertical"> 6 android:orientation="vertical">
7 7
8 - <TextView  
9 - android:id="@+id/cons_tut3"  
10 - android:layout_width="wrap_content"  
11 - android:layout_height="wrap_content"  
12 - android:layout_alignParentBottom="true"  
13 - android:layout_centerHorizontal="true"  
14 - android:layout_margin="20dp"  
15 - android:maxWidth="650dp"  
16 - android:textAppearance="@style/TextFont" />  
17 8
18 <ImageView 9 <ImageView
19 android:id="@+id/blue_rectangle31" 10 android:id="@+id/blue_rectangle31"
@@ -74,24 +65,34 @@ @@ -74,24 +65,34 @@
74 65
75 <Button 66 <Button
76 android:id="@+id/button_id_home" 67 android:id="@+id/button_id_home"
  68 + android:layout_width="80dp"
  69 + android:layout_height="80dp"
  70 + android:layout_alignParentBottom="true"
  71 + android:layout_alignParentStart="true"
  72 + android:layout_margin="10dp"
  73 + android:background="@drawable/app_menu"
  74 + android:onClick="backHome" />
  75 +
  76 + <TextView
  77 + android:id="@+id/cons_tut3"
77 android:layout_width="wrap_content" 78 android:layout_width="wrap_content"
78 android:layout_height="wrap_content" 79 android:layout_height="wrap_content"
79 android:layout_alignParentBottom="true" 80 android:layout_alignParentBottom="true"
80 - android:layout_alignParentStart="true"  
81 - android:layout_margin="20dp"  
82 - android:onClick="backHome"  
83 - android:textAppearance="@style/TextFont"  
84 - android:text="@string/home" /> 81 + android:layout_margin="10dp"
  82 + android:layout_toEndOf="@id/button_id_home"
  83 + android:layout_toStartOf="@id/announce_instruction"
  84 + android:gravity="center"
  85 + android:textAppearance="@style/TextFont" />
85 86
86 <Button 87 <Button
87 android:id="@+id/announce_instruction" 88 android:id="@+id/announce_instruction"
88 - android:layout_width="wrap_content"  
89 - android:layout_height="wrap_content" 89 + android:layout_width="80dp"
  90 + android:layout_height="80dp"
90 android:layout_alignParentBottom="true" 91 android:layout_alignParentBottom="true"
91 android:layout_alignParentEnd="true" 92 android:layout_alignParentEnd="true"
92 - android:layout_margin="20dp"  
93 - android:onClick="enonceConsigne"  
94 - android:textAppearance="@style/TextFont"  
95 - android:text="@string/instruction" /> 93 + android:layout_margin="10dp"
  94 + android:background="@drawable/speech_icon"
  95 + android:onClick="enonceConsigne" />
  96 +
96 97
97 </RelativeLayout> 98 </RelativeLayout>
98 \ No newline at end of file 99 \ No newline at end of file
app/src/main/res/layout/tutorial4_display.xml
  Show/Hide comments   View file @d87c7c3
@@ -150,36 +150,35 @@ @@ -150,36 +150,35 @@
150 android:layout_toEndOf="@id/green_rectangle44" 150 android:layout_toEndOf="@id/green_rectangle44"
151 android:background="@drawable/blue_rectangle" /> 151 android:background="@drawable/blue_rectangle" />
152 152
153 - <TextView  
154 - android:id="@+id/cons_tut4"  
155 - android:layout_width="wrap_content"  
156 - android:layout_height="wrap_content"  
157 - android:layout_alignParentBottom="true"  
158 - android:layout_centerHorizontal="true"  
159 - android:layout_margin="20dp"  
160 - android:maxWidth="650dp"  
161 - android:textAppearance="@style/TextFont" />  
162 -  
163 -  
164 <Button 153 <Button
165 android:id="@+id/button_id_home" 154 android:id="@+id/button_id_home"
  155 + android:layout_width="80dp"
  156 + android:layout_height="80dp"
  157 + android:layout_alignParentBottom="true"
  158 + android:layout_alignParentStart="true"
  159 + android:layout_margin="10dp"
  160 + android:background="@drawable/app_menu"
  161 + android:onClick="backHome" />
  162 +
  163 + <TextView
  164 + android:id="@+id/cons_tut4"
166 android:layout_width="wrap_content" 165 android:layout_width="wrap_content"
167 android:layout_height="wrap_content" 166 android:layout_height="wrap_content"
168 android:layout_alignParentBottom="true" 167 android:layout_alignParentBottom="true"
169 - android:layout_alignParentStart="true"  
170 - android:layout_margin="20dp"  
171 - android:onClick="backHome"  
172 - android:text="@string/home" 168 + android:layout_margin="10dp"
  169 + android:layout_toEndOf="@id/button_id_home"
  170 + android:layout_toStartOf="@id/announce_instruction"
  171 + android:gravity="center"
173 android:textAppearance="@style/TextFont" /> 172 android:textAppearance="@style/TextFont" />
174 173
175 <Button 174 <Button
176 android:id="@+id/announce_instruction" 175 android:id="@+id/announce_instruction"
177 - android:layout_width="wrap_content"  
178 - android:layout_height="wrap_content" 176 + android:layout_width="80dp"
  177 + android:layout_height="80dp"
179 android:layout_alignParentBottom="true" 178 android:layout_alignParentBottom="true"
180 android:layout_alignParentEnd="true" 179 android:layout_alignParentEnd="true"
181 - android:layout_margin="20dp"  
182 - android:onClick="enonceConsigne"  
183 - android:text="@string/instruction"  
184 - android:textAppearance="@style/TextFont" /> 180 + android:layout_margin="10dp"
  181 + android:background="@drawable/speech_icon"
  182 + android:onClick="enonceConsigne" />
  183 +
185 </RelativeLayout> 184 </RelativeLayout>
186 \ No newline at end of file 185 \ No newline at end of file
app/src/main/res/layout/tutorial5_display.xml
  Show/Hide comments   View file @d87c7c3
@@ -112,36 +112,35 @@ @@ -112,36 +112,35 @@
112 android:layout_toEndOf="@id/green_rectangle54" 112 android:layout_toEndOf="@id/green_rectangle54"
113 android:background="@drawable/blue_rectangle" /> 113 android:background="@drawable/blue_rectangle" />
114 114
115 - <TextView  
116 - android:id="@+id/cons_tut5"  
117 - android:layout_width="wrap_content"  
118 - android:layout_height="wrap_content"  
119 - android:layout_alignParentBottom="true"  
120 - android:layout_centerHorizontal="true"  
121 - android:layout_margin="20dp"  
122 - android:maxWidth="650dp"  
123 - android:textAppearance="@style/TextFont" />  
124 -  
125 -  
126 <Button 115 <Button
127 android:id="@+id/button_id_home" 116 android:id="@+id/button_id_home"
  117 + android:layout_width="80dp"
  118 + android:layout_height="80dp"
  119 + android:layout_alignParentBottom="true"
  120 + android:layout_alignParentStart="true"
  121 + android:layout_margin="10dp"
  122 + android:background="@drawable/app_menu"
  123 + android:onClick="backHome" />
  124 +
  125 + <TextView
  126 + android:id="@+id/cons_tut5"
128 android:layout_width="wrap_content" 127 android:layout_width="wrap_content"
129 android:layout_height="wrap_content" 128 android:layout_height="wrap_content"
130 android:layout_alignParentBottom="true" 129 android:layout_alignParentBottom="true"
131 - android:layout_alignParentStart="true"  
132 - android:layout_margin="20dp"  
133 - android:onClick="backHome"  
134 - android:text="@string/home" 130 + android:layout_margin="10dp"
  131 + android:layout_toEndOf="@id/button_id_home"
  132 + android:layout_toStartOf="@id/announce_instruction"
  133 + android:gravity="center"
135 android:textAppearance="@style/TextFont" /> 134 android:textAppearance="@style/TextFont" />
136 135
137 <Button 136 <Button
138 android:id="@+id/announce_instruction" 137 android:id="@+id/announce_instruction"
139 - android:layout_width="wrap_content"  
140 - android:layout_height="wrap_content" 138 + android:layout_width="80dp"
  139 + android:layout_height="80dp"
141 android:layout_alignParentBottom="true" 140 android:layout_alignParentBottom="true"
142 android:layout_alignParentEnd="true" 141 android:layout_alignParentEnd="true"
143 - android:layout_margin="20dp"  
144 - android:onClick="enonceConsigne"  
145 - android:text="@string/instruction"  
146 - android:textAppearance="@style/TextFont" /> 142 + android:layout_margin="10dp"
  143 + android:background="@drawable/speech_icon"
  144 + android:onClick="enonceConsigne" />
  145 +
147 </RelativeLayout> 146 </RelativeLayout>
148 \ No newline at end of file 147 \ No newline at end of file
app/src/main/res/values/strings.xml
  Show/Hide comments   View file @d87c7c3
@@ -5,14 +5,14 @@ @@ -5,14 +5,14 @@
5 <string name="health">Santé</string> 5 <string name="health">Santé</string>
6 <string name="hygiene">Hygiène</string> 6 <string name="hygiene">Hygiène</string>
7 <string name="independence">Autonomie</string> 7 <string name="independence">Autonomie</string>
8 - <string name="security">Sécurité</string>  
9 - <string name="sociability">Sociabilité</string> 8 + <string name="security">Intégration des risques quotidiens</string>
  9 + <string name="sociability">Comportements adaptés</string>
10 <string name="anatomy">Anatomie</string> 10 <string name="anatomy">Anatomie</string>
11 <string name="bathroom">Salle de bain</string> 11 <string name="bathroom">Salle de bain</string>
12 <string name="tutorial">Tutoriel</string> 12 <string name="tutorial">Tutoriel</string>
13 <string name="home">Menu</string> 13 <string name="home">Menu</string>
14 <string name="theme">Thème</string> 14 <string name="theme">Thème</string>
15 <string name="bravotxt">Bravo ! Tu as réussi la mission. Clique sur l\'écran pour continuer à jouer.</string> 15 <string name="bravotxt">Bravo ! Tu as réussi la mission. Clique sur l\'écran pour continuer à jouer.</string>
16 - <string name="instruction">Lire consigne</string> 16 + <string name="instruction">Consigne</string>
17 <string name="food">Alimentation</string> 17 <string name="food">Alimentation</string>
18 </resources> 18 </resources>
app/src/main/res/values/styles.xml
  Show/Hide comments   View file @d87c7c3
@@ -16,4 +16,13 @@ @@ -16,4 +16,13 @@
16 <item name="android:fontFamily">arial</item> 16 <item name="android:fontFamily">arial</item>
17 </style> 17 </style>
18 18
  19 + <style name="TextButtonFont">
  20 + <item name="android:textColor">#065679</item>
  21 + <item name="android:textStyle">bold</item>
  22 + <item name="android:textSize">30sp</item>
  23 + <item name="android:typeface">monospace</item>
  24 + <item name="android:fontFamily">arial</item>
  25 + <item name="android:textAllCaps">true</item>
  26 + </style>
  27 +
19 </resources> 28 </resources>