commit a1356e34ef5ae6d92b1a2554cbcc71964158d17b parent 47fc940d00941823bb0f688fc1f159b462633bee Author: Bertrand BRUN <bertrand0brun@gmail.com> Date: Wed, 9 Feb 2011 23:29:02 +0100 Renommage de la vue game.xml en basegame.xml Diffstat:
| A | code/PtiClic/res/layout/basegame.xml | | | 125 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| D | code/PtiClic/res/layout/game.xml | | | 126 | ------------------------------------------------------------------------------- |
| M | code/PtiClic/src/org/pticlic/games/BaseGame.java | | | 2 | +- |
3 files changed, 126 insertions(+), 127 deletions(-)
diff --git a/code/PtiClic/res/layout/basegame.xml b/code/PtiClic/res/layout/basegame.xml @@ -0,0 +1,125 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout android:layout_width="fill_parent" + android:layout_height="fill_parent" android:orientation="vertical" + 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"> + + <LinearLayout android:layout_width="fill_parent" + android:layout_height="wrap_content" android:paddingTop="10px" + android:orientation="horizontal"> + + <TextView android:id="@+id/wordRemaining" android:text="0/10" + android:textStyle="bold" android:paddingTop="10px" + android:paddingLeft="20px" android:layout_height="wrap_content" + android:layout_width="wrap_content" android:paddingRight="5px"> + </TextView> + + <TextView android:id="@+id/mainWord" android:text="mainWord" + android:textStyle="bold" android:textSize="30dip" + android:layout_weight="1" android:paddingTop="10px" android:layout_height="fill_parent" + android:layout_width="fill_parent" android:gravity="center_vertical|center_horizontal"> + </TextView> + + <ImageView android:src="@drawable/aide" android:id="@+id/aideBaseGame" + android:paddingRight="10px" android:layout_width="wrap_content" + android:layout_height="wrap_content"></ImageView> + + </LinearLayout> + + <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"> + </TextView> + + </LinearLayout> + + <LinearLayout android:layout_height="fill_parent" + android:layout_width="fill_parent" android:layout_weight="10" + android:orientation="horizontal" android:id="@+id/menuLayout"> + + <LinearLayout android:layout_height="wrap_content" + android:layout_width="fill_parent" android:orientation="horizontal" + android:id="@+id/relation1Layout" android:layout_weight="1" + android:layout_gravity="center"> + <ImageView android:id="@+id/relation1" android:src="@drawable/contenant" + android:layout_weight="1" android:layout_height="wrap_content" + android:layout_width="wrap_content"> + </ImageView> + <TextView android:id="@+id/relation1Name" + android:layout_width="wrap_content" android:text="contenant" + android:textStyle="bold" android:textSize="15dip" + android:layout_height="wrap_content" android:layout_weight="3" + android:layout_gravity="center_vertical" android:visibility="gone"> + </TextView> + </LinearLayout> + + <LinearLayout android:layout_height="wrap_content" + android:layout_width="fill_parent" android:orientation="horizontal" + android:id="@+id/relation2Layout" android:layout_weight="1" + android:layout_gravity="center"> + <ImageView android:id="@+id/relation2" android:src="@drawable/contenu" + android:layout_weight="1" android:layout_height="wrap_content" + android:layout_width="wrap_content"> + </ImageView> + <TextView android:id="@+id/relation2Name" + android:layout_width="wrap_content" android:text="contenu" + android:textStyle="bold" android:textSize="15dip" + android:layout_height="wrap_content" android:layout_weight="3" + android:layout_gravity="center_vertical" android:visibility="gone"> + </TextView> + </LinearLayout> + + <LinearLayout android:layout_height="wrap_content" + android:layout_width="fill_parent" android:orientation="horizontal" + android:id="@+id/relation3Layout" android:layout_weight="1" + android:layout_gravity="center"> + <ImageView android:id="@+id/relation3" android:src="@drawable/contraire" + android:layout_weight="1" android:layout_height="wrap_content" + android:layout_width="wrap_content"> + </ImageView> + <TextView android:id="@+id/relation3Name" + android:layout_width="wrap_content" android:text="contraire" + android:textStyle="bold" android:textSize="15dip" + android:layout_height="wrap_content" android:layout_weight="3" + android:layout_gravity="center_vertical" android:visibility="gone"> + </TextView> + </LinearLayout> + + <LinearLayout android:layout_height="wrap_content" + android:layout_width="fill_parent" android:orientation="horizontal" + android:id="@+id/relation4Layout" android:layout_weight="1" + android:layout_gravity="center"> + <ImageView android:id="@+id/relation4" android:src="@drawable/synonyme" + android:layout_weight="1" android:layout_height="wrap_content" + android:layout_width="wrap_content" android:layout_gravity="center"> + </ImageView> + <TextView android:id="@+id/relation4Name" + android:layout_width="wrap_content" android:text="synonyme" + android:textStyle="bold" android:textSize="15dip" + android:layout_height="wrap_content" android:layout_weight="3" + android:layout_gravity="center_vertical" android:visibility="gone"> + </TextView> + </LinearLayout> + + <LinearLayout android:layout_height="wrap_content" + android:layout_width="fill_parent" android:orientation="horizontal" + android:id="@+id/trashLayout" android:layout_weight="1" + android:layout_gravity="center"> + + <ImageView android:id="@+id/trash" android:src="@android:drawable/ic_menu_delete" + android:layout_weight="1" android:layout_height="wrap_content" + android:layout_width="wrap_content" android:layout_gravity="center"> + </ImageView> + <TextView android:id="@+id/trashName" android:layout_width="wrap_content" + android:text="poubelle" android:textStyle="bold" android:textSize="15dip" + android:layout_height="wrap_content" android:layout_weight="3" + android:layout_gravity="center_vertical" android:visibility="gone"> + </TextView> + </LinearLayout> + + </LinearLayout> + +</LinearLayout> diff --git a/code/PtiClic/res/layout/game.xml b/code/PtiClic/res/layout/game.xml @@ -1,126 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout android:layout_width="fill_parent" - android:layout_height="fill_parent" android:orientation="vertical" - 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"> - - <LinearLayout android:layout_width="fill_parent" - android:layout_height="wrap_content" android:paddingTop="10px" - android:orientation="horizontal"> - - <TextView android:id="@+id/wordRemaining" android:text="0/10" - android:textStyle="bold" android:paddingTop="10px" - android:paddingLeft="20px" android:layout_height="wrap_content" - android:layout_width="wrap_content"> - </TextView> - - <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> - - <ImageView android:src="@drawable/aide" android:id="@+id/aideBaseGame" - android:paddingRight="10px" android:layout_width="wrap_content" - android:layout_height="wrap_content"></ImageView> - - </LinearLayout> - - <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"> - </TextView> - - </LinearLayout> - - <LinearLayout android:layout_height="fill_parent" - android:layout_width="fill_parent" android:layout_weight="10" - android:orientation="horizontal" android:id="@+id/menuLayout"> - - <LinearLayout android:layout_height="wrap_content" - android:layout_width="fill_parent" android:orientation="horizontal" - android:id="@+id/relation1Layout" android:layout_weight="1" - android:layout_gravity="center"> - <ImageView android:id="@+id/relation1" android:src="@drawable/contenant" - android:layout_weight="1" android:layout_height="wrap_content" - android:layout_width="wrap_content"> - </ImageView> - <TextView android:id="@+id/relation1Name" - android:layout_width="wrap_content" android:text="contenant" - android:textStyle="bold" android:textSize="15dip" - android:layout_height="wrap_content" android:layout_weight="3" - android:layout_gravity="center_vertical" android:visibility="gone"> - </TextView> - </LinearLayout> - - <LinearLayout android:layout_height="wrap_content" - android:layout_width="fill_parent" android:orientation="horizontal" - android:id="@+id/relation2Layout" android:layout_weight="1" - android:layout_gravity="center"> - <ImageView android:id="@+id/relation2" android:src="@drawable/contenu" - android:layout_weight="1" android:layout_height="wrap_content" - android:layout_width="wrap_content"> - </ImageView> - <TextView android:id="@+id/relation2Name" - android:layout_width="wrap_content" android:text="contenu" - android:textStyle="bold" android:textSize="15dip" - android:layout_height="wrap_content" android:layout_weight="3" - android:layout_gravity="center_vertical" android:visibility="gone"> - </TextView> - </LinearLayout> - - <LinearLayout android:layout_height="wrap_content" - android:layout_width="fill_parent" android:orientation="horizontal" - android:id="@+id/relation3Layout" android:layout_weight="1" - android:layout_gravity="center"> - <ImageView android:id="@+id/relation3" android:src="@drawable/contraire" - android:layout_weight="1" android:layout_height="wrap_content" - android:layout_width="wrap_content"> - </ImageView> - <TextView android:id="@+id/relation3Name" - android:layout_width="wrap_content" android:text="contraire" - android:textStyle="bold" android:textSize="15dip" - android:layout_height="wrap_content" android:layout_weight="3" - android:layout_gravity="center_vertical" android:visibility="gone"> - </TextView> - </LinearLayout> - - <LinearLayout android:layout_height="wrap_content" - android:layout_width="fill_parent" android:orientation="horizontal" - android:id="@+id/relation4Layout" android:layout_weight="1" - android:layout_gravity="center"> - <ImageView android:id="@+id/relation4" android:src="@drawable/synonyme" - android:layout_weight="1" android:layout_height="wrap_content" - android:layout_width="wrap_content" android:layout_gravity="center"> - </ImageView> - <TextView android:id="@+id/relation4Name" - android:layout_width="wrap_content" android:text="synonyme" - android:textStyle="bold" android:textSize="15dip" - android:layout_height="wrap_content" android:layout_weight="3" - android:layout_gravity="center_vertical" android:visibility="gone"> - </TextView> - </LinearLayout> - - <LinearLayout android:layout_height="wrap_content" - android:layout_width="fill_parent" android:orientation="horizontal" - android:id="@+id/trashLayout" android:layout_weight="1" - android:layout_gravity="center"> - - <ImageView android:id="@+id/trash" android:src="@android:drawable/ic_menu_delete" - android:layout_weight="1" android:layout_height="wrap_content" - android:layout_width="wrap_content" android:layout_gravity="center"> - </ImageView> - <TextView android:id="@+id/trashName" android:layout_width="wrap_content" - android:text="poubelle" android:textStyle="bold" android:textSize="15dip" - android:layout_height="wrap_content" android:layout_weight="3" - android:layout_gravity="center_vertical" android:visibility="gone"> - </TextView> - </LinearLayout> - - </LinearLayout> - -</LinearLayout> diff --git a/code/PtiClic/src/org/pticlic/games/BaseGame.java b/code/PtiClic/src/org/pticlic/games/BaseGame.java @@ -55,7 +55,7 @@ public class BaseGame extends Activity implements OnClickListener { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.game); + setContentView(R.layout.basegame); // On recupere du PreferenceManager les differentes information dont on a besoin SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);