modification de MyPlayActivity pour ajout methode lanceConsigne

aarnaude
1 parent 427a4dcd
Showing 14 changed files with 65 additions and 76 deletions Show diff stats
app/src/main/java/tonio/noa/BravoActivity.java
app/src/main/java/tonio/noa/Hygiene1Activity.java
app/src/main/java/tonio/noa/Hygiene2Activity.java
app/src/main/java/tonio/noa/Hygiene3Activity.java
app/src/main/java/tonio/noa/Hygiene4Activity.java
app/src/main/java/tonio/noa/MyPlayActivity.java
app/src/main/java/tonio/noa/TutorialScene1Activity.java
app/src/main/java/tonio/noa/TutorialScene2Activity.java
app/src/main/java/tonio/noa/TutorialScene3Activity.java
app/src/main/java/tonio/noa/TutorialScene4Activity.java
app/src/main/java/tonio/noa/TutorialScene5Activity.java
app/src/main/res/layout/bravo_display.xml
app/src/main/res/layout/tutorial1_display.xml
app/src/main/res/values/strings.xml
@@ -3,15 +3,20 @@ package tonio.noa;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.speech.tts.TextToSpeech;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.TextView;
  
+import java.util.Locale;
+
 /**
  * Created by tonio on 23/11/17.
  */
  
-public class BravoActivity extends Activity{
+public class BravoActivity extends Activity {
+
+    private TextToSpeech bravoSpk;
  
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -22,12 +27,31 @@ public class BravoActivity extends Activity{
         View view = findViewById(R.id.bravo_view);
         view.setOnTouchListener(new View.OnTouchListener() {
  
-                                    @Override
-                                    public boolean onTouch(View view,MotionEvent event) {
-                                        setResult(RESULT_OK,intent);
-                                        finish();
-                                        return true;
-                                    }
-                                });
+            @Override
+            public boolean onTouch(View view, MotionEvent event) {
+                setResult(RESULT_OK, intent);
+                finish();
+                return true;
+            }
+        });
+
+        bravoSpk = new TextToSpeech(getApplicationContext(), new TextToSpeech.OnInitListener() {
+            @Override
+            public void onInit(int status) {
+                if (status != TextToSpeech.ERROR) {
+                    bravoSpk.setLanguage(Locale.FRENCH);
+                    bravoSpk.speak(getString(R.string.bravotxt), TextToSpeech.QUEUE_FLUSH, null, null);
+                }
+            }
+        });
+    }
+
+    @Override
+    public void onDestroy() {
+        if (bravoSpk != null) {
+            bravoSpk.stop();
+            bravoSpk.shutdown();
+        }
+        super.onDestroy();
     }
 }
@@ -16,15 +16,8 @@ public class Hygiene1Activity extends MyPlayActivity implements View.OnTouchList
  
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.hygiene1_display);
-
-        Intent i = new Intent(this, ConsigneActivity.class);
-        i.putExtra("keyConsigne", "Salut!\nTu peux mettre la brosse à dent bleu\nsur son ombre ?");
-        int requestCode = 0;
-        startActivityForResult(i, requestCode);
-
+        lanceConsigne("Salut!\nTu peux mettre la brosse à dent bleu\nsur son ombre ?");
     }
  
     @Override
@@ -16,15 +16,8 @@ public class Hygiene2Activity extends MyPlayActivity implements View.OnTouchList
  
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.hygiene2_display);
-
-        Intent i = new Intent(this, ConsigneActivity.class);
-        i.putExtra("keyConsigne", "Maintenant met le dessin de la brosse à dent\nsur la photo de la brosse à dent.");
-        int requestCode = 0;
-        startActivityForResult(i, requestCode);
-
+        lanceConsigne("Maintenant met le dessin de la brosse à dent\nsur la photo de la brosse à dent.");
     }
  
     @Override
@@ -16,15 +16,8 @@ public class Hygiene3Activity extends MyPlayActivity implements View.OnTouchList
  
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.hygiene3_display);
-
-        Intent i = new Intent(this, ConsigneActivity.class);
-        i.putExtra("keyConsigne", "Tu peux mettre la brosse à dent bleu\nsur la rouge?");
-        int requestCode = 0;
-        startActivityForResult(i, requestCode);
-
+        lanceConsigne("Tu peux mettre la brosse à dent bleu\nsur la rouge?");
     }
  
     @Override
@@ -21,13 +21,8 @@ public class Hygiene4Activity extends MyPlayActivity implements View.OnTouchList
  
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
-        Intent i = new Intent(this, ConsigneActivity.class);
-        i.putExtra("keyConsigne", "Tu peux m'aider ?\nPrépare mes affaires de toilette.");
-        int requestCode = 0;
-        startActivityForResult(i, requestCode);
-
+        lanceConsigne("Tu peux m'aider ?\nPrépare mes affaires de toilette.");
     }
  
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
@@ -2,6 +2,8 @@ package tonio.noa;
  
 import android.app.Activity;
 import android.content.Intent;
+import android.os.Bundle;
+import android.speech.tts.TextToSpeech;
 import android.view.View;
 import android.widget.Toast;
  
@@ -13,18 +15,27 @@ import android.widget.Toast;
 public abstract class MyPlayActivity extends Activity {
  
     public static final int REQUEST_CODE = 1;
+    protected TextToSpeech tts;
  
     protected abstract void next();
  
-    protected void bravoPage(View view){
+    protected void bravoPage(View view) {
         startActivityForResult(new Intent(this, BravoActivity.class), REQUEST_CODE);
     }
+
+    protected void lanceConsigne(String cons) {
+        Intent i = new Intent(this, ConsigneActivity.class);
+        i.putExtra("keyConsigne", cons);
+        int requestCode = 0;
+        startActivityForResult(i, requestCode);
+    }
+
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data){
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         try {
             super.onActivityResult(requestCode, resultCode, data);
  
-            if (requestCode == REQUEST_CODE  && resultCode  == RESULT_OK) {
+            if (requestCode == REQUEST_CODE && resultCode == RESULT_OK) {
                 this.next();
                 finish();
             }
@@ -39,4 +50,5 @@ public abstract class MyPlayActivity extends Activity {
         startActivity(new Intent(this, MainActivity.class));
         finish();
     }
+
 }
@@ -7,22 +7,19 @@ import android.os.Bundle;
  * Created by tonio on 22/11/17.
  */
  
-public class TutorialScene1Activity extends MyPlayActivity{
+public class TutorialScene1Activity extends MyPlayActivity {
  
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Intent i = new Intent(this, ConsigneActivity.class);
-        i.putExtra("keyConsigne","Salut!\nJe suis Noa.\nTu peux retrouver mon ballon de football?\nTouche l'écran pour m'aider.");
-        int requestCode = 0;
-        startActivityForResult(i,requestCode);
+        lanceConsigne("Salut!\nJe suis Noa.\nTu peux retrouver mon ballon de football?\nTouche l'écran pour m'aider.");
     }
  
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         setContentView(R.layout.tutorial1_display);
-       // do your stuff here after SecondActivity finished.
+        // do your stuff here after SecondActivity finished.
     }
  
     @Override
@@ -17,15 +17,8 @@ public class TutorialScene2Activity extends MyPlayActivity implements View.OnTou
  
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.tutorial2_display);
-
-        Intent i = new Intent(this, ConsigneActivity.class);
-        i.putExtra("keyConsigne", "J'ai encore besoin de toi !\nMet le rectangle bleu sur le rouge.");
-        int requestCode = 0;
-        startActivityForResult(i, requestCode);
-
+        lanceConsigne("J'ai encore besoin de toi !\nMet le rectangle bleu sur le rouge.");
     }
  
     @Override
@@ -20,13 +20,8 @@ public class TutorialScene3Activity extends MyPlayActivity implements View.OnTou
  
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
-        Intent i = new Intent(this, ConsigneActivity.class);
-        i.putExtra("keyConsigne", "J'ai encore une nouvelle mission pour toi!\nTu dois associer les carrés de même couleur.");
-        int requestCode = 0;
-        startActivityForResult(i, requestCode);
-
+        lanceConsigne("J'ai encore une nouvelle mission pour toi!\nTu dois associer les carrés de même couleur.");
     }
  
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
@@ -86,7 +81,10 @@ public class TutorialScene3Activity extends MyPlayActivity implements View.OnTou
  
             // the drag and drop operation has concluded
             case DragEvent.ACTION_DRAG_ENDED:
-                if (win_counter == 3 && !done){done=true; bravoPage(v);}
+                if (win_counter == 3 && !done) {
+                    done = true;
+                    bravoPage(v);
+                }
                 break;
  
             //drag shadow has been released,the drag point is within the bounding box of the View
@@ -19,13 +19,8 @@ public class TutorialScene4Activity extends MyPlayActivity implements View.OnTou
  
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
-        Intent i = new Intent(this, ConsigneActivity.class);
-        i.putExtra("keyConsigne", "Tu peux mettre les petits carrés de couleurs sur les gros de la même couleur ?\nMerci !");
-        int requestCode = 0;
-        startActivityForResult(i, requestCode);
-
+        lanceConsigne("Tu peux mettre les petits carrés de couleurs sur les gros de la même couleur ?\nMerci !");
     }
  
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
@@ -16,13 +16,8 @@ public class TutorialScene5Activity extends MyPlayActivity implements View.OnTou
  
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-
         super.onCreate(savedInstanceState);
-        Intent i = new Intent(this, ConsigneActivity.class);
-        i.putExtra("keyConsigne", "Cette fois\ntu dois cliquer sur les carrés verts!\nC'est ta dernière mission ;)");
-        int requestCode = 0;
-        startActivityForResult(i, requestCode);
-
+        lanceConsigne("Cette fois\ntu dois cliquer sur les carrés verts!\nC'est ta dernière mission ;)");
     }
  
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
@@ -26,7 +26,7 @@
         android:layout_centerHorizontal="true"
         android:gravity="center"
         android:maxLines="3"
-        android:text="Bravo !\nTu as réussi la mission.\nClique sur l'écran pour continuer à jouer."
+        android:text="@string/bravotxt"
         android:textAppearance="@style/TextFont"/>
  
 </RelativeLayout>
 \ No newline at end of file
@@ -10,7 +10,7 @@
         android:layout_alignParentBottom="true"
         android:layout_margin="20dp"
         android:layout_centerHorizontal="true"
-        android:text="Clique sur le ballon de foot."
+        android:text="Touche le ballon de foot."
         android:textAppearance="@style/TextFont" />
  
     <ImageButton
@@ -12,4 +12,5 @@
     <string name="tutorial">tutoriel</string>
     <string name="home">Menu</string>
     <string name="theme">Thème</string>
+    <string name="bravotxt">Bravo ! Tu as réussi la mission. Clique sur l\'écran pour continuer à jouer.</string>
 </resources>