suzanne.soy/2011-m1s2-ter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github:jsmaniac/2011-m1s2-ter

Browse Source
This commit is contained in:
Georges Dupéron 2011-01-31 22:08:55 +01:00
commit df1b86dab5
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/PtiClic/res/layout/main.xml
View File

@ -11,7 +11,8 @@
android:id="@+id/RelativeLayout01" android:layout_width="wrap_content"
android:layout_gravity="bottom|center_horizontal">
<Button android:layout_height="wrap_content" android:text="@string/play_label" android:layout_width="wrap_content"
<Button android:layout_height="wrap_content" android:text="@string/play_label"
android:layout_width="wrap_content"
android:paddingLeft="60px" android:paddingRight="60px"
android:id="@+id/play"/>

8
code/PtiClic/res/values/strings.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">PtiClic</string>
<string name="prefs_name">Préférences</string>
<string name="play_label">Jouer</string>
<string name="textInfo">Ce projet a été réalisé l</string>
<color name="background">#FF0000</color>
<string name="prefs_name">Préférences</string>
<string name="play_label">Jouer</string>
<string name="textInfo">Ce projet a été réalisé l</string>
<color name="background">#FF0000</color>
</resources>

3
code/PtiClic/src/org/pticlic/Score.java
View File

@ -10,7 +10,6 @@ import android.view.View;
import android.view.View.OnClickListener;
public class Score extends Activity implements OnClickListener{
private GamePlayed gamePlayed;
@ -38,7 +37,7 @@ public class Score extends Activity implements OnClickListener{
protected double calculateTotal(){
throw new UnsupportedOperationException();
//return this.corrects - this.manquants - this.mauvais;
//return this.corrects - this.manquants - this.mauvais;
}
@Override