Skip to content

Commit 8e80145

Browse files
authored
fix: dependabot dep issues (#2253)
* fix: dependabot dep issues * chore: upgraded maps and speedview libs * chore: upgraded osm and search dialog versions
1 parent 09dd681 commit 8e80145

File tree

4 files changed

+39
-41
lines changed

4 files changed

+39
-41
lines changed

app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import androidx.constraintlayout.widget.ConstraintLayout;
2525
import androidx.coordinatorlayout.widget.CoordinatorLayout;
2626
import androidx.core.content.ContextCompat;
27+
2728
import android.util.DisplayMetrics;
2829
import android.util.Log;
2930
import android.view.GestureDetector;
@@ -49,6 +50,8 @@
4950
import com.google.android.material.bottomsheet.BottomSheetBehavior;
5051
import com.google.android.material.snackbar.Snackbar;
5152
import com.warkiz.widget.IndicatorSeekBar;
53+
import com.warkiz.widget.OnSeekChangeListener;
54+
import com.warkiz.widget.SeekParams;
5255

5356
import java.util.ArrayList;
5457
import java.util.Date;
@@ -438,16 +441,14 @@ public void onClick(View view) {
438441

439442
monitorLongClicks(imgBtnUp, imgBtnDown);
440443

441-
seekBar.setOnSeekChangeListener(new IndicatorSeekBar.OnSeekBarChangeListener() {
444+
seekBar.setOnSeekChangeListener(new OnSeekChangeListener() {
442445
@Override
443-
public void onProgressChanged(IndicatorSeekBar seekBar, int progress, float progressFloat, boolean fromUserTouch) {
446+
public void onSeeking(SeekParams seekParams) {
444447
String valueText;
445-
switch (unit) {
446-
case "\u00b0":
447-
valueText = progress + unit;
448-
break;
449-
default:
450-
valueText = progress + " " + unit;
448+
if ("\u00b0".equals(unit)) {
449+
valueText = seekParams.progress + unit;
450+
} else {
451+
valueText = seekParams.progress + " " + unit;
451452
}
452453

453454
if (waveMonSelected) {
@@ -459,18 +460,13 @@ public void onProgressChanged(IndicatorSeekBar seekBar, int progress, float prog
459460
}
460461

461462
@Override
462-
public void onSectionChanged(IndicatorSeekBar seekBar, int thumbPosOnTick, String textBelowTick, boolean fromUserTouch) {
463-
//do nothing
464-
}
465-
466-
@Override
467-
public void onStartTrackingTouch(IndicatorSeekBar seekBar, int thumbPosOnTick) {
468-
//do nothing
463+
public void onStartTrackingTouch(IndicatorSeekBar seekBar) {
464+
// Unused method override
469465
}
470466

471467
@Override
472468
public void onStopTrackingTouch(IndicatorSeekBar seekBar) {
473-
//do nothing
469+
// Unused method override
474470
}
475471
});
476472

@@ -911,7 +907,10 @@ private void setSeekBar(IndicatorSeekBar seekBar) {
911907
numTicks = 51;
912908
leastCount = 1;
913909
}
914-
seekBar.getBuilder().setMin(seekMin).setMax(seekMax).setTickNum(numTicks).apply();
910+
911+
seekBar.setMin(seekMin);
912+
seekBar.setMax(seekMax);
913+
seekBar.setTickCount(numTicks);
915914

916915
if (!waveMonSelected) {
917916
waveMonPropSelect.setText("");

app/src/main/java/io/pslab/others/LogicAnalyzerAxisFormatter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package io.pslab.others;
22

33
import com.github.mikephil.charting.components.AxisBase;
4-
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
4+
import com.github.mikephil.charting.formatter.ValueFormatter;
55

66
import java.util.ArrayList;
77

8-
public class LogicAnalyzerAxisFormatter implements IAxisValueFormatter {
8+
public class LogicAnalyzerAxisFormatter extends ValueFormatter {
99

1010
private ArrayList<String> laChannelNames;
1111

app/src/main/res/layout/wave_generator_seekbar.xml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,17 @@
2121

2222
<com.warkiz.widget.IndicatorSeekBar
2323
android:id="@+id/seek_bar_wave_gen"
24-
android:layout_width="@dimen/dimen_zero_dp"
25-
android:layout_height="@dimen/seekbar_height_wave"
24+
android:layout_width="0dp"
25+
android:layout_height="wrap_content"
2626
android:layout_marginTop="@dimen/seekbar_margin"
2727
android:layout_marginBottom="@dimen/seekbar_margin"
2828
android:layout_weight="1"
2929
app:isb_max="5000"
3030
app:isb_min="0"
31-
app:isb_seek_bar_type="discrete_ticks"
32-
app:isb_show_indicator="false"
31+
app:isb_show_indicator="none"
3332
app:isb_thumb_color="@color/colorPrimary"
34-
app:isb_tick_color="@color/colorPrimary"
35-
app:isb_tick_num="51" />
33+
app:isb_tick_marks_color="@color/colorPrimary"
34+
app:isb_ticks_count="51" />
3635

3736

3837
<ImageButton

build.gradle

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,31 +36,31 @@ ext {
3636
compileSdkVersion = 28
3737

3838
// App dependencies
39-
supportLibraryVersion = '28.0.0'
40-
picassoVersion = '2.5.2'
39+
androidAboutPageVersion = '1.2.5'
40+
atvVersion = '1.2.9'
4141
butterKnifeVersion = '10.2.3'
42+
carouselPickerVersion = '1.2'
4243
circleImageViewVersion = '3.1.0'
43-
mpAndroidChartVersion = 'v3.0.3'
44-
commonMathVersion = '3.6.1'
4544
commonLangVersion = '3.5'
46-
materialDialogsVersion = '0.9.6.0'
47-
navTabStripVersion = '1.0.4'
45+
commonMathVersion = '3.6.1'
4846
constraintLayoutVersion = '2.0.4'
49-
atvVersion = '1.2.9'
50-
androidAboutPageVersion = '1.2.5'
51-
markDownViewVersion = '0.19.0'
52-
searchDialogVersion = '1.1'
5347
crollerVersion = '1.0.7'
5448
knobLibraryVersion = '1.9.0'
55-
seekBarLibraryVersion = '1.2.9'
56-
carouselPickerVersion = '1.2'
57-
speedView = '1.2.0'
58-
realmAdapter = '4.0.0'
49+
markDownViewVersion = '0.19.0'
50+
materialDialogsVersion = '0.9.6.0'
51+
mpAndroidChartVersion = 'v3.1.0'
52+
navTabStripVersion = '1.0.4'
5953
okHttpVersion = '4.0.1'
54+
picassoVersion = '2.5.2'
55+
realmAdapter = '4.0.0'
56+
searchDialogVersion = '1.2.4'
57+
seekBarLibraryVersion = '2.1.2'
58+
speedView = '1.5.52'
59+
supportLibraryVersion = '28.0.0'
6060

6161
// Map related versions
62-
osmVersion = '5.1'
63-
mapsforgeVersion = '6.0.2'
62+
osmVersion = '6.1.11'
63+
mapsforgeVersion = '6.1.11'
6464
geoPackageVersion = '6.1.11'
6565
googleMapsVersion = '17.0.1'
6666

0 commit comments

Comments
 (0)