Skip to content

Commit 47df545

Browse files
DylianBEGODylianBEGO
committed
Intégration du Super choix 1, 2 et 3
1 parent cf9c08c commit 47df545

File tree

10 files changed

+566
-13
lines changed

10 files changed

+566
-13
lines changed

‎gen/com/example/tiptopformation2/R.java‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,36 +21,43 @@ public static final class dimen {
2121
public static final int activity_vertical_margin=0x7f040001;
2222
}
2323
public static final class drawable {
24-
public static final int ic_launcher=0x7f020000;
25-
public static final int toxique=0x7f020001;
24+
public static final int flamme=0x7f020000;
25+
public static final int ic_launcher=0x7f020001;
26+
public static final int toxique=0x7f020002;
2627
}
2728
public static final class id {
28-
public static final int action_settings=0x7f080010;
29+
public static final int action_settings=0x7f080013;
2930
public static final int button1=0x7f080004;
3031
public static final int button2=0x7f080006;
3132
public static final int button3=0x7f080007;
3233
public static final int button4=0x7f080005;
3334
public static final int correct=0x7f080009;
34-
public static final int difficile=0x7f08000e;
35-
public static final int facile=0x7f08000c;
35+
public static final int difficile=0x7f080011;
36+
public static final int facile=0x7f08000f;
37+
public static final int home=0x7f08000b;
3638
public static final int incorrect=0x7f08000a;
37-
public static final int jouer=0x7f08000f;
38-
public static final int moyen=0x7f08000d;
39-
public static final int reponse=0x7f08000b;
39+
public static final int incorrect2=0x7f08000c;
40+
public static final int jouer=0x7f080012;
41+
public static final int moyen=0x7f080010;
42+
public static final int reponse=0x7f08000e;
4043
public static final int textView1=0x7f080002;
4144
public static final int textView2=0x7f080001;
4245
public static final int textView3=0x7f080003;
4346
public static final int valider=0x7f080000;
4447
public static final int zoneDepot=0x7f080008;
48+
public static final int zoneText=0x7f08000d;
4549
}
4650
public static final class layout {
4751
public static final int activity_culture_generale_jeu=0x7f030000;
4852
public static final int activity_home=0x7f030001;
4953
public static final int activity_quizz=0x7f030002;
5054
public static final int activity_super_choix_jeu=0x7f030003;
51-
public static final int quizz_resultat=0x7f030004;
52-
public static final int resultat_super_choix_jeu=0x7f030005;
53-
public static final int selectionner_level=0x7f030006;
55+
public static final int activity_super_choix_me1=0x7f030004;
56+
public static final int activity_super_choix_me2=0x7f030005;
57+
public static final int activity_super_choix_me3=0x7f030006;
58+
public static final int quizz_resultat=0x7f030007;
59+
public static final int resultat_super_choix_jeu=0x7f030008;
60+
public static final int selectionner_level=0x7f030009;
5461
}
5562
public static final class menu {
5663
public static final int culture_generale_jeu=0x7f070000;

‎project.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-15
14+
target=android-17

‎res/drawable-mdpi/flamme.jpg‎

249 KB
Loading

‎res/layout/activity_super_choix_jeu.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
android:paddingLeft="@dimen/activity_horizontal_margin"
88
android:paddingRight="@dimen/activity_horizontal_margin"
99
android:paddingTop="@dimen/activity_vertical_margin"
10-
tools:context=".MainActivity" >
10+
tools:context=".SuperChoixJeuME2" >
1111

1212
<TextView
1313
android:layout_width="fill_parent"

‎res/layout/activity_super_choix_me1.xml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:tools="http://schemas.android.com/tools"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent"
5+
android:orientation="vertical"
6+
android:paddingBottom="@dimen/activity_vertical_margin"
7+
android:paddingLeft="@dimen/activity_horizontal_margin"
8+
android:paddingRight="@dimen/activity_horizontal_margin"
9+
android:paddingTop="@dimen/activity_vertical_margin"
10+
tools:context=".SuperChoixJeuME1" >
11+
12+
<TextView
13+
android:layout_width="fill_parent"
14+
android:layout_height="wrap_content"
15+
android:layout_gravity="center_horizontal"
16+
android:text="Que signifie ce pictogramme ?"
17+
android:textSize="25sp"
18+
android:textStyle="bold" />
19+
20+
<ImageView
21+
android:layout_width="200dp"
22+
android:layout_height="200dp"
23+
android:layout_gravity="center_horizontal"
24+
android:layout_marginTop="40dp"
25+
android:src="@drawable/toxique" />
26+
27+
<Button
28+
android:id="@+id/zoneDepot"
29+
android:layout_width="200dp"
30+
android:layout_height="wrap_content"
31+
android:layout_gravity="center_horizontal"
32+
android:layout_marginTop="10dp"
33+
android:clickable="false" />
34+
35+
<Button
36+
android:id="@+id/correct"
37+
android:layout_width="200dp"
38+
android:layout_height="wrap_content"
39+
android:layout_gravity="center_horizontal"
40+
android:layout_marginTop="60dp"
41+
android:background="@android:color/holo_blue_light"
42+
android:text="Toxique" />
43+
44+
<Button
45+
android:id="@+id/incorrect"
46+
android:layout_width="200dp"
47+
android:layout_height="wrap_content"
48+
android:layout_gravity="center_horizontal"
49+
android:layout_marginTop="10dp"
50+
android:background="@android:color/holo_blue_light"
51+
android:text="Corrosif" />
52+
53+
<LinearLayout
54+
android:layout_width="fill_parent"
55+
android:layout_height="fill_parent"
56+
android:layout_marginTop="20dp"
57+
android:orientation="horizontal" >
58+
59+
<Button
60+
android:id="@+id/home"
61+
android:layout_width="100dp"
62+
android:layout_height="100dp"
63+
android:layout_gravity="bottom"
64+
android:background="@android:color/holo_red_light"
65+
android:text="Menu"
66+
android:textColor="@android:color/white"
67+
android:textSize="30sp" />
68+
69+
<Button
70+
android:id="@+id/valider"
71+
android:layout_width="100dp"
72+
android:layout_height="100dp"
73+
android:layout_gravity="bottom"
74+
android:layout_marginLeft="350dp"
75+
android:background="@android:color/holo_green_light"
76+
android:text="Valider"
77+
android:textColor="@android:color/white"
78+
android:textSize="30sp" />
79+
</LinearLayout>
80+
81+
</LinearLayout>

‎res/layout/activity_super_choix_me2.xml‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:tools="http://schemas.android.com/tools"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent"
5+
android:orientation="vertical"
6+
android:paddingBottom="@dimen/activity_vertical_margin"
7+
android:paddingLeft="@dimen/activity_horizontal_margin"
8+
android:paddingRight="@dimen/activity_horizontal_margin"
9+
android:paddingTop="@dimen/activity_vertical_margin"
10+
tools:context=".SuperChoixJeuME2" >
11+
12+
<TextView
13+
android:layout_width="fill_parent"
14+
android:layout_height="wrap_content"
15+
android:layout_gravity="center_horizontal"
16+
android:text="Que signifie ce pictogramme ?"
17+
android:textSize="25sp"
18+
android:textStyle="bold" />
19+
20+
<ImageView
21+
android:layout_width="200dp"
22+
android:layout_height="200dp"
23+
android:layout_gravity="center_horizontal"
24+
android:layout_marginTop="40dp"
25+
android:src="@drawable/flamme" />
26+
27+
<Button
28+
android:id="@+id/zoneDepot"
29+
android:layout_width="200dp"
30+
android:layout_height="wrap_content"
31+
android:layout_gravity="center_horizontal"
32+
android:layout_marginTop="10dp"
33+
android:clickable="false" />
34+
35+
<Button
36+
android:id="@+id/correct"
37+
android:layout_width="200dp"
38+
android:layout_height="wrap_content"
39+
android:layout_gravity="center_horizontal"
40+
android:layout_marginTop="60dp"
41+
android:background="@android:color/holo_blue_light"
42+
android:text="Inflammable" />
43+
44+
<Button
45+
android:id="@+id/incorrect"
46+
android:layout_width="200dp"
47+
android:layout_height="wrap_content"
48+
android:layout_gravity="center_horizontal"
49+
android:layout_marginTop="10dp"
50+
android:background="@android:color/holo_blue_light"
51+
android:text="Corrosif" />
52+
53+
<Button
54+
android:id="@+id/incorrect2"
55+
android:layout_width="200dp"
56+
android:layout_height="wrap_content"
57+
android:layout_gravity="center_horizontal"
58+
android:layout_marginTop="10dp"
59+
android:background="@android:color/holo_blue_light"
60+
android:text="Toxique" />
61+
62+
<LinearLayout
63+
android:layout_width="fill_parent"
64+
android:layout_height="fill_parent"
65+
android:orientation="horizontal"
66+
android:layout_marginTop="20dp">
67+
68+
<Button
69+
android:id="@+id/home"
70+
android:layout_width="100dp"
71+
android:layout_height="100dp"
72+
android:layout_gravity="bottom"
73+
android:background="@android:color/holo_red_light"
74+
android:text="Menu"
75+
android:textColor="@android:color/white"
76+
android:textSize="30sp" />
77+
78+
<Button
79+
android:id="@+id/valider"
80+
android:layout_width="100dp"
81+
android:layout_height="100dp"
82+
android:background="@android:color/holo_green_light"
83+
android:layout_gravity="bottom"
84+
android:layout_marginLeft="350dp"
85+
android:text="Valider"
86+
android:textColor="@android:color/white"
87+
android:textSize="30sp" />
88+
89+
</LinearLayout>
90+
91+
</LinearLayout>

‎res/layout/activity_super_choix_me3.xml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:tools="http://schemas.android.com/tools"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent"
5+
android:orientation="vertical"
6+
android:paddingBottom="@dimen/activity_vertical_margin"
7+
android:paddingLeft="@dimen/activity_horizontal_margin"
8+
android:paddingRight="@dimen/activity_horizontal_margin"
9+
android:paddingTop="@dimen/activity_vertical_margin"
10+
tools:context=".SuperChoixJeuME3" >
11+
12+
<TextView
13+
android:layout_width="fill_parent"
14+
android:layout_height="wrap_content"
15+
android:layout_gravity="center_horizontal"
16+
android:text="Que signifie ce pictogramme ?"
17+
android:textSize="25sp"
18+
android:textStyle="bold" />
19+
20+
<ImageView
21+
android:layout_width="200dp"
22+
android:layout_height="200dp"
23+
android:layout_gravity="center_horizontal"
24+
android:layout_marginTop="40dp"
25+
android:src="@drawable/flamme" />
26+
27+
<EditText
28+
android:id="@+id/zoneText"
29+
android:layout_width="200dp"
30+
android:layout_height="wrap_content"
31+
android:layout_gravity="center_horizontal"
32+
android:layout_marginTop="10dp"
33+
android:hint="Cliquez ici"
34+
android:inputType="textCapWords"/>
35+
36+
<LinearLayout
37+
android:layout_width="fill_parent"
38+
android:layout_height="fill_parent"
39+
android:layout_marginTop="20dp"
40+
android:orientation="horizontal" >
41+
42+
<Button
43+
android:id="@+id/home"
44+
android:layout_width="100dp"
45+
android:layout_height="100dp"
46+
android:layout_gravity="bottom"
47+
android:background="@android:color/holo_red_light"
48+
android:text="Menu"
49+
android:textColor="@android:color/white"
50+
android:textSize="30sp" />
51+
52+
<Button
53+
android:id="@+id/valider"
54+
android:layout_width="100dp"
55+
android:layout_height="100dp"
56+
android:layout_gravity="bottom"
57+
android:layout_marginLeft="100dp"
58+
android:background="@android:color/holo_green_light"
59+
android:text="Valider"
60+
android:textColor="@android:color/white"
61+
android:textSize="30sp" />
62+
</LinearLayout>
63+
64+
</LinearLayout>

0 commit comments

Comments
 (0)