www

commit fb143a3b9612693e918292729a2fca4166d43259
parent ec213a5a107f5583d9c4d622027d8d08e94bf408
Author: Bertrand Brun <bertrand0brun@gmail.com>
Date:   Fri,  6 May 2011 16:17:28 +0200

Merge branch 'unstable' of https://github.com/jsmaniac/2011-m1s2-ter into unstable

Diffstat:
M
code/PtiClic/src/org/pticlic/FrontPage.java
 | 
9
++++-----
M
code/PtiClic/src/org/pticlic/Main.java
 | 
46
++++++++++++++++++++++++++++++----------------
M
code/PtiClic/src/org/pticlic/js/JavaScriptInterface.java
 | 
19
++++++++++++++-----
M
code/PtiClic/src/org/pticlic/model/Network.java
 | 
1
+

4 files changed, 49 insertions(+), 26 deletions(-)
diff --git a/code/PtiClic/src/org/pticlic/FrontPage.java b/code/PtiClic/src/org/pticlic/FrontPage.java
@@ -5,7 +5,7 @@ import org.pticlic.model.Constant;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.webkit.WebSettings;
+import android.util.Log;
 import android.webkit.WebView;
 
 public class FrontPage extends Activity {
@@ -20,15 +20,14 @@ public class FrontPage extends Activity {
 		setContentView(R.layout.frontpage);
 
 		webView = (WebView) findViewById(R.id.webview);
-		WebSettings webSettings = webView.getSettings();
-		webSettings.setJavaScriptEnabled(true);
+		webView.getSettings().setJavaScriptEnabled(true);
 		
 		js = new JavaScriptInterface(this);
-		js.show("PtiClic", "Démarrage de l'application");
 		webView.addJavascriptInterface(js, "PtiClicAndroid");
+		Log.i("[INFO]", Constant.SERVER + Constant.SERVER_URL);
 		webView.loadUrl(Constant.SERVER + Constant.SERVER_URL);
 	}
-	
+		
 	@Override
 	public void onBackPressed() {
 		webView.goBack();
diff --git a/code/PtiClic/src/org/pticlic/Main.java b/code/PtiClic/src/org/pticlic/Main.java
@@ -1,33 +1,48 @@
 package org.pticlic;
 
+import org.pticlic.js.JavaScriptInterface;
+import org.pticlic.model.Constant;
+
 import android.app.Activity;
-import android.content.Intent;
 import android.os.Bundle;
-import android.view.MotionEvent;
+import android.util.Log;
+import android.webkit.WebChromeClient;
+import android.webkit.WebView;
 
 public class Main extends Activity {
 
+	private WebView webView;
+	private JavaScriptInterface js = null;
+	
+	/** Called when the activity is first created. */
 	@Override
-	protected void onCreate(Bundle savedInstanceState) {
+	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.main);
-	}
+		setContentView(R.layout.frontpage);
 
-	@Override
-	protected void onStart() {
-		super.onStart();
+		webView = (WebView) findViewById(R.id.webview);
+		webView.getSettings().setJavaScriptEnabled(true);
+		webView.setWebChromeClient(new WebChromeClient());
+		webView.setVerticalScrollBarEnabled(false);
+		webView.setHorizontalScrollBarEnabled(false);
 
-	}
-	@Override
-	public boolean onTouchEvent(MotionEvent event) {
-		startActivityForResult(new Intent(this, FrontPage.class), 0x0);
-		return super.onTouchEvent(event);
+		js = new JavaScriptInterface(this);
+		webView.addJavascriptInterface(js, "PtiClicAndroid");
+		Log.i("[INFO]", Constant.SERVER + Constant.SERVER_URL);	
 	}
 	
 	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
+	protected void onStart() {
+		super.onStart();
+		webView.loadUrl(Constant.SERVER + Constant.SERVER_URL);
+	}
 		
+	@Override
+	public void onBackPressed() {
+		if (js.getScreen().equals("splash") || js.getScreen().equals("frontpage"))
+			finish();
+		else
+			webView.goBack();
 	}
 	
 	@Override
@@ -36,5 +51,4 @@ public class Main extends Activity {
 
 		finish();
 	}
-
 }
 \ No newline at end of file
diff --git a/code/PtiClic/src/org/pticlic/js/JavaScriptInterface.java b/code/PtiClic/src/org/pticlic/js/JavaScriptInterface.java
@@ -1,23 +1,24 @@
 package org.pticlic.js;
 
+import android.app.Activity;
 import android.app.ProgressDialog;
-import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
 public class JavaScriptInterface {
-	private Context mContext;
+	private Activity mContext;
 	private ProgressDialog dialog;
+	private String screen;
 
     /** Instantie l'interface et initialise le context */
-    public JavaScriptInterface(Context c) {
+    public JavaScriptInterface(Activity c) {
         mContext = c;
     }
     
     /**
      * Permet de setter une valeur dans les preferences
      * 
-     * @param aName Le nom de la preference
+     * @param aName Le nom de la preference 
      * @param aValue La valeur que l'on veux pour la preference
      */
     public void setPreference(String aName, String aValue) {
@@ -55,6 +56,14 @@ public class JavaScriptInterface {
      * 
      */
     public void exit() {
-    	System.exit(0);
+    	mContext.finish();
     }
+
+	public void setScreen(String screen) {
+		this.screen = screen;
+	}
+
+	public String getScreen() {
+		return screen;
+	}
 }
diff --git a/code/PtiClic/src/org/pticlic/model/Network.java b/code/PtiClic/src/org/pticlic/model/Network.java
@@ -10,6 +10,7 @@ import android.preference.PreferenceManager;
 import com.google.gson.Gson;
 
 
+
 /**
  * @author Bertrand BRUN
  *