Merge branch 'master' of github:jsmaniac/2011-m1s2-ter
This commit is contained in:
commit
df1b86dab5
|
@ -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"/>
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue
Block a user