merge heads

2013-11-20 10:36:47 -08:00
parent 45909e70b6
commit 63c1330f50
68 changed files with 1487 additions and 1176 deletions
@@ -453,7 +453,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {

    if (tripStatisticsUpdater != null) {
      tripStatisticsUpdater.addLocation(location, recordingDistanceInterval, false,
-          ActivityType.INVALID, PreferencesUtils.STATS_WEIGHT_DEFAULT);
+          ActivityType.INVALID, PreferencesUtils.WEIGHT_DEFAULT);
      TripStatistics tripStatistics = tripStatisticsUpdater.getTripStatistics();
      if (chartByDistance) {
        double distance = tripStatistics.getTotalDistance() * UnitConversions.M_TO_KM;
@@ -16,12 +16,16 @@

 package com.google.android.apps.mytracks.fragments;

+import com.google.android.apps.mytracks.util.PreferencesUtils;
+import com.google.android.apps.mytracks.util.StringUtils;
 import com.google.android.apps.mytracks.util.TrackIconUtils;
+import com.google.android.apps.mytracks.util.UnitConversions;
 import com.google.android.maps.mytracks.R;

 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.content.DialogInterface;
 import android.graphics.BitmapFactory;
 import android.graphics.BitmapFactory.Options;
 import android.os.Bundle;
@@ -30,20 +34,22 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.GridView;
+import android.widget.ImageButton;
+import android.widget.TextView;

 import java.util.ArrayList;
 import java.util.List;

 /**
 * A DialogFragment to choose an activity type.
- *
+ * 
 * @author apoorvn
 */
 public class ChooseActivityTypeDialogFragment extends DialogFragment {

  /**
   * Interface for caller of this dialog fragment.
-   *
+   * 
   * @author apoorvn
   */
  public interface ChooseActivityTypeCaller {
@@ -51,12 +57,28 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment {
    /**
     * Called when choose activity type is done.
     */
-    public void onChooseActivityTypeDone(String iconValue);
+    public void onChooseActivityTypeDone(String iconValue, boolean newWeight);
  }

  public static final String CHOOSE_ACTIVITY_TYPE_DIALOG_TAG = "chooseActivityType";

+  private static final String KEY_CATEGORY = "category";
+
  private ChooseActivityTypeCaller caller;
+  private ChooseActivityTypeImageAdapter imageAdapter;
+  private AlertDialog alertDialog;
+  private View weightContainer;
+  private TextView weight;
+  private String weightValue;
+
+  public static ChooseActivityTypeDialogFragment newInstance(String category) {
+    Bundle bundle = new Bundle();
+    bundle.putString(KEY_CATEGORY, category);
+
+    ChooseActivityTypeDialogFragment fragment = new ChooseActivityTypeDialogFragment();
+    fragment.setArguments(bundle);
+    return fragment;
+  }

  @Override
  public void onAttach(Activity activity) {
@@ -71,12 +93,31 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment {

  @Override
  public Dialog onCreateDialog(Bundle savedInstanceState) {
-    GridView gridView =
-        (GridView) getActivity().getLayoutInflater().inflate(R.layout.choose_activity_type, null);
-
-    final List<String> iconValues = TrackIconUtils.getAllIconValues();
+    View view = getActivity().getLayoutInflater().inflate(R.layout.choose_activity_type, null);   
+    GridView gridView = (GridView) view.findViewById(R.id.choose_activity_type_grid_view);
+    weightContainer = view.findViewById(R.id.choose_activity_type_weight_container);
+    
+    TextView weightLabel = (TextView) view.findViewById(R.id.choose_activity_type_weight_label);
+    weightLabel.setText(
+        PreferencesUtils.isMetricUnits(getActivity()) ? R.string.description_weight_metric
+            : R.string.description_weight_imperial);
+    
+    weight = (TextView) view.findViewById(R.id.choose_activity_type_weight);
+    ImageButton imageButton = (ImageButton) view.findViewById(
+        R.id.choose_activity_type_weight_image_button);
+    imageButton.setOnClickListener(new View.OnClickListener() {
+        @Override
+      public void onClick(View v) {
+        double weightDefault = PreferencesUtils.WEIGHT_DEFAULT;
+        if (!PreferencesUtils.isMetricUnits(getActivity())) {
+          weightDefault *= UnitConversions.KG_TO_LB;
+        }
+        weight.setText(StringUtils.formatWeight(weightDefault));
+      }
+    });
+    
    List<Integer> imageIds = new ArrayList<Integer>();
-    for (String iconValue : iconValues) {
+    for (String iconValue : TrackIconUtils.getAllIconValues()) {
      imageIds.add(TrackIconUtils.getIconDrawable(iconValue));
    }

@@ -88,18 +129,77 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment {
    int height = options.outHeight + 2 * padding;
    gridView.setColumnWidth(width);

-    ChooseActivityTypeImageAdapter imageAdapter =
-        new ChooseActivityTypeImageAdapter(getActivity(), imageIds, width, height, padding);
+    imageAdapter = new ChooseActivityTypeImageAdapter(
+        getActivity(), imageIds, width, height, padding);
    gridView.setAdapter(imageAdapter);
    gridView.setOnItemClickListener(new OnItemClickListener() {
-      @Override
+        @Override
      public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
-        dismiss();
-        caller.onChooseActivityTypeDone(iconValues.get(position));
+        alertDialog.getButton(Dialog.BUTTON_POSITIVE).setEnabled(true);
+        imageAdapter.setSelected(position);
+        imageAdapter.notifyDataSetChanged();
+        updateWeightContainer(position);
      }
    });

-    return new AlertDialog.Builder(getActivity()).setNegativeButton(R.string.generic_cancel, null)
-        .setTitle(R.string.track_edit_activity_type_hint).setView(gridView).create();
+    alertDialog = new AlertDialog.Builder(getActivity()).setNegativeButton(
+        R.string.generic_cancel, null)
+        .setPositiveButton(R.string.generic_ok, new Dialog.OnClickListener() {
+
+            @Override
+          public void onClick(DialogInterface dialog, int which) {
+            boolean newWeight = false;
+            if (weightContainer.getVisibility() == View.VISIBLE) {
+              String newValue = weight.getText().toString();
+              if (!newValue.equals(weightValue)) {
+                newWeight = true;
+                PreferencesUtils.storeWeightValue(getActivity(), newValue);
+              }
+            }
+            int selected = imageAdapter.getSelected();
+            caller.onChooseActivityTypeDone(
+                TrackIconUtils.getAllIconValues().get(selected), newWeight);
+          }
+        }).setTitle(R.string.track_edit_activity_type_hint).setView(view).create();
+    alertDialog.setOnShowListener(new DialogInterface.OnShowListener() {
+
+        @Override
+      public void onShow(DialogInterface dialog) {
+        int position = getPosition();
+        alertDialog.getButton(Dialog.BUTTON_POSITIVE).setEnabled(position != -1);
+        if (position != -1) {
+          imageAdapter.setSelected(position);
+          imageAdapter.notifyDataSetChanged();
+        }
+        updateWeightContainer(position);
+        double weightDisplayValue = PreferencesUtils.getWeightDisplayValue(getActivity());
+        weightValue = StringUtils.formatWeight(weightDisplayValue);
+        weight.setText(weightValue);
+      }
+    });
+    return alertDialog;
+  }
+
+  private int getPosition() {
+    String category = getArguments().getString(KEY_CATEGORY);
+    if (category == null) {
+      return -1;
+    }
+    String iconValue = TrackIconUtils.getIconValue(getActivity(), category);
+    if (iconValue.equals("")) {
+      return -1;
+    }
+    List<String> iconValues = TrackIconUtils.getAllIconValues();
+    for (int i = 0; i < iconValues.size(); i++) {
+      if (iconValues.get(i).equals(iconValue)) {
+        return i;
+      }
+    }
+    return -1;
+  }
+
+  private void updateWeightContainer(int position) {
+    boolean showWeight = position == 0 || position == 1 || position == 2;
+    weightContainer.setVisibility(showWeight ? View.VISIBLE : View.GONE);
  }
 }
@@ -16,7 +16,10 @@

 package com.google.android.apps.mytracks.fragments;

+import com.google.android.maps.mytracks.R;
+
 import android.content.Context;
+import android.graphics.Color;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
@@ -36,6 +39,7 @@ public class ChooseActivityTypeImageAdapter extends BaseAdapter {
  private final int width;
  private final int height;
  private final int padding;
+  private int selected = -1;

  public ChooseActivityTypeImageAdapter(
      Context context, List<Integer> imageIds, int width, int height, int padding) {
@@ -61,6 +65,14 @@ public class ChooseActivityTypeImageAdapter extends BaseAdapter {
    return 0;
  }

+  public int getSelected() {
+    return selected;
+  }
+
+  public void setSelected(int position) {
+    selected = position;
+  }
+
  @Override
  public View getView(int position, View convertView, ViewGroup parent) {
    ImageView imageView;
@@ -69,6 +81,11 @@ public class ChooseActivityTypeImageAdapter extends BaseAdapter {
    } else {
      imageView = (ImageView) convertView;
    }
+    if (position == selected) {
+      imageView.setBackgroundResource(R.drawable.list_selector_background_transition_holo_dark);
+    } else {
+      imageView.setBackgroundColor(Color.TRANSPARENT);
+    }
    imageView.setImageResource(imageIds.get(position));
    imageView.setMinimumHeight(height);
    imageView.setMinimumWidth(width);
@@ -22,9 +22,10 @@ import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
+import com.google.android.apps.mytracks.util.CalorieUtils;
+import com.google.android.apps.mytracks.util.CalorieUtils.ActivityType;
 import com.google.android.apps.mytracks.util.IntentUtils;
 import com.google.android.apps.mytracks.util.PhotoUtils;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
 import com.google.android.apps.mytracks.util.StatsUtils;
 import com.google.android.apps.mytracks.util.StringUtils;
 import com.google.android.maps.mytracks.R;
@@ -128,6 +129,9 @@ public class MarkerDetailFragment extends Fragment {
        int visibility = waypointInfo.getVisibility() == View.GONE ? View.VISIBLE : View.GONE;
        textGradient.setVisibility(visibility);
        waypointInfo.setVisibility(visibility);
+        if (visibility == View.VISIBLE) {
+          handler.postDelayed(hideText, HIDE_TEXT_DELAY);
+        }
      }
    });
    textGradient = (ImageView) view.findViewById(R.id.marker_detail_waypoint_text_gradient);
@@ -277,8 +281,12 @@ public class MarkerDetailFragment extends Fragment {
      TextView name = (TextView) getView().findViewById(R.id.marker_detail_statistics_name);
      setTextView(name, waypoint.getName());

-      StatsUtils.setTripStatisticsValues(getActivity(), null, getView(),
-          waypoint.getTripStatistics(), PreferencesUtils.RECORDING_TRACK_ID_DEFAULT);
+      Track track = myTracksProviderUtils.getTrack(waypoint.getTrackId());
+      ActivityType activityType = track != null ? CalorieUtils.getActivityType(
+          getActivity(), track.getCategory())
+          : ActivityType.INVALID;
+      StatsUtils.setTripStatisticsValues(
+          getActivity(), null, getView(), waypoint.getTripStatistics(), activityType, null);
      StatsUtils.setLocationValues(getActivity(), null, getView(), waypoint.getLocation(), false);
    }
  }
@@ -23,9 +23,13 @@ import com.google.android.apps.mytracks.content.TrackDataListener;
 import com.google.android.apps.mytracks.content.TrackDataType;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.stats.TripStatistics;
+import com.google.android.apps.mytracks.util.CalorieUtils;
+import com.google.android.apps.mytracks.util.CalorieUtils.ActivityType;
 import com.google.android.apps.mytracks.util.LocationUtils;
 import com.google.android.apps.mytracks.util.PreferencesUtils;
 import com.google.android.apps.mytracks.util.StatsUtils;
+import com.google.android.apps.mytracks.util.TrackIconUtils;
+import com.google.android.apps.mytracks.util.UnitConversions;
 import com.google.android.maps.mytracks.R;

 import android.location.Location;
@@ -33,9 +37,12 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Spinner;

 import java.util.EnumSet;

@@ -49,13 +56,15 @@ public class StatsFragment extends Fragment implements TrackDataListener {

  public static final String STATS_FRAGMENT_TAG = "statsFragment";

-  private static final int ONE_SECOND = 1000;
+  // 1 second in milliseconds
+  private static final long ONE_SECOND = (long) UnitConversions.S_TO_MS;

  private TrackDataHub trackDataHub;
  private Handler handler;

  private Location lastLocation = null;
  private TripStatistics lastTripStatistics = null;
+  private String category = "";
  private int recordingGpsAccuracy = PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT;

  // A runnable to update the total time field.
@@ -81,13 +90,34 @@ public class StatsFragment extends Fragment implements TrackDataListener {
  public void onActivityCreated(Bundle savedInstanceState) {
    super.onActivityCreated(savedInstanceState);
    handler = new Handler();
-    updateUi(getActivity());
+   
+    Spinner activityTypeIcon = (Spinner) getView().findViewById(R.id.stats_activity_type_icon);
+    activityTypeIcon.setAdapter(TrackIconUtils.getIconSpinnerAdapter(getActivity(), ""));
+    activityTypeIcon.setOnTouchListener(new View.OnTouchListener() {
+        @Override
+      public boolean onTouch(View v, MotionEvent event) {
+        if (event.getAction() == MotionEvent.ACTION_UP) {
+          ((TrackDetailActivity) getActivity()).chooseActivityType(category);          
+        }
+        return true;
+      }
+    });
+    activityTypeIcon.setOnKeyListener(new View.OnKeyListener() {
+        @Override
+      public boolean onKey(View v, int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
+          ((TrackDetailActivity) getActivity()).chooseActivityType(category);
+        }
+        return true;
+      }
+    });
  }

  @Override
  public void onResume() {
    super.onResume();
    resumeTrackDataHub();
+    updateUi(getActivity());
    if (isSelectedTrackRecording()) {
      handler.post(updateTotalTime);
    }
@@ -106,8 +136,9 @@ public class StatsFragment extends Fragment implements TrackDataListener {
      getActivity().runOnUiThread(new Runnable() {
          @Override
        public void run() {
-          if (isResumed()) {
+          if (isResumed()) {           
            lastTripStatistics = track != null ? track.getTripStatistics() : null;
+            category = track != null ? track.getCategory() : "";
            updateUi(getActivity());
          }
        }
@@ -260,9 +291,10 @@ public class StatsFragment extends Fragment implements TrackDataListener {
   * Updates the UI.
   */
  private void updateUi(FragmentActivity activity) {
-    StatsUtils.setTripStatisticsValues(activity, activity, null, lastTripStatistics,
-        trackDataHub == null ? PreferencesUtils.RECORDING_TRACK_ID_DEFAULT
-            : trackDataHub.getSelectedTrackId());
+    ActivityType activityType = CalorieUtils.getActivityType(activity, category);
+    String trackIconValue = TrackIconUtils.getIconValue(activity, category);
+    StatsUtils.setTripStatisticsValues(
+        activity, activity, null, lastTripStatistics, activityType, trackIconValue);
    StatsUtils.setLocationValues(
        activity, activity, null, lastLocation, isSelectedTrackRecording());
  }