diff --git a/src/main/java/de/dennisguse/opentracks/ChartView.java b/src/main/java/de/dennisguse/opentracks/ChartView.java index fef767a6c..c9219cfe7 100644 --- a/src/main/java/de/dennisguse/opentracks/ChartView.java +++ b/src/main/java/de/dennisguse/opentracks/ChartView.java @@ -449,8 +449,7 @@ public class ChartView extends View { synchronized (waypoints) { for (int i = 0; i < waypoints.size(); i++) { Waypoint waypoint = waypoints.get(i); - int distance = Math.abs( - getX(getWaypointXValue(waypoint)) - (int) event.getX() - getScrollX()); + int distance = Math.abs(getX(getWaypointXValue(waypoint)) - (int) event.getX() - getScrollX()); if (distance < minDistance) { minDistance = distance; nearestWaypoint = waypoint; @@ -482,8 +481,7 @@ public class ChartView extends View { @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - updateEffectiveDimensionsIfChanged( - View.MeasureSpec.getSize(widthMeasureSpec), View.MeasureSpec.getSize(heightMeasureSpec)); + updateEffectiveDimensionsIfChanged(View.MeasureSpec.getSize(widthMeasureSpec), View.MeasureSpec.getSize(heightMeasureSpec)); super.onMeasure(widthMeasureSpec, heightMeasureSpec); } @@ -633,8 +631,7 @@ public class ChartView extends View { private String getXAxisLabel() { Context context = getContext(); if (chartByDistance) { - return metricUnits ? context.getString(R.string.unit_kilometer) - : context.getString(R.string.unit_mile); + return metricUnits ? context.getString(R.string.unit_kilometer) : context.getString(R.string.unit_mile); } else { return context.getString(R.string.description_time); } @@ -719,8 +716,7 @@ public class ChartView extends View { int interval = chartValueSeries.getInterval(); float maxMarkerWidth = 0; for (int i = 0; i <= Y_AXIS_INTERVALS; i++) { - maxMarkerWidth = Math.max(maxMarkerWidth, drawYAxisMarker(chartValueSeries, canvas, xPosition, - i * interval + chartValueSeries.getMinMarkerValue())); + maxMarkerWidth = Math.max(maxMarkerWidth, drawYAxisMarker(chartValueSeries, canvas, xPosition, i * interval + chartValueSeries.getMinMarkerValue())); } return maxMarkerWidth; } @@ -734,8 +730,7 @@ public class ChartView extends View { * @param yValue the y value * @return the marker width. */ - private float drawYAxisMarker( - ChartValueSeries chartValueSeries, Canvas canvas, int xPosition, int yValue) { + private float drawYAxisMarker(ChartValueSeries chartValueSeries, Canvas canvas, int xPosition, int yValue) { String marker = chartValueSeries.formatMarker(yValue); Paint paint = chartValueSeries.getMarkerPaint(); Rect rect = getRect(paint, marker); diff --git a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java index b27c1441e..c8b84a8ad 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java @@ -19,7 +19,6 @@ package de.dennisguse.opentracks; import android.os.Bundle; import android.util.Log; import android.view.KeyEvent; -import android.view.MotionEvent; import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; @@ -117,15 +116,12 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit activityTypeIcon = findViewById(R.id.track_edit_activity_type_icon); activityTypeIcon.setAdapter(TrackIconUtils.getIconSpinnerAdapter(this, iconValue)); - activityTypeIcon.setOnTouchListener(new View.OnTouchListener() { + activityTypeIcon.setOnClickListener(new View.OnClickListener() { @Override - public boolean onTouch(View v, MotionEvent event) { - if (event.getAction() == MotionEvent.ACTION_UP) { - ChooseActivityTypeDialogFragment.newInstance(activityType.getText().toString()).show( - getSupportFragmentManager(), - ChooseActivityTypeDialogFragment.CHOOSE_ACTIVITY_TYPE_DIALOG_TAG); - } - return true; + public void onClick(View view) { + ChooseActivityTypeDialogFragment.newInstance(activityType.getText().toString()).show( + getSupportFragmentManager(), + ChooseActivityTypeDialogFragment.CHOOSE_ACTIVITY_TYPE_DIALOG_TAG); } }); activityTypeIcon.setOnKeyListener(new View.OnKeyListener() { diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java index a82fbeaac..4b5a60d9e 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java @@ -22,7 +22,6 @@ import android.os.Handler; import android.util.Log; import android.view.KeyEvent; import android.view.LayoutInflater; -import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.widget.Spinner; @@ -99,20 +98,18 @@ public class StatsFragment extends Fragment implements TrackDataListener { Spinner activityTypeIcon = getView().findViewById(R.id.stats_activity_type_icon); activityTypeIcon.setAdapter(TrackIconUtils.getIconSpinnerAdapter(getActivity(), "")); - activityTypeIcon.setOnTouchListener(new View.OnTouchListener() { + activityTypeIcon.setOnClickListener(new View.OnClickListener() { + @Override - public boolean onTouch(View v, MotionEvent event) { - if (event.getAction() == MotionEvent.ACTION_UP) { - ((TrackDetailActivity) getActivity()).chooseActivityType(category); - } - return true; + public void onClick(View view) { + ((TrackDetailActivity) getActivity()).chooseActivityType(category); } }); 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); + v.performClick(); } return true; } diff --git a/src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java b/src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java index dfef4b948..ad6977d56 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java +++ b/src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java @@ -29,10 +29,10 @@ import android.widget.ArrayAdapter; import android.widget.AutoCompleteTextView; import android.widget.Spinner; +import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.util.DialogUtils; import de.dennisguse.opentracks.util.PreferencesUtils; import de.dennisguse.opentracks.util.TrackIconUtils; -import de.dennisguse.opentracks.R; /** * For entering the default activity type. @@ -64,14 +64,12 @@ public class ActivityTypePreference extends DialogPreference { getContext(), R.string.default_activity_key, PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT); textView.setText(category); - ArrayAdapter adapter = ArrayAdapter.createFromResource( - getContext(), R.array.activity_types, android.R.layout.simple_dropdown_item_1line); + ArrayAdapter adapter = ArrayAdapter.createFromResource(getContext(), R.array.activity_types, android.R.layout.simple_dropdown_item_1line); textView.setAdapter(adapter); textView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView parent, View v, int position, long id) { - String iconValue = TrackIconUtils.getIconValue( - getContext(), (String) textView.getAdapter().getItem(position)); + String iconValue = TrackIconUtils.getIconValue(getContext(), (String) textView.getAdapter().getItem(position)); TrackIconUtils.setIconSpinner(spinner, iconValue); } });