commit 8e6d1ea994cf614d661dc0dd364837321251ecdd parent 4ee5659363b9c972ced580b22163c02d8a445081 Author: Bertrand BRUN <bertrand0brun@gmail.com> Date: Sat, 29 Jan 2011 16:58:53 +0100 Correction de la vue Game Diffstat:
| M | code/PtiClic/res/layout/game.xml | | | 54 | ++++++++++++++++++++++++++++++++++++++++-------------- |
1 file changed, 40 insertions(+), 14 deletions(-)
diff --git a/code/PtiClic/res/layout/game.xml b/code/PtiClic/res/layout/game.xml @@ -1,17 +1,43 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_x="1dip" android:id="@+id/linearLayout2" - android:layout_y="116dip" android:orientation="vertical" android:layout_height="fill_parent" android:layout_width="fill_parent"> - <LinearLayout android:id="@+id/linearLayout3" android:layout_gravity="center_horizontal" android:layout_height="fill_parent" android:layout_weight="1" android:layout_width="wrap_content"> - <TextView android:layout_weight="1" android:layout_width="wrap_content" android:layout_gravity="center_vertical" android:layout_height="wrap_content" android:id="@+id/mainWord" android:text="@+id/mainWord"></TextView> - </LinearLayout> - <AbsoluteLayout android:id="@+id/absoluteLayout1" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_weight="1"> - <TextView android:id="@+id/currentWord" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@+id/currentWord"></TextView> - </AbsoluteLayout> - <LinearLayout android:id="@+id/linearLayout1" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1"> - <Button android:id="@+id/relation1" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_weight="1" android:text="@+id/relation1"></Button> - <Button android:id="@+id/relation2" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_weight="1" android:text="@+id/relation2"></Button> - <Button android:id="@+id/relation3" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_weight="1" android:text="@+id/relation3"></Button> - <Button android:id="@+id/relation4" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_weight="1" android:text="@+id/relation4"></Button> +<LinearLayout android:id="@+id/widget29" + android:layout_width="fill_parent" android:layout_height="fill_parent" + android:orientation="vertical" xmlns:android="http://schemas.android.com/apk/res/android"> + + <LinearLayout android:id="@+id/widget40" + android:layout_width="fill_parent" android:layout_height="fill_parent" + android:orientation="vertical" android:layout_weight="1"> + + <TextView android:id="@+id/mainWord" android:layout_width="fill_parent" + android:layout_height="wrap_content" android:text="mainWord" + android:textSize="30sp" android:textStyle="bold" android:gravity="center"> + </TextView> + <TextView android:id="@+id/currentWord" android:layout_width="fill_parent" + android:layout_height="wrap_content" android:text="currentWord" + android:textStyle="bold" android:gravity="center"> + </TextView> + <TextView android:text="secondWord" android:id="@+id/secondWord" + android:layout_width="fill_parent" android:layout_height="wrap_content" + android:textStyle="bold" android:gravity="center" android:visibility="gone"> + </TextView> + </LinearLayout> + + <LinearLayout android:id="@+id/widget44" + android:orientation="horizontal" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="9"> + + <Button android:id="@+id/relation1" + android:text="relation1" android:layout_height="wrap_content" android:layout_weight="1" android:layout_width="fill_parent" android:layout_gravity="bottom"> + </Button> + <Button android:id="@+id/relation2" + android:text="relation2" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_weight="1" android:layout_gravity="bottom"> + </Button> + <Button android:id="@+id/relation3" + android:text="relation3" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_weight="1" android:layout_gravity="bottom"> + </Button> + <Button android:id="@+id/relation4" + android:text="relation4" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_weight="1" android:layout_gravity="bottom"> + </Button> + + </LinearLayout> + </LinearLayout>