X-Git-Url: http://www.average.org/gitweb/?p=WhereAmI.git;a=blobdiff_plain;f=src%2Forg%2Faverage%2Fwhereami%2FWhereAmI.java;h=20812aa04ecabf6fcedc3d8f0ad87bc22307de7e;hp=2f69212af35f023f542cd6d4a5a310d29e242426;hb=ca6debb0783f0cd561b042df3dd0495654a4a503;hpb=d837c7a854c5e53867641b519a33d545b929c52e

diff --git a/src/org/average/whereami/WhereAmI.java b/src/org/average/whereami/WhereAmI.java
index 2f69212..20812aa 100644
--- a/src/org/average/whereami/WhereAmI.java
+++ b/src/org/average/whereami/WhereAmI.java
@@ -3,6 +3,10 @@ package org.average.whereami;
 import android.app.Activity;
 import android.os.Bundle;
 import android.os.AsyncTask;
+import android.os.Handler;
+import android.os.SystemClock;
+import android.content.res.Resources;
+import android.text.format.Time;
 import android.util.Log;
 import android.view.View;
 import android.view.Window;
@@ -11,6 +15,11 @@ import android.widget.TextView;
 
 public class WhereAmI extends Activity
 {
+    private TextView tv, tvt, tvd;
+    private Resources res;
+    private String[] month;
+    private String[] wday;
+
     /** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle savedInstanceState)
@@ -20,11 +29,62 @@ public class WhereAmI extends Activity
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
         getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
         setContentView(R.layout.main);
+        res = getResources();
+        month = res.getStringArray(R.array.month);
+        wday = res.getStringArray(R.array.wday);
+        tv = (TextView)findViewById(R.id.location);
+        tvt = (TextView)findViewById(R.id.time);
+        tvd = (TextView)findViewById(R.id.date);
         Log.v("WhereAmI", "created UI, about to start update task");
-        new TimedUpdateTask().execute(5);
+	updateClock.run();
+	updateCal.run();
+	updateInfo.run();
         Log.v("WhereAmI", "created UI, update task created");
     }
 
+    private Handler mHandler = new Handler();
+
+    private Runnable updateClock = new Runnable () {
+        public void run() {
+            long now = System.currentTimeMillis();
+            Time tm = new Time();
+            tm.set(now);
+            tvt.setText(tm.format("%H:%M"));
+            tm.set(now + 60000);
+            tm.second=0;
+            long next = tm.toMillis(false);
+            mHandler.postDelayed(this, next-now+1);
+        }
+    };
+
+    private Runnable updateCal = new Runnable () {
+        public void run() {
+            long now = System.currentTimeMillis();
+            Time tm = new Time();
+            tm.set(now);
+            tvd.setText(
+                       wday[tm.weekDay] +
+                       tm.format("\n%d ") +
+                       month[tm.month] +
+                       tm.format(" %Y"));
+            tm.set(now + 86400000);
+            tm.hour=0;
+            tm.minute=0;
+            tm.second=0;
+            long next = tm.toMillis(false);
+            mHandler.postDelayed(this, next-now+1);
+        }
+    };
+
+    private Runnable updateInfo = new Runnable () {
+        public void run() {
+            Log.v("updateInfo", "starting");
+            tv.setText(R.string.updating);
+            new TimedUpdateTask().execute(5); // for delayed execution
+            mHandler.postDelayed(this, 10000);
+        }
+    };
+
     private class TimedUpdateTask extends AsyncTask<Integer, Void, String> {
     	@Override
         protected String doInBackground(Integer... howlong) {
@@ -40,9 +100,8 @@ public class WhereAmI extends Activity
     
     	@Override
         protected void onPostExecute(String str) {
-            TextView tv = (TextView)findViewById(R.id.tv);
             Log.v("TimedUpdateTask", "callback executing");
-            tv.append("\n" + str);
+            tv.setText(R.string.failure);
         }
     }
 }