commit 4f0ac61338fde8ac440f6aee27ecbe46d2daed3d parent b50f0ccc550b680b85031160446dd164b7f0781b Author: bbrun <bertrand0brun@gmail.com> Date: Fri, 4 Feb 2011 13:36:55 +0100 Debut de la mise en place du menu d'aide dans BaseGame Diffstat:
| M | code/PtiClic/res/layout/game.xml | | | 70 | +++++++++++++++++++++++++++++++++++++++++++++++++++------------------- |
| M | code/PtiClic/src/org/pticlic/model/Constant.java | | | 2 | ++ |
2 files changed, 53 insertions(+), 19 deletions(-)
diff --git a/code/PtiClic/res/layout/game.xml b/code/PtiClic/res/layout/game.xml @@ -4,37 +4,69 @@ xmlns:android="http://schemas.android.com/apk/res/android"> <LinearLayout android:layout_width="fill_parent" - android:layout_height="fill_parent" android:orientation="vertical" android:layout_weight="2"> + android:layout_height="fill_parent" android:orientation="vertical" + android:layout_weight="2"> + + + <AbsoluteLayout android:layout_width="fill_parent" + android:layout_height="wrap_content" android:paddingTop="10px"> + + <TextView android:id="@+id/mainWord" android:text="mainWord" + android:textStyle="bold" android:textSize="30dip" + android:layout_weight="1" android:gravity="center" + android:paddingTop="10px" android:layout_height="fill_parent" + android:layout_width="fill_parent"> + </TextView> + + + + + + + <LinearLayout android:layout_width="fill_parent" + android:layout_height="fill_parent" android:gravity="right"> + + <ImageView android:src="@drawable/aide" + android:id="@+id/aideBaseGame" android:paddingRight="10px" + android:layout_width="wrap_content" android:layout_height="wrap_content"></ImageView> + + </LinearLayout> + + + </AbsoluteLayout> - <TextView android:id="@+id/mainWord" android:layout_width="fill_parent" - android:layout_height="wrap_content" android:text="mainWord" - android:textStyle="bold" android:gravity="center" android:textSize="30dip"> - </TextView> <TextView android:id="@+id/currentWord" android:layout_width="fill_parent" - android:text="currentWord" - android:textStyle="bold" android:textSize="20dip" android:layout_height="fill_parent" android:gravity="top|center"> + android:text="currentWord" android:textStyle="bold" android:textSize="20dip" + android:layout_height="fill_parent" android:gravity="top|center"> </TextView> - </LinearLayout> + +</LinearLayout> <LinearLayout android:orientation="horizontal" - android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="10"> + android:layout_height="fill_parent" android:layout_width="fill_parent" + android:layout_weight="10"> - <ImageView android:id="@+id/relation1" - android:src="@drawable/contenant" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_gravity="center"> + <ImageView android:id="@+id/relation1" android:src="@drawable/contenant" + android:layout_weight="1" android:layout_width="fill_parent" + android:layout_height="wrap_content" android:layout_gravity="center"> </ImageView> - <ImageView android:id="@+id/relation2" - android:src="@drawable/contenu" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_gravity="center"> + <ImageView android:id="@+id/relation2" android:src="@drawable/contenu" + android:layout_weight="1" android:layout_width="fill_parent" + android:layout_height="wrap_content" android:layout_gravity="center"> </ImageView> - <ImageView android:id="@+id/trash" - android:src="@android:drawable/ic_menu_delete" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_gravity="center"> + <ImageView android:id="@+id/relation3" android:src="@drawable/contraire" + android:layout_weight="1" android:layout_width="fill_parent" + android:layout_height="wrap_content" android:layout_gravity="center"> </ImageView> - <ImageView android:id="@+id/relation3" - android:src="@drawable/contraire" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_gravity="center"> + <ImageView android:id="@+id/relation4" android:src="@drawable/synonyme" + android:layout_weight="1" android:layout_width="fill_parent" + android:layout_height="wrap_content" android:layout_gravity="center"> </ImageView> - <ImageView android:id="@+id/relation4" - android:src="@drawable/synonyme" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_gravity="center"> + <ImageView android:id="@+id/trash" android:src="@android:drawable/ic_menu_delete" + android:layout_weight="1" android:layout_width="fill_parent" + android:layout_height="wrap_content" android:layout_gravity="center"> </ImageView> </LinearLayout> diff --git a/code/PtiClic/src/org/pticlic/model/Constant.java b/code/PtiClic/src/org/pticlic/model/Constant.java @@ -3,6 +3,8 @@ package org.pticlic.model; public class Constant { public static final String SERVER_URL = "SERVER_URL"; + public static final String SERVER_AUTH = "SERVER_AUTH"; + // Constant pour les information de l'utilisateur. public static final String USER_ID = "login"; public static final String USER_PASSWD = "passwd";