scène 4 : débogguée

scène 5 : fonctionelle

scène 4 : débogguée
scène 5 : fonctionelle
aarnaude
1 parent 48365340
Showing 3 changed files with 93 additions and 6 deletions Show diff stats
app/src/main/AndroidManifest.xml
app/src/main/java/tonio/noa/TutorialScene4Activity.java
app/src/main/java/tonio/noa/TutorialScene5Activity.java
@@ -82,6 +82,15 @@
         </activity>
         <activity
+            android:name=".TutorialScene5Activity"
+            android:parentActivityName=".TutorialScene4Activity"
+            android:screenOrientation="userLandscape">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".MainActivity" />
+        </activity>
+
+        <activity
             android:name=".BravoActivity"
             android:screenOrientation="userLandscape"></activity>
@@ -30,18 +30,20 @@ public class TutorialScene4Activity extends MyPlayActivity implements View.OnTou
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        setContentView(R.layout.tutorial3_display);
+        setContentView(R.layout.tutorial4_display);
         findViewById(R.id.blue_rectangle41).setOnTouchListener(this);
         findViewById(R.id.blue_rectangle42).setOnTouchListener(this);
         findViewById(R.id.blue_rectangle43).setOnTouchListener(this);
+        findViewById(R.id.blue_rectangle44).setOnTouchListener(this);
         findViewById(R.id.red_rectangle41).setOnTouchListener(this);
         findViewById(R.id.red_rectangle42).setOnTouchListener(this);
         findViewById(R.id.red_rectangle43).setOnTouchListener(this);
+        findViewById(R.id.red_rectangle44).setOnTouchListener(this);
         findViewById(R.id.green_rectangle41).setOnTouchListener(this);
         findViewById(R.id.green_rectangle42).setOnTouchListener(this);
         findViewById(R.id.green_rectangle43).setOnTouchListener(this);
-
+        findViewById(R.id.green_rectangle44).setOnTouchListener(this);
         findViewById(R.id.anchor_blue_rectangle).setOnDragListener(this);
         findViewById(R.id.anchor_red_rectangle).setOnDragListener(this);
@@ -49,12 +51,15 @@ public class TutorialScene4Activity extends MyPlayActivity implements View.OnTou
         findViewById(R.id.blue_rectangle41).setOnDragListener(this);
         findViewById(R.id.blue_rectangle42).setOnDragListener(this);
         findViewById(R.id.blue_rectangle43).setOnDragListener(this);
+        findViewById(R.id.blue_rectangle44).setOnDragListener(this);
         findViewById(R.id.red_rectangle41).setOnDragListener(this);
         findViewById(R.id.red_rectangle42).setOnDragListener(this);
         findViewById(R.id.red_rectangle43).setOnDragListener(this);
+        findViewById(R.id.red_rectangle44).setOnDragListener(this);
         findViewById(R.id.green_rectangle41).setOnDragListener(this);
         findViewById(R.id.green_rectangle42).setOnDragListener(this);
         findViewById(R.id.green_rectangle43).setOnDragListener(this);
+        findViewById(R.id.green_rectangle44).setOnDragListener(this);
     }
@@ -105,7 +110,8 @@ public class TutorialScene4Activity extends MyPlayActivity implements View.OnTou
                 if (v == findViewById(R.id.anchor_red_rectangle)) {
                     if (view == findViewById(R.id.red_rectangle41)
                             || view == findViewById(R.id.red_rectangle42)
-                            || view == findViewById(R.id.red_rectangle43)) {
+                            || view == findViewById(R.id.red_rectangle43)
+                            || view == findViewById(R.id.red_rectangle44)) {
                         //stop displaying the view where it was before it was dragged
                         view.setVisibility(View.INVISIBLE);
                         win_counter++;
@@ -113,7 +119,8 @@ public class TutorialScene4Activity extends MyPlayActivity implements View.OnTou
                 } else if (v == findViewById(R.id.anchor_blue_rectangle)) {
                     if (view == findViewById(R.id.blue_rectangle41)
                             || view == findViewById(R.id.blue_rectangle42)
-                            || view == findViewById(R.id.blue_rectangle43)) {
+                            || view == findViewById(R.id.blue_rectangle43)
+                            || view == findViewById(R.id.blue_rectangle44)) {
                         //stop displaying the view where it was before it was dragged
                         view.setVisibility(View.INVISIBLE);
                         win_counter++;
@@ -121,7 +128,8 @@ public class TutorialScene4Activity extends MyPlayActivity implements View.OnTou
                 } else if (v == findViewById(R.id.anchor_green_rectangle)) {
                     if (view == findViewById(R.id.green_rectangle41)
                             || view == findViewById(R.id.green_rectangle42)
-                            || view == findViewById(R.id.green_rectangle43)) {
+                            || view == findViewById(R.id.green_rectangle43)
+                            || view == findViewById(R.id.green_rectangle44)) {
                         //stop displaying the view where it was before it was dragged
                         view.setVisibility(View.INVISIBLE);
                         win_counter++;
@@ -134,6 +142,6 @@ public class TutorialScene4Activity extends MyPlayActivity implements View.OnTou
     @Override
     protected void next() {
-        this.backHome(null);
+        startActivity(new Intent(this, TutorialScene5Activity.class));
     }
 }
@@ -0,0 +1,70 @@
+package tonio.noa;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.MotionEvent;
+import android.view.View;
+
+/**
+ * Created by psyk on 24/01/18.
+ */
+
+public class TutorialScene5Activity extends MyPlayActivity implements View.OnTouchListener {
+
+    private int win_counter = 0;
+
+    @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);
+
+    }
+
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        setContentView(R.layout.tutorial5_display);
+
+        findViewById(R.id.blue_rectangle51).setOnTouchListener(this);
+        findViewById(R.id.blue_rectangle52).setOnTouchListener(this);
+        findViewById(R.id.blue_rectangle53).setOnTouchListener(this);
+        findViewById(R.id.blue_rectangle54).setOnTouchListener(this);
+        findViewById(R.id.red_rectangle51).setOnTouchListener(this);
+        findViewById(R.id.red_rectangle52).setOnTouchListener(this);
+        findViewById(R.id.red_rectangle53).setOnTouchListener(this);
+        findViewById(R.id.red_rectangle54).setOnTouchListener(this);
+        findViewById(R.id.green_rectangle51).setOnTouchListener(this);
+        findViewById(R.id.green_rectangle52).setOnTouchListener(this);
+        findViewById(R.id.green_rectangle53).setOnTouchListener(this);
+        findViewById(R.id.green_rectangle54).setOnTouchListener(this);
+
+    }
+
+    @Override
+    public boolean onTouch(View view, MotionEvent event) {
+        if (event.getAction() == MotionEvent.ACTION_DOWN) {
+            if (view == findViewById(R.id.green_rectangle51)
+                    || view == findViewById(R.id.green_rectangle52)
+                    || view == findViewById(R.id.green_rectangle53)
+                    || view == findViewById(R.id.green_rectangle54)) {
+                view.setVisibility(View.INVISIBLE);
+                win_counter++;
+            } else view.setBackgroundColor(0xff888888);
+            return true;
+        }
+        if (win_counter == 4) {
+            this.bravoPage(null);
+            return true;
+        } else
+            return false;
+    }
+
+    @Override
+    protected void next() {
+        this.backHome(null);
+    }
+}