Commit a5c66bd70e88995160782bfa82ce6dd2e66a5deb
1 parent
c9866333
modif boutons/typo/backgrounds
Showing
29 changed files
with
515 additions
and
85 deletions
Show diff stats
app/src/main/AndroidManifest.xml
| @@ -137,6 +137,14 @@ | @@ -137,6 +137,14 @@ | ||
| 137 | </activity> | 137 | </activity> |
| 138 | 138 | ||
| 139 | <activity | 139 | <activity |
| 140 | + android:name=".Food1Activity" | ||
| 141 | + android:screenOrientation="userLandscape"> | ||
| 142 | + <meta-data | ||
| 143 | + android:name="android.support.PARENT_ACTIVITY" | ||
| 144 | + android:value=".MainActivity" /> | ||
| 145 | + </activity> | ||
| 146 | + | ||
| 147 | + <activity | ||
| 140 | android:name=".BravoActivity" | 148 | android:name=".BravoActivity" |
| 141 | android:screenOrientation="userLandscape"></activity> | 149 | android:screenOrientation="userLandscape"></activity> |
| 142 | 150 |
| @@ -0,0 +1,134 @@ | @@ -0,0 +1,134 @@ | ||
| 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.TextView; | ||
| 11 | + | ||
| 12 | +/** | ||
| 13 | + * Created by psyk on 24/01/18. | ||
| 14 | + */ | ||
| 15 | + | ||
| 16 | +public class Food1Activity extends MyPlayActivity implements View.OnTouchListener, View.OnDragListener { | ||
| 17 | + | ||
| 18 | + private int win_counter = 0; | ||
| 19 | + private boolean done = false; | ||
| 20 | + | ||
| 21 | + @Override | ||
| 22 | + protected void onCreate(Bundle savedInstanceState) { | ||
| 23 | + super.onCreate(savedInstanceState); | ||
| 24 | + lanceConsigne("Salut !\nTu peux m'aider à trier\nles aliments salés et sucrés ?\nTouche l'écran pour commencer."); | ||
| 25 | + } | ||
| 26 | + | ||
| 27 | + protected void onActivityResult(int requestCode, int resultCode, Intent data) { | ||
| 28 | + super.onActivityResult(requestCode, resultCode, data); | ||
| 29 | + | ||
| 30 | + setContentView(R.layout.food1_display); | ||
| 31 | + | ||
| 32 | + TextView txtV = findViewById(R.id.cons_food1); | ||
| 33 | + smallCons = "Tri les aliments sucrés et ceux salés."; | ||
| 34 | + txtV.setText(smallCons); | ||
| 35 | + setTts(); | ||
| 36 | + | ||
| 37 | + findViewById(R.id.bacon).setOnTouchListener(this); | ||
| 38 | + findViewById(R.id.muskmelon).setOnTouchListener(this); | ||
| 39 | + findViewById(R.id.cake).setOnTouchListener(this); | ||
| 40 | + findViewById(R.id.fries).setOnTouchListener(this); | ||
| 41 | + findViewById(R.id.apple).setOnTouchListener(this); | ||
| 42 | + findViewById(R.id.hot_dog).setOnTouchListener(this); | ||
| 43 | + findViewById(R.id.cheese).setOnTouchListener(this); | ||
| 44 | + findViewById(R.id.muffin).setOnTouchListener(this); | ||
| 45 | + | ||
| 46 | + findViewById(R.id.bacon).setOnDragListener(this); | ||
| 47 | + findViewById(R.id.muffin).setOnDragListener(this); | ||
| 48 | + findViewById(R.id.muskmelon).setOnDragListener(this); | ||
| 49 | + findViewById(R.id.cake).setOnDragListener(this); | ||
| 50 | + findViewById(R.id.fries).setOnDragListener(this); | ||
| 51 | + findViewById(R.id.apple).setOnDragListener(this); | ||
| 52 | + findViewById(R.id.hot_dog).setOnDragListener(this); | ||
| 53 | + findViewById(R.id.cheese).setOnDragListener(this); | ||
| 54 | + findViewById(R.id.salt).setOnDragListener(this); | ||
| 55 | + findViewById(R.id.sugar).setOnDragListener(this); | ||
| 56 | + | ||
| 57 | + } | ||
| 58 | + | ||
| 59 | + @Override | ||
| 60 | + public boolean onTouch(View view, MotionEvent event) { | ||
| 61 | + if (event.getAction() == MotionEvent.ACTION_DOWN) { | ||
| 62 | + | ||
| 63 | + View.DragShadowBuilder shadowBuilder = new View.DragShadowBuilder(view); | ||
| 64 | + ClipData data = ClipData.newPlainText("id", view.getResources().getResourceEntryName(view.getId())); | ||
| 65 | + | ||
| 66 | + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { | ||
| 67 | + view.startDragAndDrop(data, shadowBuilder, view, 0); | ||
| 68 | + } else { | ||
| 69 | + view.startDrag(data, shadowBuilder, view, 0); | ||
| 70 | + } | ||
| 71 | + return true; | ||
| 72 | + } else | ||
| 73 | + return false; | ||
| 74 | + } | ||
| 75 | + | ||
| 76 | + @Override | ||
| 77 | + public boolean onDrag(View v, DragEvent event) { | ||
| 78 | + switch (event.getAction()) { | ||
| 79 | + // signal for the start of a drag and drop operation | ||
| 80 | + case DragEvent.ACTION_DRAG_STARTED: | ||
| 81 | + // do nothing | ||
| 82 | + break; | ||
| 83 | + | ||
| 84 | + // the drag point has entered the bounding box of the View | ||
| 85 | + case DragEvent.ACTION_DRAG_ENTERED: | ||
| 86 | + // do nothing | ||
| 87 | + break; | ||
| 88 | + | ||
| 89 | + // the user has moved the drag shadow outside the bounding box of the View | ||
| 90 | + case DragEvent.ACTION_DRAG_EXITED: | ||
| 91 | + // do nothing | ||
| 92 | + break; | ||
| 93 | + | ||
| 94 | + // the drag and drop operation has concluded | ||
| 95 | + case DragEvent.ACTION_DRAG_ENDED: | ||
| 96 | + if (win_counter == 8 && !done) { | ||
| 97 | + done = true; | ||
| 98 | + bravoPage(v); | ||
| 99 | + } | ||
| 100 | + break; | ||
| 101 | + | ||
| 102 | + //drag shadow has been released,the drag point is within the bounding box of the View | ||
| 103 | + case DragEvent.ACTION_DROP: | ||
| 104 | + //handle the dragged view being dropped over a target view | ||
| 105 | + View view = (View) event.getLocalState(); | ||
| 106 | + if (v == findViewById(R.id.salt)) { | ||
| 107 | + if (view == findViewById(R.id.bacon) | ||
| 108 | + || view == findViewById(R.id.hot_dog) | ||
| 109 | + || view == findViewById(R.id.cheese) | ||
| 110 | + || view == findViewById(R.id.fries)) { | ||
| 111 | + //stop displaying the view where it was before it was dragged | ||
| 112 | + view.setVisibility(View.INVISIBLE); | ||
| 113 | + win_counter++; | ||
| 114 | + } | ||
| 115 | + } else if (v == findViewById(R.id.sugar)) { | ||
| 116 | + if (view == findViewById(R.id.muffin) | ||
| 117 | + || view == findViewById(R.id.apple) | ||
| 118 | + || view == findViewById(R.id.muskmelon) | ||
| 119 | + || view == findViewById(R.id.cake)) { | ||
| 120 | + //stop displaying the view where it was before it was dragged | ||
| 121 | + view.setVisibility(View.INVISIBLE); | ||
| 122 | + win_counter++; | ||
| 123 | + } | ||
| 124 | + } | ||
| 125 | + break; | ||
| 126 | + } | ||
| 127 | + return true; | ||
| 128 | + } | ||
| 129 | + | ||
| 130 | + @Override | ||
| 131 | + protected void next() { | ||
| 132 | + //startActivity(new Intent(this, TutorialScene5Activity.class)); | ||
| 133 | + } | ||
| 134 | +} |
app/src/main/java/tonio/noa/MainActivity.java
| @@ -2,33 +2,65 @@ package tonio.noa; | @@ -2,33 +2,65 @@ package tonio.noa; | ||
| 2 | 2 | ||
| 3 | import android.app.Activity; | 3 | import android.app.Activity; |
| 4 | import android.content.Intent; | 4 | import android.content.Intent; |
| 5 | +import android.speech.tts.TextToSpeech; | ||
| 5 | import android.support.v7.app.AppCompatActivity; | 6 | import android.support.v7.app.AppCompatActivity; |
| 6 | import android.os.Bundle; | 7 | import android.os.Bundle; |
| 7 | import android.view.View; | 8 | import android.view.View; |
| 9 | +import android.widget.TextView; | ||
| 8 | 10 | ||
| 9 | -public class MainActivity extends Activity { | 11 | +import java.util.Locale; |
| 12 | + | ||
| 13 | +public class MainActivity extends Activity implements View.OnLongClickListener { | ||
| 14 | + | ||
| 15 | + private TextToSpeech tts; | ||
| 10 | 16 | ||
| 11 | @Override | 17 | @Override |
| 12 | protected void onCreate(Bundle savedInstanceState) { | 18 | protected void onCreate(Bundle savedInstanceState) { |
| 13 | super.onCreate(savedInstanceState); | 19 | super.onCreate(savedInstanceState); |
| 14 | setContentView(R.layout.activity_main); | 20 | setContentView(R.layout.activity_main); |
| 21 | + | ||
| 22 | + findViewById(R.id.button_id_play).setOnLongClickListener(this); | ||
| 23 | + findViewById(R.id.button_id_tutorial).setOnLongClickListener(this); | ||
| 24 | + | ||
| 25 | + tts = new TextToSpeech(getApplicationContext(), new TextToSpeech.OnInitListener() { | ||
| 26 | + @Override | ||
| 27 | + public void onInit(int status) { | ||
| 28 | + if (status != TextToSpeech.ERROR) { | ||
| 29 | + tts.setLanguage(Locale.FRENCH); | ||
| 30 | + } | ||
| 31 | + } | ||
| 32 | + }); | ||
| 15 | } | 33 | } |
| 16 | 34 | ||
| 17 | - public void themePage(View view){ | 35 | + public void themePage(View view) { |
| 18 | 36 | ||
| 19 | startActivity(new Intent(this, ThemeActivity.class)); | 37 | startActivity(new Intent(this, ThemeActivity.class)); |
| 20 | finish(); | 38 | finish(); |
| 21 | } | 39 | } |
| 22 | 40 | ||
| 23 | - public void configurePage(View view){ | 41 | + public void configurePage(View view) { |
| 24 | 42 | ||
| 25 | startActivity(new Intent(this, ConfigureActivity.class)); | 43 | startActivity(new Intent(this, ConfigureActivity.class)); |
| 26 | finish(); | 44 | finish(); |
| 27 | } | 45 | } |
| 28 | 46 | ||
| 29 | - public void tutorialPage(View view){ | 47 | + public void tutorialPage(View view) { |
| 30 | 48 | ||
| 31 | startActivity(new Intent(this, TutorialScene1Activity.class)); | 49 | startActivity(new Intent(this, TutorialScene1Activity.class)); |
| 32 | finish(); | 50 | finish(); |
| 33 | } | 51 | } |
| 52 | + | ||
| 53 | + public boolean onLongClick(View view) { | ||
| 54 | + tts.speak(((TextView) view).getText(), TextToSpeech.QUEUE_FLUSH, null, null); | ||
| 55 | + return true; | ||
| 56 | + } | ||
| 57 | + | ||
| 58 | + @Override | ||
| 59 | + public void onDestroy() { | ||
| 60 | + if (tts != null) { | ||
| 61 | + tts.stop(); | ||
| 62 | + tts.shutdown(); | ||
| 63 | + } | ||
| 64 | + super.onDestroy(); | ||
| 65 | + } | ||
| 34 | } | 66 | } |
app/src/main/java/tonio/noa/ThemeActivity.java
| @@ -4,32 +4,75 @@ package tonio.noa; | @@ -4,32 +4,75 @@ package tonio.noa; | ||
| 4 | import android.app.Activity; | 4 | import android.app.Activity; |
| 5 | import android.content.Intent; | 5 | import android.content.Intent; |
| 6 | import android.os.Bundle; | 6 | import android.os.Bundle; |
| 7 | +import android.speech.tts.TextToSpeech; | ||
| 7 | import android.support.v7.app.AppCompatActivity; | 8 | import android.support.v7.app.AppCompatActivity; |
| 8 | import android.view.View; | 9 | import android.view.View; |
| 10 | +import android.widget.TextView; | ||
| 9 | 11 | ||
| 12 | +import java.util.Locale; | ||
| 10 | 13 | ||
| 11 | /** | 14 | /** |
| 12 | * Created by tonio on 16/11/17. | 15 | * Created by tonio on 16/11/17. |
| 13 | */ | 16 | */ |
| 14 | 17 | ||
| 15 | -public class ThemeActivity extends Activity { | 18 | +public class ThemeActivity extends Activity implements View.OnLongClickListener { |
| 16 | 19 | ||
| 17 | - protected void onCreate(Bundle savedInstanceState){ | 20 | + private TextToSpeech tts; |
| 21 | + | ||
| 22 | + protected void onCreate(Bundle savedInstanceState) { | ||
| 18 | 23 | ||
| 19 | super.onCreate(savedInstanceState); | 24 | super.onCreate(savedInstanceState); |
| 20 | setContentView(R.layout.theme_display); | 25 | setContentView(R.layout.theme_display); |
| 26 | + | ||
| 27 | + findViewById(R.id.button_id_health).setOnLongClickListener(this); | ||
| 28 | + findViewById(R.id.button_id_sociability).setOnLongClickListener(this); | ||
| 29 | + findViewById(R.id.button_id_security).setOnLongClickListener(this); | ||
| 30 | + findViewById(R.id.button_id_hygiene).setOnLongClickListener(this); | ||
| 31 | + findViewById(R.id.button_id_independence).setOnLongClickListener(this); | ||
| 32 | + findViewById(R.id.button_id_food).setOnLongClickListener(this); | ||
| 33 | + | ||
| 34 | + tts = new TextToSpeech(getApplicationContext(), new TextToSpeech.OnInitListener() { | ||
| 35 | + @Override | ||
| 36 | + public void onInit(int status) { | ||
| 37 | + if (status != TextToSpeech.ERROR) { | ||
| 38 | + tts.setLanguage(Locale.FRENCH); | ||
| 39 | + } | ||
| 40 | + } | ||
| 41 | + }); | ||
| 21 | } | 42 | } |
| 22 | 43 | ||
| 23 | - public void healthPage(View view){ | 44 | + @Override |
| 45 | + public boolean onLongClick(View view) { | ||
| 46 | + tts.speak(((TextView) view).getText(), TextToSpeech.QUEUE_FLUSH, null, null); | ||
| 47 | + return true; | ||
| 48 | + } | ||
| 49 | + | ||
| 50 | + public void healthPage(View view) { | ||
| 24 | 51 | ||
| 25 | startActivity(new Intent(this, HealthActivity.class)); | 52 | startActivity(new Intent(this, HealthActivity.class)); |
| 26 | } | 53 | } |
| 27 | - public void hygienePage(View view){ | 54 | + |
| 55 | + public void hygienePage(View view) { | ||
| 28 | 56 | ||
| 29 | startActivity(new Intent(this, Hygiene1Activity.class)); | 57 | startActivity(new Intent(this, Hygiene1Activity.class)); |
| 30 | } | 58 | } |
| 31 | - public void backHome(View view){ | ||
| 32 | 59 | ||
| 33 | - startActivity(new Intent( this, MainActivity.class)); | 60 | + public void foodPage(View view) { |
| 61 | + | ||
| 62 | + startActivity(new Intent(this, Food1Activity.class)); | ||
| 63 | + } | ||
| 64 | + | ||
| 65 | + public void backHome(View view) { | ||
| 66 | + | ||
| 67 | + startActivity(new Intent(this, MainActivity.class)); | ||
| 68 | + } | ||
| 69 | + | ||
| 70 | + @Override | ||
| 71 | + public void onDestroy() { | ||
| 72 | + if (tts != null) { | ||
| 73 | + tts.stop(); | ||
| 74 | + tts.shutdown(); | ||
| 75 | + } | ||
| 76 | + super.onDestroy(); | ||
| 34 | } | 77 | } |
| 35 | } | 78 | } |
157 KB
51 KB
88.7 KB
46.8 KB
129 KB
82.4 KB
254 KB
149 KB
343 KB
841 KB
app/src/main/res/layout/activity_main.xml
| @@ -2,17 +2,27 @@ | @@ -2,17 +2,27 @@ | ||
| 2 | <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 | android:layout_width="match_parent" | 3 | android:layout_width="match_parent" |
| 4 | android:layout_height="match_parent" | 4 | android:layout_height="match_parent" |
| 5 | - android:orientation="vertical"> | 5 | + android:background="@color/colorPrimary"> |
| 6 | + | ||
| 7 | + <ImageView | ||
| 8 | + android:layout_width="wrap_content" | ||
| 9 | + android:layout_height="wrap_content" | ||
| 10 | + android:layout_centerInParent="true" | ||
| 11 | + android:adjustViewBounds="true" | ||
| 12 | + android:maxWidth="580dp" | ||
| 13 | + android:src="@drawable/noa_bravo" /> | ||
| 6 | 14 | ||
| 7 | <Button | 15 | <Button |
| 8 | android:id="@+id/button_id_play" | 16 | android:id="@+id/button_id_play" |
| 9 | android:layout_width="wrap_content" | 17 | android:layout_width="wrap_content" |
| 10 | android:layout_height="wrap_content" | 18 | android:layout_height="wrap_content" |
| 11 | android:layout_alignParentStart="true" | 19 | android:layout_alignParentStart="true" |
| 12 | - android:layout_centerVertical="true" | ||
| 13 | - android:layout_marginStart="50dp" | 20 | + android:layout_marginStart="130dp" |
| 21 | + android:layout_marginTop="160dp" | ||
| 14 | android:onClick="themePage" | 22 | android:onClick="themePage" |
| 15 | - android:text="@string/play" /> | 23 | + android:padding="70dp" |
| 24 | + android:text="@string/play" | ||
| 25 | + android:textAppearance="@style/TextFont" /> | ||
| 16 | 26 | ||
| 17 | <Button | 27 | <Button |
| 18 | android:id="@+id/button_id_tutorial" | 28 | android:id="@+id/button_id_tutorial" |
| @@ -21,18 +31,20 @@ | @@ -21,18 +31,20 @@ | ||
| 21 | android:layout_alignBaseline="@+id/button_id_play" | 31 | android:layout_alignBaseline="@+id/button_id_play" |
| 22 | android:layout_alignBottom="@+id/button_id_play" | 32 | android:layout_alignBottom="@+id/button_id_play" |
| 23 | android:layout_alignParentEnd="true" | 33 | android:layout_alignParentEnd="true" |
| 24 | - android:layout_marginEnd="50dp" | 34 | + android:layout_marginEnd="130dp" |
| 25 | android:onClick="tutorialPage" | 35 | android:onClick="tutorialPage" |
| 26 | - android:text="@string/tutorial" /> | 36 | + android:padding="70dp" |
| 37 | + android:text="@string/tutorial" | ||
| 38 | + android:textAppearance="@style/TextFont" /> | ||
| 27 | 39 | ||
| 28 | <Button | 40 | <Button |
| 29 | android:id="@+id/button_id_configure" | 41 | android:id="@+id/button_id_configure" |
| 30 | android:layout_width="wrap_content" | 42 | android:layout_width="wrap_content" |
| 31 | android:layout_height="wrap_content" | 43 | android:layout_height="wrap_content" |
| 32 | - android:layout_alignEnd="@+id/button_id_play" | ||
| 33 | android:layout_alignParentBottom="true" | 44 | android:layout_alignParentBottom="true" |
| 34 | - android:layout_marginBottom="20dp" | 45 | + android:layout_margin="20dp" |
| 35 | android:onClick="configurePage" | 46 | android:onClick="configurePage" |
| 36 | - android:text="@string/configure" /> | 47 | + android:text="@string/configure" |
| 48 | + android:textAppearance="@style/TextFont" /> | ||
| 37 | 49 | ||
| 38 | </RelativeLayout> | 50 | </RelativeLayout> |
| @@ -0,0 +1,147 @@ | @@ -0,0 +1,147 @@ | ||
| 1 | +<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| 3 | + android:id="@+id/food1" | ||
| 4 | + android:layout_width="match_parent" | ||
| 5 | + android:layout_height="match_parent" | ||
| 6 | + android:orientation="vertical"> | ||
| 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" | ||
| 13 | + 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" /> | ||
| 30 | + | ||
| 31 | + </LinearLayout> | ||
| 32 | + | ||
| 33 | + <ImageView | ||
| 34 | + android:id="@+id/bacon" | ||
| 35 | + android:layout_width="wrap_content" | ||
| 36 | + android:layout_height="wrap_content" | ||
| 37 | + android:layout_alignParentStart="true" | ||
| 38 | + android:layout_alignParentTop="true" | ||
| 39 | + android:adjustViewBounds="true" | ||
| 40 | + android:maxWidth="200dp" | ||
| 41 | + android:src="@drawable/bacon" /> | ||
| 42 | + | ||
| 43 | + <ImageView | ||
| 44 | + android:id="@+id/apple" | ||
| 45 | + android:layout_width="wrap_content" | ||
| 46 | + android:layout_height="wrap_content" | ||
| 47 | + android:layout_alignParentTop="true" | ||
| 48 | + android:layout_toEndOf="@id/bacon" | ||
| 49 | + android:adjustViewBounds="true" | ||
| 50 | + android:maxWidth="190dp" | ||
| 51 | + android:src="@drawable/apple" /> | ||
| 52 | + | ||
| 53 | + <ImageView | ||
| 54 | + android:id="@+id/cake" | ||
| 55 | + android:layout_width="wrap_content" | ||
| 56 | + android:layout_height="wrap_content" | ||
| 57 | + android:layout_alignParentTop="true" | ||
| 58 | + android:layout_toEndOf="@id/apple" | ||
| 59 | + android:adjustViewBounds="true" | ||
| 60 | + android:maxWidth="190dp" | ||
| 61 | + android:src="@drawable/cake" /> | ||
| 62 | + | ||
| 63 | + <ImageView | ||
| 64 | + android:id="@+id/hot_dog" | ||
| 65 | + android:layout_width="wrap_content" | ||
| 66 | + android:layout_height="wrap_content" | ||
| 67 | + android:layout_alignParentTop="true" | ||
| 68 | + android:layout_toEndOf="@id/cake" | ||
| 69 | + android:adjustViewBounds="true" | ||
| 70 | + android:maxWidth="200dp" | ||
| 71 | + android:src="@drawable/hot_dog" /> | ||
| 72 | + | ||
| 73 | + <ImageView | ||
| 74 | + android:id="@+id/cheese" | ||
| 75 | + android:layout_width="wrap_content" | ||
| 76 | + android:layout_height="wrap_content" | ||
| 77 | + android:layout_above="@id/linear2" | ||
| 78 | + android:layout_alignParentStart="true" | ||
| 79 | + android:adjustViewBounds="true" | ||
| 80 | + android:maxWidth="200dp" | ||
| 81 | + android:src="@drawable/cheese" /> | ||
| 82 | + | ||
| 83 | + <ImageView | ||
| 84 | + android:id="@+id/muskmelon" | ||
| 85 | + android:layout_width="wrap_content" | ||
| 86 | + android:layout_height="wrap_content" | ||
| 87 | + android:layout_above="@id/linear2" | ||
| 88 | + android:layout_toEndOf="@id/cheese" | ||
| 89 | + android:adjustViewBounds="true" | ||
| 90 | + android:maxWidth="200dp" | ||
| 91 | + android:src="@drawable/muskmelon" /> | ||
| 92 | + | ||
| 93 | + <ImageView | ||
| 94 | + android:id="@+id/fries" | ||
| 95 | + android:layout_width="wrap_content" | ||
| 96 | + android:layout_height="wrap_content" | ||
| 97 | + android:layout_above="@id/linear2" | ||
| 98 | + android:layout_toEndOf="@id/muskmelon" | ||
| 99 | + android:adjustViewBounds="true" | ||
| 100 | + android:maxWidth="180dp" | ||
| 101 | + android:src="@drawable/fries" /> | ||
| 102 | + | ||
| 103 | + <ImageView | ||
| 104 | + android:id="@+id/muffin" | ||
| 105 | + android:layout_width="wrap_content" | ||
| 106 | + android:layout_height="wrap_content" | ||
| 107 | + android:layout_above="@id/linear2" | ||
| 108 | + android:layout_toEndOf="@id/fries" | ||
| 109 | + android:adjustViewBounds="true" | ||
| 110 | + android:maxWidth="200dp" | ||
| 111 | + android:src="@drawable/muffin" /> | ||
| 112 | + | ||
| 113 | + <LinearLayout | ||
| 114 | + android:id="@+id/linear2" | ||
| 115 | + android:layout_width="wrap_content" | ||
| 116 | + 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> | ||
| 146 | + | ||
| 147 | +</RelativeLayout> | ||
| 0 | \ No newline at end of file | 148 | \ No newline at end of file |
app/src/main/res/layout/hygiene1_display.xml
| @@ -46,6 +46,7 @@ | @@ -46,6 +46,7 @@ | ||
| 46 | android:layout_alignParentStart="true" | 46 | android:layout_alignParentStart="true" |
| 47 | android:layout_margin="20dp" | 47 | android:layout_margin="20dp" |
| 48 | android:onClick="backHome" | 48 | android:onClick="backHome" |
| 49 | + android:textAppearance="@style/TextFont" | ||
| 49 | android:text="@string/home" /> | 50 | android:text="@string/home" /> |
| 50 | 51 | ||
| 51 | <Button | 52 | <Button |
| @@ -56,5 +57,6 @@ | @@ -56,5 +57,6 @@ | ||
| 56 | android:layout_alignParentEnd="true" | 57 | android:layout_alignParentEnd="true" |
| 57 | android:layout_margin="20dp" | 58 | android:layout_margin="20dp" |
| 58 | android:onClick="enonceConsigne" | 59 | android:onClick="enonceConsigne" |
| 60 | + android:textAppearance="@style/TextFont" | ||
| 59 | android:text="@string/instruction" /> | 61 | android:text="@string/instruction" /> |
| 60 | </RelativeLayout> | 62 | </RelativeLayout> |
| 61 | \ No newline at end of file | 63 | \ No newline at end of file |
app/src/main/res/layout/hygiene2_display.xml
| @@ -45,6 +45,7 @@ | @@ -45,6 +45,7 @@ | ||
| 45 | android:layout_alignParentStart="true" | 45 | android:layout_alignParentStart="true" |
| 46 | android:layout_margin="20dp" | 46 | android:layout_margin="20dp" |
| 47 | android:onClick="backHome" | 47 | android:onClick="backHome" |
| 48 | + android:textAppearance="@style/TextFont" | ||
| 48 | android:text="@string/home" /> | 49 | android:text="@string/home" /> |
| 49 | 50 | ||
| 50 | <Button | 51 | <Button |
| @@ -55,5 +56,6 @@ | @@ -55,5 +56,6 @@ | ||
| 55 | android:layout_alignParentEnd="true" | 56 | android:layout_alignParentEnd="true" |
| 56 | android:layout_margin="20dp" | 57 | android:layout_margin="20dp" |
| 57 | android:onClick="enonceConsigne" | 58 | android:onClick="enonceConsigne" |
| 59 | + android:textAppearance="@style/TextFont" | ||
| 58 | android:text="@string/instruction" /> | 60 | android:text="@string/instruction" /> |
| 59 | </RelativeLayout> | 61 | </RelativeLayout> |
| 60 | \ No newline at end of file | 62 | \ No newline at end of file |
app/src/main/res/layout/hygiene3_display.xml
| @@ -45,6 +45,7 @@ | @@ -45,6 +45,7 @@ | ||
| 45 | android:layout_alignParentStart="true" | 45 | android:layout_alignParentStart="true" |
| 46 | android:layout_margin="20dp" | 46 | android:layout_margin="20dp" |
| 47 | android:onClick="backHome" | 47 | android:onClick="backHome" |
| 48 | + android:textAppearance="@style/TextFont" | ||
| 48 | android:text="@string/home" /> | 49 | android:text="@string/home" /> |
| 49 | 50 | ||
| 50 | <Button | 51 | <Button |
| @@ -55,5 +56,6 @@ | @@ -55,5 +56,6 @@ | ||
| 55 | android:layout_alignParentEnd="true" | 56 | android:layout_alignParentEnd="true" |
| 56 | android:layout_margin="20dp" | 57 | android:layout_margin="20dp" |
| 57 | android:onClick="enonceConsigne" | 58 | android:onClick="enonceConsigne" |
| 59 | + android:textAppearance="@style/TextFont" | ||
| 58 | android:text="@string/instruction" /> | 60 | android:text="@string/instruction" /> |
| 59 | </RelativeLayout> | 61 | </RelativeLayout> |
| 60 | \ No newline at end of file | 62 | \ No newline at end of file |
app/src/main/res/layout/hygiene4_display.xml
| @@ -133,6 +133,7 @@ | @@ -133,6 +133,7 @@ | ||
| 133 | android:layout_alignParentStart="true" | 133 | android:layout_alignParentStart="true" |
| 134 | android:layout_margin="20dp" | 134 | android:layout_margin="20dp" |
| 135 | android:onClick="backHome" | 135 | android:onClick="backHome" |
| 136 | + android:textAppearance="@style/TextFont" | ||
| 136 | android:text="@string/home" /> | 137 | android:text="@string/home" /> |
| 137 | 138 | ||
| 138 | <Button | 139 | <Button |
| @@ -143,5 +144,7 @@ | @@ -143,5 +144,7 @@ | ||
| 143 | android:layout_alignParentEnd="true" | 144 | android:layout_alignParentEnd="true" |
| 144 | android:layout_margin="20dp" | 145 | android:layout_margin="20dp" |
| 145 | android:onClick="enonceConsigne" | 146 | android:onClick="enonceConsigne" |
| 147 | + android:textAppearance="@style/TextFont" | ||
| 146 | android:text="@string/instruction" /> | 148 | android:text="@string/instruction" /> |
| 149 | + | ||
| 147 | </RelativeLayout> | 150 | </RelativeLayout> |
| 148 | \ No newline at end of file | 151 | \ No newline at end of file |
app/src/main/res/layout/hygiene5_display.xml
| @@ -86,6 +86,7 @@ | @@ -86,6 +86,7 @@ | ||
| 86 | android:layout_alignParentStart="true" | 86 | android:layout_alignParentStart="true" |
| 87 | android:layout_margin="20dp" | 87 | android:layout_margin="20dp" |
| 88 | android:onClick="backHome" | 88 | android:onClick="backHome" |
| 89 | + android:textAppearance="@style/TextFont" | ||
| 89 | android:text="@string/home" /> | 90 | android:text="@string/home" /> |
| 90 | 91 | ||
| 91 | <Button | 92 | <Button |
| @@ -96,6 +97,7 @@ | @@ -96,6 +97,7 @@ | ||
| 96 | android:layout_alignParentEnd="true" | 97 | android:layout_alignParentEnd="true" |
| 97 | android:layout_margin="20dp" | 98 | android:layout_margin="20dp" |
| 98 | android:onClick="enonceConsigne" | 99 | android:onClick="enonceConsigne" |
| 100 | + android:textAppearance="@style/TextFont" | ||
| 99 | android:text="@string/instruction" /> | 101 | android:text="@string/instruction" /> |
| 100 | 102 | ||
| 101 | </RelativeLayout> | 103 | </RelativeLayout> |
| 102 | \ No newline at end of file | 104 | \ No newline at end of file |
app/src/main/res/layout/hygiene6_display.xml
| @@ -67,7 +67,8 @@ | @@ -67,7 +67,8 @@ | ||
| 67 | android:layout_alignParentStart="true" | 67 | android:layout_alignParentStart="true" |
| 68 | android:layout_margin="20dp" | 68 | android:layout_margin="20dp" |
| 69 | android:onClick="backHome" | 69 | android:onClick="backHome" |
| 70 | - android:text="@string/home" /> | 70 | + android:text="@string/home" |
| 71 | + android:textAppearance="@style/TextFont" /> | ||
| 71 | 72 | ||
| 72 | <Button | 73 | <Button |
| 73 | android:id="@+id/announce_instruction" | 74 | android:id="@+id/announce_instruction" |
| @@ -77,6 +78,7 @@ | @@ -77,6 +78,7 @@ | ||
| 77 | android:layout_alignParentEnd="true" | 78 | android:layout_alignParentEnd="true" |
| 78 | android:layout_margin="20dp" | 79 | android:layout_margin="20dp" |
| 79 | android:onClick="enonceConsigne" | 80 | android:onClick="enonceConsigne" |
| 80 | - android:text="@string/instruction" /> | 81 | + android:text="@string/instruction" |
| 82 | + android:textAppearance="@style/TextFont" /> | ||
| 81 | 83 | ||
| 82 | </RelativeLayout> | 84 | </RelativeLayout> |
| 83 | \ No newline at end of file | 85 | \ No newline at end of file |
app/src/main/res/layout/theme_display.xml
| @@ -2,65 +2,94 @@ | @@ -2,65 +2,94 @@ | ||
| 2 | <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 | android:layout_width="match_parent" | 3 | android:layout_width="match_parent" |
| 4 | android:layout_height="match_parent" | 4 | android:layout_height="match_parent" |
| 5 | - android:orientation="vertical"> | 5 | + android:background="@color/colorPrimary"> |
| 6 | 6 | ||
| 7 | - <Button | ||
| 8 | - android:id="@+id/button_id_health" | ||
| 9 | - android:layout_width="wrap_content" | ||
| 10 | - android:layout_height="wrap_content" | ||
| 11 | - android:layout_alignParentLeft="true" | ||
| 12 | - android:layout_alignParentTop="true" | ||
| 13 | - android:onClick="healthPage" | ||
| 14 | - android:text="@string/health" /> | 7 | + <LinearLayout |
| 8 | + android:layout_width="match_parent" | ||
| 9 | + android:layout_height="match_parent" | ||
| 10 | + android:layout_above="@id/button_id_home" | ||
| 11 | + android:orientation="horizontal" | ||
| 12 | + android:weightSum="2"> | ||
| 15 | 13 | ||
| 16 | - <Button | ||
| 17 | - android:id="@+id/button_id_hygiene" | ||
| 18 | - android:layout_width="wrap_content" | ||
| 19 | - android:layout_height="wrap_content" | ||
| 20 | - android:layout_alignParentRight="true" | ||
| 21 | - android:layout_alignParentTop="true" | ||
| 22 | - android:onClick="hygienePage" | ||
| 23 | - android:text="@string/hygiene" /> | 14 | + <LinearLayout |
| 15 | + android:layout_width="0dp" | ||
| 16 | + android:layout_height="match_parent" | ||
| 17 | + android:layout_weight="1" | ||
| 18 | + android:orientation="vertical" | ||
| 19 | + android:weightSum="3"> | ||
| 24 | 20 | ||
| 25 | - <Button | ||
| 26 | - android:id="@+id/button_id_security" | ||
| 27 | - android:layout_width="wrap_content" | ||
| 28 | - android:layout_height="wrap_content" | ||
| 29 | - android:layout_alignParentLeft="true" | ||
| 30 | - android:layout_centerInParent="true" | ||
| 31 | - android:text="@string/security" /> | 21 | + <Button |
| 22 | + android:id="@+id/button_id_health" | ||
| 23 | + android:layout_width="match_parent" | ||
| 24 | + android:layout_height="0dp" | ||
| 25 | + android:layout_weight="1" | ||
| 26 | + android:onClick="healthPage" | ||
| 27 | + android:text="@string/health" | ||
| 28 | + android:textAppearance="@style/TextFont" /> | ||
| 32 | 29 | ||
| 33 | - <Button | ||
| 34 | - android:id="@+id/button_id_independence" | ||
| 35 | - android:layout_width="wrap_content" | ||
| 36 | - android:layout_height="wrap_content" | ||
| 37 | - android:layout_alignParentRight="true" | ||
| 38 | - android:layout_centerInParent="true" | ||
| 39 | - android:text="@string/independence" /> | 30 | + <Button |
| 31 | + android:id="@+id/button_id_security" | ||
| 32 | + android:layout_width="match_parent" | ||
| 33 | + android:layout_height="0dp" | ||
| 34 | + android:layout_weight="1" | ||
| 35 | + android:text="@string/security" | ||
| 36 | + android:textAppearance="@style/TextFont" /> | ||
| 40 | 37 | ||
| 41 | - <Button | ||
| 42 | - android:id="@+id/button_id_sociability" | ||
| 43 | - android:layout_width="wrap_content" | ||
| 44 | - android:layout_height="wrap_content" | ||
| 45 | - android:layout_alignParentBottom="true" | ||
| 46 | - android:layout_alignParentLeft="true" | ||
| 47 | - android:text="@string/sociability" /> | 38 | + <Button |
| 39 | + android:id="@+id/button_id_sociability" | ||
| 40 | + android:layout_width="match_parent" | ||
| 41 | + android:layout_height="0dp" | ||
| 42 | + android:layout_weight="1" | ||
| 43 | + android:text="@string/sociability" | ||
| 44 | + android:textAppearance="@style/TextFont" /> | ||
| 48 | 45 | ||
| 49 | - <Button | ||
| 50 | - android:id="@+id/button_id_anatomy" | ||
| 51 | - android:layout_width="wrap_content" | ||
| 52 | - android:layout_height="wrap_content" | ||
| 53 | - android:layout_alignParentBottom="true" | ||
| 54 | - android:layout_alignParentRight="true" | ||
| 55 | - android:text="@string/anatomy" /> | 46 | + </LinearLayout> |
| 47 | + | ||
| 48 | + <LinearLayout | ||
| 49 | + android:layout_width="0dp" | ||
| 50 | + android:layout_height="match_parent" | ||
| 51 | + android:layout_weight="1" | ||
| 52 | + android:orientation="vertical" | ||
| 53 | + android:weightSum="3"> | ||
| 54 | + | ||
| 55 | + <Button | ||
| 56 | + android:id="@+id/button_id_hygiene" | ||
| 57 | + android:layout_width="match_parent" | ||
| 58 | + android:layout_height="0dp" | ||
| 59 | + android:layout_weight="1" | ||
| 60 | + android:onClick="hygienePage" | ||
| 61 | + android:text="@string/hygiene" | ||
| 62 | + android:textAppearance="@style/TextFont" /> | ||
| 63 | + | ||
| 64 | + | ||
| 65 | + <Button | ||
| 66 | + android:id="@+id/button_id_independence" | ||
| 67 | + android:layout_width="match_parent" | ||
| 68 | + android:layout_height="0dp" | ||
| 69 | + android:layout_weight="1" | ||
| 70 | + android:text="@string/independence" | ||
| 71 | + android:textAppearance="@style/TextFont" /> | ||
| 72 | + | ||
| 73 | + | ||
| 74 | + <Button | ||
| 75 | + android:id="@+id/button_id_food" | ||
| 76 | + android:layout_width="match_parent" | ||
| 77 | + android:layout_height="0dp" | ||
| 78 | + android:layout_weight="1" | ||
| 79 | + android:onClick="foodPage" | ||
| 80 | + android:text="@string/food" | ||
| 81 | + android:textAppearance="@style/TextFont" /> | ||
| 82 | + | ||
| 83 | + </LinearLayout> | ||
| 84 | + </LinearLayout> | ||
| 56 | 85 | ||
| 57 | <Button | 86 | <Button |
| 58 | android:id="@+id/button_id_home" | 87 | android:id="@+id/button_id_home" |
| 59 | - android:layout_width="wrap_content" | 88 | + android:layout_width="match_parent" |
| 60 | android:layout_height="wrap_content" | 89 | android:layout_height="wrap_content" |
| 61 | android:layout_alignParentBottom="true" | 90 | android:layout_alignParentBottom="true" |
| 62 | - android:layout_centerInParent="true" | ||
| 63 | android:onClick="backHome" | 91 | android:onClick="backHome" |
| 64 | - android:text="@string/home" /> | 92 | + android:text="@string/home" |
| 93 | + android:textAppearance="@style/TextFont" /> | ||
| 65 | 94 | ||
| 66 | </RelativeLayout> | 95 | </RelativeLayout> |
| 67 | \ No newline at end of file | 96 | \ No newline at end of file |
app/src/main/res/layout/tutorial1_display.xml
| @@ -8,10 +8,10 @@ | @@ -8,10 +8,10 @@ | ||
| 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" | ||
| 12 | android:layout_alignParentBottom="true" | 11 | android:layout_alignParentBottom="true" |
| 13 | android:layout_centerHorizontal="true" | 12 | android:layout_centerHorizontal="true" |
| 14 | android:layout_margin="20dp" | 13 | android:layout_margin="20dp" |
| 14 | + android:maxWidth="650dp" | ||
| 15 | android:textAppearance="@style/TextFont" /> | 15 | android:textAppearance="@style/TextFont" /> |
| 16 | 16 | ||
| 17 | <ImageButton | 17 | <ImageButton |
| @@ -30,7 +30,8 @@ | @@ -30,7 +30,8 @@ | ||
| 30 | android:layout_alignParentStart="true" | 30 | android:layout_alignParentStart="true" |
| 31 | android:layout_margin="20dp" | 31 | android:layout_margin="20dp" |
| 32 | android:onClick="backHome" | 32 | android:onClick="backHome" |
| 33 | - android:text="@string/home" /> | 33 | + android:text="@string/home" |
| 34 | + android:textAppearance="@style/TextFont" /> | ||
| 34 | 35 | ||
| 35 | <Button | 36 | <Button |
| 36 | android:id="@+id/announce_instruction" | 37 | android:id="@+id/announce_instruction" |
| @@ -40,6 +41,7 @@ | @@ -40,6 +41,7 @@ | ||
| 40 | android:layout_alignParentEnd="true" | 41 | android:layout_alignParentEnd="true" |
| 41 | android:layout_margin="20dp" | 42 | android:layout_margin="20dp" |
| 42 | android:onClick="enonceConsigne" | 43 | android:onClick="enonceConsigne" |
| 43 | - android:text="@string/instruction" /> | 44 | + android:text="@string/instruction" |
| 45 | + android:textAppearance="@style/TextFont" /> | ||
| 44 | 46 | ||
| 45 | </RelativeLayout> | 47 | </RelativeLayout> |
| 46 | \ No newline at end of file | 48 | \ No newline at end of file |
app/src/main/res/layout/tutorial2_display.xml
| @@ -42,7 +42,8 @@ | @@ -42,7 +42,8 @@ | ||
| 42 | android:layout_alignParentStart="true" | 42 | android:layout_alignParentStart="true" |
| 43 | android:layout_margin="20dp" | 43 | android:layout_margin="20dp" |
| 44 | android:onClick="backHome" | 44 | android:onClick="backHome" |
| 45 | - android:text="@string/home" /> | 45 | + android:text="@string/home" |
| 46 | + android:textAppearance="@style/TextFont" /> | ||
| 46 | 47 | ||
| 47 | <Button | 48 | <Button |
| 48 | android:id="@+id/announce_instruction" | 49 | android:id="@+id/announce_instruction" |
| @@ -52,6 +53,7 @@ | @@ -52,6 +53,7 @@ | ||
| 52 | android:layout_alignParentEnd="true" | 53 | android:layout_alignParentEnd="true" |
| 53 | android:layout_margin="20dp" | 54 | android:layout_margin="20dp" |
| 54 | android:onClick="enonceConsigne" | 55 | android:onClick="enonceConsigne" |
| 55 | - android:text="@string/instruction" /> | 56 | + android:text="@string/instruction" |
| 57 | + android:textAppearance="@style/TextFont" /> | ||
| 56 | 58 | ||
| 57 | </RelativeLayout> | 59 | </RelativeLayout> |
| 58 | \ No newline at end of file | 60 | \ No newline at end of file |
app/src/main/res/layout/tutorial3_display.xml
| @@ -80,6 +80,7 @@ | @@ -80,6 +80,7 @@ | ||
| 80 | android:layout_alignParentStart="true" | 80 | android:layout_alignParentStart="true" |
| 81 | android:layout_margin="20dp" | 81 | android:layout_margin="20dp" |
| 82 | android:onClick="backHome" | 82 | android:onClick="backHome" |
| 83 | + android:textAppearance="@style/TextFont" | ||
| 83 | android:text="@string/home" /> | 84 | android:text="@string/home" /> |
| 84 | 85 | ||
| 85 | <Button | 86 | <Button |
| @@ -90,5 +91,7 @@ | @@ -90,5 +91,7 @@ | ||
| 90 | android:layout_alignParentEnd="true" | 91 | android:layout_alignParentEnd="true" |
| 91 | android:layout_margin="20dp" | 92 | android:layout_margin="20dp" |
| 92 | android:onClick="enonceConsigne" | 93 | android:onClick="enonceConsigne" |
| 94 | + android:textAppearance="@style/TextFont" | ||
| 93 | android:text="@string/instruction" /> | 95 | android:text="@string/instruction" /> |
| 96 | + | ||
| 94 | </RelativeLayout> | 97 | </RelativeLayout> |
| 95 | \ No newline at end of file | 98 | \ No newline at end of file |
app/src/main/res/layout/tutorial4_display.xml
| @@ -169,7 +169,8 @@ | @@ -169,7 +169,8 @@ | ||
| 169 | android:layout_alignParentStart="true" | 169 | android:layout_alignParentStart="true" |
| 170 | android:layout_margin="20dp" | 170 | android:layout_margin="20dp" |
| 171 | android:onClick="backHome" | 171 | android:onClick="backHome" |
| 172 | - android:text="@string/home" /> | 172 | + android:text="@string/home" |
| 173 | + android:textAppearance="@style/TextFont" /> | ||
| 173 | 174 | ||
| 174 | <Button | 175 | <Button |
| 175 | android:id="@+id/announce_instruction" | 176 | android:id="@+id/announce_instruction" |
| @@ -179,5 +180,6 @@ | @@ -179,5 +180,6 @@ | ||
| 179 | android:layout_alignParentEnd="true" | 180 | android:layout_alignParentEnd="true" |
| 180 | android:layout_margin="20dp" | 181 | android:layout_margin="20dp" |
| 181 | android:onClick="enonceConsigne" | 182 | android:onClick="enonceConsigne" |
| 182 | - android:text="@string/instruction" /> | 183 | + android:text="@string/instruction" |
| 184 | + android:textAppearance="@style/TextFont" /> | ||
| 183 | </RelativeLayout> | 185 | </RelativeLayout> |
| 184 | \ No newline at end of file | 186 | \ No newline at end of file |
app/src/main/res/layout/tutorial5_display.xml
| @@ -131,7 +131,8 @@ | @@ -131,7 +131,8 @@ | ||
| 131 | android:layout_alignParentStart="true" | 131 | android:layout_alignParentStart="true" |
| 132 | android:layout_margin="20dp" | 132 | android:layout_margin="20dp" |
| 133 | android:onClick="backHome" | 133 | android:onClick="backHome" |
| 134 | - android:text="@string/home" /> | 134 | + android:text="@string/home" |
| 135 | + android:textAppearance="@style/TextFont" /> | ||
| 135 | 136 | ||
| 136 | <Button | 137 | <Button |
| 137 | android:id="@+id/announce_instruction" | 138 | android:id="@+id/announce_instruction" |
| @@ -141,5 +142,6 @@ | @@ -141,5 +142,6 @@ | ||
| 141 | android:layout_alignParentEnd="true" | 142 | android:layout_alignParentEnd="true" |
| 142 | android:layout_margin="20dp" | 143 | android:layout_margin="20dp" |
| 143 | android:onClick="enonceConsigne" | 144 | android:onClick="enonceConsigne" |
| 144 | - android:text="@string/instruction" /> | 145 | + android:text="@string/instruction" |
| 146 | + android:textAppearance="@style/TextFont" /> | ||
| 145 | </RelativeLayout> | 147 | </RelativeLayout> |
| 146 | \ No newline at end of file | 148 | \ No newline at end of file |
app/src/main/res/values/strings.xml
| @@ -2,16 +2,17 @@ | @@ -2,16 +2,17 @@ | ||
| 2 | <string name="app_name">Noa</string> | 2 | <string name="app_name">Noa</string> |
| 3 | <string name="configure">Paramètres</string> | 3 | <string name="configure">Paramètres</string> |
| 4 | <string name="play">Jouer !</string> | 4 | <string name="play">Jouer !</string> |
| 5 | - <string name="health">santé</string> | ||
| 6 | - <string name="hygiene">hygiène</string> | ||
| 7 | - <string name="independence">autonomie</string> | ||
| 8 | - <string name="security">sécurité</string> | ||
| 9 | - <string name="sociability">sociabilité</string> | ||
| 10 | - <string name="anatomy">anatomie</string> | 5 | + <string name="health">Santé</string> |
| 6 | + <string name="hygiene">Hygiène</string> | ||
| 7 | + <string name="independence">Autonomie</string> | ||
| 8 | + <string name="security">Sécurité</string> | ||
| 9 | + <string name="sociability">Sociabilité</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">Lire consigne</string> |
| 17 | + <string name="food">Alimentation</string> | ||
| 17 | </resources> | 18 | </resources> |