www

commit d80988ab06124712e7dccc3462cd76f37d8bb5c4
parent 033d51d44cb66c59cd9d0b0c0dd4b24419c64581
Author: Bertrand BRUN <bertrand0brun@gmail.com>
Date:   Sun, 13 Feb 2011 00:49:34 +0100

Petit modification dans l'affichage du jeu BaseGame
Diffstat:
M
code/PtiClic/res/layout/basegame.xml
 | 
17
++++++-----------
M
code/PtiClic/src/org/pticlic/games/BaseGame.java
 | 
8
++++----

2 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/code/PtiClic/res/layout/basegame.xml b/code/PtiClic/res/layout/basegame.xml
@@ -8,19 +8,15 @@
 		android:layout_weight="2">
 
 		<LinearLayout android:layout_width="fill_parent"
-			android:layout_height="wrap_content" android:paddingTop="10px"
-			android:orientation="horizontal">
+			android:layout_height="wrap_content" android:orientation="horizontal" android:paddingTop="10dip">
 
 			<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">
+				android:textStyle="bold" android:layout_height="wrap_content"
+				android:layout_width="wrap_content" android:paddingRight="5dip" android:paddingTop="10dip" android:paddingLeft="13dip">
 			</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 android:id="@+id/mainWord" android:textStyle="bold" android:textSize="30dip"
+				android:layout_weight="1" android:layout_width="fill_parent" android:paddingBottom="10dip" android:layout_height="90dip" android:gravity="top|center_vertical|center_horizontal" android:text="Un truc super long">
 			</TextView>
 
 			<ImageView android:src="@drawable/aide" android:id="@+id/aideBaseGame"
@@ -37,8 +33,7 @@
 	</LinearLayout>
 
 	<LinearLayout android:layout_height="fill_parent"
-		android:layout_width="fill_parent" android:layout_weight="10"
-		android:orientation="horizontal" android:id="@+id/menuLayout">
+		android:layout_width="fill_parent" android:orientation="horizontal" android:id="@+id/menuLayout" android:layout_weight="8">
 
 		<LinearLayout android:layout_height="wrap_content"
 			android:layout_width="fill_parent" android:orientation="horizontal"
diff --git a/code/PtiClic/src/org/pticlic/games/BaseGame.java b/code/PtiClic/src/org/pticlic/games/BaseGame.java
@@ -200,9 +200,9 @@ public class BaseGame extends Activity implements OnClickListener {
 
 		TranslateAnimation translate;
 		if (isInHelpMode())
-			translate = new TranslateAnimation(mainWord.getScrollX() / 2, mainWord.getScrollX() / 2, mainWord.getScrollY() / 2, width / 4);
+			translate = new TranslateAnimation(mainWord.getScrollX() / 2, mainWord.getScrollX() / 2, mainWord.getScrollY() / 2, width / 8);
 		else
-			translate = new TranslateAnimation(mainWord.getScrollX() / 2, mainWord.getScrollX() / 2, mainWord.getScrollY() / 2, width / 2);
+			translate = new TranslateAnimation(mainWord.getScrollX() / 2, mainWord.getScrollX() / 2, mainWord.getScrollY() / 2, width / 4);
 		translate.setDuration(500);
 		set.addAnimation(translate);
 
@@ -301,7 +301,7 @@ public class BaseGame extends Activity implements OnClickListener {
 			TextView mainWord = (TextView)findViewById(R.id.mainWord);
 			currentWordTextView = (TextView)findViewById(R.id.currentWord);
 
-			TranslateAnimation translate = new TranslateAnimation(mainWord.getScrollX() / 2, mainWord.getScrollX() / 2, mainWord.getScrollY() / 2, width / 4);
+			TranslateAnimation translate = new TranslateAnimation(mainWord.getScrollX() / 2, mainWord.getScrollX() / 2, mainWord.getScrollY() / 2, width / 8);
 			translate.setDuration(0);
 			translate.setFillAfter(true);
 
@@ -355,7 +355,7 @@ public class BaseGame extends Activity implements OnClickListener {
 			TextView mainWord = (TextView)findViewById(R.id.mainWord);
 			currentWordTextView = (TextView)findViewById(R.id.currentWord);
 
-			TranslateAnimation translate = new TranslateAnimation(mainWord.getScrollX() / 2, mainWord.getScrollX() / 2, mainWord.getScrollY() / 2, width / 2);
+			TranslateAnimation translate = new TranslateAnimation(mainWord.getScrollX() / 2, mainWord.getScrollX() / 2, mainWord.getScrollY() / 2, width / 4);
 			translate.setDuration(0);
 			translate.setFillAfter(true);