commit 21fb8ba2ca3f5fca57995123ba9cf71a301e0217
parent 984d28890cf2cba1cc05def7b7744745b3296a62
Author: Georges Dupéron <jahvascriptmaniac+github@free.fr>
Date: Thu, 27 Jan 2011 19:12:07 +0100
Merge branch 'master' of https://github.com/jsmaniac/2011-m1s2-ter
Conflicts:
code/PtiClic/AndroidManifest.xml
code/PtiClic/res/layout/main.xml
code/PtiClic/src/org/pticlic/Main.java
Diffstat:
5 files changed, 129 insertions(+), 6 deletions(-)
diff --git a/code/PtiClic/AndroidManifest.xml b/code/PtiClic/AndroidManifest.xml
@@ -13,7 +13,9 @@
<activity android:name=".Preference" android:label="Préférence"></activity>
<activity android:name=".Game"></activity>
+ <activity android:name=".Info" android:label="Information"></activity>
+ <activity android:name=".Score" android:label="Score"></activity>
</application>
-</manifest>
-\ No newline at end of file
+</manifest>
diff --git a/code/PtiClic/res/layout/main.xml b/code/PtiClic/res/layout/main.xml
@@ -19,8 +19,13 @@
android:layout_width="wrap_content" android:id="@+id/prefs"
android:text="@string/prefs_name" android:layout_below="@+id/play"
android:layout_alignLeft="@+id/play" android:layout_alignRight="@+id/play" />
-
-
+ <!-- A SUPPRIMER : -->
+ <Button android:layout_height="wrap_content"
+ android:layout_width="wrap_content" android:id="@+id/voirscore"
+ android:text="Voir score" android:layout_below="@+id/prefs"
+ android:layout_alignLeft="@+id/prefs"
+ android:layout_alignRight="@+id/prefs" />
+ <!-- FIN A SUPPRIMER -->
</RelativeLayout>
<LinearLayout android:id="@+id/LinearLayout01"
@@ -31,8 +36,8 @@
android:layout_width="fill_parent"
android:textStyle="bold"
android:gravity="center_horizontal" android:text="@+id/login" android:id="@+id/login"></TextView>
- <ImageView android:layout_height="wrap_content" android:id="@+id/info"
- android:layout_width="wrap_content" android:src="@android:drawable/ic_dialog_info" android:layout_gravity="right" android:layout_weight="5"></ImageView>
+ <ImageButton android:layout_height="wrap_content" android:id="@+id/infoButton"
+ android:layout_width="wrap_content" android:src="@android:drawable/ic_dialog_info" android:layout_gravity="right" android:layout_weight="5"/>
</LinearLayout>
diff --git a/code/PtiClic/res/layout/score.xml b/code/PtiClic/res/layout/score.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+android:layout_height="fill_parent" android:orientation="vertical"
+android:layout_width="fill_parent" android:id="@+id/LinearLayout01">
+
+
+<TextView android:text="@+id/corrects" android:id="@+id/corrects" android:layout_width="fill_parent"
+android:layout_height="wrap_content" android:textSize="20px"></TextView>
+
+<TextView android:text="@+id/manquants" android:id="@+id/manquants" android:layout_width="fill_parent"
+android:layout_height="wrap_content" android:textSize="20px"></TextView>
+
+<TextView android:text="@+id/mauvais" android:id="@+id/mauvais" android:layout_width="fill_parent"
+android:layout_height="wrap_content" android:textSize="20px"></TextView>
+
+<TextView android:text="@+id/total" android:id="@+id/total" android:layout_width="fill_parent"
+android:layout_height="wrap_content" android:textSize="25px"></TextView>
+
+<TextView android:text="@+id/joueravec" android:id="@+id/joueravec" android:layout_width="wrap_content"
+android:layout_height="wrap_content" android:textSize="20px"></TextView>
+
+<Button android:text="J'ai vu !" android:id="@+id/jaivu" android:layout_width="100px"
+android:layout_height="40px" android:layout_gravity="center_vertical|center_horizontal|center"></Button>
+
+<TextView android:text="@+id/category1" android:id="@+id/category1" android:layout_width="wrap_content"
+android:layout_height="wrap_content" android:textSize="20px"></TextView>
+
+<TextView android:text="@+id/category1words" android:id="@+id/category1words" android:layout_width="wrap_content"
+android:layout_height="wrap_content"></TextView>
+
+<TextView android:text="@+id/category2" android:id="@+id/category2" android:layout_width="wrap_content"
+android:layout_height="wrap_content" android:textSize="20px"></TextView>
+
+<TextView android:text="@+id/category2words" android:id="@+id/category2words" android:layout_width="wrap_content"
+android:layout_height="wrap_content"></TextView>
+
+
+</LinearLayout>
diff --git a/code/PtiClic/src/model/GamePlayed.java b/code/PtiClic/src/model/GamePlayed.java
@@ -0,0 +1,62 @@
+package model;
+
+import java.util.Arrays;
+
+public class GamePlayed {
+
+ private int id;
+ private String centre;
+ private String[] cloud;
+ private String[] category;
+ private static GamePlayed instance = null;
+
+ private GamePlayed(){
+ this.id = -1;
+ this.centre = "";
+ this.cloud = null;
+ this.category = null;
+ }
+
+ private GamePlayed(int id, String centre, String[] cloud, String[] category) {
+ this.id = id;
+ this.centre = centre;
+ this.cloud = cloud;
+ this.category = category;
+ }
+
+ public final static GamePlayed getInstance(){
+ if(instance == null) instance = new GamePlayed();
+ return instance;
+ }
+
+ public int getId() {
+ return id;
+ }
+ public void setId(int id) {
+ this.id = id;
+ }
+ public String getCentre() {
+ return centre;
+ }
+ public void setCentre(String centre) {
+ this.centre = centre;
+ }
+ public String[] getCloud() {
+ return cloud;
+ }
+ public void setCloud(String[] cloud) {
+ this.cloud = cloud;
+ }
+ public String[] getCategory() {
+ return category;
+ }
+ public void setCategory(String[] category) {
+ this.category = category;
+ }
+
+ @Override
+ public String toString() {
+ return "GamePlayed [id=" + id + ", centre=" + centre + ", cloud="
+ + Arrays.toString(cloud) + ", category=" + category + "]";
+ }
+}
diff --git a/code/PtiClic/src/org/pticlic/Main.java b/code/PtiClic/src/org/pticlic/Main.java
@@ -1,6 +1,9 @@
package org.pticlic;
import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.AlertDialog.Builder;
+import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
@@ -8,6 +11,7 @@ import android.preference.PreferenceManager;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
+import android.widget.ImageButton;
import android.widget.TextView;
public class Main extends Activity implements OnClickListener {
@@ -37,5 +41,16 @@ public class Main extends Activity implements OnClickListener {
case (R.id.prefs) : startActivity(new Intent(this, Preference.class)); break;
case (R.id.play) : startActivity(new Intent(this, Game.class)); break;
}
+ if (v.getId()==R.id.voirscore){
+ // TODO: à supprimer
+ Intent intent = new Intent(this, Score.class);
+ intent.putExtra("corrects", 10);
+ intent.putExtra("mauvais", 2);
+ intent.putExtra("manquants", 1.5);
+ intent.putExtra("total", 10); // WHERE??
+ startActivity(intent);
+ }
}
+
+
}
\ No newline at end of file
