Better toasts implemented.

1 files changed, 23 insertions, 4 deletions

diff --git a/src/net/cbaines/suma/ToastHelperActivity.java b/src/net/cbaines/suma/ToastHelperActivity.java
index 6c5974c..a7997e9 100644
--- a/src/net/cbaines/suma/ToastHelperActivity.java
+++ b/src/net/cbaines/suma/ToastHelperActivity.java
@@ -1,5 +1,6 @@
 package net.cbaines.suma;
 
+import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -7,17 +8,35 @@ import com.j256.ormlite.android.apptools.OrmLiteBaseActivity;
 
 public class ToastHelperActivity extends OrmLiteBaseActivity<DatabaseHelper> {
 
-	protected Toast toast;
-	protected TextView toastView;
+	private Toast toast;
+	private View toastView;
+	private TextView toastMessageTextView;
+	private TextView toastSubMessageTextView;
 
 	void makeToast(String message, int length) {
+		makeToast(message, null, length);
+	}
+
+	void makeToast(String message, String subMessage, int length) {
 		if (toastView == null) {
-			toastView = (TextView) getLayoutInflater().inflate(R.layout.toast_view, null);
+			toastView = (View) getLayoutInflater().inflate(R.layout.toast_view, null);
 		}
-		toastView.setText(message);
 		if (toast == null) {
 			toast = new Toast(this);
 		}
+
+		toastMessageTextView = (TextView) toastView.findViewById(R.id.toastViewText);
+		toastMessageTextView.setText(message);
+
+		toastSubMessageTextView = (TextView) toastView.findViewById(R.id.toastViewSubMessage);
+		if (subMessage != null) {
+			toastSubMessageTextView.setText(subMessage);
+			toastSubMessageTextView.setVisibility(View.VISIBLE);
+		} else {
+			toastSubMessageTextView.setText("");
+			toastSubMessageTextView.setVisibility(View.GONE);
+		}
+
 		toast.setDuration(length);
 		toast.setView(toastView);
 		toast.show();