From 81fa2f539a8b84253ba94f687b8ef6b3a3f634c3 Mon Sep 17 00:00:00 2001 From: Bertrand BRUN Date: Fri, 4 Feb 2011 13:29:48 +0100 Subject: [PATCH] Ajout des images dans les relations pour BaseGame ainsi que correction d'un probleme avec l'animation --- code/PtiClic/AndroidManifest.xml | 10 ++++---- code/PtiClic/res/layout/frontpage.xml | 24 +++++++++---------- .../src/org/pticlic/games/BaseGame.java | 2 -- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/code/PtiClic/AndroidManifest.xml b/code/PtiClic/AndroidManifest.xml index a4b421e..b81538f 100644 --- a/code/PtiClic/AndroidManifest.xml +++ b/code/PtiClic/AndroidManifest.xml @@ -10,11 +10,11 @@ - - - - - + + + + + diff --git a/code/PtiClic/res/layout/frontpage.xml b/code/PtiClic/res/layout/frontpage.xml index eaf1f0f..e3de1d5 100644 --- a/code/PtiClic/res/layout/frontpage.xml +++ b/code/PtiClic/res/layout/frontpage.xml @@ -13,30 +13,28 @@ + android:id="@+id/play" android:clickable="true" android:padding="30dip" + android:src="@drawable/mode_normal"/> - + android:layout_alignLeft="@+id/play" android:layout_alignRight="@+id/play" + android:padding="30dip"> - - - - - - - + + android:layout_height="wrap_content" android:layout_width="fill_parent" + android:orientation="vertical" android:layout_weight="1"> + android:layout_width="wrap_content" android:layout_gravity="right" + android:layout_weight="5" android:clickable="true" android:src="@drawable/aide" /> diff --git a/code/PtiClic/src/org/pticlic/games/BaseGame.java b/code/PtiClic/src/org/pticlic/games/BaseGame.java index faae23f..61e7a57 100644 --- a/code/PtiClic/src/org/pticlic/games/BaseGame.java +++ b/code/PtiClic/src/org/pticlic/games/BaseGame.java @@ -9,11 +9,9 @@ import org.pticlic.model.Network; import org.pticlic.model.Network.Mode; import org.pticlic.model.Relation; -import android.R.anim; import android.app.Activity; import android.content.Intent; import android.content.SharedPreferences; -import android.graphics.Color; import android.os.Bundle; import android.preference.PreferenceManager; import android.view.Display;