From 79934d51ac6028fe0203e8d7535ea2d6f9a430cd Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Tue, 10 Sep 2019 22:19:37 +0200 Subject: [PATCH] Revert "Moved from onTouch to onClick listeners." This reverts commit 025dee68 --- .../java/de/dennisguse/opentracks/ChartView.java | 15 ++++++++++----- .../dennisguse/opentracks/TrackEditActivity.java | 14 +++++++++----- .../opentracks/fragments/StatsFragment.java | 13 ++++++++----- .../settings/ActivityTypePreference.java | 6 ++++-- 4 files changed, 31 insertions(+), 17 deletions(-) diff --git a/src/main/java/de/dennisguse/opentracks/ChartView.java b/src/main/java/de/dennisguse/opentracks/ChartView.java index f2c646fd5..bbe21841e 100644 --- a/src/main/java/de/dennisguse/opentracks/ChartView.java +++ b/src/main/java/de/dennisguse/opentracks/ChartView.java @@ -449,7 +449,8 @@ 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; @@ -481,7 +482,8 @@ 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); } @@ -631,7 +633,8 @@ 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); } @@ -716,7 +719,8 @@ 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; } @@ -730,7 +734,8 @@ 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 48e560d7b..7c5e28472 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java @@ -19,6 +19,7 @@ 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; @@ -115,12 +116,15 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit activityTypeIcon = findViewById(R.id.track_edit_activity_type_icon); activityTypeIcon.setAdapter(TrackIconUtils.getIconSpinnerAdapter(this, iconValue)); - activityTypeIcon.setOnClickListener(new View.OnClickListener() { + activityTypeIcon.setOnTouchListener(new View.OnTouchListener() { @Override - public void onClick(View view) { - ChooseActivityTypeDialogFragment.newInstance(activityType.getText().toString()).show( - getSupportFragmentManager(), - ChooseActivityTypeDialogFragment.CHOOSE_ACTIVITY_TYPE_DIALOG_TAG); + 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; } }); 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 e63ea87b9..3a4c48196 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java @@ -22,6 +22,7 @@ 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,18 +100,20 @@ public class StatsFragment extends Fragment implements TrackDataListener { Spinner activityTypeIcon = getView().findViewById(R.id.stats_activity_type_icon); activityTypeIcon.setAdapter(TrackIconUtils.getIconSpinnerAdapter(getActivity(), "")); - activityTypeIcon.setOnClickListener(new View.OnClickListener() { - + activityTypeIcon.setOnTouchListener(new View.OnTouchListener() { @Override - public void onClick(View view) { - ((TrackDetailActivity) getActivity()).chooseActivityType(category); + 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) { - v.performClick(); + ((TrackDetailActivity) getActivity()).chooseActivityType(category); } 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 50757e7ea..83d88a4fb 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java +++ b/src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java @@ -64,12 +64,14 @@ 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); } });