diff --git a/app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java b/app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java index eb455d98c..df76a9f79 100644 --- a/app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java +++ b/app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java @@ -24,6 +24,7 @@ import androidx.constraintlayout.widget.ConstraintLayout; import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.core.content.ContextCompat; + import android.util.DisplayMetrics; import android.util.Log; import android.view.GestureDetector; @@ -49,6 +50,8 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.snackbar.Snackbar; import com.warkiz.widget.IndicatorSeekBar; +import com.warkiz.widget.OnSeekChangeListener; +import com.warkiz.widget.SeekParams; import java.util.ArrayList; import java.util.Date; @@ -438,16 +441,14 @@ public void onClick(View view) { monitorLongClicks(imgBtnUp, imgBtnDown); - seekBar.setOnSeekChangeListener(new IndicatorSeekBar.OnSeekBarChangeListener() { + seekBar.setOnSeekChangeListener(new OnSeekChangeListener() { @Override - public void onProgressChanged(IndicatorSeekBar seekBar, int progress, float progressFloat, boolean fromUserTouch) { + public void onSeeking(SeekParams seekParams) { String valueText; - switch (unit) { - case "\u00b0": - valueText = progress + unit; - break; - default: - valueText = progress + " " + unit; + if ("\u00b0".equals(unit)) { + valueText = seekParams.progress + unit; + } else { + valueText = seekParams.progress + " " + unit; } if (waveMonSelected) { @@ -459,18 +460,13 @@ public void onProgressChanged(IndicatorSeekBar seekBar, int progress, float prog } @Override - public void onSectionChanged(IndicatorSeekBar seekBar, int thumbPosOnTick, String textBelowTick, boolean fromUserTouch) { - //do nothing - } - - @Override - public void onStartTrackingTouch(IndicatorSeekBar seekBar, int thumbPosOnTick) { - //do nothing + public void onStartTrackingTouch(IndicatorSeekBar seekBar) { + // Unused method override } @Override public void onStopTrackingTouch(IndicatorSeekBar seekBar) { - //do nothing + // Unused method override } }); @@ -911,7 +907,10 @@ private void setSeekBar(IndicatorSeekBar seekBar) { numTicks = 51; leastCount = 1; } - seekBar.getBuilder().setMin(seekMin).setMax(seekMax).setTickNum(numTicks).apply(); + + seekBar.setMin(seekMin); + seekBar.setMax(seekMax); + seekBar.setTickCount(numTicks); if (!waveMonSelected) { waveMonPropSelect.setText(""); diff --git a/app/src/main/java/io/pslab/others/LogicAnalyzerAxisFormatter.java b/app/src/main/java/io/pslab/others/LogicAnalyzerAxisFormatter.java index 6157c194c..15d3ee415 100644 --- a/app/src/main/java/io/pslab/others/LogicAnalyzerAxisFormatter.java +++ b/app/src/main/java/io/pslab/others/LogicAnalyzerAxisFormatter.java @@ -1,11 +1,11 @@ package io.pslab.others; import com.github.mikephil.charting.components.AxisBase; -import com.github.mikephil.charting.formatter.IAxisValueFormatter; +import com.github.mikephil.charting.formatter.ValueFormatter; import java.util.ArrayList; -public class LogicAnalyzerAxisFormatter implements IAxisValueFormatter { +public class LogicAnalyzerAxisFormatter extends ValueFormatter { private ArrayList laChannelNames; diff --git a/app/src/main/res/layout/wave_generator_seekbar.xml b/app/src/main/res/layout/wave_generator_seekbar.xml index 29b575a5b..6b3961459 100644 --- a/app/src/main/res/layout/wave_generator_seekbar.xml +++ b/app/src/main/res/layout/wave_generator_seekbar.xml @@ -21,18 +21,17 @@ + app:isb_tick_marks_color="@color/colorPrimary" + app:isb_ticks_count="51" />