diff --git a/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java index 76f1af919..dc090abf3 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java @@ -22,7 +22,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; -import android.widget.ZoomControls; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -77,10 +76,9 @@ public abstract class ChartFragment extends Fragment implements TrackDataListene // UI elements private ChartView chartView; - private ZoomControls zoomControls; /** - * A runnable that will enable/disable zoom controls and orange pointer as appropriate and redraw. + * A runnable that will set the orange pointer as appropriate and redraw. */ private final Runnable updateChart = new Runnable() { @Override @@ -89,8 +87,6 @@ public abstract class ChartFragment extends Fragment implements TrackDataListene return; } - zoomControls.setIsZoomInEnabled(chartView.canZoomIn()); - zoomControls.setIsZoomOutEnabled(chartView.canZoomOut()); chartView.setShowPointer(isSelectedTrackRecording()); chartView.invalidate(); } @@ -112,21 +108,7 @@ public abstract class ChartFragment extends Fragment implements TrackDataListene @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.chart, container, false); - zoomControls = view.findViewById(R.id.chart_zoom_controls); - zoomControls.setOnZoomInClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - zoomIn(); - } - }); - zoomControls.setOnZoomOutClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - zoomOut(); - } - }); - return view; + return inflater.inflate(R.layout.chart, container, false); } @Override @@ -401,18 +383,6 @@ public abstract class ChartFragment extends Fragment implements TrackDataListene } } - private void zoomIn() { - chartView.zoomIn(); - zoomControls.setIsZoomInEnabled(chartView.canZoomIn()); - zoomControls.setIsZoomOutEnabled(chartView.canZoomOut()); - } - - private void zoomOut() { - chartView.zoomOut(); - zoomControls.setIsZoomInEnabled(chartView.canZoomIn()); - zoomControls.setIsZoomOutEnabled(chartView.canZoomOut()); - } - /** * Runs a runnable on the UI thread if possible. * diff --git a/src/main/res/layout/chart.xml b/src/main/res/layout/chart.xml index 767d4e6d3..bd30d42b7 100644 --- a/src/main/res/layout/chart.xml +++ b/src/main/res/layout/chart.xml @@ -14,22 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - \ No newline at end of file + android:layout_height="0dp" + android:layout_weight="1" + android:orientation="vertical" />