From 225560b863e17223dbfe022708b4ceb308a3c939 Mon Sep 17 00:00:00 2001
From: Miguel Astor <sonofgrendel@gmail.com>
Date: Thu, 28 Nov 2013 09:01:45 -0430
Subject: [PATCH] Refactored the implementation of the Toaster interface.

---
 src/ve/ucv/ciens/ccg/nxtar/MainActivity.java  | 42 ++++++++++++++++---
 .../ciens/ccg/nxtar/utils/AndroidToaster.java | 41 ------------------
 2 files changed, 36 insertions(+), 47 deletions(-)
 delete mode 100644 src/ve/ucv/ciens/ccg/nxtar/utils/AndroidToaster.java

diff --git a/src/ve/ucv/ciens/ccg/nxtar/MainActivity.java b/src/ve/ucv/ciens/ccg/nxtar/MainActivity.java
index 3411f8c..2c6a6d1 100644
--- a/src/ve/ucv/ciens/ccg/nxtar/MainActivity.java
+++ b/src/ve/ucv/ciens/ccg/nxtar/MainActivity.java
@@ -1,40 +1,70 @@
 package ve.ucv.ciens.ccg.nxtar;
 
 import ve.ucv.ciens.ccg.nxtar.interfaces.MulticastEnabler;
-import ve.ucv.ciens.ccg.nxtar.utils.AndroidToaster;
+import ve.ucv.ciens.ccg.nxtar.interfaces.Toaster;
 import android.content.Context;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WifiManager.MulticastLock;
 import android.os.Bundle;
+import android.os.Handler;
+import android.widget.Toast;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.backends.android.AndroidApplication;
 import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
 
-public class MainActivity extends AndroidApplication implements MulticastEnabler{
+public class MainActivity extends AndroidApplication implements Toaster, MulticastEnabler{
 	private static final String TAG = "NXTAR_ANDROID_MAIN";
 	private static final String CLASS_NAME = MainActivity.class.getSimpleName();
 
-	private AndroidToaster toaster;
 	private WifiManager wifiManager;
 	private MulticastLock multicastLock;
+	private Handler uiHandler;
+	private Context uiContext;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
+		uiHandler = new Handler();
+		uiContext = this;
 		wifiManager = (WifiManager)getSystemService(Context.WIFI_SERVICE);
-		toaster = new AndroidToaster(this);
 
 		AndroidApplicationConfiguration cfg = new AndroidApplicationConfiguration();
 		cfg.useGL20 = false;
 
-		initialize(new Main(toaster, this), cfg);
+		initialize(new NxtARCore(this), cfg);
+	}
+
+	////////////////////////////////
+	// Toaster interface methods. //
+	////////////////////////////////
+	@Override
+	public void showShortToast(final String msg) {
+		uiHandler.post(new Runnable() {
+			@Override
+			public void run() {
+				Toast.makeText(uiContext, msg, Toast.LENGTH_SHORT).show();
+			}
+		});
 	}
 
+	@Override
+	public void showLongToast(final String msg) {
+		uiHandler.post(new Runnable() {
+			@Override
+			public void run() {
+				Toast.makeText(uiContext, msg, Toast.LENGTH_LONG).show();
+			}
+		});
+	}
+
+	/////////////////////////////////////////
+	// MulticastEnabler interface methods. //
+	/////////////////////////////////////////
 	@Override
 	public void enableMulticast(){
-		Gdx.app.debug(TAG, CLASS_NAME + ".disableMulticast() :: Requesting multicast lock.");
+		Gdx.app.debug(TAG, CLASS_NAME + ".enableMulticast() :: Requesting multicast lock.");
 		multicastLock = wifiManager.createMulticastLock(TAG);
 		multicastLock.setReferenceCounted(true);
 		multicastLock.acquire();
diff --git a/src/ve/ucv/ciens/ccg/nxtar/utils/AndroidToaster.java b/src/ve/ucv/ciens/ccg/nxtar/utils/AndroidToaster.java
deleted file mode 100644
index b93ec64..0000000
--- a/src/ve/ucv/ciens/ccg/nxtar/utils/AndroidToaster.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package ve.ucv.ciens.ccg.nxtar.utils;
-
-import ve.ucv.ciens.ccg.nxtar.interfaces.Toaster;
-import android.content.Context;
-import android.os.Handler;
-import android.widget.Toast;
-
-/**
- * Class used for showing toast messages from a LibGDX game.
- * 
- * @author Miguel Angel Astor Romero
- */
-public class AndroidToaster implements Toaster {
-	private Handler uiHandler;
-	private Context uiContext; 
-
-	public AndroidToaster(Context context){
-		uiHandler = new Handler();
-		uiContext = context;
-	}
-
-	@Override
-	public void showShortToast(final String msg) {
-		uiHandler.post(new Runnable() {
-			@Override
-			public void run() {
-				Toast.makeText(uiContext, msg, Toast.LENGTH_SHORT).show();
-			}
-		});
-	}
-
-	@Override
-	public void showLongToast(final String msg) {
-		uiHandler.post(new Runnable() {
-			@Override
-			public void run() {
-				Toast.makeText(uiContext, msg, Toast.LENGTH_LONG).show();
-			}
-		});
-	}
-}