karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Revert "Moved from onTouch to onClick listeners."

Browse Source 
This reverts commit 025dee68
This commit is contained in:
Dennis Guse
2019-09-10 22:19:37 +02:00
parent 496cf9145b
commit 79934d51ac
4 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/ChartView.java
+10 -5
View File
@@ -449,7 +449,8 @@ public class ChartView extends View {
synchronized (waypoints) { synchronized (waypoints) {
for (int i = 0; i < waypoints.size(); i++) { for (int i = 0; i < waypoints.size(); i++) {
Waypoint waypoint = waypoints.get(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) { if (distance < minDistance) {
minDistance = distance; minDistance = distance;
nearestWaypoint = waypoint; nearestWaypoint = waypoint;
@@ -481,7 +482,8 @@ public class ChartView extends View {
@Override @Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { 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); super.onMeasure(widthMeasureSpec, heightMeasureSpec);
} }
@@ -631,7 +633,8 @@ public class ChartView extends View {
private String getXAxisLabel() { private String getXAxisLabel() {
Context context = getContext(); Context context = getContext();
if (chartByDistance) { 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 { } else {
return context.getString(R.string.description_time); return context.getString(R.string.description_time);
} }
@@ -716,7 +719,8 @@ public class ChartView extends View {
int interval = chartValueSeries.getInterval(); int interval = chartValueSeries.getInterval();
float maxMarkerWidth = 0; float maxMarkerWidth = 0;
for (int i = 0; i <= Y_AXIS_INTERVALS; i++) { 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; return maxMarkerWidth;
} }
@@ -730,7 +734,8 @@ public class ChartView extends View {
* @param yValue the y value * @param yValue the y value
* @return the marker width. * @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); String marker = chartValueSeries.formatMarker(yValue);
Paint paint = chartValueSeries.getMarkerPaint(); Paint paint = chartValueSeries.getMarkerPaint();
Rect rect = getRect(paint, marker); Rect rect = getRect(paint, marker);
src/main/java/de/dennisguse/opentracks/TrackEditActivity.java
+9 -5
View File
@@ -19,6 +19,7 @@ package de.dennisguse.opentracks;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.ArrayAdapter; 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 = findViewById(R.id.track_edit_activity_type_icon);
activityTypeIcon.setAdapter(TrackIconUtils.getIconSpinnerAdapter(this, iconValue)); activityTypeIcon.setAdapter(TrackIconUtils.getIconSpinnerAdapter(this, iconValue));
activityTypeIcon.setOnClickListener(new View.OnClickListener() { activityTypeIcon.setOnTouchListener(new View.OnTouchListener() {
@Override @Override
public void onClick(View view) { public boolean onTouch(View v, MotionEvent event) {
ChooseActivityTypeDialogFragment.newInstance(activityType.getText().toString()).show( if (event.getAction() == MotionEvent.ACTION_UP) {
getSupportFragmentManager(), ChooseActivityTypeDialogFragment.newInstance(activityType.getText().toString()).show(
ChooseActivityTypeDialogFragment.CHOOSE_ACTIVITY_TYPE_DIALOG_TAG); getSupportFragmentManager(),
ChooseActivityTypeDialogFragment.CHOOSE_ACTIVITY_TYPE_DIALOG_TAG);
}
return true;
} }
}); });
activityTypeIcon.setOnKeyListener(new View.OnKeyListener() { activityTypeIcon.setOnKeyListener(new View.OnKeyListener() {
src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java
+8 -5
View File
@@ -22,6 +22,7 @@ import android.os.Handler;
import android.util.Log; import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Spinner; 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); Spinner activityTypeIcon = getView().findViewById(R.id.stats_activity_type_icon);
activityTypeIcon.setAdapter(TrackIconUtils.getIconSpinnerAdapter(getActivity(), "")); activityTypeIcon.setAdapter(TrackIconUtils.getIconSpinnerAdapter(getActivity(), ""));
activityTypeIcon.setOnClickListener(new View.OnClickListener() { activityTypeIcon.setOnTouchListener(new View.OnTouchListener() {
@Override @Override
public void onClick(View view) { public boolean onTouch(View v, MotionEvent event) {
((TrackDetailActivity) getActivity()).chooseActivityType(category); if (event.getAction() == MotionEvent.ACTION_UP) {
((TrackDetailActivity) getActivity()).chooseActivityType(category);
}
return true;
} }
}); });
activityTypeIcon.setOnKeyListener(new View.OnKeyListener() { activityTypeIcon.setOnKeyListener(new View.OnKeyListener() {
@Override @Override
public boolean onKey(View v, int keyCode, KeyEvent event) { public boolean onKey(View v, int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) { if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
v.performClick(); ((TrackDetailActivity) getActivity()).chooseActivityType(category);
} }
return true; return true;
} }
src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java
+4 -2
View File
@@ -64,12 +64,14 @@ public class ActivityTypePreference extends DialogPreference {
getContext(), R.string.default_activity_key, PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT); getContext(), R.string.default_activity_key, PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT);
textView.setText(category); textView.setText(category);
ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(getContext(), R.array.activity_types, android.R.layout.simple_dropdown_item_1line); ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(
getContext(), R.array.activity_types, android.R.layout.simple_dropdown_item_1line);
textView.setAdapter(adapter); textView.setAdapter(adapter);
textView.setOnItemClickListener(new AdapterView.OnItemClickListener() { textView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override @Override
public void onItemClick(AdapterView<?> parent, View v, int position, long id) { 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); TrackIconUtils.setIconSpinner(spinner, iconValue);
} }
}); });