Improvements to Activity Recorder UI

Activity classifications are now localised. Closes #54
Times and durations are formatted properly. Closes #57

code/ActivityRecorder/res/values/strings.xml

@@ -6,4 +6,14 @@
 
     <string name="service_enabled">Stop background service</string>
     <string name="service_disabled">Start background service</string>
+
+    <string name="activity_unknown">Unknown</string>
+    <string name="activity_walking">Walking</string>
+    <string name="activity_walking_stairs_up">Walking (up stairs)</string>
+    <string name="activity_walking_stairs_down">Walking (down stairs)</string>
+    <string name="activity_dancing">Dancing</string>
+    <string name="activity_idle_standing">Standing still</string>
+    <string name="activity_idle_sitting">Sitting down</string>
+    <string name="activity_vehicle_bus">Travelling by bus</string>
+    <string name="activity_vehicle_car">Travelling by car</string>
 </resources>

code/ActivityRecorder/src/uk/co/md87/android/activityrecorder/ActivityRecorderActivity.java

@@ -22,6 +22,7 @@ import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ListView;
 import android.widget.Toast;
+import java.util.Map;
 import uk.co.md87.android.activityrecorder.rpc.ActivityRecorderBinder;
 import uk.co.md87.android.activityrecorder.rpc.Classification;
 import uk.co.md87.android.common.ExceptionHandler;
@@ -116,7 +117,7 @@ public class ActivityRecorderActivity extends Activity {
                     .getAdapter()).clear();
             for (Classification entry : service.getClassifications()) {
                 ((ArrayAdapter<Classification>) ((ListView) findViewById(R.id.list))
-                    .getAdapter()).add(entry);
+                    .getAdapter()).add(entry.withContext(this));
             }
         } catch (RemoteException ex) {
             Log.e(getClass().getName(), "Unable to get service state", ex);

code/ActivityRecorder/src/uk/co/md87/android/activityrecorder/R.java

@@ -25,6 +25,15 @@ public final class R {
         public static final int basic_model=0x7f040000;
     }
     public static final class string {
+        public static final int activity_dancing=0x7f050008;
+        public static final int activity_idle_sitting=0x7f05000a;
+        public static final int activity_idle_standing=0x7f050009;
+        public static final int activity_unknown=0x7f050004;
+        public static final int activity_vehicle_bus=0x7f05000b;
+        public static final int activity_vehicle_car=0x7f05000c;
+        public static final int activity_walking=0x7f050005;
+        public static final int activity_walking_stairs_down=0x7f050007;
+        public static final int activity_walking_stairs_up=0x7f050006;
         public static final int app_name=0x7f050000;
         public static final int error_disconnected=0x7f050001;
         public static final int service_disabled=0x7f050003;

code/ActivityRecorder/src/uk/co/md87/android/activityrecorder/RecorderService.java

@@ -167,7 +167,7 @@ public class RecorderService extends Service {
         }
 
         manager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
-        handler.postDelayed(registerRunnable, 60000);
+        handler.postDelayed(registerRunnable, 1000);
     }
 
     void register() {

code/ActivityRecorder/src/uk/co/md87/android/activityrecorder/rpc/Classification.java

@@ -5,8 +5,11 @@
 
 package uk.co.md87.android.activityrecorder.rpc;
 
+import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.text.format.DateFormat;
+import java.util.Date;
 
 /**
  *
@@ -14,6 +17,8 @@ import android.os.Parcelable;
  */
 public class Classification implements Parcelable {
 
+    private CharSequence niceClassification;
+    private String startTime;
     private final String classification;
     private final long start;
     private long end;
@@ -46,7 +51,19 @@ public class Classification implements Parcelable {
 
     @Override
     public String toString() {
-        return classification + "\n" + start + " -- " + (end - start);
+        final String duration;
+        final int length = (int) ((end - start) / 1000);
+
+        if (length < 60) {
+            duration = length + " secs";
+        } else if (length < 60 * 60) {
+            duration = (length / 60) + " mins";
+        } else {
+            duration = (length / (60 * 60)) + " hrs";
+        }
+
+
+        return niceClassification + "\n" + startTime + " for " + duration;
     }
 
     public void writeToParcel(Parcel arg0, int arg1) {
@@ -55,6 +72,23 @@ public class Classification implements Parcelable {
         arg0.writeLong(end);
     }
 
+    public Classification withContext(final Context context) {
+        String name = "activity_" + getClassification().substring(11)
+                .replace("/", "_").toLowerCase();
+
+        niceClassification = context.getResources().getText(
+                context.getResources().getIdentifier(name, "string",
+                "uk.co.md87.android.activityrecorder"));
+
+        Date date = new Date(start);
+        java.text.DateFormat dateFormat = DateFormat.getDateFormat(context);
+        java.text.DateFormat timeFormat = DateFormat.getTimeFormat(context);
+
+        startTime = dateFormat.format(date) + " " + timeFormat.format(date);
+        
+        return this;
+    }
+
     public static final Parcelable.Creator<Classification> CREATOR
              = new Parcelable.Creator<Classification>() {