www

commit 4ee5659363b9c972ced580b22163c02d8a445081
parent 7f4f86b2c312c279fe55dfd91e4697e870b25e39
Author: Georges Dupéron <jahvascriptmaniac+github@free.fr>
Date:   Fri, 28 Jan 2011 18:30:27 +0100

Interface du jeu.

Diffstat:
M
code/PtiClic/res/layout/game.xml
 | 
27
++++++++++++++++-----------
M
code/PtiClic/src/org/pticlic/Game.java
 | 
14
++++++++++----
M
code/PtiClic/src/org/pticlic/Main.java
 | 
4
----

3 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/code/PtiClic/res/layout/game.xml b/code/PtiClic/res/layout/game.xml
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<AbsoluteLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent" android:orientation="vertical">
-    <TextView android:id="@+id/mainWord" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="70" android:layout_gravity="center_horizontal" android:text="MainWord" android:layout_x="100px" android:layout_y="20px"></TextView>
-    <TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/currentWord" android:layout_weight="10000" android:text="CurrentWord" android:layout_x="100px" android:layout_y="50px"></TextView>
-    <Button android:id="@+id/relation1" android:layout_height="wrap_content" android:text="R1" android:layout_width="wrap_content" android:layout_y="100px" android:layout_x="10px"></Button>
-    <Button android:id="@+id/relation2" android:layout_height="wrap_content" android:text="R2" android:layout_width="wrap_content" android:layout_y="100px" android:layout_x="70px"></Button>
-    <Button android:id="@+id/relation3" android:layout_height="wrap_content" android:text="R3" android:layout_width="wrap_content" android:layout_y="100px" android:layout_x="130px"></Button>
-    <Button android:id="@+id/relation4" android:layout_height="wrap_content" android:text="R4" android:layout_width="wrap_content" android:layout_x="190px" android:layout_y="100px"></Button>
-</AbsoluteLayout>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_x="1dip" android:id="@+id/linearLayout2"
+	android:layout_y="116dip" android:orientation="vertical" android:layout_height="fill_parent" android:layout_width="fill_parent">
+    <LinearLayout android:id="@+id/linearLayout3" android:layout_gravity="center_horizontal" android:layout_height="fill_parent" android:layout_weight="1" android:layout_width="wrap_content">
+        <TextView android:layout_weight="1" android:layout_width="wrap_content" android:layout_gravity="center_vertical" android:layout_height="wrap_content" android:id="@+id/mainWord" android:text="@+id/mainWord"></TextView>
+    </LinearLayout>
+	<AbsoluteLayout android:id="@+id/absoluteLayout1" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_weight="1">
+		<TextView android:id="@+id/currentWord" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@+id/currentWord"></TextView>
+	</AbsoluteLayout>
+	<LinearLayout android:id="@+id/linearLayout1" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1">
+		<Button android:id="@+id/relation1" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_weight="1" android:text="@+id/relation1"></Button>
+		<Button android:id="@+id/relation2" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_weight="1" android:text="@+id/relation2"></Button>
+		<Button android:id="@+id/relation3" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_weight="1" android:text="@+id/relation3"></Button>
+		<Button android:id="@+id/relation4" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_weight="1" android:text="@+id/relation4"></Button>
+	</LinearLayout>
+</LinearLayout>
diff --git a/code/PtiClic/src/org/pticlic/Game.java b/code/PtiClic/src/org/pticlic/Game.java
@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
+import android.widget.TextView;
 
 public class Game extends Activity implements OnClickListener {
 	/** Called when the activity is first created. */
@@ -21,10 +22,15 @@ public class Game extends Activity implements OnClickListener {
 		Button r4 = ((Button)findViewById(R.id.relation4));
 		
 		// Écoute des clics sur les relations
-		r1.setOnClickListener(this);
-		r2.setOnClickListener(this);
-		r3.setOnClickListener(this);
-		r4.setOnClickListener(this);
+		if (nbrel > 0) { r1.setOnClickListener(this); } else { r1.setVisibility(View.GONE); }
+		if (nbrel > 1) { r2.setOnClickListener(this); } else { r2.setVisibility(View.GONE); }
+		if (nbrel > 2) { r3.setOnClickListener(this); } else { r3.setVisibility(View.GONE); }
+		if (nbrel > 3) { r4.setOnClickListener(this); } else { r4.setVisibility(View.GONE); }
+		
+		r1.setText("=");
+		r2.setText("∈");
+		((TextView)findViewById(R.id.mainWord)).setText("Chat");
+		((TextView)findViewById(R.id.currentWord)).setText("Matou");
 	}
 	
 	/* (non-Javadoc)
diff --git a/code/PtiClic/src/org/pticlic/Main.java b/code/PtiClic/src/org/pticlic/Main.java
@@ -1,9 +1,6 @@
 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;
@@ -11,7 +8,6 @@ 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 {