activity consigne ajoutée lien entre bravo et next activity + uniformisation police

aarnaude
1 parent e5e6f3ef
Showing 12 changed files with 136 additions and 68 deletions Show diff stats
app/src/androidTest/java/tonio/noa/ExampleInstrumentedTest.java
app/src/main/AndroidManifest.xml
app/src/main/java/tonio/noa/ConsigneActivity.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/res/layout/bravo_display.xml
app/src/main/res/layout/consigne_display.xml
app/src/main/res/layout/tutorial1_display.xml
app/src/main/res/layout/tutorial2_display.xml
app/src/main/res/layout/tutorial3_display.xml
app/src/test/java/tonio/noa/ExampleUnitTest.java
@@ -1,26 +0,0 @@
-package tonio.noa;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("tonio.noa", appContext.getPackageName());
-    }
-}
@@ -76,6 +76,10 @@
             android:name=".BravoActivity"
             android:screenOrientation="userLandscape"></activity>
+        <activity
+            android:name=".ConsigneActivity"
+            android:screenOrientation="userLandscape"></activity>
+
     </application>
 </manifest>
 \ No newline at end of file
@@ -0,0 +1,35 @@
+package tonio.noa;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.TextView;
+
+/**
+ * Created by psyk on 22/01/18.
+ */
+
+public class ConsigneActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+        final Intent intent = getIntent();
+        setContentView(R.layout.consigne_display);
+        TextView consigneTxt = findViewById(R.id.consigne);
+        consigneTxt.setText(intent.getStringExtra("keyConsigne"));
+        View view = findViewById(R.id.consigne_view);
+        view.setOnTouchListener(new View.OnTouchListener() {
+
+                                    @Override
+                                    public boolean onTouch(View view,MotionEvent event) {
+                                        setResult(RESULT_OK,intent);
+                                        finish();
+                                        return true;
+                                    }
+                                });
+    }
+}
@@ -10,14 +10,23 @@ import android.os.Bundle;
 public class TutorialScene1Activity extends MyPlayActivity{
     @Override
-    protected void next() {
-        startActivity(new Intent(this, TutorialScene2Activity.class));
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Intent i = new Intent(this, ConsigneActivity.class);
+        i.putExtra("keyConsigne","Salut mon pote!\nJe suis Noa.\nTu peux m'aider ?\nRetrouve mon ballon de football.");
+        int requestCode = 0;
+        startActivityForResult(i,requestCode);
     }
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-
-        super.onCreate(savedInstanceState);
+    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.
+    }
+
+    @Override
+    protected void next() {
+        startActivity(new Intent(this, TutorialScene2Activity.class));
     }
 }
 \ No newline at end of file
@@ -21,11 +21,24 @@ public class TutorialScene2Activity extends MyPlayActivity implements View.OnTou
         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);
+
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        setContentView(R.layout.tutorial2_display);
         findViewById(R.id.blue_rectangle).setOnTouchListener(this);
         findViewById(R.id.blue_rectangle).setOnDragListener(this);
         findViewById(R.id.red_rectangle).setOnDragListener(this);
+        // do your stuff here after SecondActivity finished.
     }
+
     @Override
     public boolean onTouch(View view, MotionEvent event) {
         if (event.getAction() == MotionEvent.ACTION_DOWN) {
 package tonio.noa;
 import android.content.ClipData;
+import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.DragEvent;
@@ -20,6 +21,16 @@ public class TutorialScene3Activity extends MyPlayActivity implements View.OnTou
     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);
+
+    }
+
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
         setContentView(R.layout.tutorial3_display);
         findViewById(R.id.blue_rectangle31).setOnTouchListener(this);
@@ -106,5 +117,6 @@ public class TutorialScene3Activity extends MyPlayActivity implements View.OnTou
     @Override
     protected void next() {
+        this.backHome(null);
     }
 }
@@ -15,7 +15,7 @@
         android:layout_alignParentStart="true"
         android:layout_margin="20dp"
         android:adjustViewBounds="true"
-        android:maxWidth="400dp"
+        android:maxWidth="430dp"
         android:src="@drawable/noa_bravo" />
     <TextView
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/consigne_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clickable="true"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:orientation="vertical">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentStart="true"
+        android:layout_margin="20dp"
+        android:adjustViewBounds="true"
+        android:maxWidth="580dp"
+        android:src="@drawable/noa_consigne" />
+
+    <TextView
+        android:id="@+id/consigne"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="50dp"
+        android:layout_centerHorizontal="true"
+        android:gravity="center"
+        android:maxLines="4"
+        android:textAppearance="@style/TextFont"/>
+
+</RelativeLayout>
 \ No newline at end of file
@@ -7,24 +7,27 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
+        android:layout_alignParentBottom="true"
+        android:layout_margin="20dp"
         android:layout_centerHorizontal="true"
-        android:text="Bienvenue dans la scène 1 du tutoriel!" />
+        android:text="Clique sur le ballon de foot."
+        android:textAppearance="@style/TextFont" />
     <ImageButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:src="@drawable/ballondefoot"
-        android:onClick="bravoPage"/>
+        android:onClick="bravoPage"
+        android:src="@drawable/ballondefoot" />
     <Button
         android:id="@+id/button_id_home"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_margin="20dp"
         android:onClick="backHome"
         android:text="@string/home" />
@@ -8,25 +8,30 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="5dp"
+        android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
+        android:maxWidth="500dp"
+        android:layout_margin="20dp"
         android:text="Fais glisser le rectangle bleu sur le rectangle rouge."
-        android:textSize="15sp" />
+        android:textAppearance="@style/TextFont" />
     <ImageView
         android:id="@+id/blue_rectangle"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:layout_margin="50dp"
-        android:layout_centerHorizontal="true"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"
+        android:layout_margin="100dp"
         android:background="@drawable/blue_rectangle" />
     <ImageView
         android:id="@+id/red_rectangle"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:layout_centerInParent="true"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        android:layout_margin="100dp"
         android:background="@drawable/red_rectangle" />
     <Button
@@ -35,7 +40,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"
-        android:layout_margin="5dp"
+        android:layout_margin="10dp"
         android:onClick="backHome"
         android:text="@string/home" />
@@ -10,16 +10,16 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
+        android:layout_alignParentBottom="true"
         android:layout_margin="20dp"
-        android:text="Associe les carrés de même couleur ensemble."
-        android:textSize="15sp" />
+        android:text="Associe les carrés de même couleur."
+        android:textAppearance="@style/TextFont" />
     <ImageView
         android:id="@+id/blue_rectangle31"
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:layout_alignParentStart="true"
-        android:layout_below="@id/text3"
         android:layout_margin="50dp"
         android:background="@drawable/blue_rectangle" />
@@ -29,7 +29,6 @@
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:layout_alignParentEnd="true"
-        android:layout_below="@id/text3"
         android:layout_margin="50dp"
         android:background="@drawable/red_rectangle"
         android:nextFocusRight="@id/blue_rectangle31" />
@@ -1,17 +0,0 @@
-package tonio.noa;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
 \ No newline at end of file