From 1b2872b6e53791cf5619a016d2b22d015544c2c8 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 6 Mar 2012 15:44:49 +0000 Subject: Better BusActivity. --- src/net/cbaines/suma/BusSpecificTimetableAdapter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/net/cbaines/suma/BusSpecificTimetableAdapter.java') diff --git a/src/net/cbaines/suma/BusSpecificTimetableAdapter.java b/src/net/cbaines/suma/BusSpecificTimetableAdapter.java index 7bcb560..96fe713 100644 --- a/src/net/cbaines/suma/BusSpecificTimetableAdapter.java +++ b/src/net/cbaines/suma/BusSpecificTimetableAdapter.java @@ -60,8 +60,8 @@ public class BusSpecificTimetableAdapter extends BaseAdapter { } if (changed == null || changed[position]) { - a.reset(); - stopView.startAnimation(a); + // a.reset(); + // stopView.startAnimation(a); // Log.i(TAG, "Animating it"); } -- cgit v1.2.3 From 56c74a2fa83916915587ae2de1b46a50f2c856ee Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 6 Mar 2012 22:10:47 +0000 Subject: Improved Bus activity, and U6 route overlay. --- .../cbaines/suma/BusSpecificTimetableAdapter.java | 41 +++++++++++----------- 1 file changed, 20 insertions(+), 21 deletions(-) (limited to 'src/net/cbaines/suma/BusSpecificTimetableAdapter.java') diff --git a/src/net/cbaines/suma/BusSpecificTimetableAdapter.java b/src/net/cbaines/suma/BusSpecificTimetableAdapter.java index 96fe713..7b9a34a 100644 --- a/src/net/cbaines/suma/BusSpecificTimetableAdapter.java +++ b/src/net/cbaines/suma/BusSpecificTimetableAdapter.java @@ -21,16 +21,14 @@ package net.cbaines.suma; import android.view.View; import android.view.ViewGroup; -import android.view.animation.Animation; -import android.view.animation.AnimationUtils; import android.widget.BaseAdapter; public class BusSpecificTimetableAdapter extends BaseAdapter { private final BusActivity context; private Timetable timetable; - private final Animation a; - private boolean[] changed; + // private final Animation a; + // private boolean[] changed; private long timeOfLastForcedUpdate = System.currentTimeMillis(); @@ -39,7 +37,7 @@ public class BusSpecificTimetableAdapter extends BaseAdapter { public BusSpecificTimetableAdapter(BusActivity context, Timetable timetable) { this.context = context; this.timetable = timetable; - this.a = AnimationUtils.loadAnimation(context, R.anim.updated_stop_view); + // this.a = AnimationUtils.loadAnimation(context, R.anim.updated_stop_view); } public View getView(int position, View convertView, ViewGroup parent) { @@ -47,6 +45,7 @@ public class BusSpecificTimetableAdapter extends BaseAdapter { // timetable.get(position)); if (timeOfLastForcedUpdate + 1000 < System.currentTimeMillis()) { + context.handler.removeCallbacks(context.refreshData); context.handler.post(context.refreshData); timeOfLastForcedUpdate = System.currentTimeMillis(); } @@ -59,11 +58,11 @@ public class BusSpecificTimetableAdapter extends BaseAdapter { stopView.setStop(timetable.get(position)); } - if (changed == null || changed[position]) { - // a.reset(); - // stopView.startAnimation(a); - // Log.i(TAG, "Animating it"); - } + // if (changed == null || changed[position]) { + // a.reset(); + // stopView.startAnimation(a); + // Log.i(TAG, "Animating it"); + // } return stopView; } @@ -83,17 +82,17 @@ public class BusSpecificTimetableAdapter extends BaseAdapter { public void updateTimetable(Timetable newTimetable) { // Log.v(TAG, "Old timetable " + timetable); // Log.v(TAG, "Adaptor loading new timetable"); - changed = new boolean[newTimetable.size()]; - for (int i = 0; i < newTimetable.size(); i++) { - if (newTimetable.get(i).arivalTime != null && !timetable.contains(newTimetable.get(i), true)) { - changed[i] = true; - // Log.i(TAG, "Old timetable does not contain: " + - // newTimetable.get(i)); - } else { - // Log.i(TAG, "Old timetable contains: " + newTimetable.get(i)); - changed[i] = false; - } - } + // changed = new boolean[newTimetable.size()]; + // for (int i = 0; i < newTimetable.size(); i++) { + // if (newTimetable.get(i).arivalTime != null && !timetable.contains(newTimetable.get(i), true)) { + // changed[i] = true; + // // Log.i(TAG, "Old timetable does not contain: " + + // // newTimetable.get(i)); + // } else { + // // Log.i(TAG, "Old timetable contains: " + newTimetable.get(i)); + // changed[i] = false; + // } + // } timetable = newTimetable; this.notifyDataSetChanged(); } -- cgit v1.2.3 From 8079c02095db7a90ecde6ee5cf66f1ecb56e51f2 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 7 Mar 2012 22:22:02 +0000 Subject: More bug fixes, and commented out some of the more verbose debugging stuff. --- src/net/cbaines/suma/BusSpecificTimetableAdapter.java | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'src/net/cbaines/suma/BusSpecificTimetableAdapter.java') diff --git a/src/net/cbaines/suma/BusSpecificTimetableAdapter.java b/src/net/cbaines/suma/BusSpecificTimetableAdapter.java index 7b9a34a..954217c 100644 --- a/src/net/cbaines/suma/BusSpecificTimetableAdapter.java +++ b/src/net/cbaines/suma/BusSpecificTimetableAdapter.java @@ -58,12 +58,6 @@ public class BusSpecificTimetableAdapter extends BaseAdapter { stopView.setStop(timetable.get(position)); } - // if (changed == null || changed[position]) { - // a.reset(); - // stopView.startAnimation(a); - // Log.i(TAG, "Animating it"); - // } - return stopView; } @@ -80,19 +74,6 @@ public class BusSpecificTimetableAdapter extends BaseAdapter { } public void updateTimetable(Timetable newTimetable) { - // Log.v(TAG, "Old timetable " + timetable); - // Log.v(TAG, "Adaptor loading new timetable"); - // changed = new boolean[newTimetable.size()]; - // for (int i = 0; i < newTimetable.size(); i++) { - // if (newTimetable.get(i).arivalTime != null && !timetable.contains(newTimetable.get(i), true)) { - // changed[i] = true; - // // Log.i(TAG, "Old timetable does not contain: " + - // // newTimetable.get(i)); - // } else { - // // Log.i(TAG, "Old timetable contains: " + newTimetable.get(i)); - // changed[i] = false; - // } - // } timetable = newTimetable; this.notifyDataSetChanged(); } -- cgit v1.2.3