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

Correction d'une inversion mc mn

Browse Source
This commit is contained in:
Bertrand BRUN 2011-03-30 08:58:23 +02:00
parent 83a3769e1a
commit d1dc58bc5a
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/PtiClic/proguard.cfg
View File

@ -10,6 +10,8 @@
-keep public class * extends android.app.Service -keep public class * extends android.app.Service
-keep public class * extends android.content.BroadcastReceiver -keep public class * extends android.content.BroadcastReceiver
-keep public class * extends android.content.ContentProvider -keep public class * extends android.content.ContentProvider
-keep public class * extends android.app.backup.BackupAgentHelper
-keep public class * extends android.preference.Preference
-keep public class com.android.vending.licensing.ILicensingService -keep public class com.android.vending.licensing.ILicensingService
-keepclasseswithmembernames class * { -keepclasseswithmembernames class * {

7
code/PtiClic/src/org/pticlic/Information.java
View File

@ -8,6 +8,7 @@ import java.io.InputStreamReader;
import android.app.Activity; import android.app.Activity;
import android.graphics.Color; import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
import android.webkit.WebSettings;
import android.webkit.WebView; import android.webkit.WebView;
import android.widget.TextView; import android.widget.TextView;
@ -21,8 +22,10 @@ public class Information extends Activity {
((TextView)findViewById(R.id.infoVersion)).setText("version : " + getString(R.string.version)); ((TextView)findViewById(R.id.infoVersion)).setText("version : " + getString(R.string.version));
InputStream in = getResources().openRawResource(R.raw.info); InputStream in = getResources().openRawResource(R.raw.info);
WebView webview = (WebView)findViewById(R.id.textContent); WebView webview = (WebView)findViewById(R.id.textContent);
webview.setBackgroundColor(Color.BLACK); webview.setBackgroundColor(Color.WHITE);
webview.setScrollBarStyle(WebView.SCROLLBARS_OUTSIDE_OVERLAY); webview.setScrollBarStyle(WebView.SCROLLBARS_OUTSIDE_OVERLAY);
WebSettings webSettings = webview.getSettings();
webSettings.setJavaScriptEnabled(true);
if (in != null) { if (in != null) {
@ -37,7 +40,7 @@ public class Information extends Activity {
} }
in.close(); in.close();
webview.loadData(buf.toString(), "text/html", "UTF-8"); webview.loadUrl("http://www.pticlic.fr/html5/code/html5/");
} catch (IOException e) { } catch (IOException e) {
//TODO : Ajouter un boite de dialog indiquant qu'une erreur est arrivee. //TODO : Ajouter un boite de dialog indiquant qu'une erreur est arrivee.

4
code/html5/pticlic.js
View File

@ -7,8 +7,8 @@ $(function () {
var refresh = function() { var refresh = function() {
if (currentWordNb < game.cloud.length) { if (currentWordNb < game.cloud.length) {
$(".mc").text(game.cloud[currentWordNb].name); $(".mn").text(game.cloud[currentWordNb].name);
$(".mn").text(game.center.name); $(".mc").text(game.center.name);
} else { } else {
$(".relations").empty(); $(".relations").empty();
alert("Partie terminée !"); alert("Partie terminée !");