commit 81fa2f539a8b84253ba94f687b8ef6b3a3f634c3 parent 86ce7a8ad49480f9f0828c61a84fa43680494064 Author: Bertrand BRUN <bertrand0brun@gmail.com> Date: Fri, 4 Feb 2011 13:29:48 +0100 Ajout des images dans les relations pour BaseGame ainsi que correction d'un probleme avec l'animation Diffstat:
| M | code/PtiClic/AndroidManifest.xml | | | 10 | +++++----- |
| M | code/PtiClic/res/layout/frontpage.xml | | | 24 | +++++++++++------------- |
| M | code/PtiClic/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 @@ -10,11 +10,11 @@ </intent-filter> </activity> - <activity android:name=".Preference" android:label="Préférence"></activity> - <activity android:name=".games.BaseGame"></activity> - <activity android:label="Information" android:name=".Information"></activity> - <activity android:name=".Score" android:label="Score"></activity> -<activity android:name=".FrontPage"></activity> + <activity android:name=".Preference" android:label="Préférence" android:screenOrientation="portrait"></activity> + <activity android:name=".games.BaseGame" android:screenOrientation="portrait"></activity> + <activity android:label="Information" android:name=".Information" android:screenOrientation="portrait"></activity> + <activity android:name=".Score" android:label="Score" android:screenOrientation="portrait"></activity> +<activity android:name=".FrontPage" android:screenOrientation="portrait"></activity> </application> diff --git a/code/PtiClic/res/layout/frontpage.xml b/code/PtiClic/res/layout/frontpage.xml @@ -13,30 +13,28 @@ <ImageView android:layout_height="wrap_content" android:text="@string/play_label" android:layout_width="wrap_content" - android:id="@+id/play" android:clickable="true" android:padding="30dip" android:src="@drawable/mode_normal"/> + android:id="@+id/play" android:clickable="true" android:padding="30dip" + android:src="@drawable/mode_normal"/> - <ImageView android:src="@drawable/config" android:layout_height="wrap_content" android:id="@+id/prefs" + <ImageView android:src="@drawable/config" + 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" android:padding="30dip"></ImageView> + android:layout_alignLeft="@+id/play" android:layout_alignRight="@+id/play" + android:padding="30dip"></ImageView> - - - - - - -</RelativeLayout> + </RelativeLayout> <LinearLayout android:id="@+id/LinearLayout01" - android:layout_height="wrap_content" android:layout_width="fill_parent" android:orientation="vertical" android:layout_weight="1"> + 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> <ImageView android:layout_height="wrap_content" android:id="@+id/infoButton" - android:layout_width="wrap_content" android:layout_gravity="right" android:layout_weight="5" - android:clickable="true" android:src="@drawable/aide"/> + android:layout_width="wrap_content" android:layout_gravity="right" + android:layout_weight="5" android:clickable="true" android:src="@drawable/aide" /> </LinearLayout> diff --git 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;