From 4836534062c370cfe560eca75d3baf3983e1afed Mon Sep 17 00:00:00 2001
From: aarnaude <antoine.arnaudet@polytech-lille.net>
Date: Wed, 24 Jan 2018 16:43:31 +0100
Subject: [PATCH] ajout scène 4 tri : bug/ne se lance pas ajout scène 5 selection parmi plusieurs choix : seulement interface graphique

---
 app/src/main/AndroidManifest.xml                        |  11 ++++++++++-
 app/src/main/java/tonio/noa/TutorialScene3Activity.java |   2 +-
 app/src/main/java/tonio/noa/TutorialScene4Activity.java | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app/src/main/java/tonio/noa/TutorialScene5Activity.java |   0
 app/src/main/res/layout/tutorial4_display.xml           | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app/src/main/res/layout/tutorial5_display.xml           | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 460 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/tonio/noa/TutorialScene4Activity.java
 create mode 100644 app/src/main/java/tonio/noa/TutorialScene5Activity.java
 create mode 100644 app/src/main/res/layout/tutorial4_display.xml
 create mode 100644 app/src/main/res/layout/tutorial5_display.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e8acebd..5b80ff7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -65,7 +65,16 @@
 
         <activity
             android:name=".TutorialScene3Activity"
-            android:parentActivityName=".TutorialScene1Activity"
+            android:parentActivityName=".TutorialScene2Activity"
+            android:screenOrientation="userLandscape">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".MainActivity" />
+        </activity>
+
+        <activity
+            android:name=".TutorialScene4Activity"
+            android:parentActivityName=".TutorialScene3Activity"
             android:screenOrientation="userLandscape">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/app/src/main/java/tonio/noa/TutorialScene3Activity.java b/app/src/main/java/tonio/noa/TutorialScene3Activity.java
index d768768..4ac58c1 100644
--- a/app/src/main/java/tonio/noa/TutorialScene3Activity.java
+++ b/app/src/main/java/tonio/noa/TutorialScene3Activity.java
@@ -117,6 +117,6 @@ public class TutorialScene3Activity extends MyPlayActivity implements View.OnTou
 
     @Override
     protected void next() {
-        this.backHome(null);
+        startActivity(new Intent(this, TutorialScene4Activity.class));
     }
 }
diff --git a/app/src/main/java/tonio/noa/TutorialScene4Activity.java b/app/src/main/java/tonio/noa/TutorialScene4Activity.java
new file mode 100644
index 0000000..88c43bc
--- /dev/null
+++ b/app/src/main/java/tonio/noa/TutorialScene4Activity.java
@@ -0,0 +1,139 @@
+package tonio.noa;
+
+import android.content.ClipData;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.DragEvent;
+import android.view.MotionEvent;
+import android.view.View;
+
+/**
+ * Created by psyk on 24/01/18.
+ */
+
+public class TutorialScene4Activity extends MyPlayActivity implements View.OnTouchListener, View.OnDragListener {
+
+    private int win_counter = 0;
+
+    @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 mon pote!");
+        int requestCode = 0;
+        startActivityForResult(i, requestCode);
+
+    }
+
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        setContentView(R.layout.tutorial3_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.red_rectangle41).setOnTouchListener(this);
+        findViewById(R.id.red_rectangle42).setOnTouchListener(this);
+        findViewById(R.id.red_rectangle43).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.anchor_blue_rectangle).setOnDragListener(this);
+        findViewById(R.id.anchor_red_rectangle).setOnDragListener(this);
+        findViewById(R.id.anchor_green_rectangle).setOnDragListener(this);
+        findViewById(R.id.blue_rectangle41).setOnDragListener(this);
+        findViewById(R.id.blue_rectangle42).setOnDragListener(this);
+        findViewById(R.id.blue_rectangle43).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.green_rectangle41).setOnDragListener(this);
+        findViewById(R.id.green_rectangle42).setOnDragListener(this);
+        findViewById(R.id.green_rectangle43).setOnDragListener(this);
+
+    }
+
+    @Override
+    public boolean onTouch(View view, MotionEvent event) {
+        if (event.getAction() == MotionEvent.ACTION_DOWN) {
+
+            View.DragShadowBuilder shadowBuilder = new View.DragShadowBuilder(view);
+            ClipData data = ClipData.newPlainText("id", view.getResources().getResourceEntryName(view.getId()));
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                view.startDragAndDrop(data, shadowBuilder, view, 0);
+            } else {
+                view.startDrag(data, shadowBuilder, view, 0);
+            }
+            return true;
+        } else
+            return false;
+    }
+
+    @Override
+    public boolean onDrag(View v, DragEvent event) {
+        switch (event.getAction()) {
+            // signal for the start of a drag and drop operation
+            case DragEvent.ACTION_DRAG_STARTED:
+                // do nothing
+                break;
+
+            // the drag point has entered the bounding box of the View
+            case DragEvent.ACTION_DRAG_ENTERED:
+                // do nothing
+                break;
+
+            // the user has moved the drag shadow outside the bounding box of the View
+            case DragEvent.ACTION_DRAG_EXITED:
+                // do nothing
+                break;
+
+            // the drag and drop operation has concluded
+            case DragEvent.ACTION_DRAG_ENDED:
+                if (win_counter == 12) bravoPage(v);
+                break;
+
+            //drag shadow has been released,the drag point is within the bounding box of the View
+            case DragEvent.ACTION_DROP:
+                //handle the dragged view being dropped over a target view
+                View view = (View) event.getLocalState();
+                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)) {
+                        //stop displaying the view where it was before it was dragged
+                        view.setVisibility(View.INVISIBLE);
+                        win_counter++;
+                    }
+                } 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)) {
+                        //stop displaying the view where it was before it was dragged
+                        view.setVisibility(View.INVISIBLE);
+                        win_counter++;
+                    }
+                } 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)) {
+                        //stop displaying the view where it was before it was dragged
+                        view.setVisibility(View.INVISIBLE);
+                        win_counter++;
+                    }
+                }
+                break;
+        }
+        return true;
+    }
+
+    @Override
+    protected void next() {
+        this.backHome(null);
+    }
+}
diff --git a/app/src/main/java/tonio/noa/TutorialScene5Activity.java b/app/src/main/java/tonio/noa/TutorialScene5Activity.java
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/app/src/main/java/tonio/noa/TutorialScene5Activity.java
diff --git a/app/src/main/res/layout/tutorial4_display.xml b/app/src/main/res/layout/tutorial4_display.xml
new file mode 100644
index 0000000..f05ed51
--- /dev/null
+++ b/app/src/main/res/layout/tutorial4_display.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/tut4"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/linear51"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:weightSum="3">
+
+        <ImageView
+            android:id="@+id/anchor_blue_rectangle"
+            android:layout_width="match_parent"
+            android:layout_height="300dp"
+            android:layout_weight="1"
+            android:background="@drawable/blue_rectangle" />
+
+
+        <ImageView
+            android:id="@+id/anchor_red_rectangle"
+            android:layout_width="match_parent"
+            android:layout_height="300dp"
+            android:layout_weight="1"
+            android:background="@drawable/red_rectangle"
+            android:nextFocusRight="@id/anchor_blue_rectangle" />
+
+        <ImageView
+            android:id="@+id/anchor_green_rectangle"
+            android:layout_width="match_parent"
+            android:layout_height="300dp"
+            android:layout_weight="1"
+            android:background="@drawable/green_rectangle"
+            android:nextFocusRight="@id/anchor_red_rectangle" />
+
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/blue_rectangle41"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_alignParentStart="true"
+        android:layout_below="@id/linear51"
+        android:layout_margin="50dp"
+        android:background="@drawable/blue_rectangle" />
+
+
+    <ImageView
+        android:id="@+id/red_rectangle41"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_below="@id/linear51"
+        android:layout_margin="50dp"
+        android:layout_toEndOf="@id/blue_rectangle41"
+        android:background="@drawable/red_rectangle" />
+
+    <ImageView
+        android:id="@+id/green_rectangle41"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_below="@id/linear51"
+        android:layout_margin="50dp"
+        android:layout_toEndOf="@id/red_rectangle41"
+        android:background="@drawable/green_rectangle" />
+
+    <ImageView
+        android:id="@+id/blue_rectangle42"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_below="@id/linear51"
+        android:layout_margin="50dp"
+        android:layout_toEndOf="@id/green_rectangle41"
+        android:background="@drawable/blue_rectangle" />
+
+
+    <ImageView
+        android:id="@+id/red_rectangle42"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_below="@id/linear51"
+        android:layout_margin="50dp"
+        android:layout_toEndOf="@id/blue_rectangle42"
+        android:background="@drawable/red_rectangle" />
+
+    <ImageView
+        android:id="@+id/green_rectangle42"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_below="@id/linear51"
+        android:layout_margin="50dp"
+        android:layout_toEndOf="@id/red_rectangle42"
+        android:background="@drawable/green_rectangle" />
+
+
+    <ImageView
+        android:id="@+id/red_rectangle43"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_alignParentStart="true"
+        android:layout_below="@id/blue_rectangle41"
+        android:layout_margin="50dp"
+        android:background="@drawable/red_rectangle" />
+
+    <ImageView
+        android:id="@+id/green_rectangle43"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_below="@id/blue_rectangle41"
+        android:layout_margin="50dp"
+        android:layout_toEndOf="@id/red_rectangle43"
+        android:background="@drawable/green_rectangle" />
+
+    <ImageView
+        android:id="@+id/blue_rectangle43"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_below="@id/blue_rectangle41"
+        android:layout_margin="50dp"
+        android:layout_toEndOf="@id/green_rectangle43"
+        android:background="@drawable/blue_rectangle" />
+
+
+    <ImageView
+        android:id="@+id/red_rectangle44"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_below="@id/blue_rectangle41"
+        android:layout_margin="50dp"
+        android:layout_toEndOf="@id/blue_rectangle43"
+        android:background="@drawable/red_rectangle" />
+
+    <ImageView
+        android:id="@+id/green_rectangle44"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_below="@id/blue_rectangle41"
+        android:layout_margin="50dp"
+        android:layout_toEndOf="@id/red_rectangle44"
+        android:background="@drawable/green_rectangle" />
+
+
+    <ImageView
+        android:id="@+id/blue_rectangle44"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_below="@id/blue_rectangle41"
+        android:layout_margin="50dp"
+        android:layout_toEndOf="@id/green_rectangle44"
+        android:background="@drawable/blue_rectangle" />
+
+    <TextView
+        android:id="@+id/text4"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_margin="20dp"
+        android:text="Met les carrés dans les cases correspondantes."
+        android:textAppearance="@style/TextFont" />
+
+
+    <Button
+        android:id="@+id/button_id_home"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentStart="true"
+        android:layout_margin="5dp"
+        android:onClick="backHome"
+        android:text="@string/home" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tutorial5_display.xml b/app/src/main/res/layout/tutorial5_display.xml
new file mode 100644
index 0000000..1e7f5ec
--- /dev/null
+++ b/app/src/main/res/layout/tutorial5_display.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/tut5"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/blue_rectangle51"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_alignParentStart="true"
+        android:layout_margin="50dp"
+        android:background="@drawable/blue_rectangle" />
+
+
+    <ImageView
+        android:id="@+id/red_rectangle51"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_margin="50dp"
+        android:layout_toEndOf="@id/blue_rectangle51"
+        android:background="@drawable/red_rectangle" />
+
+    <ImageView
+        android:id="@+id/green_rectangle51"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_margin="50dp"
+        android:layout_toEndOf="@id/red_rectangle51"
+        android:background="@drawable/green_rectangle" />
+
+    <ImageView
+        android:id="@+id/blue_rectangle52"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_margin="50dp"
+        android:layout_toEndOf="@id/green_rectangle51"
+        android:background="@drawable/blue_rectangle" />
+
+
+    <ImageView
+        android:id="@+id/red_rectangle52"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_margin="50dp"
+        android:layout_toEndOf="@id/blue_rectangle52"
+        android:background="@drawable/red_rectangle" />
+
+    <ImageView
+        android:id="@+id/green_rectangle52"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_margin="50dp"
+        android:layout_toEndOf="@id/red_rectangle52"
+        android:background="@drawable/green_rectangle" />
+
+
+    <ImageView
+        android:id="@+id/red_rectangle53"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_alignParentStart="true"
+        android:layout_below="@id/blue_rectangle51"
+        android:layout_margin="50dp"
+        android:background="@drawable/red_rectangle" />
+
+    <ImageView
+        android:id="@+id/green_rectangle53"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_below="@id/blue_rectangle51"
+        android:layout_margin="50dp"
+        android:layout_toEndOf="@id/red_rectangle53"
+        android:background="@drawable/green_rectangle" />
+
+    <ImageView
+        android:id="@+id/blue_rectangle53"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_below="@id/blue_rectangle51"
+        android:layout_margin="50dp"
+        android:layout_toEndOf="@id/green_rectangle53"
+        android:background="@drawable/blue_rectangle" />
+
+
+    <ImageView
+        android:id="@+id/red_rectangle54"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_below="@id/blue_rectangle51"
+        android:layout_margin="50dp"
+        android:layout_toEndOf="@id/blue_rectangle53"
+        android:background="@drawable/red_rectangle" />
+
+    <ImageView
+        android:id="@+id/green_rectangle54"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_below="@id/blue_rectangle51"
+        android:layout_margin="50dp"
+        android:layout_toEndOf="@id/red_rectangle54"
+        android:background="@drawable/green_rectangle" />
+
+
+    <ImageView
+        android:id="@+id/blue_rectangle54"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_below="@id/blue_rectangle51"
+        android:layout_margin="50dp"
+        android:layout_toEndOf="@id/green_rectangle54"
+        android:background="@drawable/blue_rectangle" />
+
+    <TextView
+        android:id="@+id/text4"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_margin="20dp"
+        android:text="Clique sur les carrés verts."
+        android:textAppearance="@style/TextFont" />
+
+
+    <Button
+        android:id="@+id/button_id_home"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentStart="true"
+        android:layout_margin="5dp"
+        android:onClick="backHome"
+        android:text="@string/home" />
+
+</RelativeLayout>
\ No newline at end of file
--
libgit2 0.21.2