diff --git a/code/PtiClic/proguard.cfg b/code/PtiClic/proguard.cfg index 8ad7d33..12dd039 100644 --- a/code/PtiClic/proguard.cfg +++ b/code/PtiClic/proguard.cfg @@ -10,6 +10,8 @@ -keep public class * extends android.app.Service -keep public class * extends android.content.BroadcastReceiver -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 -keepclasseswithmembernames class * { diff --git a/code/PtiClic/src/org/pticlic/Information.java b/code/PtiClic/src/org/pticlic/Information.java index a767d0a..d106f83 100644 --- a/code/PtiClic/src/org/pticlic/Information.java +++ b/code/PtiClic/src/org/pticlic/Information.java @@ -8,6 +8,7 @@ import java.io.InputStreamReader; import android.app.Activity; import android.graphics.Color; import android.os.Bundle; +import android.webkit.WebSettings; import android.webkit.WebView; import android.widget.TextView; @@ -21,8 +22,10 @@ public class Information extends Activity { ((TextView)findViewById(R.id.infoVersion)).setText("version : " + getString(R.string.version)); InputStream in = getResources().openRawResource(R.raw.info); WebView webview = (WebView)findViewById(R.id.textContent); - webview.setBackgroundColor(Color.BLACK); + webview.setBackgroundColor(Color.WHITE); webview.setScrollBarStyle(WebView.SCROLLBARS_OUTSIDE_OVERLAY); + WebSettings webSettings = webview.getSettings(); + webSettings.setJavaScriptEnabled(true); if (in != null) { @@ -37,7 +40,7 @@ public class Information extends Activity { } in.close(); - webview.loadData(buf.toString(), "text/html", "UTF-8"); + webview.loadUrl("http://www.pticlic.fr/html5/code/html5/"); } catch (IOException e) { //TODO : Ajouter un boite de dialog indiquant qu'une erreur est arrivee. diff --git a/code/html5/pticlic.js b/code/html5/pticlic.js index 1fc7364..9c0b3f0 100644 --- a/code/html5/pticlic.js +++ b/code/html5/pticlic.js @@ -7,8 +7,8 @@ $(function () { var refresh = function() { if (currentWordNb < game.cloud.length) { - $(".mc").text(game.cloud[currentWordNb].name); - $(".mn").text(game.center.name); + $(".mn").text(game.cloud[currentWordNb].name); + $(".mc").text(game.center.name); } else { $(".relations").empty(); alert("Partie terminée !");