X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Forg%2Fpileus%2Fspades%2FMain.java;h=bc9828518b28251c885f22a8a1c032ecb71f8ac1;hb=254a01823368fd3692476fb87022805b6e4a184f;hp=cf0baed4caa470a64dfc3be81ad851bc2ee26d6b;hpb=b821ae0936d4a9dbbf373f3e14bb805be8fcb4ee;p=~andy%2Fspades

diff --git a/src/org/pileus/spades/Main.java b/src/org/pileus/spades/Main.java
index cf0baed..bc98285 100644
--- a/src/org/pileus/spades/Main.java
+++ b/src/org/pileus/spades/Main.java
@@ -5,28 +5,32 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Messenger;
+import android.text.Html;
 import android.text.method.ScrollingMovementMethod;
-import android.view.View;
+import android.text.format.DateFormat;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 import android.widget.ScrollView;
 import android.widget.TabHost;
 import android.widget.TabWidget;
+import android.widget.TextView;
+import android.widget.Toast;
 
 public class Main extends Activity
 {
-	/* Static data */
-	private Handler      handler; 
-	private Messenger    messenger; 
-
 	/* Private data */
+	private Handler      handler;
+	private Messenger    messenger;
 	private Task         task;
+	private Toast        toast;
 	private boolean      ready;
+	private String       topic;
+	private String       names;
 
 	/* Widgets */
 	private TabHost      window;
@@ -41,26 +45,124 @@ public class Main extends Activity
 	private ScrollView   lscroll;
 	private ScrollView   dscroll;
 
-	/* Private methods */
-	public void onRegister(Object obj)
+	/* Private helper methods */
+	private void notice(String text)
+	{
+		this.log.append(Html.fromHtml("<b>*** " + text + "</b><br />"));
+	}
+
+	private void display(Message msg)
+	{
+		String when = DateFormat.format("hh:mm:ss", msg.time).toString();
+		String from = String.format("<font color=\"#ff88ff\">%s</font>", msg.from);
+		String text = msg.msg;
+		String fmt  = null;
+		Os.debug("msg: " + Os.base64(msg.msg));
+
+		// Do IRC Colors
+		//   - This doesn't actually work
+		String fg   = "<font color=\"<$1>\">";
+		String bg   = "<font bgcolor=\"<$2>\">";
+		text = text
+			.replaceAll("&", "&amp;")
+			.replaceAll("<", "&lt;")
+			.replaceAll(">", "&gt;");
+		text = text
+			.replaceAll("\\002", "<b>")  // bold
+			.replaceAll("\\011", "<i>")  // italic
+			.replaceAll("\\025", "<u>")  // underline
+			.replaceAll("\\022", "<b>"); // reverse
+		text = text
+			.replaceAll("\\003(\\d+),(\\d+)", fg + bg) // color
+			.replaceAll("\\013(\\d+),(\\d+)", fg + bg) // color
+			.replaceAll("\\003(\\d+)", fg)             // color
+			.replaceAll("\\013(\\d+)", fg);            // color
+		text = text
+			.replaceAll("<0?0>", "#000000")  // White
+			.replaceAll("<0?1>", "#000000")  // Black
+			.replaceAll("<0?2>", "#000080")  // Navy Blue
+			.replaceAll("<0?3>", "#008000")  // Green
+			.replaceAll("<0?4>", "#FF0000")  // Red
+			.replaceAll("<0?5>", "#804040")  // Brown
+			.replaceAll("<0?6>", "#8000FF")  // Purple
+			.replaceAll("<0?7>", "#808000")  // Olive
+			.replaceAll("<0?8>", "#FFFF00")  // Yellow
+			.replaceAll("<0?9>", "#00FF00")  // Lime Green
+			.replaceAll("<10>",  "#008080")  // Teal
+			.replaceAll("<11>",  "#00FFFF")  // Aqua Light
+			.replaceAll("<12>",  "#0000FF")  // Royal Blue
+			.replaceAll("<13>",  "#FF00FF")  // Hot Pink
+			.replaceAll("<14>",  "#808080")  // Dark Gray
+			.replaceAll("<15>",  "#C0C0C0"); // Light Gray
+
+		// Message formatting
+		switch (msg.how) {
+			case DIRECT:
+			case MENTION:
+			case PRIVMSG:
+				fmt  = "<b>(%s) %s: %s</b>";
+				break;
+			default:
+				fmt  = "(%s) %s: %s";
+				break;
+		}
+
+		String html = String.format(fmt, when, from, text);
+		this.log.append(Html.fromHtml(html + "<br />"));
+	}
+
+	/* Private handler methods */
+	private void onRegister(Object obj)
 	{
 		Os.debug("Main: onRegister");
 		this.task = (Task)obj;
 	}
 
-	public void onMessage(Object obj)
+	private void onMessage(Object obj)
 	{
 		Message msg = (Message)obj;
 
+		// Debug
 		this.debug.append("> " + msg.line + "\n");
 		this.dscroll.smoothScrollTo(0, this.debug.getBottom());
 
-		if (msg.cmd.equals("PRIVMSG")) {
-			this.log.append(msg.from + ": " + msg.msg + "\n");
-			this.lscroll.smoothScrollTo(0, this.log.getBottom());
+		// Chat
+		switch (msg.type) {
+			case PRIVMSG:
+				this.display(msg);
+				break;
+			case TOPIC:
+				if (!msg.txt.equals(this.topic))
+					this.notice("Topic for " + msg.arg + ": " + msg.txt);
+				this.topic = msg.txt;
+				break;
+			case NAMES:
+				if (!msg.txt.equals(this.names))
+					this.notice("Users in " + msg.arg + ": " + msg.txt);
+				this.names = msg.txt;
+				break;
+			case ERROR:
+				this.notice("Error: " + msg.txt);
+				break;
+			case AUTHOK:
+				this.notice("Authentication succeeded: " + msg.txt);
+				break;
+			case AUTHFAIL:
+				this.notice("Authentication failed: " + msg.txt);
+				break;
 		}
+		this.lscroll.smoothScrollTo(0, this.log.getBottom());
 	}
 
+	private void onNotify(String text)
+	{
+		Os.debug("Main: onNotify - " + text);
+		this.notice(text);
+		this.toast.setText(text);
+		this.toast.show();
+	}
+
+	/* Private service methods */
 	private void startService()
 	{
 		Os.debug("Main: startService");
@@ -97,6 +199,9 @@ public class Main extends Activity
 			// Setup main layout
 			this.setContentView(R.layout.main);
 
+			// Setup toast
+			this.toast     = Toast.makeText(this, "", Toast.LENGTH_SHORT);
+
 			// Setup communication
 			this.handler   = new MainHandler();
 			this.messenger = new Messenger(this.handler);
@@ -203,6 +308,9 @@ public class Main extends Activity
 			case R.id.disconnect:
 				this.stopService();
 				return true;
+			case R.id.settings:
+				this.startActivity(new Intent(this, Prefs.class));
+				return true;
 			case R.id.exit:
 				this.stopService();
 				this.finish();
@@ -230,6 +338,9 @@ public class Main extends Activity
 				case Task.DISCONNECT:
 					Main.this.ready = false;
 					break;
+				case Task.NOTIFY:
+					Main.this.onNotify((String)msg.obj);
+					break;
 				default:
 					Os.debug("Main: unknown message - " + msg.what);
 					break;
@@ -237,4 +348,3 @@ public class Main extends Activity
 		}
 	}
 }
-