www

commit da5127cc2b7a5244be4cfe8397771098c9d49212
parent bb96b13792d08e7c657c3504d84b4f5136c85f15
Author: Bertrand BRUN <bertrand0brun@gmail.com>
Date:   Tue,  1 Feb 2011 04:00:46 +0100

Prise en compte des images de Laura dans la page de garde (l'image pour le mode normal n'est pas la bonne)
Diffstat:
M
code/PtiClic/res/layout/main.xml
 | 
51
++++++++++++++++++++++++++-------------------------
M
code/PtiClic/src/org/pticlic/Main.java
 | 
9
++++++---

2 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/code/PtiClic/res/layout/main.xml b/code/PtiClic/res/layout/main.xml
@@ -5,40 +5,41 @@
 
 	<TextView android:text="@string/app_name" android:id="@+id/logo"
 		android:layout_width="fill_parent" android:layout_height="wrap_content"
-		android:textSize="50px" android:layout_weight="3" />
+		android:textSize="50px" android:layout_weight="1" />
 
 	<RelativeLayout android:layout_height="wrap_content"
 		android:id="@+id/RelativeLayout01" android:layout_width="wrap_content"
 		android:layout_gravity="bottom|center_horizontal">
 
-		<Button android:layout_height="wrap_content" android:text="@string/play_label" 
-		android:layout_width="wrap_content"
-			android:paddingLeft="60px" android:paddingRight="60px"
-			android:id="@+id/play"/>
-
-		<Button android:layout_height="wrap_content"
-			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>
+		<ImageView android:layout_height="wrap_content"
+			android:text="@string/play_label" android:layout_width="wrap_content"
+			android:id="@+id/play" android:src="@drawable/mode_chrono"
+			android:clickable="true" android:padding="40dip" />
+
+		<ImageView android:src="@drawable/config" android:padding="40dip"
+			android:layout_height="wrap_content" android:id="@+id/prefs"
+			android:layout_width="wrap_content" android:layout_below="@+id/play"
+			android:layout_alignLeft="@+id/play" android:layout_alignRight="@+id/play"></ImageView>
+
+
+
+
+	
+
+
+</RelativeLayout>
 
 	<LinearLayout android:id="@+id/LinearLayout01"
-		android:layout_height="wrap_content" android:layout_weight="1"
-		android:layout_width="fill_parent" android:orientation="vertical">
+		android:layout_height="wrap_content" android:layout_width="fill_parent" android:orientation="vertical" android:layout_weight="1">
 
 		<TextView android:layout_height="wrap_content"
-			android:layout_width="fill_parent"
-			android:textStyle="bold"
-			android:gravity="center_horizontal" android:text="@+id/login" android:id="@+id/login"></TextView>
-		<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"/>
+			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/infoButton"
+			android:layout_width="wrap_content" android:src="@android:drawable/ic_dialog_info"
+			android:layout_gravity="right" android:layout_weight="5"
+			android:clickable="true" />
 
 	</LinearLayout>
 
diff --git a/code/PtiClic/src/org/pticlic/Main.java b/code/PtiClic/src/org/pticlic/Main.java
@@ -9,7 +9,6 @@ import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -21,8 +20,8 @@ public class Main extends Activity implements OnClickListener {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.main);
 		// Écoute des clics sur les différents boutons
-		((Button)findViewById(R.id.prefs)).setOnClickListener(this);
-		((Button)findViewById(R.id.play)).setOnClickListener(this);
+		((ImageView)findViewById(R.id.prefs)).setOnClickListener(this);
+		((ImageView)findViewById(R.id.play)).setOnClickListener(this);
 		((ImageView)findViewById(R.id.infoButton)).setOnClickListener(this);
 
 		// On récupère le nom du joueur des préférences.
@@ -44,5 +43,9 @@ public class Main extends Activity implements OnClickListener {
 		}
 	}
 	
+	@Override
+	public void onBackPressed() {
+		System.exit(0);
+	}
 	
 }
 \ No newline at end of file